1 files changed, 31 insertions, 33 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
index 02ef4a098..fb94d55b1 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
@@ -42,10 +42,9 @@
 #include <QUrl>
 #include <QFileInfo>
 
-class QWebSettingsPrivate
-{
+class QWebSettingsPrivate {
 public:
-    QWebSettingsPrivate(WebCore::Settings *wcSettings = 0)
+    QWebSettingsPrivate(WebCore::Settings* wcSettings = 0)
         : settings(wcSettings)
     {
     }
@@ -60,7 +59,7 @@ public:
     qint64 offlineStorageDefaultQuota;
 
     void apply();
-    WebCore::Settings *settings;
+    WebCore::Settings* settings;
 };
 
 typedef QHash<int, QPixmap> WebGraphicHash;
@@ -80,14 +79,14 @@ static WebGraphicHash* graphics()
     return hash;
 }
 
-Q_GLOBAL_STATIC(QList<QWebSettingsPrivate *>, allSettings);
+Q_GLOBAL_STATIC(QList<QWebSettingsPrivate*>, allSettings);
 
 void QWebSettingsPrivate::apply()
 {
     if (settings) {
         settings->setTextAreasAreResizable(true);
 
-        QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
+        QWebSettingsPrivate* global = QWebSettings::globalSettings()->d;
 
         QString family = fontFamilies.value(QWebSettings::StandardFont,
                                             global->fontFamilies.value(QWebSettings::StandardFont));
@@ -194,7 +193,7 @@ void QWebSettingsPrivate::apply()
                                       global->attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls));
         settings->setAllowUniversalAccessFromFileURLs(value);
     } else {
-        QList<QWebSettingsPrivate *> settings = *::allSettings();
+        QList<QWebSettingsPrivate*> settings = *::allSettings();
         for (int i = 0; i < settings.count(); ++i)
             settings[i]->apply();
     }
@@ -206,9 +205,9 @@ void QWebSettingsPrivate::apply()
     Any setting changed on the default object is automatically applied to all
     QWebPage instances where the particular setting is not overriden already.
 */
