From c148836d104b4825a52fddc09897c2af17ebc7aa Mon Sep 17 00:00:00 2001 From: nowrep Date: Fri, 18 Mar 2011 16:08:24 +0100 Subject: [PATCH] Removed QT_NO_DEBUG_OUTPUT define from headers, instead it is defined in .pro project file --- .gitignore | 1 + src/QupZilla.pro | 7 +- src/app/autosaver.h | 4 - src/app/commandlineoptions.h | 4 - src/app/mainapplication.h | 4 - src/app/qupzilla.h | 4 - src/autofill/autofillmodel.h | 4 - src/bookmarks/bookmarksmanager.h | 4 - src/bookmarks/bookmarksmodel.h | 3 - src/bookmarks/bookmarkstoolbar.h | 4 - src/bookmarks/bookmarkswidget.h | 3 - src/cookies/cookiejar.h | 4 - src/cookies/cookiemanager.h | 4 - src/downloads/downloadmanager.h | 4 - src/history/historymanager.h | 4 - src/history/historymodel.h | 4 - src/main.cpp | 4 +- src/navigation/locationbar.h | 4 - src/navigation/locationcompleter.h | 4 - src/navigation/websearchbar.h | 4 - src/network/networkmanager.h | 4 - src/network/networkmanagerproxy.h | 4 - src/other/aboutdialog.h | 4 - src/other/clearprivatedata.cpp | 1 + src/other/clearprivatedata.h | 4 - src/other/clearprivatedata.ui | 184 +++++++++++++++++++++++++++++ src/other/sourceviewer.h | 4 - src/other/updater.h | 4 - src/plugins/pluginproxy.h | 3 - src/plugins/plugins.h | 3 - src/preferences/autofillmanager.h | 4 - src/preferences/pluginslist.h | 3 - src/preferences/preferences.h | 4 - src/rss/rssmanager.h | 4 - src/webview/searchtoolbar.h | 4 - src/webview/siteinfo.h | 4 - src/webview/tabbar.h | 4 - src/webview/tabwidget.h | 4 - src/webview/webpage.h | 4 - src/webview/webview.h | 4 - 40 files changed, 192 insertions(+), 140 deletions(-) create mode 100644 src/other/clearprivatedata.ui diff --git a/.gitignore b/.gitignore index 504d2520d..21f94ce1a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ src0.9.7 *.deb *.pro.user license_template +Makefile diff --git a/src/QupZilla.pro b/src/QupZilla.pro index c81d81114..3ec53e36c 100644 --- a/src/QupZilla.pro +++ b/src/QupZilla.pro @@ -4,7 +4,6 @@ # #------------------------------------------------- -DESTDIR = ../bin QT += core gui webkit sql network TARGET = qupzilla TEMPLATE = app @@ -12,11 +11,14 @@ VERSION = 0.90.8 TRANSLATIONS +=cs_CZ.ts\ sk_SK.ts +DESTDIR = ../bin OBJECTS_DIR = ../build MOC_DIR = ../build RCC_DIR = ../build UI_DIR = ../build +!CONFIG(debug, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT + INCLUDEPATH += 3rdparty\ app\ autofill\ @@ -171,7 +173,8 @@ FORMS += \ rss/rsswidget.ui \ autofill/autofillnotification.ui \ rss/rssnotification.ui \ - preferences/sslmanager.ui + preferences/sslmanager.ui \ + other/clearprivatedata.ui RESOURCES += \ data/icons.qrc \ diff --git a/src/app/autosaver.h b/src/app/autosaver.h index 0dc3567d1..ea756dd4a 100644 --- a/src/app/autosaver.h +++ b/src/app/autosaver.h @@ -18,10 +18,6 @@ #ifndef AUTOSAVER_H #define AUTOSAVER_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #ifdef QT_NO_DEBUG #ifdef DEVELOPING #error "TRYING TO RELEASE WITH DEVELOPING FLAG" diff --git a/src/app/commandlineoptions.h b/src/app/commandlineoptions.h index c67459521..4b3611359 100644 --- a/src/app/commandlineoptions.h +++ b/src/app/commandlineoptions.h @@ -18,10 +18,6 @@ #ifndef COMMANDLINEOPTIONS_H #define COMMANDLINEOPTIONS_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include diff --git a/src/app/mainapplication.h b/src/app/mainapplication.h index fc9fd8874..2a9df779c 100644 --- a/src/app/mainapplication.h +++ b/src/app/mainapplication.h @@ -19,10 +19,6 @@ #define MAINAPPLICATION_H #define mApp MainApplication::getInstance() -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/app/qupzilla.h b/src/app/qupzilla.h index b95598347..186980482 100644 --- a/src/app/qupzilla.h +++ b/src/app/qupzilla.h @@ -18,10 +18,6 @@ #ifndef QUPZILLA_H #define QUPZILLA_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - //Comment for release building #define DEVELOPING //Check if i don't fuck anything diff --git a/src/autofill/autofillmodel.h b/src/autofill/autofillmodel.h index 4bbe73dc6..ac75fd151 100644 --- a/src/autofill/autofillmodel.h +++ b/src/autofill/autofillmodel.h @@ -18,10 +18,6 @@ #ifndef AUTOFILLMODEL_H #define AUTOFILLMODEL_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h index cd3cd96ed..e4d0e235f 100644 --- a/src/bookmarks/bookmarksmanager.h +++ b/src/bookmarks/bookmarksmanager.h @@ -18,10 +18,6 @@ #ifndef BOOKMARKSMANAGER_H #define BOOKMARKSMANAGER_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/bookmarks/bookmarksmodel.h b/src/bookmarks/bookmarksmodel.h index 166f6a6d3..e4e3a3eb8 100644 --- a/src/bookmarks/bookmarksmodel.h +++ b/src/bookmarks/bookmarksmodel.h @@ -17,9 +17,6 @@ * ============================================================ */ #ifndef BOOKMARKSMODEL_H #define BOOKMARKSMODEL_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif #include #include diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h index 959e43275..fecfeb6b1 100644 --- a/src/bookmarks/bookmarkstoolbar.h +++ b/src/bookmarks/bookmarkstoolbar.h @@ -18,10 +18,6 @@ #ifndef BOOKMARKSTOOLBAR_H #define BOOKMARKSTOOLBAR_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/bookmarks/bookmarkswidget.h b/src/bookmarks/bookmarkswidget.h index 861e28f57..5aacf07d8 100644 --- a/src/bookmarks/bookmarkswidget.h +++ b/src/bookmarks/bookmarkswidget.h @@ -17,9 +17,6 @@ * ============================================================ */ #ifndef BOOKMARKSWIDGET_H #define BOOKMARKSWIDGET_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif #include #include diff --git a/src/cookies/cookiejar.h b/src/cookies/cookiejar.h index 5ce34bd40..50e44e2b5 100644 --- a/src/cookies/cookiejar.h +++ b/src/cookies/cookiejar.h @@ -18,10 +18,6 @@ #ifndef COOKIEJAR_H #define COOKIEJAR_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/cookies/cookiemanager.h b/src/cookies/cookiemanager.h index 6ae8cec7a..6447b5830 100644 --- a/src/cookies/cookiemanager.h +++ b/src/cookies/cookiemanager.h @@ -18,10 +18,6 @@ #ifndef COOKIEMANAGER_H #define COOKIEMANAGER_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/downloads/downloadmanager.h b/src/downloads/downloadmanager.h index 44ae17fe4..82f05463f 100644 --- a/src/downloads/downloadmanager.h +++ b/src/downloads/downloadmanager.h @@ -18,10 +18,6 @@ #ifndef DOWNLOADMANAGER_H #define DOWNLOADMANAGER_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/history/historymanager.h b/src/history/historymanager.h index a6e7cfb2a..09e23f264 100644 --- a/src/history/historymanager.h +++ b/src/history/historymanager.h @@ -18,10 +18,6 @@ #ifndef HISTORYMANAGER_H #define HISTORYMANAGER_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/history/historymodel.h b/src/history/historymodel.h index 5ca5d8496..adb309e41 100644 --- a/src/history/historymodel.h +++ b/src/history/historymodel.h @@ -18,10 +18,6 @@ #ifndef HISTORYMODEL_H #define HISTORYMODEL_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include "QtSql/QSqlDatabase" #include "QSqlQuery" #include "QDateTime" diff --git a/src/main.cpp b/src/main.cpp index 4c5a13cbd..df6e976a4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,9 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * ============================================================ */ -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif + #include #include diff --git a/src/navigation/locationbar.h b/src/navigation/locationbar.h index e1c4a0f1b..c5fe7ae6a 100644 --- a/src/navigation/locationbar.h +++ b/src/navigation/locationbar.h @@ -18,10 +18,6 @@ #ifndef LOCATIONBAR_H #define LOCATIONBAR_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/navigation/locationcompleter.h b/src/navigation/locationcompleter.h index 0c7f4a0ea..efaf0aa9f 100644 --- a/src/navigation/locationcompleter.h +++ b/src/navigation/locationcompleter.h @@ -18,10 +18,6 @@ #ifndef LOCATIONCOMPLETER_H #define LOCATIONCOMPLETER_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/navigation/websearchbar.h b/src/navigation/websearchbar.h index e0bf8f674..cca40b0a0 100644 --- a/src/navigation/websearchbar.h +++ b/src/navigation/websearchbar.h @@ -18,10 +18,6 @@ #ifndef WEBSEARCHBAR_H #define WEBSEARCHBAR_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/network/networkmanager.h b/src/network/networkmanager.h index 8a10da234..ad0cac1a7 100644 --- a/src/network/networkmanager.h +++ b/src/network/networkmanager.h @@ -18,10 +18,6 @@ #ifndef NETWORKMANAGER_H #define NETWORKMANAGER_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/network/networkmanagerproxy.h b/src/network/networkmanagerproxy.h index 671431943..0c48e1029 100644 --- a/src/network/networkmanagerproxy.h +++ b/src/network/networkmanagerproxy.h @@ -18,10 +18,6 @@ #ifndef NETWORKMANAGERPROXY_H #define NETWORKMANAGERPROXY_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/other/aboutdialog.h b/src/other/aboutdialog.h index 6c21fc8ce..a97920db9 100644 --- a/src/other/aboutdialog.h +++ b/src/other/aboutdialog.h @@ -18,10 +18,6 @@ #ifndef ABOUTDIALOG_H #define ABOUTDIALOG_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include namespace Ui { diff --git a/src/other/clearprivatedata.cpp b/src/other/clearprivatedata.cpp index 9d916e040..6ad00ead5 100644 --- a/src/other/clearprivatedata.cpp +++ b/src/other/clearprivatedata.cpp @@ -21,6 +21,7 @@ #include "mainapplication.h" #include "networkmanager.h" #include "clickablelabel.h" +#include "ui_clearprivatedata.h" ClearPrivateData::ClearPrivateData(QupZilla* mainClass, QWidget* parent) : QDialog(parent) diff --git a/src/other/clearprivatedata.h b/src/other/clearprivatedata.h index 2da88397d..14544fdd3 100644 --- a/src/other/clearprivatedata.h +++ b/src/other/clearprivatedata.h @@ -18,10 +18,6 @@ #ifndef CLEARPRIVATEDATA_H #define CLEARPRIVATEDATA_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/other/clearprivatedata.ui b/src/other/clearprivatedata.ui new file mode 100644 index 000000000..e16b4a0f6 --- /dev/null +++ b/src/other/clearprivatedata.ui @@ -0,0 +1,184 @@ + + + ClearPrivateData + + + + 0 + 0 + 321 + 274 + + + + Clear Recent History + + + + :/icons/qupzilla.png:/icons/qupzilla.png + + + + + + Choose what you want to delete: + + + + + + + Clear history + + + true + + + + + + + Clear cookies + + + true + + + + + + + Clear cache + + + true + + + + + + + Clear icons + + + + + + + color: blue; text-decoration: underline; + + + Clear cookies from Adobe Flash Player + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + <b>Clear Recent History</b> + + + + + + + + 0 + 0 + + + + + + + :/icons/preferences/applications-system.png + + + + + + + + Today + + + + + Week + + + + + Month + + + + + All + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + buttonBox + accepted() + ClearPrivateData + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + ClearPrivateData + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/other/sourceviewer.h b/src/other/sourceviewer.h index 28f1dc40c..93c58ffb1 100644 --- a/src/other/sourceviewer.h +++ b/src/other/sourceviewer.h @@ -18,10 +18,6 @@ #ifndef SOURCEVIEWER_H #define SOURCEVIEWER_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/other/updater.h b/src/other/updater.h index 9db1fbf91..e6d38d1e1 100644 --- a/src/other/updater.h +++ b/src/other/updater.h @@ -18,10 +18,6 @@ #ifndef UPDATER_H #define UPDATER_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/plugins/pluginproxy.h b/src/plugins/pluginproxy.h index bad84358a..f079a41d4 100644 --- a/src/plugins/pluginproxy.h +++ b/src/plugins/pluginproxy.h @@ -17,9 +17,6 @@ * ============================================================ */ #ifndef PLUGINPROXY_H #define PLUGINPROXY_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif #include #include diff --git a/src/plugins/plugins.h b/src/plugins/plugins.h index 5f3dd779e..b8fc3179a 100644 --- a/src/plugins/plugins.h +++ b/src/plugins/plugins.h @@ -17,9 +17,6 @@ * ============================================================ */ #ifndef PLUGINLOADER_H #define PLUGINLOADER_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif #include #include diff --git a/src/preferences/autofillmanager.h b/src/preferences/autofillmanager.h index 55249ba44..4706512d0 100644 --- a/src/preferences/autofillmanager.h +++ b/src/preferences/autofillmanager.h @@ -18,10 +18,6 @@ #ifndef AUTOFILLMANAGER_H #define AUTOFILLMANAGER_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/preferences/pluginslist.h b/src/preferences/pluginslist.h index 447ec1525..1ab0623a9 100644 --- a/src/preferences/pluginslist.h +++ b/src/preferences/pluginslist.h @@ -17,9 +17,6 @@ * ============================================================ */ #ifndef PLUGINSLIST_H #define PLUGINSLIST_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif #include #include diff --git a/src/preferences/preferences.h b/src/preferences/preferences.h index f45d68ca4..f887a76a7 100644 --- a/src/preferences/preferences.h +++ b/src/preferences/preferences.h @@ -18,10 +18,6 @@ #ifndef PREFERENCES_H #define PREFERENCES_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/rss/rssmanager.h b/src/rss/rssmanager.h index 05e6f4746..e00ccc5e9 100644 --- a/src/rss/rssmanager.h +++ b/src/rss/rssmanager.h @@ -18,10 +18,6 @@ #ifndef RSSMANAGER_H #define RSSMANAGER_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/webview/searchtoolbar.h b/src/webview/searchtoolbar.h index ba2a2f622..3e2011096 100644 --- a/src/webview/searchtoolbar.h +++ b/src/webview/searchtoolbar.h @@ -18,10 +18,6 @@ #ifndef SEARCHTOOLBAR_H #define SEARCHTOOLBAR_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/webview/siteinfo.h b/src/webview/siteinfo.h index 663cb9065..e01515421 100644 --- a/src/webview/siteinfo.h +++ b/src/webview/siteinfo.h @@ -18,10 +18,6 @@ #ifndef SITEINFO_H #define SITEINFO_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include namespace Ui { diff --git a/src/webview/tabbar.h b/src/webview/tabbar.h index 492fa4aa8..7bcedbb13 100644 --- a/src/webview/tabbar.h +++ b/src/webview/tabbar.h @@ -18,10 +18,6 @@ #ifndef TABBAR_H #define TABBAR_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/webview/tabwidget.h b/src/webview/tabwidget.h index 8a21f1394..70278f852 100644 --- a/src/webview/tabwidget.h +++ b/src/webview/tabwidget.h @@ -18,10 +18,6 @@ #ifndef TABWIDGET_H #define TABWIDGET_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include "webview.h" #include "webtab.h" #include diff --git a/src/webview/webpage.h b/src/webview/webpage.h index bd3d963a4..beac0fef7 100644 --- a/src/webview/webpage.h +++ b/src/webview/webpage.h @@ -18,10 +18,6 @@ #ifndef WEBPAGE_H #define WEBPAGE_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include diff --git a/src/webview/webview.h b/src/webview/webview.h index 7f3f6d72e..4d687d62d 100644 --- a/src/webview/webview.h +++ b/src/webview/webview.h @@ -18,10 +18,6 @@ #ifndef WEBVIEW_H #define WEBVIEW_H -#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT) -#define QT_NO_DEBUG_OUTPUT -#endif - #include #include #include