X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=5aa21efe19083d5bd166053946b314acc9dad2c7;hp=5cbfc861b9219961a71562be94955869b9c5714e;hb=be7d5dde2d1285e03a68f3f611f3b0ace1a619b4;hpb=a7f5d6a23f7214b11f6db85346a67fd7d02767da diff --git a/src/common/util.cpp b/src/common/util.cpp index 5cbfc861..5aa21efe 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005/06 by The Quassel Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -44,11 +44,11 @@ bool isChannelName(QString str) { return QString("#&!+").contains(str[0]); } -QString decodeString(QByteArray input, QString encoding) { +QString decodeString(const QByteArray &input, QTextCodec *codec) { // First, we check if it's utf8. It is very improbable to encounter a string that looks like // valid utf8, but in fact is not. This means that if the input string passes as valid utf8, it // is safe to assume that it is. - Q_ASSERT(sizeof(const char) == sizeof(quint8)); // just to make sure + // Q_ASSERT(sizeof(const char) == sizeof(quint8)); // In God we trust... bool isUtf8 = true; int cnt = 0; for(int i = 0; i < input.size(); i++) { @@ -69,14 +69,12 @@ QString decodeString(QByteArray input, QString encoding) { //qDebug() << "Detected utf8:" << s; return s; } - QTextCodec *codec = QTextCodec::codecForName(encoding.toAscii()); - if(!codec) { - qWarning() << QString("Invalid encoding: %1").arg(encoding); - return QString::fromAscii(input); - } + //QTextCodec *codec = QTextCodec::codecForName(encoding.toAscii()); + if(!codec) return QString::fromAscii(input); return codec->toUnicode(input); } +/* not needed anymore void writeDataToDevice(QIODevice *dev, const QVariant &item) { QByteArray block; QDataStream out(&block, QIODevice::WriteOnly); @@ -99,7 +97,7 @@ bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item) { in >> item; return true; } - +*/ uint editingDistance(const QString &s1, const QString &s2) { uint n = s1.size()+1; @@ -140,3 +138,21 @@ QByteArray methodName(const QMetaMethod &method) { QByteArray sig(method.signature()); return sig.left(sig.indexOf("(")); } + +QDir quasselDir() { + // kinda ugly, but I currently see no other way to do that +#ifdef Q_OS_WIN32 + QString quasselDir = QDir::homePath() + qgetenv("APPDATA") + "/quassel/"; +#else + QString quasselDir = QDir::homePath() + "/.quassel/"; +#endif + + QDir qDir(quasselDir); + if(!qDir.exists(quasselDir)) { + if(!qDir.mkpath(quasselDir)) { + qCritical() << "Unable to create Quassel data directory:" << qPrintable(qDir.absolutePath()); + } + } + + return qDir; +}