Krazy fixes

7 files changed, 37 insertions, 25 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6bcbe85..35c10a19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 PROJECT( rekonq )
 
 # ==================================================================================
-# Informations to update before to release this package.
+# Information to update before to release this package.
 
 # rekonq info
 SET(REKONQ_VERSION "0.9.82" )
diff --git a/kwebapp/urlresolver.cpp b/kwebapp/urlresolver.cpp
index 173dc613..c56e5a94 100644
--- a/kwebapp/urlresolver.cpp
+++ b/kwebapp/urlresolver.cpp
@@ -35,6 +35,11 @@
 #include <KProtocolInfo>
 #include <KDebug>
 
+// Qt Includes
+#include <QLatin1String>
+
+#define QL1S(x) QLatin1String(x)
+
 
 // NOTE
 // default kurifilter plugin list (at least in my box):
@@ -67,7 +72,7 @@ KUrl UrlResolver::urlFromTextTyped(const QString &typedText)
     if (urlFromUserInput.isValid())
     {
         // ensure http(s) hosts are lower cases
-        if (urlFromUserInput.scheme().startsWith("http"))
+        if (urlFromUserInput.scheme().startsWith(QL1S("http")))
         {
             QString hst = urlFromUserInput.host();
             urlFromUserInput.setHost(hst.toLower());
diff --git a/src/adblock/adblockwidget.h b/src/adblock/adblockwidget.h
index 28ff7c0c..37f29f93 100644
--- a/src/adblock/adblockwidget.h
+++ b/src/adblock/adblockwidget.h
@@ -46,7 +46,7 @@ class AdBlockWidget : public QWidget, private Ui::adblock
     Q_OBJECT
 
 public:
-    AdBlockWidget(KSharedConfig::Ptr config, QWidget *parent = 0);
+    explicit AdBlockWidget(KSharedConfig::Ptr config, QWidget *parent = 0);
 
     bool changed();
 
diff --git a/src/sync/googlesynchandler.cpp b/src/sync/googlesynchandler.cpp
index fab3c635..90de34b4 100644
--- a/src/sync/googlesynchandler.cpp
+++ b/src/sync/googlesynchandler.cpp
@@ -194,7 +194,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
     }
     else if (path == "/bookmarks/")
     {
-        //We get to this page after succesful login, let's fetch the bookmark list in Xml format.
+        // We get to this page after successful login, let's fetch the bookmark list in Xml format.
         QNetworkAccessManager *qnam = _webPage.networkAccessManager();
         QNetworkRequest request;
         request.setUrl(QUrl("http://www.google.com/bookmarks/?output=xml"));
diff --git a/src/sync/operasynchandler.cpp b/src/sync/operasynchandler.cpp
index 08c3e542..b32e315f 100644
--- a/src/sync/operasynchandler.cpp
+++ b/src/sync/operasynchandler.cpp
@@ -159,12 +159,13 @@ void OperaSyncHandler::startLogin()
 
     if (_authToken.isEmpty() || _authTokenSecret.isEmpty())
     {
-        //If we have not yet logged into server, we need to fetch OAuth access token and secret from server.
+        // If we have not yet logged into server, we need to fetch OAuth access token and secret from server.
         kDebug() << "Loading login page...";
         QOAuth::ParamMap requestMap;
         requestMap.insert("oauth_callback", "oob");
 
-        QOAuth::ParamMap requestParam = _qoauth.requestToken("https://auth.opera.com/service/oauth/request_token", QOAuth::POST, QOAuth::HMAC_SHA1, requestMap);
+        QOAuth::ParamMap requestParam = _qoauth.requestToken("https://auth.opera.com/service/oauth/request_token", QOAuth::POST,
+                                        QOAuth::HMAC_SHA1, requestMap);
 
         if (_qoauth.error() != QOAuth::NoError)
         {
@@ -179,20 +180,20 @@ void OperaSyncHandler::startLogin()
 
         kDebug() << "OAuth Request Token : " << _requestToken;
         kDebug() << "OAuth Request Token Secret : " << _requestTokenSecret;
-
-
         kDebug() << QUrl("https://auth.opera.com/service/oauth/authorize?oauth_token=" + QString(_requestToken) + "&oauth_callback=oob");
 
-        _webPage.mainFrame()->load(QUrl("https://auth.opera.com/service/oauth/authorize?oauth_token=" + QString(_requestToken) + "&oauth_callback=oob"));
+        QString u = QL1S("https://auth.opera.com/service/oauth/authorize?oauth_token=") + QString(_requestToken) + QL1S("&oauth_callback=oob");
+        _webPage.mainFrame()->load(QUrl(u));
     }
     else
     {
-        //We already have OAuth access token and secret, let's fetch bookmarks from server directly.
+        // We already have OAuth access token and secret, let's fetch bookmarks from server directly.
         getBookmarks();
     }
 }
 
-//Loading a webpage finished, what action to take is decided based on url we have loaded.
+
+// Loading a webpage finished, what action to take is decided based on url we have loaded.
 void OperaSyncHandler::loadFinished(bool ok)
 {
     kDebug() << "Load Finished" << ok;
@@ -243,11 +244,12 @@ void OperaSyncHandler::loadFinished(bool ok)
             authParams.insert("oauth_verifier", verifier);
 
             emit syncStatus(Rekonq::Bookmarks, true, i18n("OAuth : Sending verification code."));
-            QOAuth::ParamMap resultParam = _qoauth.accessToken("https://auth.opera.com/service/oauth/access_token", QOAuth::POST, _requestToken, _requestTokenSecret, QOAuth::HMAC_SHA1, authParams);
+            QOAuth::ParamMap resultParam = _qoauth.accessToken("https://auth.opera.com/service/oauth/access_token", QOAuth::POST,
+                                           _requestToken, _requestTokenSecret, QOAuth::HMAC_SHA1, authParams);
 
             if (_qoauth.error() != QOAuth::NoError)
             {
-                kDebug() << "Error occured while fetching access tokens. Error code is : " << _qoauth.error();
+                kDebug() << "Error occurred while fetching access tokens. Error code is : " << _qoauth.error();
                 emit syncStatus(Rekonq::Bookmarks, false, i18n("OAuth : Error fetching access token."));
                 _isSyncing = false;
                 return;
@@ -416,11 +418,12 @@ void OperaSyncHandler::createBookmarkDataSlot(KIO::Job* job, QByteArray data)
     Q_UNUSED(job);
     Q_UNUSED(data);
 
-    //    kDebug() << data;
-//    _xmlData += data;
+    // kDebug() << data;
+    // _xmlData += data;
 }
 
-//Check whether bookmark creation was succesful on server
+
+// Check whether bookmark creation was successful on server
 void OperaSyncHandler::createBookmarkResultSlot(KJob* job)
 {
     decreaseRequestCount();
@@ -432,18 +435,18 @@ void OperaSyncHandler::createBookmarkResultSlot(KJob* job)
     }
 }
 
+
 void OperaSyncHandler::createBookmarkFolderDataSlot(KIO::Job* job, QByteArray data)
 {
-//    kDebug() << data;
-
     QByteArray &value = _jobToResponseMap[job];
     value.append(data);
 }
 
-//If bookmark folder (it's empty) was creted succesfully on server, we need to add all it's children (which exists in local bookmarks) on server.
+
+// If bookmark folder (it's empty) was creted successfully on server,
+// we need to add all it's children (which exists in local bookmarks) on server.
 void OperaSyncHandler::createBookmarkFolderResultSlot(KJob* job)
 {
-
     QByteArray value = _jobToResponseMap[job];
     KBookmarkGroup root = _jobToGroupMap[job];
 
@@ -474,26 +477,29 @@ void OperaSyncHandler::createBookmarkFolderResultSlot(KJob* job)
     decreaseRequestCount();
 }
 
-//Check whether we deleted a resource on server succesfully.
+
+// Check whether we deleted a resource on server successfully.
 void OperaSyncHandler::deleteResourceResultSlot(KJob* job)
 {
     decreaseRequestCount();
 
     if (job->error() != 160)
     {
-        kDebug() << "Error occured while deleting resource on server. Error code : " << job->error();
+        kDebug() << "Error occurred while deleting resource on server. Error code : " << job->error();
         return;
     }
 }
 
-//This function is here just for debugging purpose. We don't need it's output.
+
+// This function is here just for debugging purpose. We don't need it's output.
 void OperaSyncHandler::deleteResourceDataSlot(KIO::Job* job, QByteArray data)
 {
     Q_UNUSED(job);
     kDebug() << data;
 }
 
-//Checks whether a bookmark exists locally or not, and either add it locally or delete from server
+
+// Checks whether a bookmark exists locally or not, and either add it locally or delete from server
 void OperaSyncHandler::handleBookmark(const QDomElement &item, KBookmarkGroup root)
 {
     QString url = getUrlFromResourceProperties(item);
diff --git a/src/sync/operasynchandler.h b/src/sync/operasynchandler.h
index 59aff9fb..794164c1 100644
--- a/src/sync/operasynchandler.h
+++ b/src/sync/operasynchandler.h
@@ -46,6 +46,7 @@ class QNetworkReply;
 class BookmarkManager;
 class QWebView;
 
+
 class OperaSyncHandler : public SyncHandler
 {
     Q_OBJECT
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index e2ca32cb..43670a14 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -268,7 +268,7 @@ void UrlResolver::computeQurlFromUserInput()
     if (urlFromUserInput.isValid())
     {
         // ensure http(s) hosts are lower cases
-        if (urlFromUserInput.scheme().startsWith("http"))
+        if (urlFromUserInput.scheme().startsWith(QL1S("http")))
         {
             QString hst = urlFromUserInput.host();
             urlFromUserInput.setHost(hst.toLower());