summaryrefslogtreecommitdiff
path: root/src/tabwindow
diff options
context:
space:
mode:
Diffstat (limited to 'src/tabwindow')
-rw-r--r--src/tabwindow/tabbar.cpp1
-rw-r--r--src/tabwindow/tabbar.h3
-rw-r--r--src/tabwindow/tabhighlighteffect.h3
-rw-r--r--src/tabwindow/tabpreviewpopup.h5
-rw-r--r--src/tabwindow/tabwindow.cpp11
-rw-r--r--src/tabwindow/tabwindow.h5
6 files changed, 23 insertions, 5 deletions
diff --git a/src/tabwindow/tabbar.cpp b/src/tabwindow/tabbar.cpp
index 133ece5c..7f0a6691 100644
--- a/src/tabwindow/tabbar.cpp
+++ b/src/tabwindow/tabbar.cpp
@@ -26,7 +26,6 @@
#include "tabpreviewpopup.h"
#include "webwindow.h"
-#include <KDebug>
#include <KAcceleratorManager>
#include <KAction>
#include <KColorScheme>
diff --git a/src/tabwindow/tabbar.h b/src/tabwindow/tabbar.h
index af97c998..a34ebfe3 100644
--- a/src/tabwindow/tabbar.h
+++ b/src/tabwindow/tabbar.h
@@ -22,6 +22,9 @@
#define TAB_BAR
+// Rekonq Includes
+#include "rekonq_defines.h"
+
// KDE Includes
#include <KTabBar>
diff --git a/src/tabwindow/tabhighlighteffect.h b/src/tabwindow/tabhighlighteffect.h
index 88302283..5e8ccab6 100644
--- a/src/tabwindow/tabhighlighteffect.h
+++ b/src/tabwindow/tabhighlighteffect.h
@@ -28,6 +28,9 @@
#define TABHIGHLIGHTEFFECT_H
+// Rekonq Includes
+#include "rekonq_defines.h"
+
// Qt Includes
#include <QGraphicsEffect>
#include <QColor>
diff --git a/src/tabwindow/tabpreviewpopup.h b/src/tabwindow/tabpreviewpopup.h
index b496f60f..37d270c7 100644
--- a/src/tabwindow/tabpreviewpopup.h
+++ b/src/tabwindow/tabpreviewpopup.h
@@ -28,6 +28,10 @@
#ifndef TABPREVIEWPOPUP_H
#define TABPREVIEWPOPUP_H
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
// KDE Includes
#include <KPassivePopup>
@@ -36,6 +40,7 @@ class QLabel;
class QPixmap;
class QString;
+
class TabPreviewPopup : public KPassivePopup
{
Q_OBJECT
diff --git a/src/tabwindow/tabwindow.cpp b/src/tabwindow/tabwindow.cpp
index a849426e..d3826848 100644
--- a/src/tabwindow/tabwindow.cpp
+++ b/src/tabwindow/tabwindow.cpp
@@ -18,21 +18,24 @@
***************************************************************************/
+// Self Includes
#include "tabwindow.h"
#include "tabwindow.moc"
+// Local Includes
#include "webpage.h"
#include "webwindow.h"
#include "tabbar.h"
#include "tabhistory.h"
+// KDE Includes
#include <KAction>
-#include <KDebug>
#include <KLocalizedString>
#include <KStandardDirs>
#include <KUrl>
+// Qt Includes
#include <QApplication>
#include <QDesktopWidget>
#include <QLabel>
@@ -222,7 +225,7 @@ void TabWindow::currentChanged(int newIndex)
if (!tab)
return;
- setWindowTitle(tab->title() + QLatin1String(" - rekonq"));
+ setWindowTitle(tab->title() + QL1S(" - rekonq"));
setWindowIcon(tab->icon());
}
@@ -285,7 +288,7 @@ void TabWindow::tabTitleChanged(const QString &title)
}
else
{
- setWindowTitle(title + QLatin1String(" - rekonq"));
+ setWindowTitle(title + QL1S(" - rekonq"));
}
// TODO: What about window title? Is this enough?
@@ -388,7 +391,7 @@ void TabWindow::closeTab(int index, bool del)
}
if (!tabToClose->url().isEmpty()
- && tabToClose->url().scheme() != QLatin1String("about")
+ && tabToClose->url().scheme() != QL1S("about")
&& !tabToClose->page()->settings()->testAttribute(QWebSettings::PrivateBrowsingEnabled)
)
{
diff --git a/src/tabwindow/tabwindow.h b/src/tabwindow/tabwindow.h
index 24f1b42e..101d5804 100644
--- a/src/tabwindow/tabwindow.h
+++ b/src/tabwindow/tabwindow.h
@@ -23,8 +23,13 @@
#define TAB_WINDOW
+// Rekonq Includes
+#include "rekonq_defines.h"
+
+// KDE Includes
#include <KTabWidget>
+// Forward Declarations
class KUrl;
class QLabel;