New rekonq_defines.h

Speed up compilation & linking on Win, Lin & Mac. Step 1

49 files changed, 160 insertions, 129 deletions

diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h
index 20ca1b6e..9396e76c 100644
--- a/src/adblock/adblockmanager.h
+++ b/src/adblock/adblockmanager.h
@@ -104,8 +104,10 @@
 // END NOTE ----------------------------------------------------------------------------------------------------------
 
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "adblockrule.h"
 
 // Qt Includes
diff --git a/src/adblock/adblocknetworkreply.h b/src/adblock/adblocknetworkreply.h
index c70ecb38..79204bcd 100644
--- a/src/adblock/adblocknetworkreply.h
+++ b/src/adblock/adblocknetworkreply.h
@@ -54,8 +54,8 @@
 #define ADBLOCK_NETWORK_REPLY_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // Qt Includes
 #include <QNetworkReply>
diff --git a/src/adblock/adblockrule.cpp b/src/adblock/adblockrule.cpp
index d11cc026..d69f8a9c 100644
--- a/src/adblock/adblockrule.cpp
+++ b/src/adblock/adblockrule.cpp
@@ -61,10 +61,6 @@
 #include <QRegExp>
 #include <QUrl>
 
-// Defines
-#define QL1S(x) QLatin1String(x)
-#define QL1C(x) QLatin1Char(x)
-
 
 AdBlockRule::AdBlockRule(const QString &filter)
         : m_optionMatchRule(false)
diff --git a/src/adblock/adblockrule.h b/src/adblock/adblockrule.h
index 8990630a..a241ee7d 100644
--- a/src/adblock/adblockrule.h
+++ b/src/adblock/adblockrule.h
@@ -55,6 +55,9 @@
 #define ADBLOCKRULE_H
 
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Qt Includes
 #include <QRegExp>
 #include <QString>
diff --git a/src/application.h b/src/application.h
index 9a8031ea..44d94e5c 100644
--- a/src/application.h
+++ b/src/application.h
@@ -29,8 +29,9 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
-// Local Includes
-#include "rekonqprivate_export.h"
+
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE Includes
 #include <KUniqueApplication>
@@ -57,37 +58,6 @@ class WebView;
 typedef QList< QWeakPointer<MainWindow> > MainWindowList;
 
 
-namespace Rekonq
-{
-/**
- * @short notifying message status
- * Different message status
- */
-
-enum Notify
-{
-    Success,    ///< url successfully (down)loaded
-    Error,      ///< url failed to (down)load
-    Download,   ///< downloading url
-    Info        ///< information, (default)
-};
-
-/**
- * @short Open link options
- * Different modes of opening new tab
- */
-enum OpenType
-{
-    CurrentTab,     ///< open url in current tab
-    SettingOpenTab, ///< open url according to users settings
-    NewCurrentTab,  ///< open url in new tab and make it current
-    NewBackTab,     ///< open url in new tab in background
-    NewWindow       ///< open url in new window
-};
-
-}
-
-
 /**
   *
   */
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index 05426243..ae12280b 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -31,8 +31,10 @@
 #define BOOKMARKS_H
 
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "application.h"
 
 // Qt Includes
diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index 90597c73..b2a9f264 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -30,8 +30,10 @@
 #define BOOKMARKSPANEL_H
 
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "application.h"
 #include "paneltreeview.h"
 
diff --git a/src/bookmarks/bookmarksproxy.h b/src/bookmarks/bookmarksproxy.h
index 8b2cf95e..e7b50d8e 100644
--- a/src/bookmarks/bookmarksproxy.h
+++ b/src/bookmarks/bookmarksproxy.h
@@ -29,8 +29,8 @@
 #define BOOKMARKSPROXY_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // Qt Includes
 #include <QSortFilterProxyModel>
diff --git a/src/bookmarks/bookmarkstreemodel.h b/src/bookmarks/bookmarkstreemodel.h
index 2cb78770..d066e137 100644
--- a/src/bookmarks/bookmarkstreemodel.h
+++ b/src/bookmarks/bookmarkstreemodel.h
@@ -29,8 +29,8 @@
 #define BOOKMARKSTREEMODEL_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE includes
 #include <KBookmark>
