Fixed building on Windows + whole compilation is now faster.

src/lib/3rdparty/ecwin7.h

@@ -20,6 +20,8 @@
 #ifndef ECWIN7_H
 #define ECWIN7_H
 
+#include "qz_namespace.h"
+
 #include <QtGlobal>
 #include <QWidget>
 

src/lib/3rdparty/fancytabwidget.cpp

@@ -474,7 +474,7 @@ void FancyTabBar::setCurrentIndex(int index)
 // FancyColorButton
 //////
 
-class FancyColorButton : public QWidget
+class QT_QUPZILLA_EXPORT FancyColorButton : public QWidget
 {
 public:
     FancyColorButton(QWidget* parent)

src/lib/3rdparty/fancytabwidget.h

@@ -30,6 +30,8 @@
 #ifndef FANCYTABWIDGET_H
 #define FANCYTABWIDGET_H
 
+#include "qz_namespace.h"
+
 #include <QIcon>
 #include <QPropertyAnimation>
 #include <QProxyStyle>
@@ -50,7 +52,7 @@ namespace Core
 namespace Internal
 {
 
-class FancyTabProxyStyle : public QProxyStyle
+class QT_QUPZILLA_EXPORT FancyTabProxyStyle : public QProxyStyle
 {
     Q_OBJECT
 
@@ -65,7 +67,7 @@ protected:
     bool eventFilter(QObject* o, QEvent* e);
 };
 
-class FancyTab : public QWidget
+class QT_QUPZILLA_EXPORT FancyTab : public QWidget
 {
     Q_OBJECT
 
@@ -93,7 +95,7 @@ private:
     float m_fader;
 };
 
-class FancyTabBar : public QWidget
+class QT_QUPZILLA_EXPORT FancyTabBar : public QWidget
 {
     Q_OBJECT
 
@@ -142,7 +144,7 @@ private:
 
 };
 
-class FancyTabWidget : public QWidget
+class QT_QUPZILLA_EXPORT FancyTabWidget : public QWidget
 {
     Q_OBJECT
 

src/lib/3rdparty/lineedit.h

@@ -1,5 +1,6 @@
 #ifndef LINEEDIT_H
 #define LINEEDIT_H
+
 /**
 * Copyright (c) 2008 - 2009, Benjamin C. Meyer <ben@meyerhome.net>
 *
@@ -29,6 +30,7 @@
 */
 
 #include <QLineEdit>
+#include "qz_namespace.h"
 
 class QHBoxLayout;
 
@@ -43,7 +45,7 @@ As widgets are added to the class they are inserted from the outside
 into the center of the widget.
 */
 class SideWidget;
-class LineEdit : public QLineEdit
+class QT_QUPZILLA_EXPORT LineEdit : public QLineEdit
 {
     Q_OBJECT
     Q_PROPERTY(QString inactiveText READ inactiveText WRITE setInactiveText)
@@ -89,7 +91,7 @@ private:
 };
 
 
-class SideWidget : public QWidget
+class QT_QUPZILLA_EXPORT SideWidget : public QWidget
 {
     Q_OBJECT
 

src/lib/3rdparty/qtwin.cpp

@@ -71,7 +71,7 @@ static PtrDwmGetColorizationColor pDwmGetColorizationColor = 0;
  * DWM compositing state changes and updates the widget
  * flags correspondingly.
  */
-class WindowNotifier : public QWidget
+class QT_QUPZILLA_EXPORT WindowNotifier : public QWidget
 {
 public:
     WindowNotifier() {

src/lib/3rdparty/qtwin.h

@@ -27,6 +27,8 @@
 #ifndef QTWIN_H
 #define QTWIN_H
 
+#include "qz_namespace.h"
+
 #include <QColor>
 #include <QWidget>
 #include <QSysInfo>
@@ -46,7 +48,7 @@ DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDestListSeparator, 0x9F4C2855, 0x9F79, 0x
 
 #endif
 class WindowNotifier;
-class QtWin : public QObject
+class QT_QUPZILLA_EXPORT QtWin : public QObject
 {
     Q_OBJECT
 public:

src/lib/3rdparty/squeezelabelv1.h

@@ -1,6 +1,8 @@
 #ifndef SQUEEZELABELV1_H
 #define SQUEEZELABELV1_H
 
+#include "qz_namespace.h"
+
 /**
 * Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
 *
@@ -35,7 +37,7 @@
 A label that will squeeze the set text to fit within the size of the
 widget. The text will be elided in the middle.
 */
-class SqueezeLabelV1 : public QLabel
+class QT_QUPZILLA_EXPORT SqueezeLabelV1 : public QLabel
 {
     Q_OBJECT
 

src/lib/3rdparty/squeezelabelv2.h

@@ -1,6 +1,8 @@
 #ifndef SQUEEZELABELV2_H
 #define SQUEEZELABELV2_H
 
+#include "qz_namespace.h"
+
 /**
 * Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
 *
@@ -35,7 +37,7 @@
 A label that will squeeze the set text to fit within the size of the
 widget. The text will be elided in the middle.
 */
-class SqueezeLabelV2 : public QLabel
+class QT_QUPZILLA_EXPORT SqueezeLabelV2 : public QLabel
 {
     Q_OBJECT
 

src/lib/3rdparty/stylehelper.h

@@ -30,6 +30,8 @@
 #ifndef STYLEHELPER_H
 #define STYLEHELPER_H
 
+#include "qz_namespace.h"
+
 #include <QtGui/QColor>
 #include <QtGui/QStyle>
 

src/lib/adblock/adblockblockednetworkreply.cpp

@@ -44,11 +44,10 @@
  */
 
 #include "adblockblockednetworkreply.h"
-
 #include "adblockrule.h"
 
-#include <qnetworkrequest.h>
-#include <qtimer.h>
+#include <QNetworkRequest>
+#include <QTimer>
 
 AdBlockBlockedNetworkReply::AdBlockBlockedNetworkReply(const QNetworkRequest &request, const AdBlockRule* rule, QObject* parent)
     : QNetworkReply(parent)

src/lib/adblock/adblockblockednetworkreply.h

@@ -46,10 +46,13 @@
 #ifndef ADBLOCKBLOCKEDNETWORKREPLY_H
 #define ADBLOCKBLOCKEDNETWORKREPLY_H
 
-#include <qnetworkreply.h>
+#include <QNetworkReply>
+
+#include "qz_namespace.h"
 
 class AdBlockRule;
-class AdBlockBlockedNetworkReply : public QNetworkReply
+
+class QT_QUPZILLA_EXPORT AdBlockBlockedNetworkReply : public QNetworkReply
 {
     Q_OBJECT
 

src/lib/adblock/adblockdialog.cpp

@@ -47,6 +47,10 @@
 #include "adblocksubscription.h"
 #include "mainapplication.h"
 
+#include <QMenu>
+#include <QMessageBox>
+#include <QInputDialog>
+
 AdBlockDialog::AdBlockDialog(QWidget* parent)
     : QDialog(parent)
     , m_itemChangingBlock(false)

src/lib/adblock/adblockdialog.h

@@ -47,23 +47,15 @@
 #define ADBLOCKDIALOG_H
 
 #include <QDialog>
-#include <QDesktopServices>
-#include <QMenu>
-#include <QUrl>
-#include <QSortFilterProxyModel>
-#include <QDebug>
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QInputDialog>
-#include <QMessageBox>
-#include <QTimer>
 
+#include "qz_namespace.h"
 #include "ui_adblockdialog.h"
 
 class AdBlockModel;
 class AdBlockManager;
 class TreeSortFilterProxyModel;
-class AdBlockDialog : public QDialog, public Ui_AdBlockDialog
+
+class QT_QUPZILLA_EXPORT AdBlockDialog : public QDialog, public Ui_AdBlockDialog
 {
     Q_OBJECT
 

src/lib/adblock/adblockicon.cpp

@@ -24,6 +24,9 @@
 #include "tabwidget.h"
 #include "desktopnotificationsfactory.h"
 
+#include <QMenu>
+#include <QTimer>
+
 AdBlockIcon::AdBlockIcon(QupZilla* mainClass, QWidget* parent)
     : ClickableLabel(parent)
     , p_QupZilla(mainClass)

src/lib/adblock/adblockicon.h

@@ -18,13 +18,16 @@
 #ifndef ADBLOCKICON_H
 #define ADBLOCKICON_H
 
-#include <QObject>
-#include <QMenu>
 
+#include "qz_namespace.h"
 #include "clickablelabel.h"
 
+class QMenu;
+class QUrl;
+
 class QupZilla;
-class AdBlockIcon : public ClickableLabel
+
+class QT_QUPZILLA_EXPORT AdBlockIcon : public ClickableLabel
 {
     Q_OBJECT
 public:

src/lib/adblock/adblockmanager.cpp

@@ -52,6 +52,8 @@
 #include "qupzilla.h"
 #include "settings.h"
 
+#include <QDateTime>
+
 AdBlockManager* AdBlockManager::s_adBlockManager = 0;
 
 AdBlockManager::AdBlockManager(QObject* parent)

src/lib/adblock/adblockmanager.h

@@ -46,15 +46,18 @@
 #define ADBLOCKMANAGER_H
 
 #include <QObject>
-#include <QStringList>
 #include <QWeakPointer>
 
+#include "qz_namespace.h"
+
 class QUrl;
+
 class AdBlockDialog;
 class AdBlockNetwork;
 class AdBlockPage;
 class AdBlockSubscription;
-class AdBlockManager : public QObject
+
+class QT_QUPZILLA_EXPORT AdBlockManager : public QObject
 {
     Q_OBJECT
 

src/lib/adblock/adblocknetwork.h

@@ -48,9 +48,12 @@
 
 #include <QObject>
 
+#include "qz_namespace.h"
+
 class QNetworkRequest;
 class QNetworkReply;
-class AdBlockNetwork : public QObject
+
+class QT_QUPZILLA_EXPORT AdBlockNetwork : public QObject
 {
 public:
     AdBlockNetwork(QObject* parent = 0);

src/lib/adblock/adblockpage.cpp

@@ -25,20 +25,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
 #include "adblockpage.h"
-
 #include "adblockmanager.h"
 #include "adblocksubscription.h"
 #include "adblockrule.h"
 
-#if QT_VERSION >= 0x040600
-#include <qwebelement.h>
-#endif
-#include <qwebpage.h>
-#include <qwebframe.h>
-
-#include <qdebug.h>
+#include <QWebElement>
+#include <QWebPage>
+#include <QWebFrame>
 
 // #define ADBLOCKPAGE_DEBUG
 
@@ -89,7 +83,7 @@ void AdBlockPage::checkRule(const AdBlockRule* rule, QWebPage* page, const QStri
     }
 
     Q_UNUSED(page);
-#if QT_VERSION >= 0x040600
+
     QWebElement document = page->mainFrame()->documentElement();
     QWebElementCollection elements = document.findAll(selectorQuery);
 #if defined(ADBLOCKPAGE_DEBUG)
@@ -101,8 +95,6 @@ void AdBlockPage::checkRule(const AdBlockRule* rule, QWebPage* page, const QStri
         element.setStyleProperty(QLatin1String("visibility"), QLatin1String("hidden"));
         element.removeFromDocument();
     }
-
-#endif
 }
 
 void AdBlockPage::applyRulesToPage(QWebPage* page)
@@ -114,7 +106,7 @@ void AdBlockPage::applyRulesToPage(QWebPage* page)
     if (!manager->isEnabled()) {
         return;
     }
-#if QT_VERSION >= 0x040600
+
     QString host = page->mainFrame()->url().host();
     AdBlockSubscription* subscription = manager->subscription();
 
@@ -122,6 +114,5 @@ void AdBlockPage::applyRulesToPage(QWebPage* page)
     foreach(const AdBlockRule * rule, rules) {
         checkRule(rule, page, host);
     }
-#endif
 }
 

src/lib/adblock/adblockpage.h

@@ -29,11 +29,15 @@
 #ifndef ADBLOCKPAGE_H
 #define ADBLOCKPAGE_H
 
-#include <qobject.h>
+#include <QObject>
+
+#include "qz_namespace.h"
+
+class QWebPage;
 
 class AdBlockRule;
-class QWebPage;
-class AdBlockPage : public QObject
+
+class QT_QUPZILLA_EXPORT AdBlockPage : public QObject
 {
 public:
     AdBlockPage(QObject* parent = 0);

src/lib/adblock/adblockrule.cpp

@@ -45,12 +45,13 @@
  */
 
 #include "adblockrule.h"
-
 #include "adblocksubscription.h"
 
-#include <qdebug.h>
-#include <qregexp.h>
-#include <qurl.h>
+#include <QDebug>
+#include <QRegExp>
+#include <QUrl>
+#include <QString>
+#include <QStringList>
 
 // #define ADBLOCKRULE_DEBUG
 

src/lib/adblock/adblockrule.h

@@ -46,10 +46,14 @@
 #ifndef ADBLOCKRULE_H
 #define ADBLOCKRULE_H
 
-#include <qstringlist.h>
+#include <QObject>
+#include <QRegExp>
+#include <QStringList>
+
+#include "qz_namespace.h"
 
 class QUrl;
-class QRegExp;
+
 class AdBlockRule
 {
 

src/lib/adblock/adblocksubscription.cpp

@@ -45,6 +45,11 @@
 #include "adblocksubscription.h"
 #include "mainapplication.h"
 #include "networkmanager.h"
+
+#include <QFile>
+#include <QTimer>
+#include <QNetworkReply>
+#include <QDebug>
 // #define ADBLOCKSUBSCRIPTION_DEBUG
 
 AdBlockSubscription::AdBlockSubscription(QObject* parent)

src/lib/adblock/adblocksubscription.h

@@ -46,20 +46,15 @@
 #ifndef ADBLOCKSUBSCRIPTION_H
 #define ADBLOCKSUBSCRIPTION_H
 
-#include "adblockrule.h"
-#include <QObject>
 #include <QList>
-#include <QDateTime>
-#include <QDebug>
-#include <QFile>
-#include <QNetworkReply>
-#include <QTextStream>
-#include <QFileInfo>
-#include <QTimer>
+
+#include "qz_namespace.h"
+#include "adblockrule.h"
 
 class QNetworkReply;
 class QUrl;
-class AdBlockSubscription : public QObject
+
+class QT_QUPZILLA_EXPORT AdBlockSubscription : public QObject
 {
     Q_OBJECT
 

src/lib/app/autosaver.h

@@ -20,9 +20,10 @@
 
 #include <QObject>
 #include <QBasicTimer>
-#include <QDebug>
 
-class AutoSaver : public QObject
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT AutoSaver : public QObject
 {
     Q_OBJECT
 public:

src/lib/app/commandlineoptions.h

@@ -23,7 +23,7 @@
 
 #include "qz_namespace.h"
 
-class CommandLineOptions
+class QT_QUPZILLA_EXPORT CommandLineOptions
 {
 public:
     struct ActionPair {

src/lib/app/mainapplication.cpp

@@ -47,6 +47,18 @@
 #include "locationbarsettings.h"
 #include "webviewsettings.h"
 
+#ifdef Q_WS_MAC
+#include <QFileOpenEvent>
+#endif
+#include <QWebSecurityOrigin>
+#include <QNetworkDiskCache>
+#include <QDir>
+#include <QDesktopServices>
+#include <QSettings>
+#include <QTimer>
+#include <QTranslator>
+#include <QMessageBox>
+
 #ifdef Q_WS_WIN
 #define DEFAULT_CHECK_UPDATES true
 #else

src/lib/app/mainapplication.h

@@ -20,23 +20,17 @@
 
 #define mApp MainApplication::getInstance()
 
-#include <QEvent>
+#include <QList>
 #include <QUrl>
-#include <QWebSettings>
 #include <QWeakPointer>
-#include <QNetworkDiskCache>
-#include <QWebSecurityOrigin>
-#include <iostream>
-
-#ifdef Q_WS_MAC
-#include <QFileOpenEvent>
-#endif
 
 #include "qtsingleapplication.h"
 #include "commandlineoptions.h"
-
 #include "qz_namespace.h"
 
+class QWebSettings;
+class QNetworkDiskCache;
+
 class QupZilla;
 class CookieManager;
 class BrowsingLibrary;
@@ -53,7 +47,8 @@ class DesktopNotificationsFactory;
 class IconProvider;
 class SearchEnginesManager;
 class DatabaseWriter;
-class MainApplication : public QtSingleApplication
+
+class QT_QUPZILLA_EXPORT MainApplication : public QtSingleApplication
 {
     Q_OBJECT
 

src/lib/app/profileupdater.cpp

@@ -20,6 +20,10 @@
 #include "updater.h"
 #include "mainapplication.h"
 
+#include <QDir>
+#include <QSqlQuery>
+#include <iostream>
+
 ProfileUpdater::ProfileUpdater(const QString &profilePath)
     : m_profilePath(profilePath)
 {

src/lib/app/profileupdater.h

@@ -18,8 +18,9 @@
 #ifndef PROFILEUPDATER_H
 #define PROFILEUPDATER_H
 
-#include <QDir>
-#include <iostream>
+#include <QString>
+
+#include "qz_namespace.h"
 
 class ProfileUpdater
 {

src/lib/app/proxystyle.h

@@ -3,7 +3,9 @@
 
 #include <QProxyStyle>
 
-class ProxyStyle : public QProxyStyle
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT ProxyStyle : public QProxyStyle
 {
 public:
     explicit ProxyStyle();

src/lib/app/qupzilla.cpp

@@ -64,6 +64,21 @@
 #include "webtab.h"
 #include "speeddial.h"
 
+#include <QSplitter>
+#include <QStatusBar>
+#include <QMenuBar>
+#include <QTimer>
+#include <QShortcut>
+#include <QStackedWidget>
+#include <QSqlQuery>
+#include <QTextCodec>
+#include <QFileDialog>
+#include <QNetworkRequest>
+#include <QDesktopServices>
+#include <QPrintPreviewDialog>
+#include <QWebFrame>
+#include <QMessageBox>
+
 const QString QupZilla::VERSION = "1.1.8";
 const QString QupZilla::BUILDTIME =  __DATE__" "__TIME__;
 const QString QupZilla::AUTHOR = "David Rosca";

src/lib/app/qupzilla.h

@@ -19,33 +19,17 @@
 #define QUPZILLA_H
 
 #include <QMainWindow>
-#include <QMenuBar>
-#include <QTranslator>
-#include <QDesktopWidget>
-#include <QDebug>
 #include <QUrl>
-#include <QWebView>
-#include <QWebFrame>
-#include <QWebHistory>
-#include <QtNetwork/QtNetwork>
-#include <QtSql/QtSql>
-#include <QMessageBox>
-#include <QFile>
-#include <QMovie>
-#include <QDesktopServices>
-#include <QStatusBar>
-#include <QSplitter>
-#include <QPushButton>
-#include <QProgressBar>
-#include <QPrintPreviewDialog>
-#include <QToolButton>
-#include <QWebInspector>
-#include <QWeakPointer>
-#include <QVBoxLayout>
 #include "qwebkitversion.h"
 
 #include "qz_namespace.h"
 
+class QMenuBar;
+class QLabel;
+class QVBoxLayout;
+class QSplitter;
+class QWebFrame;
+
 class Menu;
 class TabWidget;
 class TabbedWebView;
@@ -63,7 +47,7 @@ class NavigationBar;
 class ClickableLabel;
 class WebInspectorDockWidget;
 class LocationBar;
-class QupZilla : public QMainWindow
+class QT_QUPZILLA_EXPORT QupZilla : public QMainWindow
 {
     Q_OBJECT
 

src/lib/app/qz_namespace.h

@@ -1,6 +1,12 @@
 #ifndef QZ_NAMESPACE_H
 #define QZ_NAMESPACE_H
 
+#ifdef QUPZILLA_SHAREDLIBRARY
+#define QT_QUPZILLA_EXPORT Q_DECL_EXPORT
+#else
+#define QT_QUPZILLA_EXPORT Q_DECL_IMPORT
+#endif
+
 #include <QFlags>
 
 namespace Qz

src/lib/app/settings.cpp

@@ -1,5 +1,24 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "settings.h"
 
+#include <QSettings>
+
 QSettings* Settings::m_settings = 0;
 
 Settings::Settings()

src/lib/app/settings.h

@@ -1,8 +1,29 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#include <QObject>
-#include <QSettings>
+#include <qglobal.h>
+#include <QVariant>
+
+#include "qz_namespace.h"
+
+class QSettings;
 
 class Settings
 {

src/lib/autofill/autofillmodel.cpp

@@ -25,6 +25,11 @@
 #include "databasewriter.h"
 #include "settings.h"
 
+#include <QXmlStreamWriter>
+#include <QXmlStreamReader>
+#include <QWebFrame>
+#include <QNetworkRequest>
+
 AutoFillModel::AutoFillModel(QupZilla* mainClass, QObject* parent)
     : QObject(parent)
     , p_QupZilla(mainClass)

src/lib/autofill/autofillmodel.h

@@ -18,16 +18,18 @@
 #ifndef AUTOFILLMODEL_H
 #define AUTOFILLMODEL_H
 
-#include <QObject>
-#include <QUrl>
-#include <QNetworkRequest>
-#include <QWebElement>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
+#include <QPair>
+
+#include "qz_namespace.h"
+
+class QUrl;
+class QWebElement;
+class QNetworkRequest;
 
 class QupZilla;
 class WebPage;
-class AutoFillModel : public QObject
+
+class QT_QUPZILLA_EXPORT AutoFillModel : public QObject
 {
 public:
     typedef QPair<QString, QString> QueryItem;

src/lib/autofill/autofillnotification.h

@@ -18,19 +18,18 @@
 #ifndef AUTOFILLWIDGET_H
 #define AUTOFILLWIDGET_H
 
-#include <QWidget>
 #include <QUrl>
-#include <QTimer>
-#include <QDebug>
 
+#include "qz_namespace.h"
 #include "animatedwidget.h"
 
 namespace Ui
 {
 class AutoFillWidget;
 }
+
 class AnimatedWidget;
-class AutoFillNotification : public AnimatedWidget
+class QT_QUPZILLA_EXPORT AutoFillNotification : public AnimatedWidget
 {
     Q_OBJECT
 

src/lib/bookmarks/bookmarkicon.cpp

@@ -25,6 +25,8 @@
 #include "pluginproxy.h"
 #include "speeddial.h"
 
+#include <QStyle>
+
 BookmarkIcon::BookmarkIcon(QupZilla* mainClass, QWidget* parent)
     : ClickableLabel(parent)
     , p_QupZilla(mainClass)

src/lib/bookmarks/bookmarkicon.h

@@ -22,11 +22,12 @@
 
 #include "clickablelabel.h"
 #include "bookmarksmodel.h"
+#include "qz_namespace.h"
 
 class SpeedDial;
 class QupZilla;
-class BookmarksModel;
-class BookmarkIcon : public ClickableLabel
+
+class QT_QUPZILLA_EXPORT BookmarkIcon : public ClickableLabel
 {
     Q_OBJECT
 public:

src/lib/bookmarks/bookmarksmanager.cpp

@@ -29,6 +29,13 @@
 #include "bookmarksimportdialog.h"
 #include "webtab.h"
 
+#include <QInputDialog>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QShortcut>
+#include <QMenu>
+#include <QSqlQuery>
+
 BookmarksManager::BookmarksManager(QupZilla* mainClass, QWidget* parent)
     : QWidget(parent)
     , m_isRefreshing(false)

src/lib/bookmarks/bookmarksmanager.h

@@ -19,23 +19,22 @@
 #define BOOKMARKSMANAGER_H
 
 #include <QWidget>
-#include <QTreeWidgetItem>
-#include <QInputDialog>
 #include <QWeakPointer>
-#include <QDialogButtonBox>
-#include <QShortcut>
 
 #include "bookmarksmodel.h"
+#include "qz_namespace.h"
 
 namespace Ui
 {
 class BookmarksManager;
 }
 
+class QTreeWidgetItem;
+
 class WebView;
 class QupZilla;
 class BookmarksModel;
-class BookmarksManager : public QWidget
+class QT_QUPZILLA_EXPORT BookmarksManager : public QWidget
 {
     Q_OBJECT
 

src/lib/bookmarks/bookmarksmodel.cpp

@@ -16,11 +16,13 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
 #include "bookmarksmodel.h"
-#include "settings.h"
-#include "mainapplication.h"
 #include "tabbedwebview.h"
 #include "iconprovider.h"
 #include "databasewriter.h"
+#include "mainapplication.h"
+#include "settings.h"
+
+#include <QBuffer>
 
 // SQLite DB -> table bookmarks + folders
 // Unique in bookmarks table is id

src/lib/bookmarks/bookmarksmodel.h

@@ -23,13 +23,17 @@
 #define _bookmarksUnsorted BookmarksModel::toTranslatedFolder("unsorted")
 
 #include <QObject>
-#include <QVariant>
 #include <QUrl>
-#include <QIcon>
-#include <QSqlQuery>
+#include <QImage>
+#include <QVariant>
+
+#include "qz_namespace.h"
+
+class QIcon;
 
 class WebView;
-class BookmarksModel : public QObject
+
+class QT_QUPZILLA_EXPORT BookmarksModel : public QObject
 {
     Q_OBJECT
 public:

src/lib/bookmarks/bookmarkstoolbar.cpp

@@ -26,6 +26,16 @@
 #include "enhancedmenu.h"
 #include "tabwidget.h"
 
+#include <QDialog>
+#include <QIcon>
+#include <QHBoxLayout>
+#include <QFormLayout>
+#include <QLineEdit>
+#include <QLabel>
+#include <QDialogButtonBox>
+#include <QMimeData>
+#include <QDragEnterEvent>
+
 BookmarksToolbar::BookmarksToolbar(QupZilla* mainClass, QWidget* parent)
     : QWidget(parent)
     , p_QupZilla(mainClass)

src/lib/bookmarks/bookmarkstoolbar.h

@@ -18,23 +18,20 @@
 #ifndef BOOKMARKSTOOLBAR_H
 #define BOOKMARKSTOOLBAR_H
 
-#include <QMenu>
-#include <QToolButton>
-#include <QHBoxLayout>
-#include <QFormLayout>
-#include <QDialogButtonBox>
-#include <QDropEvent>
-#include <QLabel>
-#include <QLineEdit>
+#include <QWidget>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
+class QHBoxLayout;
+
 class QupZilla;
 class BookmarksModel;
 class HistoryModel;
 class ToolButton;
 class Menu;
-class BookmarksToolbar : public QWidget
+
+class QT_QUPZILLA_EXPORT BookmarksToolbar : public QWidget
 {
     Q_OBJECT
 public:

src/lib/bookmarks/bookmarkswidget.cpp

@@ -23,6 +23,9 @@
 #include "speeddial.h"
 #include "webview.h"
 
+#include <QToolTip>
+#include <QSqlQuery>
+
 BookmarksWidget::BookmarksWidget(WebView* view, QWidget* parent)
     : QMenu(parent)
     , ui(new Ui::BookmarksWidget)

src/lib/bookmarks/bookmarkswidget.h

@@ -18,18 +18,10 @@
 #ifndef BOOKMARKSWIDGET_H
 #define BOOKMARKSWIDGET_H
 
-#include <QMenu>
-#include <QFormLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QComboBox>
-#include <QLineEdit>
-#include <QMouseEvent>
-#include <QDebug>
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QToolTip>
 #include <QUrl>
+#include <QMenu>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
@@ -39,7 +31,7 @@ class BookmarksWidget;
 class WebView;
 class SpeedDial;
 class BookmarksModel;
-class BookmarksWidget : public QMenu
+class QT_QUPZILLA_EXPORT BookmarksWidget : public QMenu
 {
     Q_OBJECT
 public:

src/lib/bookmarksimport/bookmarksimportdialog.cpp

@@ -26,6 +26,10 @@
 #include "iconprovider.h"
 #include "networkmanager.h"
 
+#include <QWebSettings>
+#include <QMessageBox>
+#include <QFileDialog>
+
 BookmarksImportDialog::BookmarksImportDialog(QWidget* parent)
     : QDialog(parent)
     , ui(new Ui::BookmarksImportDialog)

src/lib/bookmarksimport/bookmarksimportdialog.h

@@ -19,13 +19,9 @@
 #define BOOKMARKSIMPORTDIALOG_H
 
 #include <QDialog>
-#include <QFileDialog>
-#include <QMessageBox>
 #include <QPair>
-#include <QWebPage>
-#include <QWebFrame>
-#include <QWebSettings>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
 namespace Ui
@@ -34,7 +30,7 @@ class BookmarksImportDialog;
 }
 
 class IconFetcher;
-class BookmarksImportDialog : public QDialog
+class QT_QUPZILLA_EXPORT BookmarksImportDialog : public QDialog
 {
     Q_OBJECT
 

src/lib/bookmarksimport/chromeimporter.cpp

@@ -19,6 +19,11 @@
 #include "globalfunctions.h"
 #include "bookmarksimportdialog.h"
 
+#include <QScriptEngine>
+#include <QScriptValue>
+#include <QScriptValueIterator>
+#include <QRegExp>
+
 ChromeImporter::ChromeImporter(QObject* parent)
     : QObject(parent)
     , m_error(false)

src/lib/bookmarksimport/chromeimporter.h

@@ -20,14 +20,11 @@
 
 #include <QObject>
 #include <QFile>
-#include <QScriptEngine>
-#include <QScriptValue>
-#include <QScriptValueIterator>
-#include <QRegExp>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
-class ChromeImporter : public QObject
+class QT_QUPZILLA_EXPORT ChromeImporter : public QObject
 {
 public:
     explicit ChromeImporter(QObject* parent = 0);

src/lib/bookmarksimport/firefoximporter.cpp

@@ -18,6 +18,9 @@
 #include "firefoximporter.h"
 #include "bookmarksimportdialog.h"
 
+#include <QSqlQuery>
+#include <QSqlError>
+
 FirefoxImporter::FirefoxImporter(QObject* parent)
     : QObject(parent)
     , m_error(false)

src/lib/bookmarksimport/firefoximporter.h

@@ -19,14 +19,13 @@
 #define FIREFOXIMPORTER_H
 
 #include <QObject>
-#include <QSqlDatabase>
-#include <QSqlQuery>
-#include <QSqlError>
 #include <QFile>
+#include <QSqlDatabase>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
-class FirefoxImporter : public QObject
+class QT_QUPZILLA_EXPORT FirefoxImporter : public QObject
 {
 public:
     explicit FirefoxImporter(QObject* parent = 0);

src/lib/bookmarksimport/htmlimporter.cpp

@@ -1,6 +1,25 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "htmlimporter.h"
 #include "bookmarksimportdialog.h"
 
+#include <QRegExp>
+
 HtmlImporter::HtmlImporter(QObject* parent)
     : QObject(parent)
     , m_error(false)

src/lib/bookmarksimport/htmlimporter.h

@@ -1,13 +1,30 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #ifndef HTMLIMPORTER_H
 #define HTMLIMPORTER_H
 
 #include <QObject>
 #include <QFile>
-#include <QRegExp>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
-class HtmlImporter : public QObject
+class QT_QUPZILLA_EXPORT HtmlImporter : public QObject
 {
 public:
     explicit HtmlImporter(QObject* parent = 0);

src/lib/bookmarksimport/operaimporter.h

@@ -21,9 +21,10 @@
 #include <QObject>
 #include <QFile>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
-class OperaImporter : public QObject
+class QT_QUPZILLA_EXPORT OperaImporter : public QObject
 {
 public:
     explicit OperaImporter(QObject* parent = 0);

src/lib/cookies/cookiejar.cpp

@@ -19,6 +19,8 @@
 #include "qupzilla.h"
 #include "mainapplication.h"
 #include "settings.h"
+
+#include <QDateTime>
 //#define COOKIE_DEBUG
 
 bool containsDomain(QString string, QString domain)

src/lib/cookies/cookiejar.h

@@ -18,13 +18,15 @@
 #ifndef COOKIEJAR_H
 #define COOKIEJAR_H
 
-#include <QNetworkCookieJar>
-#include <QDebug>
+#include "qz_namespace.h"
+
 #include <QFile>
 #include <QStringList>
+#include <QNetworkCookieJar>
 
 class QupZilla;
-class CookieJar : public QNetworkCookieJar
+
+class QT_QUPZILLA_EXPORT CookieJar : public QNetworkCookieJar
 {
 public:
     explicit CookieJar(QupZilla* mainClass, QObject* parent = 0);

src/lib/cookies/cookiemanager.cpp

@@ -23,6 +23,13 @@
 #include "globalfunctions.h"
 #include "settings.h"
 
+#include <QMessageBox>
+#include <QDateTime>
+#include <QShortcut>
+#include <QTimer>
+#include <QInputDialog>
+#include <QCloseEvent>
+
 CookieManager::CookieManager(QWidget* parent)
     : QWidget(parent)
     , ui(new Ui::CookieManager)

src/lib/cookies/cookiemanager.h

@@ -19,20 +19,19 @@
 #define COOKIEMANAGER_H
 
 #include <QWidget>
-#include <QTimer>
-#include <QNetworkCookie>
-#include <QTreeWidgetItem>
-#include <QShortcut>
-#include <QHash>
-#include <QInputDialog>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
 class CookieManager;
 }
 
+class QTreeWidgetItem;
+
 class QupZilla;
-class CookieManager : public QWidget
+
+class QT_QUPZILLA_EXPORT CookieManager : public QWidget
 {
     Q_OBJECT
 

src/lib/desktopnotifications/desktopnotification.cpp

@@ -18,6 +18,9 @@
 #include "desktopnotification.h"
 #include "ui_desktopnotification.h"
 
+#include <QTimer>
+#include <QMouseEvent>
+
 DesktopNotification::DesktopNotification(bool setPosition)
     : QWidget(0)
     , ui(new Ui::DesktopNotification)

src/lib/desktopnotifications/desktopnotification.h

@@ -18,9 +18,9 @@
 #ifndef DESKTOPNOTIFICATION_H
 #define DESKTOPNOTIFICATION_H
 
+#include "qz_namespace.h"
+
 #include <QWidget>
-#include <QTimer>
-#include <QMouseEvent>
 #include <QPixmap>
 
 namespace Ui
@@ -28,7 +28,7 @@ namespace Ui
 class DesktopNotification;
 }
 
-class DesktopNotification : public QWidget
+class QT_QUPZILLA_EXPORT DesktopNotification : public QWidget
 {
     Q_OBJECT
 

src/lib/desktopnotifications/desktopnotificationsfactory.cpp

@@ -20,6 +20,13 @@
 #include "mainapplication.h"
 #include "settings.h"
 
+#include <QFile>
+#include <QDir>
+
+#ifdef Q_WS_X11
+#include <QDBusInterface>
+#endif
+
 DesktopNotificationsFactory::DesktopNotificationsFactory(QObject* parent)
     : QObject(parent)
     , m_uint(0)

src/lib/desktopnotifications/desktopnotificationsfactory.h

@@ -18,19 +18,17 @@
 #ifndef DESKTOPNOTIFICATIONSFACTORY_H
 #define DESKTOPNOTIFICATIONSFACTORY_H
 
+#include "qz_namespace.h"
+
 #include <QObject>
-#ifdef Q_WS_X11
-#include <QDBusInterface>
-#endif
-#include <QStringList>
 #include <QPoint>
-#include <QTimer>
 #include <QWeakPointer>
-#include <QDir>
-#include <QPixmap>
+
+class QPixmap;
 
 class DesktopNotification;
-class DesktopNotificationsFactory : public QObject
+
+class QT_QUPZILLA_EXPORT DesktopNotificationsFactory : public QObject
 {
 public:
     enum Type { DesktopNative, PopupWidget };

src/lib/downloads/downloadfilehelper.cpp

@@ -26,6 +26,14 @@
 #include "globalfunctions.h"
 #include "settings.h"
 
+#include <QFileIconProvider>
+#include <QListWidgetItem>
+#include <QTemporaryFile>
+#include <QWebHistory>
+#include <QDebug>
+#include <QFileDialog>
+#include <QDesktopServices>
+
 DownloadFileHelper::DownloadFileHelper(const QString &lastDownloadPath, const QString &downloadPath, bool useNativeDialog, WebPage* page)
     : QObject()
     , m_lastDownloadOption(DownloadManager::SaveFile)

src/lib/downloads/downloadfilehelper.h

@@ -19,21 +19,20 @@
 #define DOWNLOADFILEHELPER_H
 
 #include <QObject>
-#include <QTime>
-#include <QNetworkReply>
 #include <QPixmap>
-#include <QListWidget>
-#include <QFileInfo>
-#include <QTemporaryFile>
-#include <QFileIconProvider>
-#include <QFileDialog>
+#include <QUrl>
 
+#include "qz_namespace.h"
 #include "downloadmanager.h"
 
+class QFileIconProvider;
+class QListWidget;
+
 class DownloadItem;
 class DownloadManager;
 class WebPage;
-class DownloadFileHelper : public QObject
+
+class QT_QUPZILLA_EXPORT DownloadFileHelper : public QObject
 {
     Q_OBJECT
 public:

src/lib/downloads/downloaditem.cpp

@@ -25,6 +25,15 @@
 #include "iconprovider.h"
 #include "networkmanager.h"
 
+#include <QMenu>
+#include <QClipboard>
+#include <QListWidgetItem>
+#include <QMouseEvent>
+#include <QTimer>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QDesktopServices>
+
 //#define DOWNMANAGER_DEBUG
 
 DownloadItem::DownloadItem(QListWidgetItem* item, QNetworkReply* reply, const QString &path, const QString &fileName, const QPixmap &fileIcon, QTime* timer, bool openAfterFinishedDownload, const QUrl &downloadPage, DownloadManager* manager)

src/lib/downloads/downloaditem.h

@@ -19,28 +19,24 @@
 #define DOWNLOADITEM_H
 
 #include <QWidget>
-#include <QNetworkReply>
-#include <QNetworkRequest>
 #include <QFile>
-#include <QFileInfo>
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QFileIconProvider>
+#include <QBasicTimer>
+#include <QUrl>
+#include <QNetworkReply>
 #include <QTime>
-#include <QTimer>
-#include <QDebug>
-#include <QListWidgetItem>
-#include <QMenu>
-#include <QMessageBox>
-#include <QClipboard>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
 class DownloadItem;
 }
 
+class QListWidgetItem;
+
 class DownloadManager;
-class DownloadItem : public QWidget
+
+class QT_QUPZILLA_EXPORT DownloadItem : public QWidget
 {
     Q_OBJECT
 

src/lib/downloads/downloadmanager.cpp

@@ -30,6 +30,11 @@
 #include "downloadfilehelper.h"
 #include "settings.h"
 
+#include <QCloseEvent>
+#include <QDir>
+#include <QProcess>
+#include <QMessageBox>
+
 #ifdef Q_WS_WIN
 #define DEFAULT_USE_NATIVE_DIALOG false
 #else

src/lib/downloads/downloadmanager.h

@@ -18,21 +18,9 @@
 #ifndef DOWNLOADMANAGER_H
 #define DOWNLOADMANAGER_H
 
-#include <QDialog>
-#include <QLabel>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QDebug>
-#include <QFile>
-#include <QDateTime>
-#include <QDesktopServices>
-#include <QCloseEvent>
-#include <QMessageBox>
-#include <QTimer>
-#include <QNetworkReply>
-#include <QListWidgetItem>
-#include <QProcess>
+#include <QBasicTimer>
 
+#include "qz_namespace.h"
 #include "ecwin7.h"
 
 namespace Ui
@@ -40,11 +28,17 @@ namespace Ui
 class DownloadManager;
 }
 
+class QNetworkReply;
+class QNetworkRequest;
+class QListWidgetItem;
+class QUrl;
+
 class DownloadItem;
 class EcWin7;
 class NetworkManager;
 class WebPage;
-class DownloadManager : public QWidget
+
+class QT_QUPZILLA_EXPORT DownloadManager : public QWidget
 {
     Q_OBJECT
 public:

src/lib/downloads/downloadoptionsdialog.cpp

@@ -18,6 +18,8 @@
 #include "downloadoptionsdialog.h"
 #include "ui_downloadoptionsdialog.h"
 
+#include <QUrl>
+
 DownloadOptionsDialog::DownloadOptionsDialog(const QString &fileName, const QPixmap &fileIcon, const QString &mimeType, const QUrl &url, QWidget* parent)
     : QDialog(parent)
     , ui(new Ui::DownloadOptionsDialog)

src/lib/downloads/downloadoptionsdialog.h

@@ -19,9 +19,8 @@
 #define DOWNLOADOPTIONSDIALOG_H
 
 #include <QDialog>
-#include <QUrl>
-#include <QCloseEvent>
 
+#include "qz_namespace.h"
 #include "downloadmanager.h"
 
 namespace Ui
@@ -29,7 +28,7 @@ namespace Ui
 class DownloadOptionsDialog;
 }
 
-class DownloadOptionsDialog : public QDialog
+class QT_QUPZILLA_EXPORT DownloadOptionsDialog : public QDialog
 {
     Q_OBJECT
 

src/lib/history/historymanager.cpp

@@ -25,6 +25,12 @@
 #include "globalfunctions.h"
 #include "tabwidget.h"
 
+#include <QMenu>
+#include <QMessageBox>
+#include <QClipboard>
+#include <QTimer>
+#include <QSqlQuery>
+
 HistoryManager::HistoryManager(QupZilla* mainClass, QWidget* parent)
     : QWidget(parent)
     , ui(new Ui::HistoryManager)

src/lib/history/historymanager.h

@@ -19,11 +19,9 @@
 #define HISTORYMANAGER_H
 
 #include <QWidget>
-#include <QTreeWidgetItem>
 #include <QWeakPointer>
-#include <QClipboard>
-#include <QHash>
 
+#include "qz_namespace.h"
 #include "historymodel.h"
 
 namespace Ui
@@ -31,8 +29,11 @@ namespace Ui
 class HistoryManager;
 }
 
+class QTreeWidgetItem;
+
 class QupZilla;
-class HistoryManager : public QWidget
+
+class QT_QUPZILLA_EXPORT HistoryManager : public QWidget
 {
     Q_OBJECT
 

src/lib/history/historymodel.cpp

@@ -22,6 +22,8 @@
 #include "databasewriter.h"
 #include "settings.h"
 
+#include <QThread>
+
 HistoryModel::HistoryModel(QupZilla* mainClass)
     : QObject()
     , m_isSaving(true)

src/lib/history/historymodel.h

@@ -18,18 +18,19 @@
 #ifndef HISTORYMODEL_H
 #define HISTORYMODEL_H
 
-#include <QtSql/QSqlDatabase>
-#include <QSqlQuery>
+#include <QObject>
+#include <QList>
 #include <QDateTime>
-#include <QFile>
-#include <QIcon>
 #include <QUrl>
-#include <QThread>
+
+#include "qz_namespace.h"
+
+class QIcon;
 
 class QupZilla;
 class WebView;
-class QIcon;
-class HistoryModel : public QObject
+
+class QT_QUPZILLA_EXPORT HistoryModel : public QObject
 {
     Q_OBJECT
 public:

src/lib/history/webhistoryinterface.h

@@ -21,7 +21,9 @@
 #include <QWebHistoryInterface>
 #include <QStringList>
 
-class WebHistoryInterface : public QWebHistoryInterface
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT WebHistoryInterface : public QWebHistoryInterface
 {
 public:
     explicit WebHistoryInterface(QObject* parent = 0);

src/lib/lib.pro

@@ -3,6 +3,8 @@ unix:QT += dbus
 TARGET = qupzilla
 TEMPLATE = lib
 
+DEFINES += QUPZILLA_SHAREDLIBRARY
+
 include(3rdparty/qtsingleapplication.pri)
 include(../defines.pri)
 include(../../translations/translations.pri)

src/lib/navigation/downicon.cpp

@@ -1,5 +1,24 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "downicon.h"
 
+#include <QMouseEvent>
+
 DownIcon::DownIcon(QWidget* parent)
     : ClickableLabel(parent)
 {

src/lib/navigation/downicon.h

@@ -1,9 +1,27 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #ifndef DOWNICON_H
 #define DOWNICON_H
 
+#include "qz_namespace.h"
 #include "clickablelabel.h"
 
-class DownIcon : public ClickableLabel
+class QT_QUPZILLA_EXPORT DownIcon : public ClickableLabel
 {
 public:
     explicit DownIcon(QWidget* parent = 0);

src/lib/navigation/goicon.cpp

@@ -1,5 +1,24 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "goicon.h"
 
+#include <QMouseEvent>
+
 GoIcon::GoIcon(QWidget* parent)
     : ClickableLabel(parent)
 {

src/lib/navigation/goicon.h

@@ -1,9 +1,27 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #ifndef GOICON_H
 #define GOICON_H
 
+#include "qz_namespace.h"
 #include "clickablelabel.h"
 
-class GoIcon : public ClickableLabel
+class QT_QUPZILLA_EXPORT GoIcon : public ClickableLabel
 {
 public:
     explicit GoIcon(QWidget* parent = 0);

src/lib/navigation/locationbar.cpp

@@ -38,6 +38,8 @@
 #include "downicon.h"
 #include "globalfunctions.h"
 
+#include <QClipboard>
+
 LocationBar::LocationBar(QupZilla* mainClass)
     : LineEdit()
     , p_QupZilla(mainClass)

src/lib/navigation/locationbar.h

@@ -18,19 +18,9 @@
 #ifndef LOCATIONBAR_H
 #define LOCATIONBAR_H
 
-#include <QLabel>
-#include <QCompleter>
-#include <QStandardItemModel>
-#include <QTreeView>
-#include <QHeaderView>
-#include <QStandardItem>
 #include <QUrl>
-#include <QAction>
-#include <QToolButton>
-#include <QMenu>
-#include <QTableView>
-#include <QShortcut>
 
+#include "qz_namespace.h"
 #include "lineedit.h"
 
 class QupZilla;
@@ -42,7 +32,8 @@ class TabbedWebView;
 class SiteIcon;
 class GoIcon;
 class RssIcon;
-class LocationBar : public LineEdit
+
+class QT_QUPZILLA_EXPORT LocationBar : public LineEdit
 {
     Q_OBJECT
     Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize)

src/lib/navigation/locationbarsettings.h

@@ -18,7 +18,9 @@
 #ifndef LOCATIONBARSETTINGS_H
 #define LOCATIONBARSETTINGS_H
 
-class LocationBarSettings
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT LocationBarSettings
 {
 public:
     LocationBarSettings();

src/lib/navigation/locationcompleter.cpp

@@ -20,6 +20,11 @@
 #include "iconprovider.h"
 #include "mainapplication.h"
 
+#include <QStandardItemModel>
+#include <QTreeView>
+#include <QHeaderView>
+#include <QSqlQuery>
+
 LocationCompleter::LocationCompleter(QObject* parent)
     : QCompleter(parent)
 {

src/lib/navigation/locationcompleter.h

@@ -19,16 +19,10 @@
 #define LOCATIONCOMPLETER_H
 
 #include <QCompleter>
-#include <QDebug>
-#include <QStringList>
-#include <QSqlQuery>
-#include <QTreeView>
-#include <QStandardItemModel>
-#include <QTimer>
-#include <QHeaderView>
-#include <QUrl>
 
-class LocationCompleter : public QCompleter
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT LocationCompleter : public QCompleter
 {
     Q_OBJECT
 public:

src/lib/navigation/locationpopup.cpp

@@ -16,6 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
 #include "locationpopup.h"
+
 LocationPopup::LocationPopup(QWidget* parent)
     : QAbstractItemView()
     , m_parent(parent)

src/lib/navigation/locationpopup.h

@@ -19,9 +19,10 @@
 #define LOCATIONPOPUP_H
 
 #include <QAbstractItemView>
-#include <QDebug>
 
-class LocationPopup : public QAbstractItemView
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT LocationPopup : public QAbstractItemView
 {
     Q_OBJECT
 public:

src/lib/navigation/navigationbar.cpp

@@ -27,6 +27,11 @@
 #include "tabwidget.h"
 #include "tabbedwebview.h"
 
+#include <QSplitter>
+#include <QHBoxLayout>
+#include <QStackedWidget>
+#include <QWebHistory>
+
 QString titleForUrl(QString title, const QUrl &url)
 {
     if (title.isEmpty()) {

src/lib/navigation/navigationbar.h

@@ -19,16 +19,18 @@
 #define NAVIGATIONBAR_H
 
 #include <QWidget>
-#include <QHBoxLayout>
-#include <QMenu>
-#include <QSplitter>
+
+#include "qz_namespace.h"
+
+class QHBoxLayout;
+class QSplitter;
 
 class ToolButton;
 class WebSearchBar;
 class QupZilla;
 class ReloadStopButton;
 class Menu;
-class NavigationBar : public QWidget
+class QT_QUPZILLA_EXPORT NavigationBar : public QWidget
 {
     Q_OBJECT
 public:

src/lib/navigation/reloadstopbutton.cpp

@@ -17,6 +17,8 @@
 * ============================================================ */
 #include "reloadstopbutton.h"
 
+#include <QHBoxLayout>
+
 ReloadStopButton::ReloadStopButton(QWidget* parent)
     : QWidget(parent)
 {

src/lib/navigation/reloadstopbutton.h

@@ -18,11 +18,10 @@
 #ifndef RELOADSTOPBUTTON_H
 #define RELOADSTOPBUTTON_H
 
-#include <QHBoxLayout>
-
+#include "qz_namespace.h"
 #include "toolbutton.h"
 
-class ReloadStopButton : public QWidget
+class QT_QUPZILLA_EXPORT ReloadStopButton : public QWidget
 {
 public:
     explicit ReloadStopButton(QWidget* parent = 0);

src/lib/navigation/siteicon.cpp

@@ -19,6 +19,8 @@
 #include "locationbar.h"
 #include "tabbedwebview.h"
 
+#include <QApplication>
+
 SiteIcon::SiteIcon(LocationBar* parent)
     : ToolButton(parent)
     , m_locationBar(parent)

src/lib/navigation/siteicon.h

@@ -18,12 +18,12 @@
 #ifndef SITEICON_H
 #define SITEICON_H
 
-#include <QApplication>
-
+#include "qz_namespace.h"
 #include "toolbutton.h"
 
 class LocationBar;
-class SiteIcon : public ToolButton
+
+class QT_QUPZILLA_EXPORT SiteIcon : public ToolButton
 {
 public:
     explicit SiteIcon(LocationBar* parent);

src/lib/navigation/websearchbar.cpp

@@ -27,6 +27,13 @@
 #include "searchenginesdialog.h"
 #include "networkmanager.h"
 
+#include <QCompleter>
+#include <QStringListModel>
+#include <QMenu>
+#include <QTimer>
+#include <QWebFrame>
+#include <QClipboard>
+
 WebSearchBar::WebSearchBar(QupZilla* mainClass, QWidget* parent)
     : LineEdit(parent)
     , p_QupZilla(mainClass)

src/lib/navigation/websearchbar.h

@@ -18,25 +18,23 @@
 #ifndef WEBSEARCHBAR_H
 #define WEBSEARCHBAR_H
 
-#include <QWidget>
-#include <QPushButton>
-#include <QToolButton>
-#include <QMenu>
 #include <QWeakPointer>
-#include <QCompleter>
-#include <QStringListModel>
 
+#include "qz_namespace.h"
 #include "lineedit.h"
 #include "buttonwithmenu.h"
 #include "searchenginesmanager.h"
 
+class QStringListModel;
+
 class QupZilla;
 class LineEdit;
 class ClickableLabel;
 class SearchEnginesManager;
 class SearchEnginesDialog;
 class OpenSearchEngine;
-class WebSearchBar : public LineEdit
+
+class QT_QUPZILLA_EXPORT WebSearchBar : public LineEdit
 {
     Q_OBJECT
     Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize)

src/lib/network/cabundleupdater.cpp

@@ -1,9 +1,32 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "cabundleupdater.h"
 #include "mainapplication.h"
 #include "networkmanager.h"
 #include "qupzilla.h"
 #include "globalfunctions.h"
 
+#include <QTimer>
+#include <QDateTime>
+#include <QNetworkReply>
+#include <QDebug>
+#include <QFile>
+
 CaBundleUpdater::CaBundleUpdater(NetworkManager* manager, QObject* parent)
     : QObject(parent)
     , m_manager(manager)