Removed QT_NO_DEBUG_OUTPUT define from headers, instead it is defined in

.pro project file
2024-11-11 01:22:10 +01:00 · 2011-03-18 16:08:24 +01:00 · 2011-03-18 16:08:24 +01:00 · c148836d10
commit c148836d10
parent 54a678fff8
40 changed files with 192 additions and 140 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,4 @@ src0.9.7
 *.deb
 *.pro.user
 license_template
+Makefile
--- 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 \
--- 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"
--- 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 <QObject>

 #include <iostream>
--- 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 <QToolBar>
 #include <QWebSettings>
 #include <QUrl>
--- 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
--- 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 <QObject>
 #include <QUrl>
 #include <QNetworkRequest>
--- 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 <QWidget>
 #include <QTreeWidgetItem>
 #include <QInputDialog>
--- 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 <QUrl>
 #include <QSettings>
--- 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 <QToolBar>
 #include <QMenu>
 #include <QToolButton>
--- 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 <QMenu>
 #include <QFormLayout>
--- 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 <QNetworkCookieJar>
 #include <QDebug>
 #include <QSettings>
--- 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 <QWidget>
 #include <QTimer>
 #include <QNetworkCookie>
--- 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 <QDialog>
 #include <QLabel>
 #include <QFileIconProvider>
--- 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 <QWidget>
 #include <QTreeWidgetItem>
 #include <QPointer>
--- 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"
--- 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 <http://www.gnu.org/licenses/>.
 * ============================================================ */
-#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
-#define QT_NO_DEBUG_OUTPUT
-#endif
+ 

 #include <QtGui/QApplication>
 #include <QTextCodec>
--- 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 <QLabel>
 #include <QCompleter>
 #include <QStandardItemModel>
--- 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 <QCompleter>
 #include <QDebug>
 #include <QStringList>
--- 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 <QWidget>
 #include <QPushButton>
 #include <QToolButton>
--- 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 <QNetworkAccessManager>
 #include <QDialogButtonBox>
 #include <QBoxLayout>
--- 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 <QObject>
 #include <QNetworkRequest>
 #include <QNetworkAccessManager>
--- 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 <QDialog>

 namespace Ui {
--- 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)
--- 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 <QDialog>
 #include <QBoxLayout>
 #include <QDialogButtonBox>
--- a/src/other/clearprivatedata.ui
+++ b/src/other/clearprivatedata.ui
@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ClearPrivateData</class>
+ <widget class="QDialog" name="ClearPrivateData">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>321</width>
+    <height>274</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Clear Recent History</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../data/icons.qrc">
+    <normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0" colspan="3">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Choose what you want to delete:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QCheckBox" name="history">
+     <property name="text">
+      <string>Clear history</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QCheckBox" name="cookies">
+     <property name="text">
+      <string>Clear cookies</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QCheckBox" name="cache">
+     <property name="text">
+      <string>Clear cache</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="QCheckBox" name="icons">
+     <property name="text">
+      <string>Clear icons</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1">
+    <widget class="QLabel" name="label">
+     <property name="styleSheet">
+      <string notr="true">color: blue; text-decoration: underline;</string>
+     </property>
+     <property name="text">
+      <string>Clear cookies from Adobe Flash Player</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>&lt;b&gt;Clear Recent History&lt;/b&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QLabel" name="icon">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../data/icons.qrc">:/icons/preferences/applications-system.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" colspan="2">
+    <widget class="QComboBox" name="historyLength">
+     <item>
+      <property name="text">
+       <string>Today</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Week</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Month</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>All</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../data/icons.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ClearPrivateData</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ClearPrivateData</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
--- 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 <QWidget>
 #include <QBoxLayout>
 #include <QTextEdit>
--- 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 <QObject>
 #include <QSystemTrayIcon>
 #include <QMenu>
--- 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 <QDebug>
 #include <QMenu>
--- 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 <QObject>
 #include <QtPlugin>
--- 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 <QWidget>
 #include <QDialog>
 #include <QTimer>
--- 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 <QWidget>
 #include <QListWidgetItem>
--- 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 <QDialog>
 #include <QFileDialog>
 #include <QListWidgetItem>
--- 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 <QWidget>
 #include <QTreeWidget>
 #include <QUrl>
--- 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 <QToolBar>
 #include <QLineEdit>
 #include <QAction>
--- 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 <QDialog>

 namespace Ui {
--- 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 <QTabBar>
 #include <QAction>
 #include <QDebug>
--- 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 <QTabWidget>
--- 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 <QDebug>
 #include <QUrl>
 #include <QWebView>
--- 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 <QWebView>
 #include <QDebug>
 #include <QTabWidget>