[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/libs/webkitkde
From:       Urs Wolfer <uwolfer () kde ! org>
Date:       2009-04-10 9:34:03
Message-ID: 1239356043.709456.11987.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 951800 by uwolfer:

* un-inline in public header
* fix include
* add include guard
* QLatin1String fixes

 M  +6 -0      kdenetwork/knetworkreply.cpp  
 M  +1 -4      kdenetwork/knetworkreply.h  
 M  +1 -1      kdewebkit/kwebpage.h  
 M  +5 -0      kdewebkit/settings/khtml_filter_p.h  
 M  +2 -2      kdewebkit/settings/webkitsettings.cpp  


--- trunk/playground/libs/webkitkde/kdenetwork/knetworkreply.cpp #951799:951800
@@ -214,4 +214,10 @@
     emit downloadProgress(kiloBytes / ((double)percent / 100), kiloBytes);
 }
 
+void KNetworkReply::slotPermanentRedirection(KIO::Job *job, const KUrl &fromUrl, const KUrl &toUrl)
+{
+    Q_UNUSED(fromUrl);
+    slotRedirection(job, toUrl);
+}
+
 #include "knetworkreply.moc"
--- trunk/playground/libs/webkitkde/kdenetwork/knetworkreply.h #951799:951800
@@ -54,10 +54,7 @@
 private Q_SLOTS:
     void slotRedirection(KIO::Job *job, const KUrl &url);
     void slotPercent(KJob *job, unsigned long percent);
-    inline void slotPermanentRedirection(KIO::Job *job, const KUrl &fromUrl, const KUrl &toUrl) {
-        Q_UNUSED(fromUrl);
-        slotRedirection(job, toUrl);
-    }
+    void slotPermanentRedirection(KIO::Job *job, const KUrl &fromUrl, const KUrl &toUrl);
     
 private:
     class KNetworkReplyPrivate;
--- trunk/playground/libs/webkitkde/kdewebkit/kwebpage.h #951799:951800
@@ -25,7 +25,7 @@
 #define KWEBPAGE_H
 
 #include <kdemacros.h>
-#include <KUrl>
+#include <KDE/KUrl>
 
 #include <QtWebKit/QWebPage>
 
--- trunk/playground/libs/webkitkde/kdewebkit/settings/khtml_filter_p.h #951799:951800
@@ -20,6 +20,9 @@
    Boston, MA 02110-1301, USA.
 */
 
+#ifndef KHTML_FILTER_P_H
+#define KHTML_FILTER_P_H
+
 #include <QString>
 #include <QRegExp>
 #include <QVector>
@@ -71,4 +74,6 @@
 
 }
 
+#endif // KHTML_FILTER_P_H
+
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
--- trunk/playground/libs/webkitkde/kdewebkit/settings/webkitsettings.cpp #951799:951800
@@ -341,7 +341,7 @@
           QString name = it.key();
           QString url = it.value();
 
-          if (name.startsWith("Filter"))
+          if (name.startsWith(QLatin1String("Filter")))
           {
               if (url.startsWith(QLatin1String("@@")))
                   d->adWhiteList.addFilter(url);
@@ -748,7 +748,7 @@
 {
     if (d->m_adFilterEnabled)
     {
-        if (!url.startsWith("data:"))
+        if (!url.startsWith(QLatin1String("data:")))
         {
             // Check the blacklist, and only if that matches, the whitelist
             return d->adBlackList.isUrlMatched(url) && !d->adWhiteList.isUrlMatched(url);
[prev in list] [next in list] [prev in thread] [next in thread]