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

List:       kde-commits
Subject:    branches/work/kde4/kdelibs/kdecore
From:       David Faure <faure () kde ! org>
Date:       2005-07-06 9:00:10
Message-ID: 1120640410.980613.19111.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 432110 by dfaure:

Found and fixed bug in setQuery("?") (empty!=null is used there)


 M  +4 -4      kurl.cpp  
 M  +13 -0     tests/kurltest.cpp  


--- branches/work/kde4/kdelibs/kdecore/kurl.cpp #432109:432110
@@ -1648,7 +1648,7 @@
   if (lst.isEmpty()) return KURL();
   KURL tmp;
 
-  
+
   bool first = true;
   QListIterator<KURL> it(lst);
   it.toBack();
@@ -1860,9 +1860,9 @@
   if (!hasSubURL())
   {
      KURL u(*this);
-     
+
      u.cd("../");
-     
+
      return u;
   }
 
@@ -2005,7 +2005,7 @@
 void KURL::setQuery( const QString &_txt, int encoding_hint)
 {
    if (!_txt.isEmpty() && _txt[0] == '?')
-      _setQuery( _txt.mid(1), encoding_hint );
+      _setQuery( _txt.length() > 1 ? _txt.mid(1) : "" /*empty, not null*/, \
encoding_hint );  else
       _setQuery( _txt, encoding_hint );
 }
--- branches/work/kde4/kdelibs/kdecore/tests/kurltest.cpp #432109:432110
@@ -136,6 +136,19 @@
   check("KURL::hasSubURL()", url1.hasSubURL() ? "yes" : "no", "no");
   check("KURL::upURL()", url1.upURL().url(), "file:///opt/kde2/qt2/doc/html/");
 
+  url1 = KURL( QByteArray( "http://www.kde.org/foo.cgi?foo=bar" ) );
+  check("query", url1.query(), "?foo=bar" );
+  url1.setQuery( "toto=titi&kde=rocks" );
+  check("query", url1.query(), "?toto=titi&kde=rocks" );
+  url1.setQuery( "?kde=rocks&a=b" );
+  check("query", url1.query(), "?kde=rocks&a=b" );
+  url1.setQuery( "?" );
+  check("setQuery(\"?\") -> query", url1.query(), "?" );
+  url1.setQuery( "" );
+  check("setQuery(\"\") -> query", url1.query(), "?" );
+  url1.setQuery( QString::null );
+  check("setQuery(QString::null) -> query", url1.query(), QString::null );
+
   u1 = "file:///opt/kde2/qt2/doc/html/showimg-main-cpp.html#QObject::connect";
   url1 = u1;
   check("KURL::url()", url1.url(), \
"file:///opt/kde2/qt2/doc/html/showimg-main-cpp.html#QObject::connect");


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