Changeset 92683 in webkit

Timestamp:

Aug 9, 2011 7:24:36 AM (13 years ago)

Author:

siddharth.mathur@nokia.com

Message:

[Qt] Simplify code by removing QT_NO_DESKTOPSERVICES and QT_NO_NETWORKDISKCACHE
​https://bugs.webkit.org/show_bug.cgi?id=65880

Reviewed by Andreas Kling.

.:

QDesktopServices and QNetworkDiskCache have been around for a while now. Kill flags which
check for their feature flags. Assume that any reasonable Qt build provides them.

• Source/WebKit.pri:

Source/WebKit/qt:

QDesktopServices and QNetworkDiskCache have been around for a while now. Kill flags which
check for their feature flags. Assume that any reasonable Qt build provides them.

• Api/qwebsettings.cpp:

(QWebSettings::enablePersistentStorage):

Tools:

QDesktopServices and QNetworkDiskCache have been around for a while now. Kill flags which
check for their feature flags. Assume that any reasonable Qt build provides them.

• QtTestBrowser/cookiejar.cpp:

(TestBrowserCookieJar::TestBrowserCookieJar):

• QtTestBrowser/launcherwindow.cpp:

(LauncherWindow::createChrome):
(LauncherWindow::setDiskCache):

• QtTestBrowser/main.cpp:

(LauncherApplication::handleUserOptions):

• QtTestBrowser/webpage.cpp:

(WebPage::openUrlInDefaultBrowser):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit.pri (modified) (1 diff)
• Source/WebKit/qt/Api/qwebsettings.cpp (modified) (2 diffs)
• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/QtTestBrowser/cookiejar.cpp (modified) (1 diff)
• Tools/QtTestBrowser/launcherwindow.cpp (modified) (4 diffs)
• Tools/QtTestBrowser/main.cpp (modified) (2 diffs)
• Tools/QtTestBrowser/webpage.cpp (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-08-09  Siddharth Mathur  <siddharth.mathur@nokia.com>
+
+        [Qt] Simplify code by removing QT_NO_DESKTOPSERVICES and QT_NO_NETWORKDISKCACHE
+        https://bugs.webkit.org/show_bug.cgi?id=65880
+
+        Reviewed by Andreas Kling.
+
+        QDesktopServices and QNetworkDiskCache have been around for a while now. Kill flags which 
+        check for their feature flags. Assume that any reasonable Qt build provides them. 
+
+        * Source/WebKit.pri:
+
 2011-08-06  Aron Rosenberg  <arosenberg@logitech.com>
 

trunk/Source/WebKit.pri

@@ -170 +170 @@
     DEFINES *= QT_NO_CRASHHANDLER
     DEFINES *= QT_NO_CURSOR
-    DEFINES *= QT_NO_DESKTOPSERVICES
     DEFINES *= QT_NO_FILEDIALOG
     DEFINES *= QT_NO_GRAPHICSEFFECT

trunk/Source/WebKit/qt/Api/qwebsettings.cpp

@@ -1137 +1137 @@
 void QWebSettings::enablePersistentStorage(const QString& path)
 {
-#ifndef QT_NO_DESKTOPSERVICES
     QString storagePath;
 
@@ -1170 +1169 @@
     }
 #endif
-#endif
 }
 

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-08-09  Siddharth Mathur  <siddharth.mathur@nokia.com>
+
+        [Qt] Simplify code by removing QT_NO_DESKTOPSERVICES and QT_NO_NETWORKDISKCACHE
+        https://bugs.webkit.org/show_bug.cgi?id=65880
+
+        Reviewed by Andreas Kling.
+
+        QDesktopServices and QNetworkDiskCache have been around for a while now. Kill flags which 
+        check for their feature flags. Assume that any reasonable Qt build provides them. 
+
+        * Api/qwebsettings.cpp:
+        (QWebSettings::enablePersistentStorage):
+
 2011-08-05  Dawit Alemayehu  <adawit@kde.org>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-09  Siddharth Mathur  <siddharth.mathur@nokia.com>
+
+        [Qt] Simplify code by removing QT_NO_DESKTOPSERVICES and QT_NO_NETWORKDISKCACHE
+        https://bugs.webkit.org/show_bug.cgi?id=65880
+
+        Reviewed by Andreas Kling.
+
+        QDesktopServices and QNetworkDiskCache have been around for a while now. Kill flags which 
+        check for their feature flags. Assume that any reasonable Qt build provides them. 
+        * QtTestBrowser/cookiejar.cpp:
+        (TestBrowserCookieJar::TestBrowserCookieJar):
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::createChrome):
+        (LauncherWindow::setDiskCache):
+        * QtTestBrowser/main.cpp:
+        (LauncherApplication::handleUserOptions):
+        * QtTestBrowser/webpage.cpp:
+        (WebPage::openUrlInDefaultBrowser):
+
 2011-08-09  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/QtTestBrowser/cookiejar.cpp

@@ -42 +42 @@
     connect(&m_timer, SIGNAL(timeout()), this, SLOT(saveToDisk()));
 
-#ifndef QT_NO_DESKTOPSERVICES
     QString path = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
-#else
-    QString path = QDir::homePath() + "/.QtTestBrowser";
-#endif
-
     QDir().mkpath(path);
     m_file.setFileName(path + "/cookieJar");

trunk/Tools/QtTestBrowser/launcherwindow.cpp

@@ -46 +46 @@
 #endif
 
-#if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
 #include <QtGui/QDesktopServices>
 #include <QtNetwork/QNetworkDiskCache>
-#endif
 
 const int gExitClickArea = 80;
@@ -436 +434 @@
     QMenu* settingsMenu = menuBar()->addMenu("&Settings");
 
-#if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
     QAction* toggleDiskCache = settingsMenu->addAction("Use Disk Cache", this, SLOT(setDiskCache(bool)));
     toggleDiskCache->setCheckable(true);
     toggleDiskCache->setChecked(m_windowOptions.useDiskCache);
-#endif
 
     QAction* toggleAutoLoadImages = settingsMenu->addAction("Disable Auto Load Images", this, SLOT(toggleAutoLoadImages(bool)));
@@ -823 +819 @@
 void LauncherWindow::setDiskCache(bool enable)
 {
-#if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
     m_windowOptions.useDiskCache = enable;
     QNetworkDiskCache* cache = 0;
@@ -832 +827 @@
     }
     page()->networkAccessManager()->setCache(cache);
-#endif
 }
 

trunk/Tools/QtTestBrowser/main.cpp

@@ -183 +183 @@
 #endif
              << QString("[-viewport-update-mode %1]").arg(formatKeys(updateModes)).toLatin1().data()
-#if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
              << "[-disk-cache]"
-#endif
              << "[-cache-webview]"
              << "[-maximize]"
@@ -223 +221 @@
 
     if (args.contains("-disk-cache")) {
-#if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
         windowOptions.useDiskCache = true;
-#else
-    appQuit(1, "-disk-cache only works if QNetworkDiskCache and QDesktopServices is enabled in your Qt build.");
-#endif
     }
 

trunk/Tools/QtTestBrowser/webpage.cpp

@@ -109 +109 @@
 void WebPage::openUrlInDefaultBrowser(const QUrl& url)
 {
-#ifndef QT_NO_DESKTOPSERVICES
     if (QAction* action = qobject_cast<QAction*>(sender()))
         QDesktopServices::openUrl(action->data().toUrl());
     else
         QDesktopServices::openUrl(url);
-#endif
 }