diff --git a/src/clicktoflash.h b/src/clicktoflash.h
index f083dccc..1fd9f9c6 100644
--- a/src/clicktoflash.h
+++ b/src/clicktoflash.h
@@ -29,8 +29,8 @@
 #define CLICKTOFLASH_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // Qt Includes
 #include <QWidget>
diff --git a/src/filterurljob.h b/src/filterurljob.h
index 85249fcc..6ab10695 100644
--- a/src/filterurljob.h
+++ b/src/filterurljob.h
@@ -27,8 +27,10 @@
 #ifndef FILTER_URL_JOB_H
 #define FILTER_URL_JOB_H
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "webview.h"
 
 // KDE Includes
diff --git a/src/findbar.h b/src/findbar.h
index 9426de49..39bb28c9 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -29,8 +29,8 @@
 #define FINDBAR_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE Includes
 #include <KLineEdit>
diff --git a/src/history/autosaver.h b/src/history/autosaver.h
index b3a74df4..6927dbe8 100644
--- a/src/history/autosaver.h
+++ b/src/history/autosaver.h
@@ -29,8 +29,8 @@
 #define AUTOSAVER_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // Qt Includes
 #include <QtCore/QObject>
diff --git a/src/history/historymanager.h b/src/history/historymanager.h
index ba9a5cc5..0f131782 100644
--- a/src/history/historymanager.h
+++ b/src/history/historymanager.h
@@ -30,8 +30,8 @@
 #define HISTORY_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE Includes
 #include <KUrl>
diff --git a/src/history/historymodels.h b/src/history/historymodels.h
index 0788ce9a..01d345b8 100644
--- a/src/history/historymodels.h
+++ b/src/history/historymodels.h
@@ -30,8 +30,10 @@
 #define HISTORYMODELS_H
 
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "historymanager.h"
 
 // KDE Includes
diff --git a/src/history/historypanel.h b/src/history/historypanel.h
index bbfa1dc0..1c86cfee 100644
--- a/src/history/historypanel.h
+++ b/src/history/historypanel.h
@@ -29,8 +29,10 @@
 #define HISTORYPANEL_H
 
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "application.h"
 #include "paneltreeview.h"
 
diff --git a/src/mainview.cpp b/src/mainview.cpp
index a11f7fb6..81607a9e 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -61,9 +61,6 @@
 #include <QWidget>
 #include <QVBoxLayout>
 
-// Defines
-#define QL1S(x)  QLatin1String(x)
-
 
 MainView::MainView(MainWindow *parent)
         : KTabWidget(parent)
diff --git a/src/mainview.h b/src/mainview.h
index 1cd17348..eb5b3e02 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -31,8 +31,10 @@
 #define MAINVIEW_H
 
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "webview.h"
 #include "webpage.h"
 #include "application.h"
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 24648aa8..d6357984 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -31,11 +31,8 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-
-// Local Includes
-#include "rekonqprivate_export.h"
-#include "application.h"
-#include "previewselectorbar.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE Includes
 #include <KMainWindow>
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 1d67301b..754e1148 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -25,6 +25,7 @@
 * ============================================================ */
 
 
+
 // Self Includes
 #include "networkaccessmanager.h"
 #include "networkaccessmanager.moc"
@@ -39,9 +40,6 @@
 #include <KLocale>
 #include <KProtocolManager>
 
-// Defines
-#define QL1S(x)  QLatin1String(x)
-
 
 NetworkAccessManager::NetworkAccessManager(QObject *parent)
         : AccessManager(parent)
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index 2a240bfa..aefd1a25 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -29,8 +29,10 @@
 #define NETWORKACCESSMANAGER_H
 
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "webpage.h"
 
 // KDE Includes
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index f0cee9e1..12f23335 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -54,9 +54,6 @@
 // Qt Includes
 #include <QFile>
 
-// Defines
-#define QL1S(x)  QLatin1String(x)
-
 
 NewTabPage::NewTabPage(QWebFrame *frame)
         : QObject(frame)
diff --git a/src/newtabpage.h b/src/newtabpage.h
index 3aaf1038..ad4941d3 100644
--- a/src/newtabpage.h
+++ b/src/newtabpage.h
@@ -29,8 +29,8 @@
 #define REKONQ_NEW_TAB_PAGE
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE Includes
 #include <KUrl>
