[Cleanup] Rename export macro to just QUPZILLA_EXPORT

src/lib/3rdparty/fancytabwidget.cpp

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

src/lib/3rdparty/fancytabwidget.h

@@ -51,7 +51,7 @@ namespace Core
 namespace Internal
 {
 
-class QT_QUPZILLA_EXPORT FancyTabProxyStyle : public QProxyStyle
+class QUPZILLA_EXPORT FancyTabProxyStyle : public QProxyStyle
 {
     Q_OBJECT
 
@@ -66,7 +66,7 @@ protected:
     bool eventFilter(QObject* o, QEvent* e);
 };
 
-class QT_QUPZILLA_EXPORT FancyTab : public QWidget
+class QUPZILLA_EXPORT FancyTab : public QWidget
 {
     Q_OBJECT
 
@@ -93,7 +93,7 @@ private:
     float m_fader;
 };
 
-class QT_QUPZILLA_EXPORT FancyTabBar : public QWidget
+class QUPZILLA_EXPORT FancyTabBar : public QWidget
 {
     Q_OBJECT
 
@@ -142,7 +142,7 @@ private:
 
 };
 
-class QT_QUPZILLA_EXPORT FancyTabWidget : public QWidget
+class QUPZILLA_EXPORT FancyTabWidget : public QWidget
 {
     Q_OBJECT
 

src/lib/3rdparty/lineedit.h

@@ -62,7 +62,7 @@ As widgets are added to the class they are inserted from the outside
 into the center of the widget.
 */
 class SideWidget;
-class QT_QUPZILLA_EXPORT LineEdit : public QLineEdit
+class QUPZILLA_EXPORT LineEdit : public QLineEdit
 {
     Q_OBJECT
     Q_PROPERTY(int leftMargin READ leftMargin WRITE setLeftMargin)
@@ -109,7 +109,7 @@ private:
 };
 
 
-class QT_QUPZILLA_EXPORT SideWidget : public QWidget
+class QUPZILLA_EXPORT SideWidget : public QWidget
 {
     Q_OBJECT
 

src/lib/3rdparty/processinfo.h

@@ -31,7 +31,7 @@
  * written by user WitchCraft
  */
 
-class QT_QUPZILLA_EXPORT ProcessInfo
+class QUPZILLA_EXPORT ProcessInfo
 {
 public:
     explicit ProcessInfo(const QString &name);

src/lib/3rdparty/qtwin.cpp

@@ -72,7 +72,7 @@ QHash<QWidget*, bool> widgetsBlurState = QHash<QWidget*, bool>();
  * DWM compositing state changes and updates the widget
  * flags correspondingly.
  */
-class QT_QUPZILLA_EXPORT WindowNotifier : public QWidget
+class QUPZILLA_EXPORT WindowNotifier : public QWidget
 {
 public:
     WindowNotifier() {

src/lib/3rdparty/qtwin.h

@@ -53,7 +53,7 @@ DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDestListSeparator, 0x9F4C2855, 0x9F79, 0x
 #endif
 #endif
 class WindowNotifier;
-class QT_QUPZILLA_EXPORT QtWin : public QObject
+class QUPZILLA_EXPORT QtWin : public QObject
 {
     Q_OBJECT
 public:

src/lib/3rdparty/squeezelabelv1.h

@@ -37,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 QT_QUPZILLA_EXPORT SqueezeLabelV1 : public QLabel
+class QUPZILLA_EXPORT SqueezeLabelV1 : public QLabel
 {
     Q_OBJECT
 

src/lib/3rdparty/squeezelabelv2.h

@@ -22,7 +22,7 @@
 
 #include <QLabel>
 
-class QT_QUPZILLA_EXPORT SqueezeLabelV2 : public QLabel
+class QUPZILLA_EXPORT SqueezeLabelV2 : public QLabel
 {
     Q_OBJECT
 

src/lib/adblock/adblockaddsubscriptiondialog.h

@@ -28,7 +28,7 @@ namespace Ui
 class AdBlockAddSubscriptionDialog;
 }
 
-class QT_QUPZILLA_EXPORT AdBlockAddSubscriptionDialog : public QDialog
+class QUPZILLA_EXPORT AdBlockAddSubscriptionDialog : public QDialog
 {
     Q_OBJECT
 

src/lib/adblock/adblockblockednetworkreply.h

@@ -53,7 +53,7 @@
 class AdBlockRule;
 class AdBlockSubscription;
 
-class QT_QUPZILLA_EXPORT AdBlockBlockedNetworkReply : public QNetworkReply
+class QUPZILLA_EXPORT AdBlockBlockedNetworkReply : public QNetworkReply
 {
     Q_OBJECT
 

src/lib/adblock/adblockdialog.h

@@ -28,7 +28,7 @@ class AdBlockTreeWidget;
 class AdBlockManager;
 class AdBlockRule;
 
-class QT_QUPZILLA_EXPORT AdBlockDialog : public QWidget, public Ui_AdBlockDialog
+class QUPZILLA_EXPORT AdBlockDialog : public QWidget, public Ui_AdBlockDialog
 {
     Q_OBJECT
 

src/lib/adblock/adblockicon.h

@@ -27,7 +27,7 @@ class QUrl;
 
 class BrowserWindow;
 
-class QT_QUPZILLA_EXPORT AdBlockIcon : public ClickableLabel
+class QUPZILLA_EXPORT AdBlockIcon : public ClickableLabel
 {
     Q_OBJECT
 public:

src/lib/adblock/adblockmanager.h

@@ -32,7 +32,7 @@ class AdBlockDialog;
 class AdBlockCustomList;
 class AdBlockSubscription;
 
-class QT_QUPZILLA_EXPORT AdBlockManager : public QObject
+class QUPZILLA_EXPORT AdBlockManager : public QObject
 {
     Q_OBJECT
 

src/lib/adblock/adblockrule.h

@@ -57,7 +57,7 @@ class QUrl;
 
 class AdBlockSubscription;
 
-class QT_QUPZILLA_EXPORT AdBlockRule
+class QUPZILLA_EXPORT AdBlockRule
 {
 public:
     AdBlockRule(const QString &filter = QString(), AdBlockSubscription* subscription = 0);

src/lib/adblock/adblocksearchtree.h

@@ -27,7 +27,7 @@ class QNetworkRequest;
 
 class AdBlockRule;
 
-class QT_QUPZILLA_EXPORT AdBlockSearchTree
+class QUPZILLA_EXPORT AdBlockSearchTree
 {
 public:
     explicit AdBlockSearchTree();

src/lib/adblock/adblocksubscription.h

@@ -59,7 +59,7 @@ class QUrl;
 
 class FollowRedirectReply;
 
-class QT_QUPZILLA_EXPORT AdBlockSubscription : public QObject
+class QUPZILLA_EXPORT AdBlockSubscription : public QObject
 {
     Q_OBJECT
 public:

src/lib/adblock/adblocktreewidget.h

@@ -24,7 +24,7 @@
 class AdBlockSubscription;
 class AdBlockRule;
 
-class QT_QUPZILLA_EXPORT AdBlockTreeWidget : public TreeWidget
+class QUPZILLA_EXPORT AdBlockTreeWidget : public TreeWidget
 {
     Q_OBJECT
 public:

src/lib/app/autosaver.h

@@ -23,7 +23,7 @@
 
 #include "qz_namespace.h"
 
-class QT_QUPZILLA_EXPORT AutoSaver : public QObject
+class QUPZILLA_EXPORT AutoSaver : public QObject
 {
     Q_OBJECT
 public:

src/lib/app/browserwindow.h

@@ -51,7 +51,7 @@ class ClickableLabel;
 class WebInspectorDockWidget;
 class LocationBar;
 
-class QT_QUPZILLA_EXPORT BrowserWindow : public QMainWindow
+class QUPZILLA_EXPORT BrowserWindow : public QMainWindow
 {
     Q_OBJECT
 

src/lib/app/commandlineoptions.h

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

src/lib/app/mainapplication.h

@@ -58,7 +58,7 @@ class Speller;
 class MacMenuReceiver;
 #endif
 
-class QT_QUPZILLA_EXPORT MainApplication : public QtSingleApplication
+class QUPZILLA_EXPORT MainApplication : public QtSingleApplication
 {
     Q_OBJECT
 

src/lib/app/proxystyle.h

@@ -22,7 +22,7 @@
 
 #include "qz_namespace.h"
 
-class QT_QUPZILLA_EXPORT ProxyStyle : public QProxyStyle
+class QUPZILLA_EXPORT ProxyStyle : public QProxyStyle
 {
 public:
     explicit ProxyStyle();

src/lib/app/qz_namespace.h

@@ -22,9 +22,9 @@
 #include <QString>
 
 #ifdef QUPZILLA_SHAREDLIBRARY
-#define QT_QUPZILLA_EXPORT Q_DECL_EXPORT
+#define QUPZILLA_EXPORT Q_DECL_EXPORT
 #else
-#define QT_QUPZILLA_EXPORT Q_DECL_IMPORT
+#define QUPZILLA_EXPORT Q_DECL_IMPORT
 #endif
 
 #ifndef Q_UNLIKELY

src/lib/app/settings.h

@@ -27,7 +27,7 @@ class QSettings;
 
 class QzSettings;
 
-class QT_QUPZILLA_EXPORT Settings
+class QUPZILLA_EXPORT Settings
 {
 public:
     explicit Settings();

src/lib/autofill/autofill.h

@@ -32,7 +32,7 @@ class PasswordManager;
 struct PageFormData;
 struct PasswordEntry;
 
-class QT_QUPZILLA_EXPORT AutoFill : public QObject
+class QUPZILLA_EXPORT AutoFill : public QObject
 {
     Q_OBJECT
 

src/lib/autofill/autofillicon.h

@@ -24,7 +24,7 @@
 
 class WebView;
 
-class QT_QUPZILLA_EXPORT AutoFillIcon : public ClickableLabel
+class QUPZILLA_EXPORT AutoFillIcon : public ClickableLabel
 {
     Q_OBJECT
 

src/lib/autofill/autofillnotification.h

@@ -33,7 +33,7 @@ class AutoFillNotification;
 
 class AnimatedWidget;
 
-class QT_QUPZILLA_EXPORT AutoFillNotification : public AnimatedWidget
+class QUPZILLA_EXPORT AutoFillNotification : public AnimatedWidget
 {
     Q_OBJECT
 

src/lib/autofill/autofillwidget.h

@@ -32,7 +32,7 @@ class AutoFillWidget;
 class WebView;
 struct PasswordEntry;
 
-class QT_QUPZILLA_EXPORT AutoFillWidget : public LocationBarPopup
+class QUPZILLA_EXPORT AutoFillWidget : public LocationBarPopup
 {
     Q_OBJECT
 

src/lib/autofill/pageformcompleter.h

@@ -38,7 +38,7 @@ struct PageFormData {
     }
 };
 
-class QT_QUPZILLA_EXPORT PageFormCompleter
+class QUPZILLA_EXPORT PageFormCompleter
 {
 public:
     explicit PageFormCompleter(QWebPage* page);

src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h

@@ -27,7 +27,7 @@
 class AesInterface;
 class MasterPasswordDialog;
 
-class QT_QUPZILLA_EXPORT DatabaseEncryptedPasswordBackend : public PasswordBackend
+class QUPZILLA_EXPORT DatabaseEncryptedPasswordBackend : public PasswordBackend
 {
 public:
     enum MasterPasswordState {

src/lib/autofill/passwordbackends/databasepasswordbackend.h

@@ -21,7 +21,7 @@
 #include "passwordbackend.h"
 #include "qz_namespace.h"
 
-class QT_QUPZILLA_EXPORT DatabasePasswordBackend : public PasswordBackend
+class QUPZILLA_EXPORT DatabasePasswordBackend : public PasswordBackend
 {
 public:
     explicit DatabasePasswordBackend();

src/lib/autofill/passwordbackends/passwordbackend.h

@@ -23,7 +23,7 @@
 
 class QWidget;
 
-class QT_QUPZILLA_EXPORT PasswordBackend
+class QUPZILLA_EXPORT PasswordBackend
 {
 public:
     explicit PasswordBackend();

src/lib/autofill/passwordmanager.h

@@ -28,7 +28,7 @@ class PasswordBackend;
 class DatabasePasswordBackend;
 class DatabaseEncryptedPasswordBackend;
 
-struct QT_QUPZILLA_EXPORT PasswordEntry {
+struct QUPZILLA_EXPORT PasswordEntry {
     QVariant id;
     QString host;
     QString username;
@@ -50,11 +50,11 @@ struct QT_QUPZILLA_EXPORT PasswordEntry {
         return updated > other.updated;
     }
 
-    friend QT_QUPZILLA_EXPORT QDataStream &operator<<(QDataStream &stream, const PasswordEntry &entry);
+    friend QUPZILLA_EXPORT QDataStream &operator<<(QDataStream &stream, const PasswordEntry &entry);
-    friend QT_QUPZILLA_EXPORT QDataStream &operator>>(QDataStream &stream, PasswordEntry &entry);
+    friend QUPZILLA_EXPORT QDataStream &operator>>(QDataStream &stream, PasswordEntry &entry);
 };
 
-class QT_QUPZILLA_EXPORT PasswordManager : public QObject
+class QUPZILLA_EXPORT PasswordManager : public QObject
 {
     Q_OBJECT
 public:

src/lib/bookmarks/bookmarkitem.h

@@ -26,7 +26,7 @@
 
 #include "qz_namespace.h"
 
-class QT_QUPZILLA_EXPORT BookmarkItem
+class QUPZILLA_EXPORT BookmarkItem
 {
 public:
     enum Type {

src/lib/bookmarks/bookmarks.h

@@ -28,7 +28,7 @@ class QUrl;
 class BookmarkItem;
 class BookmarksModel;
 
-class QT_QUPZILLA_EXPORT Bookmarks : public QObject
+class QUPZILLA_EXPORT Bookmarks : public QObject
 {
     Q_OBJECT
 public:

src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h

@@ -29,7 +29,7 @@ class BookmarksExportDialog;
 
 class BookmarksExporter;
 
-class QT_QUPZILLA_EXPORT BookmarksExportDialog : public QDialog
+class QUPZILLA_EXPORT BookmarksExportDialog : public QDialog
 {
     Q_OBJECT
 

src/lib/bookmarks/bookmarksexport/bookmarksexporter.h

@@ -24,7 +24,7 @@
 
 class BookmarkItem;
 
-class QT_QUPZILLA_EXPORT BookmarksExporter : public QObject
+class QUPZILLA_EXPORT BookmarksExporter : public QObject
 {
     Q_OBJECT
 

src/lib/bookmarks/bookmarksicon.h

@@ -26,7 +26,7 @@
 class WebView;
 class BookmarkItem;
 
-class QT_QUPZILLA_EXPORT BookmarksIcon : public ClickableLabel
+class QUPZILLA_EXPORT BookmarksIcon : public ClickableLabel
 {
     Q_OBJECT
 public:

src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h

@@ -31,7 +31,7 @@ class BookmarkItem;
 class BookmarksModel;
 class BookmarksImporter;
 
-class QT_QUPZILLA_EXPORT BookmarksImportDialog : public QDialog
+class QUPZILLA_EXPORT BookmarksImportDialog : public QDialog
 {
     Q_OBJECT
 

src/lib/bookmarks/bookmarksimport/bookmarksimporter.h

@@ -26,7 +26,7 @@ class QIcon;
 
 class BookmarkItem;
 
-class QT_QUPZILLA_EXPORT BookmarksImporter : public QObject
+class QUPZILLA_EXPORT BookmarksImporter : public QObject
 {
     Q_OBJECT
 

src/lib/bookmarks/bookmarksimport/chromeimporter.h

@@ -23,7 +23,7 @@
 
 #include "bookmarksimporter.h"
 
-class QT_QUPZILLA_EXPORT ChromeImporter : public BookmarksImporter
+class QUPZILLA_EXPORT ChromeImporter : public BookmarksImporter
 {
 public:
     explicit ChromeImporter(QObject* parent = 0);

src/lib/bookmarks/bookmarksimport/firefoximporter.h

@@ -23,7 +23,7 @@
 #include "bookmarksimporter.h"
 #include "bookmarkitem.h"
 
-class QT_QUPZILLA_EXPORT FirefoxImporter : public BookmarksImporter
+class QUPZILLA_EXPORT FirefoxImporter : public BookmarksImporter
 {
 public:
     explicit FirefoxImporter(QObject* parent = 0);

src/lib/bookmarks/bookmarksimport/htmlimporter.h

@@ -22,7 +22,7 @@
 
 #include "bookmarksimporter.h"
 
-class QT_QUPZILLA_EXPORT HtmlImporter : public BookmarksImporter
+class QUPZILLA_EXPORT HtmlImporter : public BookmarksImporter
 {
 public:
     explicit HtmlImporter(QObject* parent = 0);

src/lib/bookmarks/bookmarksimport/operaimporter.h

@@ -23,7 +23,7 @@
 
 #include "bookmarksimporter.h"
 
-class QT_QUPZILLA_EXPORT OperaImporter : public BookmarksImporter
+class QUPZILLA_EXPORT OperaImporter : public BookmarksImporter
 {
 public:
     explicit OperaImporter(QObject* parent = 0);

src/lib/bookmarks/bookmarksitemdelegate.h

@@ -24,7 +24,7 @@
 
 class QTreeView;
 
-class QT_QUPZILLA_EXPORT BookmarksItemDelegate : public QStyledItemDelegate
+class QUPZILLA_EXPORT BookmarksItemDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
 

src/lib/bookmarks/bookmarksmanager.h

@@ -34,7 +34,7 @@ class BrowserWindow;
 class Bookmarks;
 class BookmarkItem;
 
-class QT_QUPZILLA_EXPORT BookmarksManager : public QWidget
+class QUPZILLA_EXPORT BookmarksManager : public QWidget
 {
     Q_OBJECT
 

src/lib/bookmarks/bookmarksmenu.h

@@ -26,7 +26,7 @@
 class BrowserWindow;
 class BookmarkItem;
 
-class QT_QUPZILLA_EXPORT BookmarksMenu : public Menu
+class QUPZILLA_EXPORT BookmarksMenu : public Menu
 {
     Q_OBJECT
 

src/lib/bookmarks/bookmarksmodel.h

@@ -28,7 +28,7 @@ class QTimer;
 class Bookmarks;
 class BookmarkItem;
 
-class QT_QUPZILLA_EXPORT BookmarksModel : public QAbstractItemModel
+class QUPZILLA_EXPORT BookmarksModel : public QAbstractItemModel
 {
     Q_OBJECT
 
@@ -77,7 +77,7 @@ private:
     Bookmarks* m_bookmarks;
 };
 
-class QT_QUPZILLA_EXPORT BookmarksFilterModel : public QSortFilterProxyModel
+class QUPZILLA_EXPORT BookmarksFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 

src/lib/bookmarks/bookmarkstoolbar.h

@@ -30,7 +30,7 @@ class Bookmarks;
 class BookmarkItem;
 class BookmarksToolbarButton;
 
-class QT_QUPZILLA_EXPORT BookmarksToolbar : public QWidget
+class QUPZILLA_EXPORT BookmarksToolbar : public QWidget
 {
     Q_OBJECT
 public:

src/lib/bookmarks/bookmarkstoolbarbutton.h

@@ -26,7 +26,7 @@ class Menu;
 class BrowserWindow;
 class BookmarkItem;
 
-class QT_QUPZILLA_EXPORT BookmarksToolbarButton : public QPushButton
+class QUPZILLA_EXPORT BookmarksToolbarButton : public QPushButton
 {
     Q_OBJECT
 

src/lib/bookmarks/bookmarkstools.h

@@ -26,7 +26,7 @@
 class Bookmarks;
 class BookmarkItem;
 
-class QT_QUPZILLA_EXPORT BookmarksFoldersMenu : public QMenu
+class QUPZILLA_EXPORT BookmarksFoldersMenu : public QMenu
 {
     Q_OBJECT
 
@@ -48,7 +48,7 @@ private:
     BookmarkItem* m_selectedFolder;
 };
 
-class QT_QUPZILLA_EXPORT BookmarksFoldersButton : public QPushButton
+class QUPZILLA_EXPORT BookmarksFoldersButton : public QPushButton
 {
     Q_OBJECT
 
@@ -75,7 +75,7 @@ class TabWidget;
 class Action;
 class Menu;
 
-class QT_QUPZILLA_EXPORT BookmarksTools
+class QUPZILLA_EXPORT BookmarksTools
 {
 public:
     // Add Bookmark Dialogs

src/lib/bookmarks/bookmarkstreeview.h

@@ -27,7 +27,7 @@ class BookmarkItem;
 class BookmarksModel;
 class BookmarksFilterModel;
 
-class QT_QUPZILLA_EXPORT BookmarksTreeView : public QTreeView
+class QUPZILLA_EXPORT BookmarksTreeView : public QTreeView
 {
     Q_OBJECT
 

src/lib/bookmarks/bookmarkswidget.h

@@ -33,7 +33,7 @@ class SpeedDial;
 class Bookmarks;
 class BookmarkItem;
 
-class QT_QUPZILLA_EXPORT BookmarksWidget : public LocationBarPopup
+class QUPZILLA_EXPORT BookmarksWidget : public LocationBarPopup
 {
     Q_OBJECT
 public:

src/lib/cookies/cookiejar.h

@@ -26,7 +26,7 @@
 
 class BrowserWindow;
 
-class QT_QUPZILLA_EXPORT CookieJar : public QNetworkCookieJar
+class QUPZILLA_EXPORT CookieJar : public QNetworkCookieJar
 {
 public:
     explicit CookieJar(BrowserWindow* window, QObject* parent = 0);

src/lib/cookies/cookiemanager.h

@@ -31,7 +31,7 @@ class QTreeWidgetItem;
 
 class BrowserWindow;
 
-class QT_QUPZILLA_EXPORT CookieManager : public QWidget
+class QUPZILLA_EXPORT CookieManager : public QWidget
 {
     Q_OBJECT
 

src/lib/desktopnotifications/desktopnotification.h

@@ -28,7 +28,7 @@ namespace Ui
 class DesktopNotification;
 }
 
-class QT_QUPZILLA_EXPORT DesktopNotification : public QWidget
+class QUPZILLA_EXPORT DesktopNotification : public QWidget
 {
     Q_OBJECT
 

src/lib/desktopnotifications/desktopnotificationsfactory.h

@@ -30,7 +30,7 @@ class QDBusError;
 
 class DesktopNotification;
 
-class QT_QUPZILLA_EXPORT DesktopNotificationsFactory : public QObject
+class QUPZILLA_EXPORT DesktopNotificationsFactory : public QObject
 {
     Q_OBJECT
 

src/lib/downloads/downloadfilehelper.h

@@ -32,7 +32,7 @@ class DownloadItem;
 class DownloadManager;
 class WebPage;
 
-class QT_QUPZILLA_EXPORT DownloadFileHelper : public QObject
+class QUPZILLA_EXPORT DownloadFileHelper : public QObject
 {
     Q_OBJECT
 public:

src/lib/downloads/downloaditem.h

@@ -37,7 +37,7 @@ class QListWidgetItem;
 class DownloadManager;
 class FtpDownloader;
 
-class QT_QUPZILLA_EXPORT DownloadItem : public QWidget
+class QUPZILLA_EXPORT DownloadItem : public QWidget
 {
     Q_OBJECT
 

src/lib/downloads/downloadmanager.h

@@ -38,7 +38,7 @@ class EcWin7;
 class NetworkManager;
 class WebPage;
 
-class QT_QUPZILLA_EXPORT DownloadManager : public QWidget
+class QUPZILLA_EXPORT DownloadManager : public QWidget
 {
     Q_OBJECT
 public:

src/lib/downloads/downloadoptionsdialog.h

@@ -29,7 +29,7 @@ namespace Ui
 class DownloadOptionsDialog;
 }
 
-class QT_QUPZILLA_EXPORT DownloadOptionsDialog : public QDialog
+class QUPZILLA_EXPORT DownloadOptionsDialog : public QDialog
 {
     Q_OBJECT
 

src/lib/history/history.h

@@ -30,7 +30,7 @@ class QIcon;
 class WebView;
 class HistoryModel;
 
-class QT_QUPZILLA_EXPORT History : public QObject
+class QUPZILLA_EXPORT History : public QObject
 {
     Q_OBJECT
 public:

src/lib/history/historyitem.h

@@ -23,7 +23,7 @@
 #include "qz_namespace.h"
 #include "history.h"
 
-class QT_QUPZILLA_EXPORT HistoryItem
+class QUPZILLA_EXPORT HistoryItem
 {
 public:
     explicit HistoryItem(HistoryItem* parent = 0);

src/lib/history/historymanager.h

@@ -33,7 +33,7 @@ class QTreeWidgetItem;
 
 class BrowserWindow;
 
-class QT_QUPZILLA_EXPORT HistoryManager : public QWidget
+class QUPZILLA_EXPORT HistoryManager : public QWidget
 {
     Q_OBJECT
 

src/lib/history/historymodel.h

@@ -29,7 +29,7 @@ class QTimer;
 class History;
 class HistoryItem;
 
-class QT_QUPZILLA_EXPORT HistoryModel : public QAbstractItemModel
+class QUPZILLA_EXPORT HistoryModel : public QAbstractItemModel
 {
     Q_OBJECT
 public:
@@ -87,7 +87,7 @@ private:
     History* m_history;
 };
 
-class QT_QUPZILLA_EXPORT HistoryFilterModel : public QSortFilterProxyModel
+class QUPZILLA_EXPORT HistoryFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 public:

src/lib/history/webhistoryinterface.h

@@ -23,7 +23,7 @@
 
 #include "qz_namespace.h"
 
-class QT_QUPZILLA_EXPORT WebHistoryInterface : public QWebHistoryInterface
+class QUPZILLA_EXPORT WebHistoryInterface : public QWebHistoryInterface
 {
 public:
     explicit WebHistoryInterface(QObject* parent = 0);

src/lib/navigation/completer/locationcompleter.h

@@ -28,7 +28,7 @@ class LocationCompleterModel;
 class LocationCompleterView;
 class LocationBar;
 
-class QT_QUPZILLA_EXPORT LocationCompleter : public QObject
+class QUPZILLA_EXPORT LocationCompleter : public QObject
 {
     Q_OBJECT
 public:

src/lib/navigation/completer/locationcompleterdelegate.h

@@ -24,7 +24,7 @@
 
 class LocationCompleterView;
 
-class QT_QUPZILLA_EXPORT LocationCompleterDelegate : public QStyledItemDelegate
+class QUPZILLA_EXPORT LocationCompleterDelegate : public QStyledItemDelegate
 {
 public:
     explicit LocationCompleterDelegate(LocationCompleterView* parent = 0);

src/lib/navigation/completer/locationcompleterview.h

@@ -23,7 +23,7 @@
 #include "qz_namespace.h"
 #include "locationcompletermodel.h"
 
-class QT_QUPZILLA_EXPORT LocationCompleterView : public QListView
+class QUPZILLA_EXPORT LocationCompleterView : public QListView
 {
     Q_OBJECT
 public:

src/lib/navigation/downicon.h

@@ -21,7 +21,7 @@
 #include "qz_namespace.h"
 #include "clickablelabel.h"
 
-class QT_QUPZILLA_EXPORT DownIcon : public ClickableLabel
+class QUPZILLA_EXPORT DownIcon : public ClickableLabel
 {
 public:
     explicit DownIcon(QWidget* parent = 0);

src/lib/navigation/goicon.h

@@ -21,7 +21,7 @@
 #include "qz_namespace.h"
 #include "clickablelabel.h"
 
-class QT_QUPZILLA_EXPORT GoIcon : public ClickableLabel
+class QUPZILLA_EXPORT GoIcon : public ClickableLabel
 {
 public:
     explicit GoIcon(QWidget* parent = 0);

src/lib/navigation/locationbar.h

@@ -35,7 +35,7 @@ class GoIcon;
 class RssIcon;
 class AutoFillIcon;
 
-class QT_QUPZILLA_EXPORT LocationBar : public LineEdit
+class QUPZILLA_EXPORT LocationBar : public LineEdit
 {
     Q_OBJECT
     Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize)

src/lib/navigation/locationbarpopup.h

@@ -23,7 +23,7 @@
 
 #include "qz_namespace.h"
 
-class QT_QUPZILLA_EXPORT LocationBarPopup : public QFrame
+class QUPZILLA_EXPORT LocationBarPopup : public QFrame
 {
 public:
     explicit LocationBarPopup(QWidget* parent);

src/lib/navigation/navigationbar.h

@@ -32,7 +32,7 @@ class ReloadStopButton;
 class Menu;
 class QUrl;
 
-class QT_QUPZILLA_EXPORT NavigationBar : public QWidget
+class QUPZILLA_EXPORT NavigationBar : public QWidget
 {
     Q_OBJECT
 public:

src/lib/navigation/navigationcontainer.h

@@ -24,7 +24,7 @@
 
 class BrowserWindow;
 
-class QT_QUPZILLA_EXPORT NavigationContainer : public QWidget
+class QUPZILLA_EXPORT NavigationContainer : public QWidget
 {
 public:
     explicit NavigationContainer(BrowserWindow* parent = 0);

src/lib/navigation/reloadstopbutton.h

@@ -26,7 +26,7 @@ class QTimer;
 
 class ToolButton;
 
-class QT_QUPZILLA_EXPORT ReloadStopButton : public QWidget
+class QUPZILLA_EXPORT ReloadStopButton : public QWidget
 {
     Q_OBJECT
 

src/lib/navigation/siteicon.h

@@ -25,7 +25,7 @@ class LocationBar;
 class WebView;
 class BrowserWindow;
 
-class QT_QUPZILLA_EXPORT SiteIcon : public ToolButton
+class QUPZILLA_EXPORT SiteIcon : public ToolButton
 {
     Q_OBJECT
 

src/lib/navigation/websearchbar.h

@@ -35,7 +35,7 @@ class SearchEnginesManager;
 class SearchEnginesDialog;
 class OpenSearchEngine;
 
-class QT_QUPZILLA_EXPORT WebSearchBar_Button : public ClickableLabel
+class QUPZILLA_EXPORT WebSearchBar_Button : public ClickableLabel
 {
 public:
     explicit WebSearchBar_Button(QWidget* parent = 0);
@@ -44,7 +44,7 @@ private:
     void contextMenuEvent(QContextMenuEvent* event);
 };
 
-class QT_QUPZILLA_EXPORT WebSearchBar : public LineEdit
+class QUPZILLA_EXPORT WebSearchBar : public LineEdit
 {
     Q_OBJECT
     Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize)

src/lib/network/cabundleupdater.h

@@ -26,7 +26,7 @@ class QNetworkReply;
 
 class NetworkManager;
 
-class QT_QUPZILLA_EXPORT CaBundleUpdater : public QObject
+class QUPZILLA_EXPORT CaBundleUpdater : public QObject
 {
     Q_OBJECT
 public:

src/lib/network/networkmanager.h

@@ -29,7 +29,7 @@ class NetworkProxyFactory;
 class QupZillaSchemeHandler;
 class SchemeHandler;
 
-class QT_QUPZILLA_EXPORT NetworkManager : public NetworkManagerProxy
+class QUPZILLA_EXPORT NetworkManager : public NetworkManagerProxy
 {
     Q_OBJECT
 public:

src/lib/network/networkmanagerproxy.h

@@ -25,7 +25,7 @@
 class WebPage;
 class NetworkManager;
 
-class QT_QUPZILLA_EXPORT NetworkManagerProxy : public QNetworkAccessManager
+class QUPZILLA_EXPORT NetworkManagerProxy : public QNetworkAccessManager
 {
 public:
     explicit NetworkManagerProxy(QObject* parent = 0);

src/lib/network/networkproxyfactory.h

@@ -42,7 +42,7 @@ private:
     QzRegExp* m_regExp;
 };
 
-class QT_QUPZILLA_EXPORT NetworkProxyFactory : public QNetworkProxyFactory
+class QUPZILLA_EXPORT NetworkProxyFactory : public QNetworkProxyFactory
 {
 public:
     enum ProxyPreference { SystemProxy, NoProxy, ProxyAutoConfig, DefinedProxy };

src/lib/network/pac/pacmanager.h

@@ -29,7 +29,7 @@ class QNetworkProxy;
 class FollowRedirectReply;
 class ProxyAutoConfig;
 
-class QT_QUPZILLA_EXPORT PacManager : public QObject
+class QUPZILLA_EXPORT PacManager : public QObject
 {
     Q_OBJECT
 public:

src/lib/network/pac/proxyautoconfig.h

@@ -31,7 +31,7 @@ class QScriptEngine;
  *
  * Based on qt-examples: https://gitorious.org/qt-examples/qt-examples/blobs/master/pac-files
  */
-class QT_QUPZILLA_EXPORT ProxyAutoConfig : public QObject
+class QUPZILLA_EXPORT ProxyAutoConfig : public QObject
 {
     Q_OBJECT
 

src/lib/network/schemehandlers/adblockschemehandler.h

@@ -21,7 +21,7 @@
 #include "qz_namespace.h"
 #include "schemehandler.h"
 
-class QT_QUPZILLA_EXPORT AdBlockSchemeHandler : public SchemeHandler
+class QUPZILLA_EXPORT AdBlockSchemeHandler : public SchemeHandler
 {
 public:
     AdBlockSchemeHandler();

src/lib/network/schemehandlers/fileschemehandler.h

@@ -24,7 +24,7 @@
 #include "schemehandler.h"
 #include "qz_namespace.h"
 
-class QT_QUPZILLA_EXPORT FileSchemeHandler : public SchemeHandler
+class QUPZILLA_EXPORT FileSchemeHandler : public SchemeHandler
 {
 public:
     explicit FileSchemeHandler();
@@ -34,7 +34,7 @@ public:
     static void handleUrl(const QUrl &url);
 };
 
-class QT_QUPZILLA_EXPORT FileSchemeReply : public QNetworkReply
+class QUPZILLA_EXPORT FileSchemeReply : public QNetworkReply
 {
     Q_OBJECT
 public:

src/lib/network/schemehandlers/ftpschemehandler.h

@@ -37,7 +37,7 @@
 
 #define FTP_AUTHENTICATOR FtpSchemeHandler::ftpAuthenticator
 
-class QT_QUPZILLA_EXPORT FtpSchemeHandler : public SchemeHandler
+class QUPZILLA_EXPORT FtpSchemeHandler : public SchemeHandler
 {
 public:
     explicit FtpSchemeHandler();
@@ -50,7 +50,7 @@ private:
     static QHash<QString, QAuthenticator*> m_ftpAuthenticatorsCache;
 };
 
-class QT_QUPZILLA_EXPORT FtpSchemeReply : public QNetworkReply
+class QUPZILLA_EXPORT FtpSchemeReply : public QNetworkReply
 {
     Q_OBJECT
 
@@ -91,7 +91,7 @@ signals:
     void downloadRequest(const QNetworkRequest &);
 };
 
-class QT_QUPZILLA_EXPORT FtpDownloader : public QFtp
+class QUPZILLA_EXPORT FtpDownloader : public QFtp
 {
     Q_OBJECT
 

src/lib/network/schemehandlers/qupzillaschemehandler.h

@@ -24,7 +24,7 @@
 #include "schemehandler.h"
 #include "qz_namespace.h"
 
-class QT_QUPZILLA_EXPORT QupZillaSchemeHandler : public SchemeHandler
+class QUPZILLA_EXPORT QupZillaSchemeHandler : public SchemeHandler
 {
 public:
     explicit QupZillaSchemeHandler();
@@ -32,7 +32,7 @@ public:
     QNetworkReply* createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice* outgoingData);
 };
 
-class QT_QUPZILLA_EXPORT QupZillaSchemeReply : public QNetworkReply
+class QUPZILLA_EXPORT QupZillaSchemeReply : public QNetworkReply
 {
     Q_OBJECT
 public:

src/lib/network/schemehandlers/schemehandler.h

@@ -22,7 +22,7 @@
 
 #include "qz_namespace.h"
 
-class QT_QUPZILLA_EXPORT SchemeHandler
+class QUPZILLA_EXPORT SchemeHandler
 {
 public:
     SchemeHandler() { }

src/lib/network/sslerrordialog.h

@@ -29,7 +29,7 @@ class QAbstractButton;
 
 #include "qz_namespace.h"
 
-class QT_QUPZILLA_EXPORT SslErrorDialog : public QDialog
+class QUPZILLA_EXPORT SslErrorDialog : public QDialog
 {
     Q_OBJECT
 

src/lib/opensearch/editsearchengine.h

@@ -27,7 +27,7 @@ namespace Ui
 class EditSearchEngine;
 }
 
-class QT_QUPZILLA_EXPORT EditSearchEngine : public QDialog
+class QUPZILLA_EXPORT EditSearchEngine : public QDialog
 {
     Q_OBJECT
 public:

src/lib/opensearch/opensearchengine.h

@@ -50,7 +50,7 @@ class QNetworkReply;
 class QScriptEngine;
 
 class OpenSearchEngineDelegate;
-class QT_QUPZILLA_EXPORT OpenSearchEngine : public QObject
+class QUPZILLA_EXPORT OpenSearchEngine : public QObject
 {
     Q_OBJECT
 

src/lib/opensearch/opensearchreader.h

@@ -42,7 +42,7 @@
 
 class OpenSearchEngine;
 
-class QT_QUPZILLA_EXPORT OpenSearchReader : public QXmlStreamReader
+class QUPZILLA_EXPORT OpenSearchReader : public QXmlStreamReader
 {
 public:
     OpenSearchReader();

src/lib/opensearch/searchenginesdialog.h

@@ -30,7 +30,7 @@ namespace Ui
 class SearchEnginesDialog;
 }
 
-class QT_QUPZILLA_EXPORT SearchEnginesDialog : public QDialog
+class QUPZILLA_EXPORT SearchEnginesDialog : public QDialog
 {
     Q_OBJECT
 

src/lib/opensearch/searchenginesmanager.h

@@ -31,7 +31,7 @@ class QWebElement;
 
 class WebView;
 
-class QT_QUPZILLA_EXPORT SearchEnginesManager : public QObject
+class QUPZILLA_EXPORT SearchEnginesManager : public QObject
 {
     Q_OBJECT
 public:

src/lib/other/aboutdialog.h

@@ -27,7 +27,7 @@ namespace Ui
 class AboutDialog;
 }
 
-class QT_QUPZILLA_EXPORT AboutDialog : public QDialog
+class QUPZILLA_EXPORT AboutDialog : public QDialog
 {
     Q_OBJECT
 

src/lib/other/browsinglibrary.h

@@ -31,7 +31,7 @@ class HistoryManager;
 class BookmarksManager;
 class RSSManager;
 class BrowserWindow;
-class QT_QUPZILLA_EXPORT BrowsingLibrary : public QWidget
+class QUPZILLA_EXPORT BrowsingLibrary : public QWidget
 {
     Q_OBJECT
 

src/lib/other/checkboxdialog.h

@@ -28,7 +28,7 @@ namespace Ui
 class CheckBoxDialog;
 }
 
-class QT_QUPZILLA_EXPORT CheckBoxDialog : public QDialog
+class QUPZILLA_EXPORT CheckBoxDialog : public QDialog
 {
     Q_OBJECT
 public:

src/lib/other/clearprivatedata.h

@@ -28,7 +28,7 @@ class ClearPrivateData;
 }
 
 class BrowserWindow;
-class QT_QUPZILLA_EXPORT ClearPrivateData : public QDialog
+class QUPZILLA_EXPORT ClearPrivateData : public QDialog
 {
     Q_OBJECT
 public:

src/lib/other/databasewriter.h

@@ -24,7 +24,7 @@
 
 #include "qz_namespace.h"
 
-class QT_QUPZILLA_EXPORT DatabaseWriter : public QObject
+class QUPZILLA_EXPORT DatabaseWriter : public QObject
 {
     Q_OBJECT
 public: