From 5e4f703ef2a9a9b432f192b4b10e80191200c072 Mon Sep 17 00:00:00 2001 From: nowrep Date: Wed, 26 Feb 2014 20:03:20 +0100 Subject: [PATCH] [Code] Renamed qz_namespace.h to qzcommon.h --- src/lib/3rdparty/ecwin7.h | 2 +- src/lib/3rdparty/fancytabwidget.h | 2 +- src/lib/3rdparty/lineedit.h | 2 +- src/lib/3rdparty/processinfo.h | 2 +- src/lib/3rdparty/qtwin.h | 2 +- src/lib/3rdparty/squeezelabelv1.h | 2 +- src/lib/3rdparty/squeezelabelv2.h | 2 +- src/lib/3rdparty/stylehelper.h | 2 +- src/lib/adblock/adblockaddsubscriptiondialog.h | 2 +- src/lib/adblock/adblockblockednetworkreply.h | 2 +- src/lib/adblock/adblockdialog.h | 2 +- src/lib/adblock/adblockicon.h | 2 +- src/lib/adblock/adblockmanager.h | 2 +- src/lib/adblock/adblockrule.h | 2 +- src/lib/adblock/adblocksearchtree.h | 2 +- src/lib/adblock/adblocksubscription.h | 2 +- src/lib/adblock/adblocktreewidget.h | 2 +- src/lib/app/autosaver.h | 2 +- src/lib/app/browserwindow.h | 2 +- src/lib/app/commandlineoptions.h | 2 +- src/lib/app/mainapplication.h | 2 +- src/lib/app/profileupdater.h | 2 +- src/lib/app/proxystyle.h | 2 +- src/lib/app/{qz_namespace.h => qzcommon.h} | 6 +++--- src/lib/app/settings.h | 2 +- src/lib/autofill/autofill.h | 2 +- src/lib/autofill/autofillicon.h | 2 +- src/lib/autofill/autofillnotification.h | 2 +- src/lib/autofill/autofillwidget.h | 2 +- src/lib/autofill/pageformcompleter.h | 2 +- .../passwordbackends/databaseencryptedpasswordbackend.h | 2 +- src/lib/autofill/passwordbackends/databasepasswordbackend.h | 2 +- src/lib/autofill/passwordbackends/passwordbackend.h | 2 +- src/lib/autofill/passwordmanager.h | 2 +- src/lib/bookmarks/bookmarkitem.h | 2 +- src/lib/bookmarks/bookmarks.h | 2 +- src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h | 2 +- src/lib/bookmarks/bookmarksexport/bookmarksexporter.h | 2 +- src/lib/bookmarks/bookmarksicon.h | 2 +- src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h | 2 +- src/lib/bookmarks/bookmarksimport/bookmarksimporter.h | 2 +- src/lib/bookmarks/bookmarksitemdelegate.h | 2 +- src/lib/bookmarks/bookmarksmanager.h | 2 +- src/lib/bookmarks/bookmarksmenu.h | 2 +- src/lib/bookmarks/bookmarksmodel.h | 2 +- src/lib/bookmarks/bookmarkstoolbar.h | 2 +- src/lib/bookmarks/bookmarkstoolbarbutton.h | 2 +- src/lib/bookmarks/bookmarkstools.h | 2 +- src/lib/bookmarks/bookmarkstreeview.h | 2 +- src/lib/bookmarks/bookmarkswidget.h | 2 +- src/lib/cookies/cookiejar.h | 2 +- src/lib/cookies/cookiemanager.h | 2 +- src/lib/desktopnotifications/desktopnotification.h | 2 +- src/lib/desktopnotifications/desktopnotificationsfactory.h | 2 +- src/lib/downloads/downloadfilehelper.h | 2 +- src/lib/downloads/downloaditem.h | 2 +- src/lib/downloads/downloadmanager.h | 2 +- src/lib/downloads/downloadoptionsdialog.h | 2 +- src/lib/history/history.h | 2 +- src/lib/history/historyitem.h | 2 +- src/lib/history/historymanager.h | 2 +- src/lib/history/historymodel.h | 2 +- src/lib/history/webhistoryinterface.h | 2 +- src/lib/lib.pro | 4 ++-- src/lib/navigation/completer/locationcompleter.h | 2 +- src/lib/navigation/completer/locationcompleterdelegate.h | 2 +- src/lib/navigation/completer/locationcompletermodel.h | 2 +- src/lib/navigation/completer/locationcompleterview.h | 2 +- src/lib/navigation/downicon.h | 2 +- src/lib/navigation/goicon.h | 2 +- src/lib/navigation/locationbar.h | 2 +- src/lib/navigation/locationbarpopup.h | 2 +- src/lib/navigation/navigationbar.h | 2 +- src/lib/navigation/reloadstopbutton.h | 2 +- src/lib/navigation/siteicon.h | 2 +- src/lib/navigation/websearchbar.h | 2 +- src/lib/network/cabundleupdater.h | 2 +- src/lib/network/networkmanager.h | 2 +- src/lib/network/networkmanagerproxy.h | 2 +- src/lib/network/networkproxyfactory.h | 2 +- src/lib/network/pac/pacmanager.h | 2 +- src/lib/network/pac/proxyautoconfig.h | 2 +- src/lib/network/schemehandlers/adblockschemehandler.h | 2 +- src/lib/network/schemehandlers/fileschemehandler.h | 2 +- src/lib/network/schemehandlers/ftpschemehandler.h | 2 +- src/lib/network/schemehandlers/qupzillaschemehandler.h | 2 +- src/lib/network/schemehandlers/schemehandler.h | 2 +- src/lib/network/sslerrordialog.h | 2 +- src/lib/opensearch/editsearchengine.h | 2 +- src/lib/opensearch/opensearchengine.h | 2 +- src/lib/opensearch/opensearchenginedelegate.h | 2 +- src/lib/opensearch/opensearchreader.h | 2 +- src/lib/opensearch/searchenginesdialog.h | 2 +- src/lib/opensearch/searchenginesmanager.h | 2 +- src/lib/other/aboutdialog.h | 2 +- src/lib/other/browsinglibrary.h | 2 +- src/lib/other/checkboxdialog.h | 2 +- src/lib/other/clearprivatedata.h | 2 +- src/lib/other/databasewriter.h | 2 +- src/lib/other/iconchooser.h | 2 +- src/lib/other/licenseviewer.h | 2 +- src/lib/other/macmenureceiver.h | 2 +- src/lib/other/pagescreen.h | 2 +- src/lib/other/qzsettings.h | 2 +- src/lib/other/registerqappassociation.h | 2 +- src/lib/other/sourceviewer.h | 2 +- src/lib/other/sourceviewersearch.h | 2 +- src/lib/other/statusbarmessage.h | 2 +- src/lib/other/updater.h | 2 +- src/lib/other/useragentmanager.h | 2 +- src/lib/plugins/clicktoflash.h | 2 +- src/lib/plugins/plugininterface.h | 2 +- src/lib/plugins/pluginproxy.h | 2 +- src/lib/plugins/plugins.h | 2 +- src/lib/plugins/qtwebkit/spellcheck/spellcheckdialog.h | 2 +- src/lib/plugins/qtwebkit/spellcheck/speller.h | 2 +- src/lib/plugins/speeddial.h | 2 +- src/lib/plugins/webpluginfactory.h | 2 +- src/lib/popupwindow/popuplocationbar.h | 2 +- src/lib/popupwindow/popupstatusbarmessage.h | 2 +- src/lib/popupwindow/popupwebpage.h | 2 +- src/lib/popupwindow/popupwebview.h | 2 +- src/lib/popupwindow/popupwindow.h | 2 +- src/lib/preferences/acceptlanguage.h | 2 +- src/lib/preferences/autofillmanager.h | 2 +- src/lib/preferences/jsoptions.h | 2 +- src/lib/preferences/pluginlistdelegate.h | 2 +- src/lib/preferences/pluginsmanager.h | 2 +- src/lib/preferences/preferences.h | 2 +- src/lib/preferences/sslmanager.h | 2 +- src/lib/preferences/thememanager.h | 2 +- src/lib/preferences/useragentdialog.h | 2 +- src/lib/rss/rssicon.h | 2 +- src/lib/rss/rssmanager.h | 2 +- src/lib/rss/rssnotification.h | 2 +- src/lib/rss/rsswidget.h | 2 +- src/lib/session/restoremanager.h | 2 +- src/lib/sidebar/bookmarkssidebar.h | 2 +- src/lib/sidebar/historysidebar.h | 2 +- src/lib/sidebar/sidebar.h | 2 +- src/lib/sidebar/sidebarinterface.h | 2 +- src/lib/tools/actioncopy.h | 2 +- src/lib/tools/aesinterface.h | 2 +- src/lib/tools/animatedwidget.h | 2 +- src/lib/tools/buttonbox.h | 2 +- src/lib/tools/buttonwithmenu.h | 2 +- src/lib/tools/certificateinfowidget.h | 2 +- src/lib/tools/clickablelabel.h | 2 +- src/lib/tools/closedtabsmanager.h | 2 +- src/lib/tools/combotabbar.h | 2 +- src/lib/tools/delayedfilewatcher.h | 2 +- src/lib/tools/docktitlebarwidget.h | 2 +- src/lib/tools/emptynetworkreply.h | 2 +- src/lib/tools/enhancedmenu.h | 2 +- src/lib/tools/focusselectlineedit.h | 2 +- src/lib/tools/followredirectreply.h | 2 +- src/lib/tools/frame.h | 2 +- src/lib/tools/headerview.h | 2 +- src/lib/tools/html5permissions/html5permissionsmanager.h | 2 +- src/lib/tools/htmlhighlighter.h | 2 +- src/lib/tools/iconfetcher.h | 2 +- src/lib/tools/iconprovider.h | 2 +- src/lib/tools/json.h | 2 +- src/lib/tools/listitemdelegate.h | 2 +- src/lib/tools/mactoolbutton.h | 2 +- src/lib/tools/menubar.h | 2 +- src/lib/tools/pagethumbnailer.h | 2 +- src/lib/tools/plaineditwithlines.h | 2 +- src/lib/tools/progressbar.h | 2 +- src/lib/tools/qzregexp.h | 2 +- src/lib/tools/qztools.h | 2 +- src/lib/tools/tabstackedwidget.h | 2 +- src/lib/tools/toolbutton.h | 2 +- src/lib/tools/treewidget.h | 2 +- src/lib/tools/widget.h | 2 +- src/lib/webview/searchtoolbar.h | 2 +- src/lib/webview/siteinfo.h | 2 +- src/lib/webview/siteinfowidget.h | 2 +- src/lib/webview/tabbar.h | 2 +- src/lib/webview/tabbedwebview.h | 2 +- src/lib/webview/tabwidget.h | 2 +- src/lib/webview/webhistorywrapper.h | 2 +- src/lib/webview/webinspectordockwidget.h | 2 +- src/lib/webview/webpage.h | 2 +- src/lib/webview/webtab.h | 2 +- src/lib/webview/webview.h | 2 +- 186 files changed, 189 insertions(+), 189 deletions(-) rename src/lib/app/{qz_namespace.h => qzcommon.h} (98%) diff --git a/src/lib/3rdparty/ecwin7.h b/src/lib/3rdparty/ecwin7.h index 3bd71170e..b82676da5 100644 --- a/src/lib/3rdparty/ecwin7.h +++ b/src/lib/3rdparty/ecwin7.h @@ -20,7 +20,7 @@ #ifndef ECWIN7_H #define ECWIN7_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/3rdparty/fancytabwidget.h b/src/lib/3rdparty/fancytabwidget.h index 875cf0e13..97e0bdfe8 100644 --- a/src/lib/3rdparty/fancytabwidget.h +++ b/src/lib/3rdparty/fancytabwidget.h @@ -30,7 +30,7 @@ #ifndef FANCYTABWIDGET_H #define FANCYTABWIDGET_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/3rdparty/lineedit.h b/src/lib/3rdparty/lineedit.h index 174ab5f45..ae4f409d0 100644 --- a/src/lib/3rdparty/lineedit.h +++ b/src/lib/3rdparty/lineedit.h @@ -47,7 +47,7 @@ * ============================================================ */ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QHBoxLayout; diff --git a/src/lib/3rdparty/processinfo.h b/src/lib/3rdparty/processinfo.h index d1240e364..5055744ee 100644 --- a/src/lib/3rdparty/processinfo.h +++ b/src/lib/3rdparty/processinfo.h @@ -24,7 +24,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" /* * Code used from http://ubuntuforums.org/showpost.php?p=6593782&postcount=5 diff --git a/src/lib/3rdparty/qtwin.h b/src/lib/3rdparty/qtwin.h index f05476b9d..3764d8764 100644 --- a/src/lib/3rdparty/qtwin.h +++ b/src/lib/3rdparty/qtwin.h @@ -27,7 +27,7 @@ #ifndef QTWIN_H #define QTWIN_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/3rdparty/squeezelabelv1.h b/src/lib/3rdparty/squeezelabelv1.h index 65f609733..603529632 100644 --- a/src/lib/3rdparty/squeezelabelv1.h +++ b/src/lib/3rdparty/squeezelabelv1.h @@ -29,7 +29,7 @@ #ifndef SQUEEZELABELV1_H #define SQUEEZELABELV1_H -#include "qz_namespace.h" +#include "qzcommon.h" #include diff --git a/src/lib/3rdparty/squeezelabelv2.h b/src/lib/3rdparty/squeezelabelv2.h index d4473ee54..7fe1c1d9b 100644 --- a/src/lib/3rdparty/squeezelabelv2.h +++ b/src/lib/3rdparty/squeezelabelv2.h @@ -18,7 +18,7 @@ #ifndef SQUEEZELABELV2_H #define SQUEEZELABELV2_H -#include "qz_namespace.h" +#include "qzcommon.h" #include diff --git a/src/lib/3rdparty/stylehelper.h b/src/lib/3rdparty/stylehelper.h index c97144678..5df4c93f2 100644 --- a/src/lib/3rdparty/stylehelper.h +++ b/src/lib/3rdparty/stylehelper.h @@ -30,7 +30,7 @@ #ifndef STYLEHELPER_H #define STYLEHELPER_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/adblock/adblockaddsubscriptiondialog.h b/src/lib/adblock/adblockaddsubscriptiondialog.h index f04a75adf..f8125d676 100644 --- a/src/lib/adblock/adblockaddsubscriptiondialog.h +++ b/src/lib/adblock/adblockaddsubscriptiondialog.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/adblock/adblockblockednetworkreply.h b/src/lib/adblock/adblockblockednetworkreply.h index e9569faaf..c3f62e372 100644 --- a/src/lib/adblock/adblockblockednetworkreply.h +++ b/src/lib/adblock/adblockblockednetworkreply.h @@ -48,7 +48,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class AdBlockRule; class AdBlockSubscription; diff --git a/src/lib/adblock/adblockdialog.h b/src/lib/adblock/adblockdialog.h index 3f9587ece..4c733f0aa 100644 --- a/src/lib/adblock/adblockdialog.h +++ b/src/lib/adblock/adblockdialog.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "ui_adblockdialog.h" class AdBlockSubscription; diff --git a/src/lib/adblock/adblockicon.h b/src/lib/adblock/adblockicon.h index f84198b20..fba1383eb 100644 --- a/src/lib/adblock/adblockicon.h +++ b/src/lib/adblock/adblockicon.h @@ -18,7 +18,7 @@ #ifndef ADBLOCKICON_H #define ADBLOCKICON_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "clickablelabel.h" #include "adblockrule.h" diff --git a/src/lib/adblock/adblockmanager.h b/src/lib/adblock/adblockmanager.h index 39268c2f4..bfcbb55c4 100644 --- a/src/lib/adblock/adblockmanager.h +++ b/src/lib/adblock/adblockmanager.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUrl; class QNetworkReply; diff --git a/src/lib/adblock/adblockrule.h b/src/lib/adblock/adblockrule.h index 24fe04b35..8fb9a94e5 100644 --- a/src/lib/adblock/adblockrule.h +++ b/src/lib/adblock/adblockrule.h @@ -49,7 +49,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "qzregexp.h" class QNetworkRequest; diff --git a/src/lib/adblock/adblocksearchtree.h b/src/lib/adblock/adblocksearchtree.h index d1be438a1..5d638cba6 100644 --- a/src/lib/adblock/adblocksearchtree.h +++ b/src/lib/adblock/adblocksearchtree.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QNetworkRequest; diff --git a/src/lib/adblock/adblocksubscription.h b/src/lib/adblock/adblocksubscription.h index 6e3d8bfba..a0dd04c8f 100644 --- a/src/lib/adblock/adblocksubscription.h +++ b/src/lib/adblock/adblocksubscription.h @@ -49,7 +49,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "adblockrule.h" #include "adblocksearchtree.h" diff --git a/src/lib/adblock/adblocktreewidget.h b/src/lib/adblock/adblocktreewidget.h index 14018d602..360035ba8 100644 --- a/src/lib/adblock/adblocktreewidget.h +++ b/src/lib/adblock/adblocktreewidget.h @@ -18,7 +18,7 @@ #ifndef ADBLOCKTREEWIDGET_H #define ADBLOCKTREEWIDGET_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "treewidget.h" class AdBlockSubscription; diff --git a/src/lib/app/autosaver.h b/src/lib/app/autosaver.h index 06d3dcf73..2cf0561c8 100644 --- a/src/lib/app/autosaver.h +++ b/src/lib/app/autosaver.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT AutoSaver : public QObject { diff --git a/src/lib/app/browserwindow.h b/src/lib/app/browserwindow.h index 8d22d1661..875c8b472 100644 --- a/src/lib/app/browserwindow.h +++ b/src/lib/app/browserwindow.h @@ -22,7 +22,7 @@ #include #include "restoremanager.h" -#include "qz_namespace.h" +#include "qzcommon.h" class QMenuBar; class QLabel; diff --git a/src/lib/app/commandlineoptions.h b/src/lib/app/commandlineoptions.h index 02916e5e1..6f7036c4c 100644 --- a/src/lib/app/commandlineoptions.h +++ b/src/lib/app/commandlineoptions.h @@ -23,7 +23,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT CommandLineOptions { diff --git a/src/lib/app/mainapplication.h b/src/lib/app/mainapplication.h index 56eb17b5c..d5c009bfe 100644 --- a/src/lib/app/mainapplication.h +++ b/src/lib/app/mainapplication.h @@ -26,7 +26,7 @@ #include "restoremanager.h" #include "qtsingleapplication.h" -#include "qz_namespace.h" +#include "qzcommon.h" class QMenu; class QWebSettings; diff --git a/src/lib/app/profileupdater.h b/src/lib/app/profileupdater.h index 625ed6ce8..e329ef816 100644 --- a/src/lib/app/profileupdater.h +++ b/src/lib/app/profileupdater.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class ProfileUpdater { diff --git a/src/lib/app/proxystyle.h b/src/lib/app/proxystyle.h index a1fa458a8..14d171576 100644 --- a/src/lib/app/proxystyle.h +++ b/src/lib/app/proxystyle.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT ProxyStyle : public QProxyStyle { diff --git a/src/lib/app/qz_namespace.h b/src/lib/app/qzcommon.h similarity index 98% rename from src/lib/app/qz_namespace.h rename to src/lib/app/qzcommon.h index 3831ee237..a9da5494f 100644 --- a/src/lib/app/qz_namespace.h +++ b/src/lib/app/qzcommon.h @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * ============================================================ */ -#ifndef QZ_NAMESPACE_H -#define QZ_NAMESPACE_H +#ifndef QZCOMMON_H +#define QZCOMMON_H #include #include @@ -153,4 +153,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qz::NewTabPositionFlags) #define QTWEBKIT_TO_2_3 \ (QT_VERSION < 0x050000 && (QTWEBKIT_VERSION < QTWEBKIT_VERSION_CHECK(2, 3, 0))) -#endif // QZ_NAMESPACE_H +#endif // QZCOMMON_H diff --git a/src/lib/app/settings.h b/src/lib/app/settings.h index a2f2a1099..aa9baa719 100644 --- a/src/lib/app/settings.h +++ b/src/lib/app/settings.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QSettings; diff --git a/src/lib/autofill/autofill.h b/src/lib/autofill/autofill.h index c68fcd1c6..c8f8d1cdf 100644 --- a/src/lib/autofill/autofill.h +++ b/src/lib/autofill/autofill.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUrl; class QWebElement; diff --git a/src/lib/autofill/autofillicon.h b/src/lib/autofill/autofillicon.h index e70636501..1a183cf48 100644 --- a/src/lib/autofill/autofillicon.h +++ b/src/lib/autofill/autofillicon.h @@ -18,7 +18,7 @@ #ifndef AUTOFILLICON_H #define AUTOFILLICON_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "clickablelabel.h" #include "passwordmanager.h" diff --git a/src/lib/autofill/autofillnotification.h b/src/lib/autofill/autofillnotification.h index 5f32191c0..7a3a1b859 100644 --- a/src/lib/autofill/autofillnotification.h +++ b/src/lib/autofill/autofillnotification.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "animatedwidget.h" #include "pageformcompleter.h" #include "passwordmanager.h" diff --git a/src/lib/autofill/autofillwidget.h b/src/lib/autofill/autofillwidget.h index 3ae611ca7..2dc436910 100644 --- a/src/lib/autofill/autofillwidget.h +++ b/src/lib/autofill/autofillwidget.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "locationbarpopup.h" namespace Ui diff --git a/src/lib/autofill/pageformcompleter.h b/src/lib/autofill/pageformcompleter.h index d58f12035..cfdbb1bb1 100644 --- a/src/lib/autofill/pageformcompleter.h +++ b/src/lib/autofill/pageformcompleter.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QWebPage; class QWebElement; diff --git a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h index 880680df6..6c70e5483 100644 --- a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h +++ b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h @@ -20,7 +20,7 @@ #define DATABASEENCRYPTEDPASSWORDBACKEND_H #include "passwordbackend.h" -#include "qz_namespace.h" +#include "qzcommon.h" #include diff --git a/src/lib/autofill/passwordbackends/databasepasswordbackend.h b/src/lib/autofill/passwordbackends/databasepasswordbackend.h index 7fb962f13..05415de1c 100644 --- a/src/lib/autofill/passwordbackends/databasepasswordbackend.h +++ b/src/lib/autofill/passwordbackends/databasepasswordbackend.h @@ -19,7 +19,7 @@ #define DATABASEPASSWORDBACKEND_H #include "passwordbackend.h" -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT DatabasePasswordBackend : public PasswordBackend { diff --git a/src/lib/autofill/passwordbackends/passwordbackend.h b/src/lib/autofill/passwordbackends/passwordbackend.h index 13d8f2e92..2a5f0e3d9 100644 --- a/src/lib/autofill/passwordbackends/passwordbackend.h +++ b/src/lib/autofill/passwordbackends/passwordbackend.h @@ -19,7 +19,7 @@ #define PASSWORDBACKEND_H #include "passwordmanager.h" -#include "qz_namespace.h" +#include "qzcommon.h" class QWidget; diff --git a/src/lib/autofill/passwordmanager.h b/src/lib/autofill/passwordmanager.h index 09811120a..c67a07dca 100644 --- a/src/lib/autofill/passwordmanager.h +++ b/src/lib/autofill/passwordmanager.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class PasswordBackend; class DatabasePasswordBackend; diff --git a/src/lib/bookmarks/bookmarkitem.h b/src/lib/bookmarks/bookmarkitem.h index 669a3a287..f6878d18e 100644 --- a/src/lib/bookmarks/bookmarkitem.h +++ b/src/lib/bookmarks/bookmarkitem.h @@ -24,7 +24,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT BookmarkItem { diff --git a/src/lib/bookmarks/bookmarks.h b/src/lib/bookmarks/bookmarks.h index 48a8d56f0..3e9c6401c 100644 --- a/src/lib/bookmarks/bookmarks.h +++ b/src/lib/bookmarks/bookmarks.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUrl; diff --git a/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h b/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h index 2cc122174..285f1c75b 100644 --- a/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h +++ b/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/bookmarks/bookmarksexport/bookmarksexporter.h b/src/lib/bookmarks/bookmarksexport/bookmarksexporter.h index 8e9b04def..f0bc5b3ba 100644 --- a/src/lib/bookmarks/bookmarksexport/bookmarksexporter.h +++ b/src/lib/bookmarks/bookmarksexport/bookmarksexporter.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class BookmarkItem; diff --git a/src/lib/bookmarks/bookmarksicon.h b/src/lib/bookmarks/bookmarksicon.h index 60058f3c6..01c0d9256 100644 --- a/src/lib/bookmarks/bookmarksicon.h +++ b/src/lib/bookmarks/bookmarksicon.h @@ -21,7 +21,7 @@ #include #include "clickablelabel.h" -#include "qz_namespace.h" +#include "qzcommon.h" class WebView; class BookmarkItem; diff --git a/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h b/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h index 78460ae2e..65fb038ad 100644 --- a/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h +++ b/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/bookmarks/bookmarksimport/bookmarksimporter.h b/src/lib/bookmarks/bookmarksimport/bookmarksimporter.h index f86fd7553..786c01561 100644 --- a/src/lib/bookmarks/bookmarksimport/bookmarksimporter.h +++ b/src/lib/bookmarks/bookmarksimport/bookmarksimporter.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QIcon; diff --git a/src/lib/bookmarks/bookmarksitemdelegate.h b/src/lib/bookmarks/bookmarksitemdelegate.h index 81c8cca99..8fd3788b2 100644 --- a/src/lib/bookmarks/bookmarksitemdelegate.h +++ b/src/lib/bookmarks/bookmarksitemdelegate.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QTreeView; diff --git a/src/lib/bookmarks/bookmarksmanager.h b/src/lib/bookmarks/bookmarksmanager.h index 67c299211..68af400eb 100644 --- a/src/lib/bookmarks/bookmarksmanager.h +++ b/src/lib/bookmarks/bookmarksmanager.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/bookmarks/bookmarksmenu.h b/src/lib/bookmarks/bookmarksmenu.h index 08cbfb37d..1a89d160d 100644 --- a/src/lib/bookmarks/bookmarksmenu.h +++ b/src/lib/bookmarks/bookmarksmenu.h @@ -21,7 +21,7 @@ #include #include "enhancedmenu.h" -#include "qz_namespace.h" +#include "qzcommon.h" class BrowserWindow; class BookmarkItem; diff --git a/src/lib/bookmarks/bookmarksmodel.h b/src/lib/bookmarks/bookmarksmodel.h index a3dcc770e..4d1b30c75 100644 --- a/src/lib/bookmarks/bookmarksmodel.h +++ b/src/lib/bookmarks/bookmarksmodel.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QTimer; diff --git a/src/lib/bookmarks/bookmarkstoolbar.h b/src/lib/bookmarks/bookmarkstoolbar.h index 69a0b4a2a..79f8b6759 100644 --- a/src/lib/bookmarks/bookmarkstoolbar.h +++ b/src/lib/bookmarks/bookmarkstoolbar.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QHBoxLayout; class QTimer; diff --git a/src/lib/bookmarks/bookmarkstoolbarbutton.h b/src/lib/bookmarks/bookmarkstoolbarbutton.h index 9ae6c0c86..25a805c94 100644 --- a/src/lib/bookmarks/bookmarkstoolbarbutton.h +++ b/src/lib/bookmarks/bookmarkstoolbarbutton.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class Menu; class BrowserWindow; diff --git a/src/lib/bookmarks/bookmarkstools.h b/src/lib/bookmarks/bookmarkstools.h index 99e24d704..517a4dccc 100644 --- a/src/lib/bookmarks/bookmarkstools.h +++ b/src/lib/bookmarks/bookmarkstools.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class Bookmarks; class BookmarkItem; diff --git a/src/lib/bookmarks/bookmarkstreeview.h b/src/lib/bookmarks/bookmarkstreeview.h index f03131182..f8100fb1f 100644 --- a/src/lib/bookmarks/bookmarkstreeview.h +++ b/src/lib/bookmarks/bookmarkstreeview.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class Bookmarks; class BookmarkItem; diff --git a/src/lib/bookmarks/bookmarkswidget.h b/src/lib/bookmarks/bookmarkswidget.h index 81cdaaacb..3f39881f8 100644 --- a/src/lib/bookmarks/bookmarkswidget.h +++ b/src/lib/bookmarks/bookmarkswidget.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "locationbarpopup.h" namespace Ui diff --git a/src/lib/cookies/cookiejar.h b/src/lib/cookies/cookiejar.h index 8d75b7f0c..40d87ee73 100644 --- a/src/lib/cookies/cookiejar.h +++ b/src/lib/cookies/cookiejar.h @@ -18,7 +18,7 @@ #ifndef COOKIEJAR_H #define COOKIEJAR_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/cookies/cookiemanager.h b/src/lib/cookies/cookiemanager.h index cacfb5555..cb6cfef00 100644 --- a/src/lib/cookies/cookiemanager.h +++ b/src/lib/cookies/cookiemanager.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/desktopnotifications/desktopnotification.h b/src/lib/desktopnotifications/desktopnotification.h index 9a5cadaca..6d51e4c48 100644 --- a/src/lib/desktopnotifications/desktopnotification.h +++ b/src/lib/desktopnotifications/desktopnotification.h @@ -18,7 +18,7 @@ #ifndef DESKTOPNOTIFICATION_H #define DESKTOPNOTIFICATION_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/desktopnotifications/desktopnotificationsfactory.h b/src/lib/desktopnotifications/desktopnotificationsfactory.h index d4513a9be..6dcc08cac 100644 --- a/src/lib/desktopnotifications/desktopnotificationsfactory.h +++ b/src/lib/desktopnotifications/desktopnotificationsfactory.h @@ -18,7 +18,7 @@ #ifndef DESKTOPNOTIFICATIONSFACTORY_H #define DESKTOPNOTIFICATIONSFACTORY_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/downloads/downloadfilehelper.h b/src/lib/downloads/downloadfilehelper.h index 80ec1134c..c5b3bc094 100644 --- a/src/lib/downloads/downloadfilehelper.h +++ b/src/lib/downloads/downloadfilehelper.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "downloadmanager.h" class QFileIconProvider; diff --git a/src/lib/downloads/downloaditem.h b/src/lib/downloads/downloaditem.h index 4ecb20e2c..c3fa1b0b1 100644 --- a/src/lib/downloads/downloaditem.h +++ b/src/lib/downloads/downloaditem.h @@ -25,7 +25,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/downloads/downloadmanager.h b/src/lib/downloads/downloadmanager.h index f4461373a..bf5de298b 100644 --- a/src/lib/downloads/downloadmanager.h +++ b/src/lib/downloads/downloadmanager.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "ecwin7.h" namespace Ui diff --git a/src/lib/downloads/downloadoptionsdialog.h b/src/lib/downloads/downloadoptionsdialog.h index 374be8ae3..95f020ffc 100644 --- a/src/lib/downloads/downloadoptionsdialog.h +++ b/src/lib/downloads/downloadoptionsdialog.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "downloadmanager.h" namespace Ui diff --git a/src/lib/history/history.h b/src/lib/history/history.h index 4bc81dc6e..046e6b387 100644 --- a/src/lib/history/history.h +++ b/src/lib/history/history.h @@ -23,7 +23,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QIcon; diff --git a/src/lib/history/historyitem.h b/src/lib/history/historyitem.h index 4ca96bd2c..13ed090f4 100644 --- a/src/lib/history/historyitem.h +++ b/src/lib/history/historyitem.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "history.h" class QUPZILLA_EXPORT HistoryItem diff --git a/src/lib/history/historymanager.h b/src/lib/history/historymanager.h index 3febf1288..1377db37f 100644 --- a/src/lib/history/historymanager.h +++ b/src/lib/history/historymanager.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "historyview.h" namespace Ui diff --git a/src/lib/history/historymodel.h b/src/lib/history/historymodel.h index 6422a11e4..89b1984d4 100644 --- a/src/lib/history/historymodel.h +++ b/src/lib/history/historymodel.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "history.h" class QTimer; diff --git a/src/lib/history/webhistoryinterface.h b/src/lib/history/webhistoryinterface.h index a510e4050..374a257a5 100644 --- a/src/lib/history/webhistoryinterface.h +++ b/src/lib/history/webhistoryinterface.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT WebHistoryInterface : public QWebHistoryInterface { diff --git a/src/lib/lib.pro b/src/lib/lib.pro index 657cae1b8..162b433bd 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -382,7 +382,6 @@ HEADERS += \ popupwindow/popuplocationbar.h \ webview/tabbedwebview.h \ webview/webview.h \ - app/qz_namespace.h \ preferences/pluginlistdelegate.h \ popupwindow/popupstatusbarmessage.h \ other/licenseviewer.h \ @@ -455,7 +454,8 @@ HEADERS += \ bookmarks/bookmarksexport/bookmarksexporter.h \ bookmarks/bookmarksexport/bookmarksexportdialog.h \ bookmarks/bookmarksexport/htmlexporter.h \ - app/browserwindow.h + app/browserwindow.h \ + app/qzcommon.h FORMS += \ preferences/autofillmanager.ui \ diff --git a/src/lib/navigation/completer/locationcompleter.h b/src/lib/navigation/completer/locationcompleter.h index 5748cbf58..cb76357c6 100644 --- a/src/lib/navigation/completer/locationcompleter.h +++ b/src/lib/navigation/completer/locationcompleter.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QModelIndex; diff --git a/src/lib/navigation/completer/locationcompleterdelegate.h b/src/lib/navigation/completer/locationcompleterdelegate.h index 046607fb8..6762e093b 100644 --- a/src/lib/navigation/completer/locationcompleterdelegate.h +++ b/src/lib/navigation/completer/locationcompleterdelegate.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class LocationCompleterView; diff --git a/src/lib/navigation/completer/locationcompletermodel.h b/src/lib/navigation/completer/locationcompletermodel.h index d1d06a3ed..e0ffc696a 100644 --- a/src/lib/navigation/completer/locationcompletermodel.h +++ b/src/lib/navigation/completer/locationcompletermodel.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QSqlQuery; class QUrl; diff --git a/src/lib/navigation/completer/locationcompleterview.h b/src/lib/navigation/completer/locationcompleterview.h index 5e8512c0d..0ed189a61 100644 --- a/src/lib/navigation/completer/locationcompleterview.h +++ b/src/lib/navigation/completer/locationcompleterview.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "locationcompletermodel.h" class QUPZILLA_EXPORT LocationCompleterView : public QListView diff --git a/src/lib/navigation/downicon.h b/src/lib/navigation/downicon.h index 16ea5326d..e1ba0cfdc 100644 --- a/src/lib/navigation/downicon.h +++ b/src/lib/navigation/downicon.h @@ -18,7 +18,7 @@ #ifndef DOWNICON_H #define DOWNICON_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "clickablelabel.h" class QUPZILLA_EXPORT DownIcon : public ClickableLabel diff --git a/src/lib/navigation/goicon.h b/src/lib/navigation/goicon.h index 75139e619..bd879bab8 100644 --- a/src/lib/navigation/goicon.h +++ b/src/lib/navigation/goicon.h @@ -18,7 +18,7 @@ #ifndef GOICON_H #define GOICON_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "clickablelabel.h" class QUPZILLA_EXPORT GoIcon : public ClickableLabel diff --git a/src/lib/navigation/locationbar.h b/src/lib/navigation/locationbar.h index b5e722dbd..00f14a6ae 100644 --- a/src/lib/navigation/locationbar.h +++ b/src/lib/navigation/locationbar.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "lineedit.h" #include "completer/locationcompleter.h" diff --git a/src/lib/navigation/locationbarpopup.h b/src/lib/navigation/locationbarpopup.h index a0f90db6b..16537edc2 100644 --- a/src/lib/navigation/locationbarpopup.h +++ b/src/lib/navigation/locationbarpopup.h @@ -21,7 +21,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT LocationBarPopup : public QFrame { diff --git a/src/lib/navigation/navigationbar.h b/src/lib/navigation/navigationbar.h index 8b4120148..ab2677b2e 100644 --- a/src/lib/navigation/navigationbar.h +++ b/src/lib/navigation/navigationbar.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QHBoxLayout; class QSplitter; diff --git a/src/lib/navigation/reloadstopbutton.h b/src/lib/navigation/reloadstopbutton.h index e38165c8d..9a1750c4b 100644 --- a/src/lib/navigation/reloadstopbutton.h +++ b/src/lib/navigation/reloadstopbutton.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QTimer; diff --git a/src/lib/navigation/siteicon.h b/src/lib/navigation/siteicon.h index 236635af9..38544da94 100644 --- a/src/lib/navigation/siteicon.h +++ b/src/lib/navigation/siteicon.h @@ -18,7 +18,7 @@ #ifndef SITEICON_H #define SITEICON_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "toolbutton.h" class LocationBar; diff --git a/src/lib/navigation/websearchbar.h b/src/lib/navigation/websearchbar.h index ac7791e0f..486c488e1 100644 --- a/src/lib/navigation/websearchbar.h +++ b/src/lib/navigation/websearchbar.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "lineedit.h" #include "buttonwithmenu.h" #include "searchenginesmanager.h" diff --git a/src/lib/network/cabundleupdater.h b/src/lib/network/cabundleupdater.h index c3ffca547..4d6295da5 100644 --- a/src/lib/network/cabundleupdater.h +++ b/src/lib/network/cabundleupdater.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QNetworkReply; diff --git a/src/lib/network/networkmanager.h b/src/lib/network/networkmanager.h index 973d94aa8..310c6916d 100644 --- a/src/lib/network/networkmanager.h +++ b/src/lib/network/networkmanager.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "networkmanagerproxy.h" class AdBlockManager; diff --git a/src/lib/network/networkmanagerproxy.h b/src/lib/network/networkmanagerproxy.h index 4da5ea539..57e7ca222 100644 --- a/src/lib/network/networkmanagerproxy.h +++ b/src/lib/network/networkmanagerproxy.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class WebPage; class NetworkManager; diff --git a/src/lib/network/networkproxyfactory.h b/src/lib/network/networkproxyfactory.h index 23d5a65c6..82c76e8bf 100644 --- a/src/lib/network/networkproxyfactory.h +++ b/src/lib/network/networkproxyfactory.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "qzregexp.h" class PacManager; diff --git a/src/lib/network/pac/pacmanager.h b/src/lib/network/pac/pacmanager.h index dee808a3a..918fb24de 100644 --- a/src/lib/network/pac/pacmanager.h +++ b/src/lib/network/pac/pacmanager.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QNetworkProxy; diff --git a/src/lib/network/pac/proxyautoconfig.h b/src/lib/network/pac/proxyautoconfig.h index a85239e90..85e6532f4 100644 --- a/src/lib/network/pac/proxyautoconfig.h +++ b/src/lib/network/pac/proxyautoconfig.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QScriptContext; class QScriptEngine; diff --git a/src/lib/network/schemehandlers/adblockschemehandler.h b/src/lib/network/schemehandlers/adblockschemehandler.h index 86ca4c9de..1343c8631 100644 --- a/src/lib/network/schemehandlers/adblockschemehandler.h +++ b/src/lib/network/schemehandlers/adblockschemehandler.h @@ -18,7 +18,7 @@ #ifndef ADBLOCKSCHEMEHANDLER_H #define ADBLOCKSCHEMEHANDLER_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "schemehandler.h" class QUPZILLA_EXPORT AdBlockSchemeHandler : public SchemeHandler diff --git a/src/lib/network/schemehandlers/fileschemehandler.h b/src/lib/network/schemehandlers/fileschemehandler.h index 64e1f2d8a..d40b1fd6c 100644 --- a/src/lib/network/schemehandlers/fileschemehandler.h +++ b/src/lib/network/schemehandlers/fileschemehandler.h @@ -22,7 +22,7 @@ #include #include "schemehandler.h" -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT FileSchemeHandler : public SchemeHandler { diff --git a/src/lib/network/schemehandlers/ftpschemehandler.h b/src/lib/network/schemehandlers/ftpschemehandler.h index 5d0cc290b..ce62e7949 100644 --- a/src/lib/network/schemehandlers/ftpschemehandler.h +++ b/src/lib/network/schemehandlers/ftpschemehandler.h @@ -33,7 +33,7 @@ #endif #include "schemehandler.h" -#include "qz_namespace.h" +#include "qzcommon.h" #define FTP_AUTHENTICATOR FtpSchemeHandler::ftpAuthenticator diff --git a/src/lib/network/schemehandlers/qupzillaschemehandler.h b/src/lib/network/schemehandlers/qupzillaschemehandler.h index d6a997f6e..d78b26588 100644 --- a/src/lib/network/schemehandlers/qupzillaschemehandler.h +++ b/src/lib/network/schemehandlers/qupzillaschemehandler.h @@ -22,7 +22,7 @@ #include #include "schemehandler.h" -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT QupZillaSchemeHandler : public SchemeHandler { diff --git a/src/lib/network/schemehandlers/schemehandler.h b/src/lib/network/schemehandlers/schemehandler.h index ee46b9cf6..7910634fb 100644 --- a/src/lib/network/schemehandlers/schemehandler.h +++ b/src/lib/network/schemehandlers/schemehandler.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT SchemeHandler { diff --git a/src/lib/network/sslerrordialog.h b/src/lib/network/sslerrordialog.h index 871a7eb4c..1f9795810 100644 --- a/src/lib/network/sslerrordialog.h +++ b/src/lib/network/sslerrordialog.h @@ -27,7 +27,7 @@ class SslErrorDialog; class QAbstractButton; -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT SslErrorDialog : public QDialog { diff --git a/src/lib/opensearch/editsearchengine.h b/src/lib/opensearch/editsearchengine.h index 50ac16c48..fb6f70bcd 100644 --- a/src/lib/opensearch/editsearchengine.h +++ b/src/lib/opensearch/editsearchengine.h @@ -18,7 +18,7 @@ #ifndef EDITSEARCHENGINES_H #define EDITSEARCHENGINES_H -#include "qz_namespace.h" +#include "qzcommon.h" #include diff --git a/src/lib/opensearch/opensearchengine.h b/src/lib/opensearch/opensearchengine.h index e904f9bc9..d210c720e 100644 --- a/src/lib/opensearch/opensearchengine.h +++ b/src/lib/opensearch/opensearchengine.h @@ -37,7 +37,7 @@ #ifndef OPENSEARCHENGINE_H #define OPENSEARCHENGINE_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/opensearch/opensearchenginedelegate.h b/src/lib/opensearch/opensearchenginedelegate.h index cfd4d633d..4a35a0aa0 100644 --- a/src/lib/opensearch/opensearchenginedelegate.h +++ b/src/lib/opensearch/opensearchenginedelegate.h @@ -20,7 +20,7 @@ #ifndef OPENSEARCHENGINEDELEGATE_H #define OPENSEARCHENGINEDELEGATE_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/opensearch/opensearchreader.h b/src/lib/opensearch/opensearchreader.h index 455cb1082..8378ca68d 100644 --- a/src/lib/opensearch/opensearchreader.h +++ b/src/lib/opensearch/opensearchreader.h @@ -36,7 +36,7 @@ #ifndef OPENSEARCHREADER_H #define OPENSEARCHREADER_H -#include "qz_namespace.h" +#include "qzcommon.h" #include diff --git a/src/lib/opensearch/searchenginesdialog.h b/src/lib/opensearch/searchenginesdialog.h index ab874f219..e9e9a53c4 100644 --- a/src/lib/opensearch/searchenginesdialog.h +++ b/src/lib/opensearch/searchenginesdialog.h @@ -18,7 +18,7 @@ #ifndef SEARCHENGINESDIALOG_H #define SEARCHENGINESDIALOG_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "searchenginesmanager.h" #include diff --git a/src/lib/opensearch/searchenginesmanager.h b/src/lib/opensearch/searchenginesmanager.h index b8cb8d67e..b4ffd7a3e 100644 --- a/src/lib/opensearch/searchenginesmanager.h +++ b/src/lib/opensearch/searchenginesmanager.h @@ -24,7 +24,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "opensearchengine.h" class QWebElement; diff --git a/src/lib/other/aboutdialog.h b/src/lib/other/aboutdialog.h index a07fc983f..c7b35ea2e 100644 --- a/src/lib/other/aboutdialog.h +++ b/src/lib/other/aboutdialog.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/other/browsinglibrary.h b/src/lib/other/browsinglibrary.h index 261b5e398..1215c7d58 100644 --- a/src/lib/other/browsinglibrary.h +++ b/src/lib/other/browsinglibrary.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/other/checkboxdialog.h b/src/lib/other/checkboxdialog.h index 019f6d8f5..9528ad298 100644 --- a/src/lib/other/checkboxdialog.h +++ b/src/lib/other/checkboxdialog.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/other/clearprivatedata.h b/src/lib/other/clearprivatedata.h index 68d1e87b8..49e9cf506 100644 --- a/src/lib/other/clearprivatedata.h +++ b/src/lib/other/clearprivatedata.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/other/databasewriter.h b/src/lib/other/databasewriter.h index b6cf44767..b59c5edc9 100644 --- a/src/lib/other/databasewriter.h +++ b/src/lib/other/databasewriter.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT DatabaseWriter : public QObject { diff --git a/src/lib/other/iconchooser.h b/src/lib/other/iconchooser.h index 922534abd..aee423931 100644 --- a/src/lib/other/iconchooser.h +++ b/src/lib/other/iconchooser.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QIcon; diff --git a/src/lib/other/licenseviewer.h b/src/lib/other/licenseviewer.h index a9bbd4f26..5d2dd3a43 100644 --- a/src/lib/other/licenseviewer.h +++ b/src/lib/other/licenseviewer.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QTextBrowser; diff --git a/src/lib/other/macmenureceiver.h b/src/lib/other/macmenureceiver.h index e0af315ff..219639fe5 100644 --- a/src/lib/other/macmenureceiver.h +++ b/src/lib/other/macmenureceiver.h @@ -21,7 +21,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QWebFrame; class Menu; diff --git a/src/lib/other/pagescreen.h b/src/lib/other/pagescreen.h index 57e5c1cf2..790cf9367 100644 --- a/src/lib/other/pagescreen.h +++ b/src/lib/other/pagescreen.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/other/qzsettings.h b/src/lib/other/qzsettings.h index b2721a93b..fc9ca1cbb 100644 --- a/src/lib/other/qzsettings.h +++ b/src/lib/other/qzsettings.h @@ -18,7 +18,7 @@ #ifndef QZSETTINGS_H #define QZSETTINGS_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "settings.h" #include diff --git a/src/lib/other/registerqappassociation.h b/src/lib/other/registerqappassociation.h index 1f0bd176e..aff8c42bd 100644 --- a/src/lib/other/registerqappassociation.h +++ b/src/lib/other/registerqappassociation.h @@ -23,7 +23,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT RegisterQAppAssociation : public QObject { diff --git a/src/lib/other/sourceviewer.h b/src/lib/other/sourceviewer.h index 763d899da..903b33505 100644 --- a/src/lib/other/sourceviewer.h +++ b/src/lib/other/sourceviewer.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class PlainEditWithLines; diff --git a/src/lib/other/sourceviewersearch.h b/src/lib/other/sourceviewersearch.h index 054d14a74..818c7fec2 100644 --- a/src/lib/other/sourceviewersearch.h +++ b/src/lib/other/sourceviewersearch.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "animatedwidget.h" namespace Ui diff --git a/src/lib/other/statusbarmessage.h b/src/lib/other/statusbarmessage.h index 99f24319c..12fd57b9e 100644 --- a/src/lib/other/statusbarmessage.h +++ b/src/lib/other/statusbarmessage.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "squeezelabelv1.h" #include "animatedwidget.h" diff --git a/src/lib/other/updater.h b/src/lib/other/updater.h index b8f2e61df..8aac9e91c 100644 --- a/src/lib/other/updater.h +++ b/src/lib/other/updater.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QNetworkReply; class QUrl; diff --git a/src/lib/other/useragentmanager.h b/src/lib/other/useragentmanager.h index d1f7c72ca..4242a4429 100644 --- a/src/lib/other/useragentmanager.h +++ b/src/lib/other/useragentmanager.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUrl; diff --git a/src/lib/plugins/clicktoflash.h b/src/lib/plugins/clicktoflash.h index 50c727798..ea5a7b79d 100644 --- a/src/lib/plugins/clicktoflash.h +++ b/src/lib/plugins/clicktoflash.h @@ -42,7 +42,7 @@ #ifndef CLICKTOFLASH_H #define CLICKTOFLASH_H -#include "qz_namespace.h" +#include "qzcommon.h" // Qt Includes #include diff --git a/src/lib/plugins/plugininterface.h b/src/lib/plugins/plugininterface.h index 5060ebf9d..4e3beb85f 100644 --- a/src/lib/plugins/plugininterface.h +++ b/src/lib/plugins/plugininterface.h @@ -23,7 +23,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" struct PluginSpec { QString name; diff --git a/src/lib/plugins/pluginproxy.h b/src/lib/plugins/pluginproxy.h index f2e677275..041c7b913 100644 --- a/src/lib/plugins/pluginproxy.h +++ b/src/lib/plugins/pluginproxy.h @@ -19,7 +19,7 @@ #define PLUGINPROXY_H #include "plugins.h" -#include "qz_namespace.h" +#include "qzcommon.h" class BrowserWindow; class WebPage; diff --git a/src/lib/plugins/plugins.h b/src/lib/plugins/plugins.h index 31ef704ef..c048e74b2 100644 --- a/src/lib/plugins/plugins.h +++ b/src/lib/plugins/plugins.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "plugininterface.h" class QPluginLoader; diff --git a/src/lib/plugins/qtwebkit/spellcheck/spellcheckdialog.h b/src/lib/plugins/qtwebkit/spellcheck/spellcheckdialog.h index 41bc7f078..a18d97359 100644 --- a/src/lib/plugins/qtwebkit/spellcheck/spellcheckdialog.h +++ b/src/lib/plugins/qtwebkit/spellcheck/spellcheckdialog.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/plugins/qtwebkit/spellcheck/speller.h b/src/lib/plugins/qtwebkit/spellcheck/speller.h index d7bf77ec3..ca55af5e4 100644 --- a/src/lib/plugins/qtwebkit/spellcheck/speller.h +++ b/src/lib/plugins/qtwebkit/spellcheck/speller.h @@ -23,7 +23,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QTextCodec; class Hunspell; diff --git a/src/lib/plugins/speeddial.h b/src/lib/plugins/speeddial.h index 0861924a3..109c0613d 100644 --- a/src/lib/plugins/speeddial.h +++ b/src/lib/plugins/speeddial.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUrl; class QWebFrame; diff --git a/src/lib/plugins/webpluginfactory.h b/src/lib/plugins/webpluginfactory.h index 8f4f81e54..9f83eec51 100644 --- a/src/lib/plugins/webpluginfactory.h +++ b/src/lib/plugins/webpluginfactory.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class WebPage; diff --git a/src/lib/popupwindow/popuplocationbar.h b/src/lib/popupwindow/popuplocationbar.h index c505117ef..76fee3941 100644 --- a/src/lib/popupwindow/popuplocationbar.h +++ b/src/lib/popupwindow/popuplocationbar.h @@ -18,7 +18,7 @@ #ifndef POPUPLOCATIONBAR_H #define POPUPLOCATIONBAR_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "lineedit.h" class QUrl; diff --git a/src/lib/popupwindow/popupstatusbarmessage.h b/src/lib/popupwindow/popupstatusbarmessage.h index 6104e0234..808ad2a16 100644 --- a/src/lib/popupwindow/popupstatusbarmessage.h +++ b/src/lib/popupwindow/popupstatusbarmessage.h @@ -18,7 +18,7 @@ #ifndef POPUPSTATUSBARMESSAGE_H #define POPUPSTATUSBARMESSAGE_H -#include "qz_namespace.h" +#include "qzcommon.h" class PopupWindow; class TipLabel; diff --git a/src/lib/popupwindow/popupwebpage.h b/src/lib/popupwindow/popupwebpage.h index 8f4dcdbb5..1e3957c83 100644 --- a/src/lib/popupwindow/popupwebpage.h +++ b/src/lib/popupwindow/popupwebpage.h @@ -18,7 +18,7 @@ #ifndef POPUPWEBPAGE_H #define POPUPWEBPAGE_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "webpage.h" class BrowserWindow; diff --git a/src/lib/popupwindow/popupwebview.h b/src/lib/popupwindow/popupwebview.h index a6873da3f..a87630a62 100644 --- a/src/lib/popupwindow/popupwebview.h +++ b/src/lib/popupwindow/popupwebview.h @@ -18,7 +18,7 @@ #ifndef POPUPWEBVIEW_H #define POPUPWEBVIEW_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "webview.h" class PopupWebPage; diff --git a/src/lib/popupwindow/popupwindow.h b/src/lib/popupwindow/popupwindow.h index bb7d24d8f..b7c777eb0 100644 --- a/src/lib/popupwindow/popupwindow.h +++ b/src/lib/popupwindow/popupwindow.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QVBoxLayout; class QStatusBar; diff --git a/src/lib/preferences/acceptlanguage.h b/src/lib/preferences/acceptlanguage.h index b63fe386e..94d3151b2 100644 --- a/src/lib/preferences/acceptlanguage.h +++ b/src/lib/preferences/acceptlanguage.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/preferences/autofillmanager.h b/src/lib/preferences/autofillmanager.h index 34d6ed349..b26c0e564 100644 --- a/src/lib/preferences/autofillmanager.h +++ b/src/lib/preferences/autofillmanager.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class PasswordManager; diff --git a/src/lib/preferences/jsoptions.h b/src/lib/preferences/jsoptions.h index 244962f21..cbcdc007a 100644 --- a/src/lib/preferences/jsoptions.h +++ b/src/lib/preferences/jsoptions.h @@ -21,7 +21,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/preferences/pluginlistdelegate.h b/src/lib/preferences/pluginlistdelegate.h index 9888cd6dd..077909625 100644 --- a/src/lib/preferences/pluginlistdelegate.h +++ b/src/lib/preferences/pluginlistdelegate.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QListWidget; diff --git a/src/lib/preferences/pluginsmanager.h b/src/lib/preferences/pluginsmanager.h index 865e23e27..1395b16e1 100644 --- a/src/lib/preferences/pluginsmanager.h +++ b/src/lib/preferences/pluginsmanager.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/preferences/preferences.h b/src/lib/preferences/preferences.h index 9ede4d540..48cb81a90 100644 --- a/src/lib/preferences/preferences.h +++ b/src/lib/preferences/preferences.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/preferences/sslmanager.h b/src/lib/preferences/sslmanager.h index 94ad58fe2..ee6fc2e9f 100644 --- a/src/lib/preferences/sslmanager.h +++ b/src/lib/preferences/sslmanager.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/preferences/thememanager.h b/src/lib/preferences/thememanager.h index 4d84483b9..00e8f51d0 100644 --- a/src/lib/preferences/thememanager.h +++ b/src/lib/preferences/thememanager.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui diff --git a/src/lib/preferences/useragentdialog.h b/src/lib/preferences/useragentdialog.h index 5904b744c..0e9b511fc 100644 --- a/src/lib/preferences/useragentdialog.h +++ b/src/lib/preferences/useragentdialog.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class UserAgentManager; diff --git a/src/lib/rss/rssicon.h b/src/lib/rss/rssicon.h index 063711bcf..d08d45b26 100644 --- a/src/lib/rss/rssicon.h +++ b/src/lib/rss/rssicon.h @@ -18,7 +18,7 @@ #ifndef RSSICON_H #define RSSICON_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "clickablelabel.h" class WebView; diff --git a/src/lib/rss/rssmanager.h b/src/lib/rss/rssmanager.h index 8d07b369d..3aedc53a4 100644 --- a/src/lib/rss/rssmanager.h +++ b/src/lib/rss/rssmanager.h @@ -18,7 +18,7 @@ #ifndef RSSMANAGER_H #define RSSMANAGER_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/rss/rssnotification.h b/src/lib/rss/rssnotification.h index e74832681..d4b3e259d 100644 --- a/src/lib/rss/rssnotification.h +++ b/src/lib/rss/rssnotification.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "animatedwidget.h" class WebView; diff --git a/src/lib/rss/rsswidget.h b/src/lib/rss/rsswidget.h index 04ede978e..2b3ba6811 100644 --- a/src/lib/rss/rsswidget.h +++ b/src/lib/rss/rsswidget.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "locationbarpopup.h" namespace Ui diff --git a/src/lib/session/restoremanager.h b/src/lib/session/restoremanager.h index ee42f5799..80549fc02 100644 --- a/src/lib/session/restoremanager.h +++ b/src/lib/session/restoremanager.h @@ -20,7 +20,7 @@ #define RESTOREMANAGER_H #include "webtab.h" -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT RestoreManager { diff --git a/src/lib/sidebar/bookmarkssidebar.h b/src/lib/sidebar/bookmarkssidebar.h index 208f2ae20..70f3cadc0 100644 --- a/src/lib/sidebar/bookmarkssidebar.h +++ b/src/lib/sidebar/bookmarkssidebar.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/sidebar/historysidebar.h b/src/lib/sidebar/historysidebar.h index 2a96fdcf4..3eeca0170 100644 --- a/src/lib/sidebar/historysidebar.h +++ b/src/lib/sidebar/historysidebar.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "historyview.h" namespace Ui diff --git a/src/lib/sidebar/sidebar.h b/src/lib/sidebar/sidebar.h index c0e961078..82041bb66 100644 --- a/src/lib/sidebar/sidebar.h +++ b/src/lib/sidebar/sidebar.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QVBoxLayout; class QMenu; diff --git a/src/lib/sidebar/sidebarinterface.h b/src/lib/sidebar/sidebarinterface.h index 5d3ac055a..677963bc0 100644 --- a/src/lib/sidebar/sidebarinterface.h +++ b/src/lib/sidebar/sidebarinterface.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QAction; diff --git a/src/lib/tools/actioncopy.h b/src/lib/tools/actioncopy.h index 2393b414b..912a42472 100644 --- a/src/lib/tools/actioncopy.h +++ b/src/lib/tools/actioncopy.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT ActionCopy : public QAction { diff --git a/src/lib/tools/aesinterface.h b/src/lib/tools/aesinterface.h index b9f61c912..e0debc693 100644 --- a/src/lib/tools/aesinterface.h +++ b/src/lib/tools/aesinterface.h @@ -21,7 +21,7 @@ #ifndef AESINTERFACE_H #define AESINTERFACE_H -#include "qz_namespace.h" +#include "qzcommon.h" #include diff --git a/src/lib/tools/animatedwidget.h b/src/lib/tools/animatedwidget.h index fa00bd260..edb07017e 100644 --- a/src/lib/tools/animatedwidget.h +++ b/src/lib/tools/animatedwidget.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT AnimatedWidget : public QWidget { diff --git a/src/lib/tools/buttonbox.h b/src/lib/tools/buttonbox.h index 7af5ddb38..9f78991f7 100644 --- a/src/lib/tools/buttonbox.h +++ b/src/lib/tools/buttonbox.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QAbstractButton; diff --git a/src/lib/tools/buttonwithmenu.h b/src/lib/tools/buttonwithmenu.h index 76a385df5..4da5e7f62 100644 --- a/src/lib/tools/buttonwithmenu.h +++ b/src/lib/tools/buttonwithmenu.h @@ -19,7 +19,7 @@ #define BUTTONWITHMENU_H #include "toolbutton.h" -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT ButtonWithMenu : public ToolButton { diff --git a/src/lib/tools/certificateinfowidget.h b/src/lib/tools/certificateinfowidget.h index fe37c188b..9e5fd6688 100644 --- a/src/lib/tools/certificateinfowidget.h +++ b/src/lib/tools/certificateinfowidget.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" namespace Ui { diff --git a/src/lib/tools/clickablelabel.h b/src/lib/tools/clickablelabel.h index 6f29d69e3..a3309f03d 100644 --- a/src/lib/tools/clickablelabel.h +++ b/src/lib/tools/clickablelabel.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QMouseEvent; diff --git a/src/lib/tools/closedtabsmanager.h b/src/lib/tools/closedtabsmanager.h index c7990e945..34d3bd6bd 100644 --- a/src/lib/tools/closedtabsmanager.h +++ b/src/lib/tools/closedtabsmanager.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class WebTab; diff --git a/src/lib/tools/combotabbar.h b/src/lib/tools/combotabbar.h index b0f07ad3f..cb7a18e56 100644 --- a/src/lib/tools/combotabbar.h +++ b/src/lib/tools/combotabbar.h @@ -18,7 +18,7 @@ #ifndef COMBOTABBAR_H #define COMBOTABBAR_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/tools/delayedfilewatcher.h b/src/lib/tools/delayedfilewatcher.h index 1cce0f907..062ef0d25 100644 --- a/src/lib/tools/delayedfilewatcher.h +++ b/src/lib/tools/delayedfilewatcher.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT DelayedFileWatcher : public QFileSystemWatcher { diff --git a/src/lib/tools/docktitlebarwidget.h b/src/lib/tools/docktitlebarwidget.h index d7127a185..dd415e4fa 100644 --- a/src/lib/tools/docktitlebarwidget.h +++ b/src/lib/tools/docktitlebarwidget.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "ui_docktitlebarwidget.h" class QUPZILLA_EXPORT DockTitleBarWidget : public QWidget, public Ui_DockTitleBarWidget diff --git a/src/lib/tools/emptynetworkreply.h b/src/lib/tools/emptynetworkreply.h index a041f6c90..ad486484c 100644 --- a/src/lib/tools/emptynetworkreply.h +++ b/src/lib/tools/emptynetworkreply.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT EmptyNetworkReply : public QNetworkReply { diff --git a/src/lib/tools/enhancedmenu.h b/src/lib/tools/enhancedmenu.h index c87b90b23..b7827a153 100644 --- a/src/lib/tools/enhancedmenu.h +++ b/src/lib/tools/enhancedmenu.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class Action; diff --git a/src/lib/tools/focusselectlineedit.h b/src/lib/tools/focusselectlineedit.h index 05e679225..92b26f12d 100644 --- a/src/lib/tools/focusselectlineedit.h +++ b/src/lib/tools/focusselectlineedit.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT FocusSelectLineEdit : public QLineEdit { diff --git a/src/lib/tools/followredirectreply.h b/src/lib/tools/followredirectreply.h index 7401d4d2c..19374c51b 100644 --- a/src/lib/tools/followredirectreply.h +++ b/src/lib/tools/followredirectreply.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QNetworkAccessManager; class QNetworkReply; diff --git a/src/lib/tools/frame.h b/src/lib/tools/frame.h index c29be53df..f6bf1860c 100644 --- a/src/lib/tools/frame.h +++ b/src/lib/tools/frame.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT Frame : public QFrame { diff --git a/src/lib/tools/headerview.h b/src/lib/tools/headerview.h index 45366c5e0..9290957be 100644 --- a/src/lib/tools/headerview.h +++ b/src/lib/tools/headerview.h @@ -22,7 +22,7 @@ class QContextMenuEvent; -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT HeaderView : public QHeaderView { diff --git a/src/lib/tools/html5permissions/html5permissionsmanager.h b/src/lib/tools/html5permissions/html5permissionsmanager.h index 1b1b56276..074113dfd 100644 --- a/src/lib/tools/html5permissions/html5permissionsmanager.h +++ b/src/lib/tools/html5permissions/html5permissionsmanager.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "webpage.h" class QUrl; diff --git a/src/lib/tools/htmlhighlighter.h b/src/lib/tools/htmlhighlighter.h index 4f9fabdfc..21076457f 100644 --- a/src/lib/tools/htmlhighlighter.h +++ b/src/lib/tools/htmlhighlighter.h @@ -61,7 +61,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "qzregexp.h" class QTextDocument; diff --git a/src/lib/tools/iconfetcher.h b/src/lib/tools/iconfetcher.h index d2c1b52e4..681ea2e13 100644 --- a/src/lib/tools/iconfetcher.h +++ b/src/lib/tools/iconfetcher.h @@ -18,7 +18,7 @@ #ifndef ICONFETCHER_H #define ICONFETCHER_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/tools/iconprovider.h b/src/lib/tools/iconprovider.h index c1ad2eb42..fd2247c49 100644 --- a/src/lib/tools/iconprovider.h +++ b/src/lib/tools/iconprovider.h @@ -26,7 +26,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QTimer; class QIcon; diff --git a/src/lib/tools/json.h b/src/lib/tools/json.h index d425c7316..1ba44bf85 100644 --- a/src/lib/tools/json.h +++ b/src/lib/tools/json.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QScriptValue; class QScriptEngine; diff --git a/src/lib/tools/listitemdelegate.h b/src/lib/tools/listitemdelegate.h index a1138430d..f033c72b9 100644 --- a/src/lib/tools/listitemdelegate.h +++ b/src/lib/tools/listitemdelegate.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT ListItemDelegate : public QStyledItemDelegate { diff --git a/src/lib/tools/mactoolbutton.h b/src/lib/tools/mactoolbutton.h index 8c708f8f2..fac83fa1d 100644 --- a/src/lib/tools/mactoolbutton.h +++ b/src/lib/tools/mactoolbutton.h @@ -19,7 +19,7 @@ #ifndef MACTOOLBUTTON_H #define MACTOOLBUTTON_H -#include "qz_namespace.h" +#include "qzcommon.h" #ifdef Q_OS_MAC #include diff --git a/src/lib/tools/menubar.h b/src/lib/tools/menubar.h index 78895675d..93480f199 100644 --- a/src/lib/tools/menubar.h +++ b/src/lib/tools/menubar.h @@ -18,7 +18,7 @@ #ifndef MENUBAR_H #define MENUBAR_H -#include "qz_namespace.h" +#include "qzcommon.h" #include diff --git a/src/lib/tools/pagethumbnailer.h b/src/lib/tools/pagethumbnailer.h index 783fe375b..c5417059c 100644 --- a/src/lib/tools/pagethumbnailer.h +++ b/src/lib/tools/pagethumbnailer.h @@ -23,7 +23,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QWebPage; class QPixmap; diff --git a/src/lib/tools/plaineditwithlines.h b/src/lib/tools/plaineditwithlines.h index eb139c6c0..bd3360326 100644 --- a/src/lib/tools/plaineditwithlines.h +++ b/src/lib/tools/plaineditwithlines.h @@ -59,7 +59,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QPaintEvent; class QResizeEvent; diff --git a/src/lib/tools/progressbar.h b/src/lib/tools/progressbar.h index 0b239aa99..0823ded30 100644 --- a/src/lib/tools/progressbar.h +++ b/src/lib/tools/progressbar.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QStyleOptionProgressBar; diff --git a/src/lib/tools/qzregexp.h b/src/lib/tools/qzregexp.h index c4ce20945..ce05b227d 100644 --- a/src/lib/tools/qzregexp.h +++ b/src/lib/tools/qzregexp.h @@ -28,7 +28,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT QzRegExp : public QRegularExpression { diff --git a/src/lib/tools/qztools.h b/src/lib/tools/qztools.h index 8f39fe490..6cb914ef0 100644 --- a/src/lib/tools/qztools.h +++ b/src/lib/tools/qztools.h @@ -23,7 +23,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QSslCertificate; class QFontMetrics; diff --git a/src/lib/tools/tabstackedwidget.h b/src/lib/tools/tabstackedwidget.h index 1614f45a9..efa97787b 100644 --- a/src/lib/tools/tabstackedwidget.h +++ b/src/lib/tools/tabstackedwidget.h @@ -18,7 +18,7 @@ #ifndef TABSTACKEDWIDGET_H #define TABSTACKEDWIDGET_H -#include "qz_namespace.h" +#include "qzcommon.h" #include diff --git a/src/lib/tools/toolbutton.h b/src/lib/tools/toolbutton.h index 45a8378f4..4aff414bd 100644 --- a/src/lib/tools/toolbutton.h +++ b/src/lib/tools/toolbutton.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT ToolButton : public QToolButton { diff --git a/src/lib/tools/treewidget.h b/src/lib/tools/treewidget.h index 7f086f266..3ff1bf568 100644 --- a/src/lib/tools/treewidget.h +++ b/src/lib/tools/treewidget.h @@ -18,7 +18,7 @@ #ifndef BOOKMARKSTREEWIDGET_H #define BOOKMARKSTREEWIDGET_H -#include "qz_namespace.h" +#include "qzcommon.h" #include diff --git a/src/lib/tools/widget.h b/src/lib/tools/widget.h index ad843d850..c88abd6f9 100644 --- a/src/lib/tools/widget.h +++ b/src/lib/tools/widget.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT Widget : public QWidget { diff --git a/src/lib/webview/searchtoolbar.h b/src/lib/webview/searchtoolbar.h index 1177a7473..824ef3dce 100644 --- a/src/lib/webview/searchtoolbar.h +++ b/src/lib/webview/searchtoolbar.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "animatedwidget.h" namespace Ui diff --git a/src/lib/webview/siteinfo.h b/src/lib/webview/siteinfo.h index 3826b3699..95e88c8e9 100644 --- a/src/lib/webview/siteinfo.h +++ b/src/lib/webview/siteinfo.h @@ -18,7 +18,7 @@ #ifndef SITEINFO_H #define SITEINFO_H -#include "qz_namespace.h" +#include "qzcommon.h" #include #include diff --git a/src/lib/webview/siteinfowidget.h b/src/lib/webview/siteinfowidget.h index 8c598a762..246725300 100644 --- a/src/lib/webview/siteinfowidget.h +++ b/src/lib/webview/siteinfowidget.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" #include namespace Ui diff --git a/src/lib/webview/tabbar.h b/src/lib/webview/tabbar.h index a359e4a25..155438949 100644 --- a/src/lib/webview/tabbar.h +++ b/src/lib/webview/tabbar.h @@ -22,7 +22,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class BrowserWindow; class TabWidget; diff --git a/src/lib/webview/tabbedwebview.h b/src/lib/webview/tabbedwebview.h index 475357f3d..250e20d87 100644 --- a/src/lib/webview/tabbedwebview.h +++ b/src/lib/webview/tabbedwebview.h @@ -18,7 +18,7 @@ #ifndef TABBEDWEBVIEW_H #define TABBEDWEBVIEW_H -#include "qz_namespace.h" +#include "qzcommon.h" #include "webview.h" class QLabel; diff --git a/src/lib/webview/tabwidget.h b/src/lib/webview/tabwidget.h index 099412e0d..372e4d938 100644 --- a/src/lib/webview/tabwidget.h +++ b/src/lib/webview/tabwidget.h @@ -25,7 +25,7 @@ #include "tabstackedwidget.h" #include "toolbutton.h" -#include "qz_namespace.h" +#include "qzcommon.h" #include "webtab.h" class QStackedWidget; diff --git a/src/lib/webview/webhistorywrapper.h b/src/lib/webview/webhistorywrapper.h index 3b07d3c6d..b1041aec0 100644 --- a/src/lib/webview/webhistorywrapper.h +++ b/src/lib/webview/webhistorywrapper.h @@ -20,7 +20,7 @@ #include -#include "qz_namespace.h" +#include "qzcommon.h" class QWebHistory; class QWebHistoryItem; diff --git a/src/lib/webview/webinspectordockwidget.h b/src/lib/webview/webinspectordockwidget.h index bea2ca495..cd86b5198 100644 --- a/src/lib/webview/webinspectordockwidget.h +++ b/src/lib/webview/webinspectordockwidget.h @@ -23,7 +23,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QUPZILLA_EXPORT WebInspector : public QWebInspector { diff --git a/src/lib/webview/webpage.h b/src/lib/webview/webpage.h index c993b3706..265eaa7ed 100644 --- a/src/lib/webview/webpage.h +++ b/src/lib/webview/webpage.h @@ -22,7 +22,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" #include "passwordmanager.h" class QWebSecurityOrigin; diff --git a/src/lib/webview/webtab.h b/src/lib/webview/webtab.h index fb94cbd9d..4c96a7a07 100644 --- a/src/lib/webview/webtab.h +++ b/src/lib/webview/webtab.h @@ -23,7 +23,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class QVBoxLayout; class QWebHistory; diff --git a/src/lib/webview/webview.h b/src/lib/webview/webview.h index f9e44b206..5d4f010c9 100644 --- a/src/lib/webview/webview.h +++ b/src/lib/webview/webview.h @@ -21,7 +21,7 @@ #include #include -#include "qz_namespace.h" +#include "qzcommon.h" class WebPage;