File patch-r906060.diff of Package kdelibs4

Overview Repositories Revisions Requests Users Attributes Meta

File patch-r906060.diff of Package kdelibs4

Subject: Fix KURL::prettyUrl for chinese unicode chars
From: wstephenson@suse.de
Bug: 
Patch-upstream: 906060
--- kdecore/tests/kurltest.cpp	(revision 906059)
+++ kdecore/tests/kurltest.cpp	(revision 906060)
@@ -1507,6 +1507,10 @@ void KUrlTest::testUtf8()
 
   KUrl umlaut2("http://www.clever-tanken.de/liste.asp?ort=N%FCrnberg&typ=Diesel"); // was ,106
   QCOMPARE(umlaut2.url(), QString("http://www.clever-tanken.de/liste.asp?ort=N%FCrnberg&typ=Diesel"));
+
+  KUrl wkai(QString::fromUtf8("/tmp/魔"));
+  QCOMPARE(wkai.url(), QString("file:///tmp/%E9%AD%94"));
+  QCOMPARE(wkai.prettyUrl(), QString::fromUtf8("file:///tmp/魔"));
 }
 
 void KUrlTest::testOtherEncodings()
--- kdecore/io/kurl.cpp	(revision 906059)
+++ kdecore/io/kurl.cpp	(revision 906060)
@@ -1006,7 +1006,7 @@ static QString toPrettyPercentEncoding(c
   QString result;
   for (int i = 0; i < input.length(); ++i) {
     QChar c = input.at(i);
-    register short u = c.unicode();
+    register ushort u = c.unicode();
     if (u < 0x20 || u == '?' || u == '#' || u == '%'
         || (u == ' ' && (i+1 == input.length() || input.at(i+1) == ' '))) {
       static const char hexdigits[] = "0123456789ABCDEF";
Index: kdecore/tests/kurltest.cpp
===================================================================
Index: kdecore/io/kurl.cpp
===================================================================

Places

File patch-r906060.diff of Package kdelibs4

Places