From d0ab264b8aa5f5c7fcb21dd172a1f3f5b777356b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= Date: Thu, 2 Sep 2010 18:10:46 +0200 Subject: Include clean-up in the big src directory --- src/tabbar.cpp | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) (limited to 'src/tabbar.cpp') diff --git a/src/tabbar.cpp b/src/tabbar.cpp index f4da2e54..4af2202a 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -29,34 +29,29 @@ //Self Includes #include "tabbar.h" -#include "tabbar.moc" // Local Includes #include "rekonq.h" + #include "application.h" +#include "iconmanager.h" +#include "mainview.h" #include "mainwindow.h" -#include "urlbar.h" +#include "webpage.h" #include "webtab.h" #include "websnap.h" -#include "mainview.h" -#include "iconmanager.h" // KDE Includes -#include -#include -#include -#include -#include #include +#include +#include +#include // Qt Includes -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #define BASE_WIDTH_DIVISOR 4 @@ -172,7 +167,7 @@ void TabBar::showTabPreview() // no previews during load if (indexedTab->progress() != 0) return; - + int w = tabSizeHint(m_currentTabPreviewIndex).width(); int h = w * ((0.0 + currentTab->height()) / currentTab->width()); @@ -208,7 +203,7 @@ void TabBar::mouseMoveEvent(QMouseEvent *event) } KTabBar::mouseMoveEvent(event); - + if (ReKonfig::alwaysShowTabPreviews()) { //Find the tab under the mouse @@ -287,7 +282,7 @@ void TabBar::mousePressEvent(QMouseEvent *event) void TabBar::contextMenu(int tab, const QPoint &pos) { setupHistoryActions(); - + m_actualIndex = tab; KMenu menu; @@ -313,7 +308,7 @@ void TabBar::contextMenu(int tab, const QPoint &pos) void TabBar::emptyAreaContextMenu(const QPoint &pos) { setupHistoryActions(); - + KMenu menu; MainWindow *mainWindow = Application::instance()->mainWindow(); @@ -328,7 +323,7 @@ void TabBar::emptyAreaContextMenu(const QPoint &pos) { menu.addAction( mainBar->toggleViewAction() ); } - + menu.exec(pos); } @@ -360,7 +355,7 @@ void TabBar::setupHistoryActions() { MainWindow *w = Application::instance()->mainWindow(); MainView *mv = qobject_cast(parent()); - + QAction *openClosedTabsAction = w->actionByName( QL1S("open_closed_tabs") ); openClosedTabsAction->setEnabled( mv->recentlyClosedTabs().size() > 0 ); -- cgit v1.2.1