[Code] Renamed qz_namespace.h to qzcommon.h

2024-12-20 10:46:35 +01:00 · 2014-02-26 20:03:20 +01:00 · 2014-02-26 20:03:20 +01:00 · 5e4f703ef2
commit 5e4f703ef2
parent 3650aac9ff
186 changed files with 189 additions and 189 deletions
--- 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 <QtGlobal>
 #include <QWidget>
--- 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 <QIcon>
 #include <QProxyStyle>
--- a/src/lib/3rdparty/lineedit.h
+++ b/src/lib/3rdparty/lineedit.h
@ -47,7 +47,7 @@
 * ============================================================ */

 #include <QLineEdit>
-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QHBoxLayout;

--- a/src/lib/3rdparty/processinfo.h
+++ b/src/lib/3rdparty/processinfo.h
@ -24,7 +24,7 @@

 #include <QString>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 /*
 * Code used from http://ubuntuforums.org/showpost.php?p=6593782&postcount=5
--- 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 <QColor>
 #include <QWidget>
--- 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 <QLabel>

--- 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 <QLabel>

--- 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 <QColor>
 #include <QStyle>
--- a/src/lib/adblock/adblockaddsubscriptiondialog.h
+++ b/src/lib/adblock/adblockaddsubscriptiondialog.h
@ -21,7 +21,7 @@
 #include <QDialog>
 #include <QVector>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 namespace Ui
 {
--- a/src/lib/adblock/adblockblockednetworkreply.h
+++ b/src/lib/adblock/adblockblockednetworkreply.h
@ -48,7 +48,7 @@

 #include <QNetworkReply>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class AdBlockRule;
 class AdBlockSubscription;
--- a/src/lib/adblock/adblockdialog.h
+++ b/src/lib/adblock/adblockdialog.h
@ -20,7 +20,7 @@

 #include <QWidget>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "ui_adblockdialog.h"

 class AdBlockSubscription;
--- 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"

--- a/src/lib/adblock/adblockmanager.h
+++ b/src/lib/adblock/adblockmanager.h
@ -22,7 +22,7 @@
 #include <QStringList>
 #include <QPointer>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUrl;
 class QNetworkReply;
--- a/src/lib/adblock/adblockrule.h
+++ b/src/lib/adblock/adblockrule.h
@ -49,7 +49,7 @@
 #include <QObject>
 #include <QStringList>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "qzregexp.h"

 class QNetworkRequest;
--- a/src/lib/adblock/adblocksearchtree.h
+++ b/src/lib/adblock/adblocksearchtree.h
@ -21,7 +21,7 @@
 #include <QChar>
 #include <QHash>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QNetworkRequest;

--- a/src/lib/adblock/adblocksubscription.h
+++ b/src/lib/adblock/adblocksubscription.h
@ -49,7 +49,7 @@
 #include <QVector>
 #include <QUrl>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "adblockrule.h"
 #include "adblocksearchtree.h"

--- 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;
--- a/src/lib/app/autosaver.h
+++ b/src/lib/app/autosaver.h
@ -21,7 +21,7 @@
 #include <QObject>
 #include <QBasicTimer>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUPZILLA_EXPORT AutoSaver : public QObject
 {
--- a/src/lib/app/browserwindow.h
+++ b/src/lib/app/browserwindow.h
@ -22,7 +22,7 @@
 #include <QUrl>

 #include "restoremanager.h"
-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QMenuBar;
 class QLabel;
--- a/src/lib/app/commandlineoptions.h
+++ b/src/lib/app/commandlineoptions.h
@ -23,7 +23,7 @@
 #include <QVector>
 #include <iostream>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUPZILLA_EXPORT CommandLineOptions
 {
--- 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;
--- a/src/lib/app/profileupdater.h
+++ b/src/lib/app/profileupdater.h
@ -20,7 +20,7 @@

 #include <QString>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class ProfileUpdater
 {
--- a/src/lib/app/proxystyle.h
+++ b/src/lib/app/proxystyle.h
@ -20,7 +20,7 @@

 #include <QProxyStyle>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUPZILLA_EXPORT ProxyStyle : public QProxyStyle
 {
--- a/src/lib/app/qz_namespace.h
+++ b/src/lib/app/qz_namespace.h
@ -15,8 +15,8 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
-#ifndef QZ_NAMESPACE_H
-#define QZ_NAMESPACE_H
+#ifndef QZCOMMON_H
+#define QZCOMMON_H

 #include <QFlags>
 #include <QString>
@ -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
--- a/src/lib/app/settings.h
+++ b/src/lib/app/settings.h
@ -21,7 +21,7 @@
 #include <qglobal.h>
 #include <QVariant>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QSettings;

--- a/src/lib/autofill/autofill.h
+++ b/src/lib/autofill/autofill.h
@ -20,7 +20,7 @@

 #include <QObject>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUrl;
 class QWebElement;
--- 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"

--- a/src/lib/autofill/autofillnotification.h
+++ b/src/lib/autofill/autofillnotification.h
@ -20,7 +20,7 @@

 #include <QUrl>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "animatedwidget.h"
 #include "pageformcompleter.h"
 #include "passwordmanager.h"
--- a/src/lib/autofill/autofillwidget.h
+++ b/src/lib/autofill/autofillwidget.h
@ -21,7 +21,7 @@
 #include <QWidget>
 #include <QList>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "locationbarpopup.h"

 namespace Ui
--- a/src/lib/autofill/pageformcompleter.h
+++ b/src/lib/autofill/pageformcompleter.h
@ -22,7 +22,7 @@
 #include <QString>
 #include <QByteArray>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QWebPage;
 class QWebElement;
--- 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 <QDialog>

--- 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
 {
--- 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;

--- a/src/lib/autofill/passwordmanager.h
+++ b/src/lib/autofill/passwordmanager.h
@ -22,7 +22,7 @@
 #include <QUrl>
 #include <QVariant>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class PasswordBackend;
 class DatabasePasswordBackend;
--- a/src/lib/bookmarks/bookmarkitem.h
+++ b/src/lib/bookmarks/bookmarkitem.h
@ -24,7 +24,7 @@
 #include <QTime>
 #include <QUrl>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUPZILLA_EXPORT BookmarkItem
 {
--- a/src/lib/bookmarks/bookmarks.h
+++ b/src/lib/bookmarks/bookmarks.h
@ -21,7 +21,7 @@
 #include <QObject>
 #include <QVariant>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUrl;

--- a/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h
+++ b/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h
@ -20,7 +20,7 @@

 #include <QDialog>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 namespace Ui
 {
--- a/src/lib/bookmarks/bookmarksexport/bookmarksexporter.h
+++ b/src/lib/bookmarks/bookmarksexport/bookmarksexporter.h
@ -20,7 +20,7 @@

 #include <QObject>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class BookmarkItem;

--- a/src/lib/bookmarks/bookmarksicon.h
+++ b/src/lib/bookmarks/bookmarksicon.h
@ -21,7 +21,7 @@
 #include <QUrl>

 #include "clickablelabel.h"
-#include "qz_namespace.h"
+#include "qzcommon.h"

 class WebView;
 class BookmarkItem;
--- a/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h
+++ b/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h
@ -20,7 +20,7 @@

 #include <QDialog>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 namespace Ui
 {
--- a/src/lib/bookmarks/bookmarksimport/bookmarksimporter.h
+++ b/src/lib/bookmarks/bookmarksimport/bookmarksimporter.h
@ -20,7 +20,7 @@

 #include <QObject>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QIcon;

--- a/src/lib/bookmarks/bookmarksitemdelegate.h
+++ b/src/lib/bookmarks/bookmarksitemdelegate.h
@ -20,7 +20,7 @@

 #include <QStyledItemDelegate>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QTreeView;

--- a/src/lib/bookmarks/bookmarksmanager.h
+++ b/src/lib/bookmarks/bookmarksmanager.h
@ -21,7 +21,7 @@
 #include <QWidget>
 #include <QPointer>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 namespace Ui
 {
--- a/src/lib/bookmarks/bookmarksmenu.h
+++ b/src/lib/bookmarks/bookmarksmenu.h
@ -21,7 +21,7 @@
 #include <QPointer>

 #include "enhancedmenu.h"
-#include "qz_namespace.h"
+#include "qzcommon.h"

 class BrowserWindow;
 class BookmarkItem;
--- a/src/lib/bookmarks/bookmarksmodel.h
+++ b/src/lib/bookmarks/bookmarksmodel.h
@ -21,7 +21,7 @@
 #include <QAbstractItemModel>
 #include <QSortFilterProxyModel>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QTimer;

--- a/src/lib/bookmarks/bookmarkstoolbar.h
+++ b/src/lib/bookmarks/bookmarkstoolbar.h
@ -20,7 +20,7 @@

 #include <QWidget>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QHBoxLayout;
 class QTimer;
--- a/src/lib/bookmarks/bookmarkstoolbarbutton.h
+++ b/src/lib/bookmarks/bookmarkstoolbarbutton.h
@ -20,7 +20,7 @@

 #include <QPushButton>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class Menu;
 class BrowserWindow;
--- a/src/lib/bookmarks/bookmarkstools.h
+++ b/src/lib/bookmarks/bookmarkstools.h
@ -21,7 +21,7 @@
 #include <QMenu>
 #include <QPushButton>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class Bookmarks;
 class BookmarkItem;
--- a/src/lib/bookmarks/bookmarkstreeview.h
+++ b/src/lib/bookmarks/bookmarkstreeview.h
@ -20,7 +20,7 @@

 #include <QTreeView>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class Bookmarks;
 class BookmarkItem;
--- a/src/lib/bookmarks/bookmarkswidget.h
+++ b/src/lib/bookmarks/bookmarkswidget.h
@ -20,7 +20,7 @@

 #include <QMenu>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "locationbarpopup.h"

 namespace Ui
--- 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 <QFile>
 #include <QStringList>
--- a/src/lib/cookies/cookiemanager.h
+++ b/src/lib/cookies/cookiemanager.h
@ -20,7 +20,7 @@

 #include <QWidget>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 namespace Ui
 {
--- 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 <QWidget>
 #include <QPixmap>
--- 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 <QObject>
 #include <QPoint>
--- a/src/lib/downloads/downloadfilehelper.h
+++ b/src/lib/downloads/downloadfilehelper.h
@ -22,7 +22,7 @@
 #include <QPixmap>
 #include <QUrl>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "downloadmanager.h"

 class QFileIconProvider;
--- a/src/lib/downloads/downloaditem.h
+++ b/src/lib/downloads/downloaditem.h
@ -25,7 +25,7 @@
 #include <QNetworkReply>
 #include <QTime>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 namespace Ui
 {
--- a/src/lib/downloads/downloadmanager.h
+++ b/src/lib/downloads/downloadmanager.h
@ -20,7 +20,7 @@

 #include <QBasicTimer>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "ecwin7.h"

 namespace Ui
--- a/src/lib/downloads/downloadoptionsdialog.h
+++ b/src/lib/downloads/downloadoptionsdialog.h
@ -21,7 +21,7 @@
 #include <QDialog>
 #include <QUrl>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "downloadmanager.h"

 namespace Ui
--- a/src/lib/history/history.h
+++ b/src/lib/history/history.h
@ -23,7 +23,7 @@
 #include <QDateTime>
 #include <QUrl>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QIcon;

--- a/src/lib/history/historyitem.h
+++ b/src/lib/history/historyitem.h
@ -20,7 +20,7 @@

 #include <QIcon>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "history.h"

 class QUPZILLA_EXPORT HistoryItem
--- a/src/lib/history/historymanager.h
+++ b/src/lib/history/historymanager.h
@ -21,7 +21,7 @@
 #include <QWidget>
 #include <QPointer>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "historyview.h"

 namespace Ui
--- a/src/lib/history/historymodel.h
+++ b/src/lib/history/historymodel.h
@ -21,7 +21,7 @@
 #include <QAbstractItemModel>
 #include <QSortFilterProxyModel>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "history.h"

 class QTimer;
--- a/src/lib/history/webhistoryinterface.h
+++ b/src/lib/history/webhistoryinterface.h
@ -21,7 +21,7 @@
 #include <QWebHistoryInterface>
 #include <set>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUPZILLA_EXPORT WebHistoryInterface : public QWebHistoryInterface
 {
--- 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 \
--- a/src/lib/navigation/completer/locationcompleter.h
+++ b/src/lib/navigation/completer/locationcompleter.h
@ -20,7 +20,7 @@

 #include <QObject>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QModelIndex;

--- a/src/lib/navigation/completer/locationcompleterdelegate.h
+++ b/src/lib/navigation/completer/locationcompleterdelegate.h
@ -20,7 +20,7 @@

 #include <QStyledItemDelegate>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class LocationCompleterView;

--- a/src/lib/navigation/completer/locationcompletermodel.h
+++ b/src/lib/navigation/completer/locationcompletermodel.h
@ -20,7 +20,7 @@

 #include <QStandardItemModel>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QSqlQuery;
 class QUrl;
--- a/src/lib/navigation/completer/locationcompleterview.h
+++ b/src/lib/navigation/completer/locationcompleterview.h
@ -20,7 +20,7 @@

 #include <QListView>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "locationcompletermodel.h"

 class QUPZILLA_EXPORT LocationCompleterView : public QListView
--- 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
--- 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
--- a/src/lib/navigation/locationbar.h
+++ b/src/lib/navigation/locationbar.h
@ -20,7 +20,7 @@

 #include <QUrl>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "lineedit.h"
 #include "completer/locationcompleter.h"

--- a/src/lib/navigation/locationbarpopup.h
+++ b/src/lib/navigation/locationbarpopup.h
@ -21,7 +21,7 @@

 #include <QFrame>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUPZILLA_EXPORT LocationBarPopup : public QFrame
 {
--- a/src/lib/navigation/navigationbar.h
+++ b/src/lib/navigation/navigationbar.h
@ -20,7 +20,7 @@

 #include <QWidget>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QHBoxLayout;
 class QSplitter;
--- a/src/lib/navigation/reloadstopbutton.h
+++ b/src/lib/navigation/reloadstopbutton.h
@ -20,7 +20,7 @@

 #include <QWidget>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QTimer;

--- 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;
--- a/src/lib/navigation/websearchbar.h
+++ b/src/lib/navigation/websearchbar.h
@ -20,7 +20,7 @@

 #include <QPointer>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "lineedit.h"
 #include "buttonwithmenu.h"
 #include "searchenginesmanager.h"
--- a/src/lib/network/cabundleupdater.h
+++ b/src/lib/network/cabundleupdater.h
@ -20,7 +20,7 @@

 #include <QObject>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QNetworkReply;

--- a/src/lib/network/networkmanager.h
+++ b/src/lib/network/networkmanager.h
@ -21,7 +21,7 @@
 #include <QSslError>
 #include <QStringList>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "networkmanagerproxy.h"

 class AdBlockManager;
--- a/src/lib/network/networkmanagerproxy.h
+++ b/src/lib/network/networkmanagerproxy.h
@ -20,7 +20,7 @@

 #include <QNetworkAccessManager>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class WebPage;
 class NetworkManager;
--- a/src/lib/network/networkproxyfactory.h
+++ b/src/lib/network/networkproxyfactory.h
@ -21,7 +21,7 @@
 #include <QNetworkProxyFactory>
 #include <QStringList>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "qzregexp.h"

 class PacManager;
--- a/src/lib/network/pac/pacmanager.h
+++ b/src/lib/network/pac/pacmanager.h
@ -22,7 +22,7 @@
 #include <QList>
 #include <QUrl>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QNetworkProxy;

--- a/src/lib/network/pac/proxyautoconfig.h
+++ b/src/lib/network/pac/proxyautoconfig.h
@ -21,7 +21,7 @@
 #include <QObject>
 #include <QScriptValue>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QScriptContext;
 class QScriptEngine;
--- 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
--- a/src/lib/network/schemehandlers/fileschemehandler.h
+++ b/src/lib/network/schemehandlers/fileschemehandler.h
@ -22,7 +22,7 @@
 #include <QBuffer>

 #include "schemehandler.h"
-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUPZILLA_EXPORT FileSchemeHandler : public SchemeHandler
 {
--- 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

--- a/src/lib/network/schemehandlers/qupzillaschemehandler.h
+++ b/src/lib/network/schemehandlers/qupzillaschemehandler.h
@ -22,7 +22,7 @@
 #include <QBuffer>

 #include "schemehandler.h"
-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUPZILLA_EXPORT QupZillaSchemeHandler : public SchemeHandler
 {
--- a/src/lib/network/schemehandlers/schemehandler.h
+++ b/src/lib/network/schemehandlers/schemehandler.h
@ -20,7 +20,7 @@

 #include <QNetworkAccessManager>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUPZILLA_EXPORT SchemeHandler
 {
--- 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
 {
--- 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 <QDialog>

--- 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 <qpair.h>
 #include <qimage.h>
--- 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 <qnetworkaccessmanager.h>
 #include <qnetworkrequest.h>
--- 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 <qxmlstream.h>

--- 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 <QDialog>
--- a/src/lib/opensearch/searchenginesmanager.h
+++ b/src/lib/opensearch/searchenginesmanager.h
@ -24,7 +24,7 @@
 #include <QVariant>
 #include <QNetworkRequest>

-#include "qz_namespace.h"
+#include "qzcommon.h"
 #include "opensearchengine.h"

 class QWebElement;
--- a/src/lib/other/aboutdialog.h
+++ b/src/lib/other/aboutdialog.h
@ -20,7 +20,7 @@

 #include <QDialog>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 namespace Ui
 {
--- a/src/lib/other/browsinglibrary.h
+++ b/src/lib/other/browsinglibrary.h
@ -20,7 +20,7 @@

 #include <QWidget>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 namespace Ui
 {
--- a/src/lib/other/checkboxdialog.h
+++ b/src/lib/other/checkboxdialog.h
@ -21,7 +21,7 @@
 #include <QDialog>
 #include <QDialogButtonBox>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 namespace Ui
 {
--- a/src/lib/other/clearprivatedata.h
+++ b/src/lib/other/clearprivatedata.h
@ -20,7 +20,7 @@

 #include <QDialog>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 namespace Ui
 {
--- a/src/lib/other/databasewriter.h
+++ b/src/lib/other/databasewriter.h
@ -22,7 +22,7 @@
 #include <QSqlQuery>
 #include <QVector>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QUPZILLA_EXPORT DatabaseWriter : public QObject
 {
--- a/src/lib/other/iconchooser.h
+++ b/src/lib/other/iconchooser.h
@ -21,7 +21,7 @@
 #include <QDialog>
 #include <QStyledItemDelegate>

-#include "qz_namespace.h"
+#include "qzcommon.h"

 class QIcon;

--- a/Show More
+++ b/Show More