diff --git a/src/previewselectorbar.h b/src/previewselectorbar.h
index bca016c1..c291fb43 100644
--- a/src/previewselectorbar.h
+++ b/src/previewselectorbar.h
@@ -28,8 +28,10 @@
 #ifndef PREVIEWSELECTORBAR_H
 #define PREVIEWSELECTORBAR_H
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "webpage.h"
 
 // Qt Includes
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index dadd6d99..ccbe4cb0 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -63,9 +63,6 @@
 #include <QFile>
 #include <QDateTime>
 
-// Defines
-#define QL1S(x)  QLatin1String(x)
-
 
 ProtocolHandler::ProtocolHandler(QObject *parent)
         : QObject(parent)
diff --git a/src/protocolhandler.h b/src/protocolhandler.h
index 9ecf4d06..a8661f81 100644
--- a/src/protocolhandler.h
+++ b/src/protocolhandler.h
@@ -28,8 +28,8 @@
 #define PROTOCOL_HANDLER_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE Includes
 #include <KDirLister>
diff --git a/src/rekonqprivate_export.h b/src/rekonq_defines.h
index 8ca98349..882cd72c 100644
--- a/src/rekonqprivate_export.h
+++ b/src/rekonq_defines.h
@@ -25,8 +25,12 @@
 * ============================================================ */
 
 
-#ifndef REKONQPRIVATE_EXPORT_H
-#define REKONQPRIVATE_EXPORT_H
+#ifndef REKONQ_DEFINES_H
+#define REKONQ_DEFINES_H
+
+
+// ----------------------------------------------------------------------------------------------------
+// UNIT TESTS NEED
 
 /* needed for KDE_EXPORT and KDE_IMPORT macros */
 #include <kdemacros.h>
@@ -40,4 +44,47 @@
 #define REKONQ_TESTS_EXPORT KDE_IMPORT
 #endif
 
-#endif  // REKONQPRIVATE_EXPORT_H
+
+// ----------------------------------------------------------------------------------------------------
+// DEFINES
+
+#define QL1S(x)  QLatin1String(x)
+#define QL1C(x)  QLatin1Char(x)
+
+
+
+// ----------------------------------------------------------------------------------------------------
+// ENUMS
+
+namespace Rekonq
+{
+    /**
+    * @short notifying message status
+    * Different message status
+    */
+
+    enum Notify
+    {
+        Success,    ///< url successfully (down)loaded
+        Error,      ///< url failed to (down)load
+        Download,   ///< downloading url
+        Info        ///< information, (default)
+    };
+
+    /**
+    * @short Open link options
+    * Different modes of opening new tab
+    */
+    enum OpenType
+    {
+        CurrentTab,     ///< open url in current tab
+        SettingOpenTab, ///< open url according to users settings
+        NewCurrentTab,  ///< open url in new tab and make it current
+        NewBackTab,     ///< open url in new tab in background
+        NewWindow       ///< open url in new window
+    };
+}
+
+// ----------------------------------------------------------------------------------------------------
+
+#endif  // REKONQ_DEFINES_H
diff --git a/src/searchengine.cpp b/src/searchengine.cpp
index f258f976..6541345b 100644
--- a/src/searchengine.cpp
+++ b/src/searchengine.cpp
@@ -24,6 +24,7 @@
 *
 * ============================================================ */
 
+
 //local includes
 #include "searchengine.h"
 
@@ -32,10 +33,6 @@
 #include <KServiceTypeTrader>
 
 
-// Defines
-#define QL1S(x)  QLatin1String(x)
-
-
 QString SearchEngine::m_delimiter = "";
 
 
diff --git a/src/searchengine.h b/src/searchengine.h
index 42107288..b31f420b 100644
--- a/src/searchengine.h
+++ b/src/searchengine.h
@@ -27,6 +27,10 @@
 #ifndef SEARCHENGINE_H
 #define SEARCHENGINE_H
 
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Auto Includes
 #include "rekonq.h"
 
@@ -36,6 +40,7 @@
 //Qt Includes
 #include <QString>
 
