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

List:       kde-commits
Subject:    [kdesvn/frameworks] src/svnfrontend/graphtree: Use QByteArray::toBase64() instead KCodecs::base64Enc
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2016-03-31 19:21:07
Message-ID: E1ali9T-0005rB-AG () scm ! kde ! org
[Download RAW message or body]

Git commit f70f5e5354e96aa7c42f0042fb34d5dd52e0450a by Christian Ehrlicher.
Committed on 27/03/2016 at 19:20.
Pushed by chehrlic into branch 'frameworks'.

Use QByteArray::toBase64() instead KCodecs::base64Encode() to not add linebreaks - \
now the revisiontree is working again

M  +4    -6    src/svnfrontend/graphtree/revisiontree.cpp

http://commits.kde.org/kdesvn/f70f5e5354e96aa7c42f0042fb34d5dd52e0450a

diff --git a/src/svnfrontend/graphtree/revisiontree.cpp \
b/src/svnfrontend/graphtree/revisiontree.cpp index 53ffe53..e49c255 100644
--- a/src/svnfrontend/graphtree/revisiontree.cpp
+++ b/src/svnfrontend/graphtree/revisiontree.cpp
@@ -33,7 +33,6 @@
 
 #include <kprogressdialog.h>
 #include <klocale.h>
-#include <kcodecs.h>
 #include <kmessagebox.h>
 
 #include <qwidget.h>
@@ -341,12 +340,11 @@ bool RevisionTree::isValid()const
 
 static QString uniqueNodeName(long rev, const QString &path)
 {
-    QString res = KCodecs::base64Encode(path.toLocal8Bit(), false);
-    res.replace('\"', "_quot_");
-    res.replace(' ', "_space_");
+    QString res = QString::fromUtf8(path.toLocal8Bit().toBase64());
+    res.replace(QLatin1Char('\"'), QLatin1String("_quot_"));
+    res.replace(QLatin1Char(' '), QLatin1String("_space_"));
     QString n; n.sprintf("%05ld", rev);
-    res = "\"" + n + QString("_%1\"").arg(res);
-    return res;
+    return QLatin1Char('\"') + n + QLatin1Char('_') + res + QLatin1Char('\"');
 }
 
 bool RevisionTree::bottomUpScan(long startrev, unsigned recurse, const QString \
&_path, long _last)


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