-QWebSettings *QWebSettings::globalSettings()
+QWebSettings* QWebSettings::globalSettings()
 {
-    static QWebSettings *global = 0;
+    static QWebSettings* global = 0;
     if (!global)
         global = new QWebSettings;
     return global;
@@ -365,7 +364,7 @@ QWebSettings::QWebSettings()
 /*!
     \internal
 */
-QWebSettings::QWebSettings(WebCore::Settings *settings)
+QWebSettings::QWebSettings(WebCore::Settings* settings)
     : d(new QWebSettingsPrivate(settings))
 {
     d->settings = settings;
@@ -400,7 +399,7 @@ int QWebSettings::fontSize(FontSize type) const
 {
     int defaultValue = 0;
     if (d->settings) {
-        QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
+        QWebSettingsPrivate* global = QWebSettings::globalSettings()->d;
         defaultValue = global->fontSizes.value(type);
     }
     return d->fontSizes.value(type, defaultValue);
@@ -427,7 +426,7 @@ void QWebSettings::resetFontSize(FontSize type)
 
     \sa userStyleSheetUrl()
 */
-void QWebSettings::setUserStyleSheetUrl(const QUrl &location)
+void QWebSettings::setUserStyleSheetUrl(const QUrl& location)
 {
     d->userStyleSheetLocation = location;
     d->apply();
@@ -453,7 +452,7 @@ QUrl QWebSettings::userStyleSheetUrl() const
 
     \sa defaultTextEncoding()
 */
-void QWebSettings::setDefaultTextEncoding(const QString &encoding)
+void QWebSettings::setDefaultTextEncoding(const QString& encoding)
 {
     d->defaultTextEncoding = encoding;
     d->apply();
@@ -478,7 +477,7 @@ QString QWebSettings::defaultTextEncoding() const
 
     Setting an empty path disables the icon database.
 */
-void QWebSettings::setIconDatabasePath(const QString &path)
+void QWebSettings::setIconDatabasePath(const QString& path)
 {
     WebCore::iconDatabase()->delayDatabaseCleanup();
 
@@ -501,11 +500,10 @@ void QWebSettings::setIconDatabasePath(const QString &path)
 */
 QString QWebSettings::iconDatabasePath()
 {
-    if (WebCore::iconDatabase()->isEnabled() && WebCore::iconDatabase()->isOpen()) {
+    if (WebCore::iconDatabase()->isEnabled() && WebCore::iconDatabase()->isOpen())
         return WebCore::iconDatabase()->databasePath();
-    } else {
+    else
         return QString();
-    }
 }
 
 /*!
@@ -527,18 +525,18 @@ void QWebSettings::clearIconDatabase()
 
     \sa setIconDatabasePath()
 */
-QIcon QWebSettings::iconForUrl(const QUrl &url)
+QIcon QWebSettings::iconForUrl(const QUrl& url)
 {
     WebCore::Image* image = WebCore::iconDatabase()->iconForPageURL(WebCore::KURL(url).string(),
                                 WebCore::IntSize(16, 16));
-    if (!image) {
+    if (!image)
         return QPixmap();
-    }
-    QPixmap *icon = image->nativeImageForCurrentFrame();
-    if (!icon) {
+
+    QPixmap* icon = image->nativeImageForCurrentFrame();
+    if (!icon)
         return QPixmap();
-    }
-    return *icon;
+
+    return* icon;
 }
 
 /*!
@@ -550,9 +548,9 @@ QIcon QWebSettings::iconForUrl(const QUrl &url)
 
     \sa webGraphic()
 */
-void QWebSettings::setWebGraphic(WebGraphic type, const QPixmap &graphic)
+void QWebSettings::setWebGraphic(WebGraphic type, const QPixmap& graphic)
 {
-    WebGraphicHash *h = graphics();
+    WebGraphicHash* h = graphics();
     if (graphic.isNull())
         h->remove(type);
     else
@@ -641,7 +639,7 @@ int QWebSettings::maximumPagesInCache()
 */
 void QWebSettings::setObjectCacheCapacities(int cacheMinDeadCapacity, int cacheMaxDead, int totalCapacity)
 {
-    bool disableCache = cacheMinDeadCapacity == 0 && cacheMaxDead == 0 && totalCapacity == 0;
+    bool disableCache = !cacheMinDeadCapacity && !cacheMaxDead && !totalCapacity;
     WebCore::cache()->setDisabled(disableCache);
 
     WebCore::cache()->setCapacities(qMax(0, cacheMinDeadCapacity),
@@ -653,7 +651,7 @@ void QWebSettings::setObjectCacheCapacities(int cacheMinDeadCapacity, int cacheM
     Sets the actual font family to \a family for the specified generic family,
     \a which.
 */
-void QWebSettings::setFontFamily(FontFamily which, const QString &family)
+void QWebSettings::setFontFamily(FontFamily which, const QString& family)
 {
     d->fontFamilies.insert(which, family);
     d->apply();
@@ -667,7 +665,7 @@ QString QWebSettings::fontFamily(FontFamily which) const
 {
     QString defaultValue;
     if (d->settings) {
-        QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
+        QWebSettingsPrivate* global = QWebSettings::globalSettings()->d;
         defaultValue = global->fontFamilies.value(which);
     }
     return d->fontFamilies.value(which, defaultValue);
@@ -708,7 +706,7 @@ bool QWebSettings::testAttribute(WebAttribute attr) const
 {
     bool defaultValue = false;
     if (d->settings) {
-        QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
+        QWebSettingsPrivate* global = QWebSettings::globalSettings()->d;
         defaultValue = global->attributes.value(attr);
     }
     return d->attributes.value(attr, defaultValue);
@@ -789,7 +787,7 @@ qint64 QWebSettings::offlineStorageDefaultQuota()
 /*
     \internal
     \relates QWebSettings
-    
+
     Sets the path for HTML5 offline web application cache storage to \a path.
 
     \a path must point to an existing directory where the cache is stored.
@@ -808,7 +806,7 @@ void QWEBKIT_EXPORT qt_websettings_setOfflineWebApplicationCachePath(const QStri
 /*
     \internal
     \relates QWebSettings
-    
+
     Returns the path of the HTML5 offline web application cache storage
     or an empty string if the feature is disabled.
 
@@ -837,7 +835,7 @@ QString QWEBKIT_EXPORT qt_websettings_offlineWebApplicationCachePath()
 */
 void QWEBKIT_EXPORT qt_websettings_setLocalStorageDatabasePath(QWebSettings* settings, const QString& path)
 {
-    QWebSettingsPrivate *d = settings->handle();
+    QWebSettingsPrivate* d = settings->handle();
     d->localStorageDatabasePath = path;
     d->apply();
 }