[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=97b64a0

The following commit has been merged in the master branch:
commit 97b64a055a69b3dde05d85ab9db7cf0620332331
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Jan 13 18:31:50 2015 +0100

    Fix QStrings breakages
---
 filters/images/images-filter.cpp | 2 +-
 filters/latex/latex-filter.cpp   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/filters/images/images-filter.cpp b/filters/images/images-filter.cpp
index 4a773f6..c1433ac 100644
--- a/filters/images/images-filter.cpp
+++ b/filters/images/images-filter.cpp
@@ -53,7 +53,7 @@ void ImagesFilter::filterMessage(KTp::Message &message, const KTp::MessageContex
         QString extension = fileName.mid(fileName.lastIndexOf(QLatin1Char('.'))+1);
 
         if (!fileName.isNull() && d->formats.contains(extension.toUtf8())) {
-            QString href = QString::fromAscii(url.toEncoded());
+            QString href = QString::fromLatin1(url.toEncoded());
             message.appendMessagePart(
                 QLatin1Literal("<br/><a href=\"") % href % QLatin1Literal("\">") %
                     QLatin1Literal("<img src=\"") %
diff --git a/filters/latex/latex-filter.cpp b/filters/latex/latex-filter.cpp
index 67d9721..aa24dcf 100644
--- a/filters/latex/latex-filter.cpp
+++ b/filters/latex/latex-filter.cpp
@@ -69,7 +69,7 @@ void LatexFilter::filterMessage(KTp::Message &message, const KTp::MessageContext
         handleLatex(formula) %
         QLatin1Literal("\" style=\"max-width:100%;margin-top:3px\"") %
         QLatin1Literal("alt=\"") %
-        Qt::escape(formula) %
+        QString(formula).toHtmlEscaped() %
         QLatin1Literal("\" isEmotion=\"true\"/>"));
 
         int length = rg.matchedLength();
@@ -95,7 +95,7 @@ QString LatexFilter::handleLatex(const QString &latexFormula)
         qCritical() << "Cannot create the TeX file";
         return QString();
     }
-    texFile.write(latexText.toAscii());
+    texFile.write(latexText.toLatin1());
     texFile.close();
 
     if (LatexConfig::latexCmd().isEmpty()) {
@@ -163,7 +163,7 @@ QString LatexFilter::handleLatex(const QString &latexFormula)
     QFile::remove(texFile.fileName().replace(QLatin1String(".tex"), QLatin1String(".aux")));
     QFile::remove(texFile.fileName().replace(QLatin1String(".tex"), QLatin1String(".log")));
 
-    return QString::fromAscii(image.toBase64());
+    return QString::fromLatin1(image.toBase64());
 }
 
 bool LatexFilter::isSafe(const QString &latexFormula)

-- 
ktp-text-ui packaging