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

List:       kde-commits
Subject:    KDE/kdebase/runtime/kurifilter-plugins
From:       John Layt <john () layt ! net>
Date:       2009-12-28 23:31:49
Message-ID: 1262043109.773090.2930.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1067117 by jlayt:

krazy fixes


 M  +1 -1      fixhost/fixhosturifilter.cpp  
 M  +2 -2      ikws/kuriikwsfiltereng.cpp  
 M  +1 -1      ikws/searchproviderdlg.cpp  
 M  +4 -4      shorturi/kshorturifilter.cpp  


--- trunk/KDE/kdebase/runtime/kurifilter-plugins/fixhost/fixhosturifilter.cpp \
#1067116:1067117 @@ -49,7 +49,7 @@
     url2.setHost( "www." + url.host());
 
     if(( url.protocol() == "http" || url.protocol() == "https" )    
-        && !url.host().startsWith( "www." ) && !exists( url ) && exists( url2 ))
+        && !url.host().startsWith( QLatin1String("www.") ) && !exists( url ) && \
exists( url2 ))  {
         setFilteredUri( data, url2 );
         setUriType( data, KUriFilterData::NetProtocol );
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/ikws/kuriikwsfiltereng.cpp \
#1067116:1067117 @@ -242,7 +242,7 @@
       }
 
       // TODO: strip whitespaces around commas
-      QStringList rl = rlstring.split(",", QString::SkipEmptyParts);
+      QStringList rl = rlstring.split(',', QString::SkipEmptyParts);
       int i = 0;
 
       while ((i<rl.count()) && !found)
@@ -300,7 +300,7 @@
             for (QStringList::Iterator it = ql.begin(); it!=ql.end(); ++it)
               (*it) = "";
           }
-          else if ((c>="0") && (c<="9"))
+          else if ((c>="0") && (c<="9")) // krazy:excludeall=doublequote_chars
           {
             // It's a numeric reference > '0'
             int n = rlitem.toInt();
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/ikws/searchproviderdlg.cpp \
#1067116:1067117 @@ -86,7 +86,7 @@
             m_provider = new SearchProvider;
         m_provider->setName(m_dlg.leName->text().trimmed());
         m_provider->setQuery(m_dlg.leQuery->text().trimmed());
-        m_provider->setKeys(m_dlg.leShortcut->text().trimmed().split(",", \
QString::SkipEmptyParts)); +        \
m_provider->setKeys(m_dlg.leShortcut->text().trimmed().split(',', \
                QString::SkipEmptyParts));
         m_provider->setCharset(m_dlg.cbCharset->currentIndex() ? \
m_dlg.cbCharset->currentText() : QString());  KDialog::accept();
     } else {
--- trunk/KDE/kdebase/runtime/kurifilter-plugins/shorturi/kshorturifilter.cpp \
#1067116:1067117 @@ -21,6 +21,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
+#include "kshorturifilter.h"
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <pwd.h>
@@ -40,8 +42,6 @@
 #include <kauthorized.h>
 #include <kmimetype.h>
 
-#include "kshorturifilter.h"
-
 #define FQDN_PATTERN    "(?:[a-zA-Z0-9][a-zA-Z0-9+-]*\\.[a-zA-Z]+)"
 #define IPv4_PATTERN    \
"[0-9]{1,3}\\.[0-9]{1,3}(?:\\.[0-9]{0,3})?(?:\\.[0-9]{0,3})?"  #define IPv6_PATTERN   \
"^\\[.*\\]" @@ -407,7 +407,7 @@
 
     if (!KAuthorized::authorizeUrlAction( QLatin1String("open"), KUrl(), u))
     {
-      // No authorisation, we pretend it's a file will get
+      // No authorization, we pretend it's a file will get
       // an access denied error later on.
       setFilteredUri( data, u );
       setUriType( data, KUriFilterData::LocalFile );
@@ -517,7 +517,7 @@
 
     if (!KAuthorized::authorizeUrlAction( QLatin1String("open"), KUrl(), u))
     {
-      // No authorisation, we pretend it exists and will get
+      // No authorization, we pretend it exists and will get
       // an access denied error later on.
       setFilteredUri( data, u );
       setUriType( data, KUriFilterData::LocalFile );


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