+
 class SearchEngine
 {
 public:
diff --git a/src/sessionmanager.h b/src/sessionmanager.h
index d6377d4b..7960fc3e 100644
--- a/src/sessionmanager.h
+++ b/src/sessionmanager.h
@@ -30,8 +30,8 @@
 #define SESSION_MANAGER_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // Qt Includes
 #include <QtCore/QObject>
diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h
index 08d3c71b..25b2fe9b 100644
--- a/src/settings/settingsdialog.h
+++ b/src/settings/settingsdialog.h
@@ -29,8 +29,8 @@
 #define SETTINGS_DIALOG_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE Includes
 #include <KConfigDialog>
diff --git a/src/tabbar.h b/src/tabbar.h
index 03ee4905..af3c537b 100644
--- a/src/tabbar.h
+++ b/src/tabbar.h
@@ -31,8 +31,8 @@
 #define TABBAR_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // Qt Includes
 #include <QWeakPointer>
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index bb840c40..8382742a 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -28,6 +28,9 @@
 #define COMPLETION_WIDGET_H
 
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
 #include "application.h"
 #include "listitem.h"
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index d6d9e044..64baa836 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -55,9 +55,6 @@
 #include <QWebSettings>
 #include <QFile>
 
-// Defines
-#define QL1S(x)  QLatin1String(x)
-
 
 ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
         : QWidget(parent)
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 7dc1af39..25d651d3 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -28,6 +28,9 @@
 #define LISTITEM_H
 
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
 #include "urlresolver.h"
 
diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp
index 5914b8c1..849ba3a8 100644
--- a/src/urlbar/rsswidget.cpp
+++ b/src/urlbar/rsswidget.cpp
@@ -33,6 +33,7 @@
 #include <QDBusInterface>
 #include <QDBusConnectionInterface>
 #include <QLabel>
+#include <QPushButton>
 
 // KDE Includes
 #include <KLocalizedString>
diff --git a/src/urlbar/rsswidget.h b/src/urlbar/rsswidget.h
index 253c20f2..ad1f051e 100644
--- a/src/urlbar/rsswidget.h
+++ b/src/urlbar/rsswidget.h
@@ -20,6 +20,9 @@
 #ifndef RSSWIDGET_H
 #define RSSWIDGET_H
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Qt Includes
 #include <QFrame>
 #include <KUrl>
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 34cbb9aa..d8f9e9bd 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -51,9 +51,6 @@
 #include <QTimer>
 #include <QVBoxLayout>
 
-// Defines
-#define QL1S(x)  QLatin1String(x)
-
 
 IconButton::IconButton(QWidget *parent)
         : QToolButton(parent)
@@ -279,7 +276,7 @@ void UrlBar::loadFinished()
     if (ReKonfig::kgetList())
     {
         IconButton *bt = addRightIcon(UrlBar::KGet);
-        connect(bt, SIGNAL(clicked(QPoint)), _tab->page(), SLOT(downloadAllContentsWithKGet()));
+        connect(bt, SIGNAL(clicked(QPoint)), _tab->page(), SLOT(downloadAllContentsWithKGet(QPoint)));
     }
 
     // show RSS
@@ -293,7 +290,7 @@ void UrlBar::loadFinished()
     if (_tab->url().scheme() == QL1S("https"))
     {
         IconButton *bt = addRightIcon(UrlBar::SSL);
-        connect(bt, SIGNAL(clicked(QPoint)), _tab->page(), SLOT(showSSLInfo()));
+        connect(bt, SIGNAL(clicked(QPoint)), _tab->page(), SLOT(showSSLInfo(QPoint)));
     }
 
     update();
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 2c1e7f23..b644f84f 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -30,10 +30,8 @@
 #ifndef URLBAR_H
 #define URLBAR_H
 
-
-// Local Includes
-#include "rekonqprivate_export.h"
-#include "application.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE Includes
 #include <KUrl>
@@ -53,12 +51,16 @@ class WebTab;
 class IconButton : public QToolButton
 {
     Q_OBJECT
+
 public:
     IconButton(QWidget *parent = 0);
+    
 signals:
     void clicked(QPoint);
+
 protected:
     void mouseReleaseEvent(QMouseEvent *event);
+
 };
 
 
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 482f8809..c16fd09b 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -27,6 +27,10 @@
 #ifndef URL_RESOLVER_H
 #define URL_RESOLVER_H
 
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // KDE Includes
 #include <KUrl>
 
diff --git a/src/walletbar.h b/src/walletbar.h
index 14efb235..5901c659 100644
--- a/src/walletbar.h
+++ b/src/walletbar.h
@@ -28,8 +28,8 @@
 #define WALLET_BAR_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // Qt Includes
 #include <QWidget>
diff --git a/src/webinspectorpanel.h b/src/webinspectorpanel.h
index 581a54fa..8b1e3507 100644
--- a/src/webinspectorpanel.h
+++ b/src/webinspectorpanel.h
@@ -28,8 +28,8 @@
 #define WEBINSPECTOR_PANEL_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // Local Includes
 #include "mainwindow.h"
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 37a04abe..41d014f0 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -73,10 +73,6 @@
 #include <QtGui/QKeyEvent>
 #include <QWebFrame>
 
-// Defines
-#define QL1S(x)  QLatin1String(x)
-#define QL1C(x)  QLatin1Char(x)
-
 
 // Returns true if the scheme and domain of the two urls match...
 static bool domainSchemeMatch(const QUrl& u1, const QUrl& u2)
@@ -509,7 +505,7 @@ void WebPage::downloadRequest(const QNetworkRequest &request)
 }
 
 
