From c841a46fb7171fdff0aa9d17168a0ffbc6d849fa Mon Sep 17 00:00:00 2001 From: Rafael Date: Fri, 1 Apr 2016 02:07:00 +0200 Subject: [PATCH] StringParser delete null bytes now, SnapmaticPicture trims title --- SnapmaticPicture.cpp | 6 +++--- StringParser.cpp | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/SnapmaticPicture.cpp b/SnapmaticPicture.cpp index c7e408e..0038fc2 100755 --- a/SnapmaticPicture.cpp +++ b/SnapmaticPicture.cpp @@ -192,15 +192,15 @@ QString SnapmaticPicture::getSnapmaticJSONString(QByteArray jsonBytes) QByteArray jsonUsefulBytes = jsonBytes; jsonUsefulBytes.replace((char)0x00, ""); jsonUsefulBytes.replace((char)0x0c, ""); - return QString::fromUtf8(jsonUsefulBytes); + return QString::fromUtf8(jsonUsefulBytes).trimmed(); } QString SnapmaticPicture::getSnapmaticTIDEString(QByteArray tideBytes) { QByteArray tideUsefulBytes = tideBytes; - tideUsefulBytes.remove(0, 4); + tideUsefulBytes.remove(0,4); QList tideUsefulBytesList = tideUsefulBytes.split(char(0x00)); - return QString::fromUtf8(tideUsefulBytesList.at(0)); + return QString::fromUtf8(tideUsefulBytesList.at(0)).trimmed(); } bool SnapmaticPicture::readingPictureFromFile(QString fileName) diff --git a/StringParser.cpp b/StringParser.cpp index 115e584..7297fe8 100755 --- a/StringParser.cpp +++ b/StringParser.cpp @@ -30,5 +30,7 @@ StringParser::StringParser() QString StringParser::parseTitleString(QByteArray commitBytes, int maxLength) { Q_UNUSED(maxLength) - return QTextCodec::codecForName("UTF-16LE")->toUnicode(commitBytes).trimmed(); + QString retStr = QTextCodec::codecForName("UTF-16LE")->toUnicode(commitBytes).trimmed(); + retStr.remove(QChar((char)0x00)); + return retStr; }