X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=a6acf5893c4913f4c4e45286510968695a75392c;hb=a8841ac148d14a676d1beb93d3c43a7e8473f72b;hp=b617bad3e7b3a933a34395a62d48455cc481912c;hpb=9d54503555534a2c554f09a33df6afa33d6308ec;p=quassel.git

diff --git a/src/common/util.cpp b/src/common/util.cpp
index b617bad3..a6acf589 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -121,8 +121,8 @@ QString decodeString(const QByteArray &input, QTextCodec *codec)
         //qDebug() << "Detected utf8:" << s;
         return s;
     }
-    //QTextCodec *codec = QTextCodec::codecForName(encoding.toAscii());
-    if (!codec) return QString::fromAscii(input);
+    //QTextCodec *codec = QTextCodec::codecForName(encoding.toLatin1());
+    if (!codec) return QString::fromLatin1(input);
     return codec->toUnicode(input);
 }