-void WebPage::downloadAllContentsWithKGet()
+void WebPage::downloadAllContentsWithKGet(QPoint)
 {
     QSet<QString> contents;
     KUrl baseUrl(currentFrame()->url());
@@ -541,7 +537,7 @@ void WebPage::downloadAllContentsWithKGet()
 }
 
 
-void WebPage::showSSLInfo()
+void WebPage::showSSLInfo(QPoint)
 {
     if (_sslInfo.isValid())
     {
diff --git a/src/webpage.h b/src/webpage.h
index 3c9b51fe..41c14295 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -33,8 +33,10 @@
 #define WEBPAGE_H
 
 
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "protocolhandler.h"
 #include "newtabpage.h"
 #include "websslinfo.h"
@@ -60,7 +62,7 @@ public:
 
 public slots:
     virtual void downloadRequest(const QNetworkRequest &request);
-    void downloadAllContentsWithKGet();
+    void downloadAllContentsWithKGet(QPoint);
 
 protected:
     WebPage *createWindow(WebWindowType type);
@@ -73,7 +75,7 @@ private slots:
     void handleUnsupportedContent(QNetworkReply *reply);
     void manageNetworkErrors(QNetworkReply *reply);
     void loadFinished(bool);
-    void showSSLInfo();
+    void showSSLInfo(QPoint);
     void updateImage(bool ok);
 
 private:
diff --git a/src/webpluginfactory.h b/src/webpluginfactory.h
index f5de51d6..c5eefa45 100644
--- a/src/webpluginfactory.h
+++ b/src/webpluginfactory.h
@@ -29,8 +29,8 @@
 #define WEB_PLUGIN_FACTORY_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE Includes
 #include <KWebPluginFactory>
diff --git a/src/websnap.h b/src/websnap.h
index b5629702..45eaf62e 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -29,8 +29,9 @@
 #ifndef WEB_SNAP_H
 #define WEB_SNAP_H
 
-// Local Includes
-#include "rekonqprivate_export.h"
+
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE Includes
 #include <KUrl>
diff --git a/src/webtab.cpp b/src/webtab.cpp
index 1b0eef5e..ae4d34c6 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -61,9 +61,6 @@
 #include <QAction>
 #include <QVBoxLayout>
 
-// Defines
-#define QL1S(x)  QLatin1String(x)
-
 
 WebTab::WebTab(QWidget *parent)
         : QWidget(parent)
diff --git a/src/webtab.h b/src/webtab.h
index 1f8aa204..10b8fe94 100644
--- a/src/webtab.h
+++ b/src/webtab.h
@@ -29,8 +29,8 @@
 #define WEBTAB_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
+// Rekonq Includes
+#include "rekonq_defines.h"
 
 // KDE Includes
 #include <KUrl>
diff --git a/src/webview.h b/src/webview.h
index 533b762c..c4c29d10 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -28,8 +28,11 @@
 #ifndef WEBVIEW_H
 #define WEBVIEW_H
 
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "application.h"
 
 // KDE Includes