X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=4698b30db7e57046548b946d2e7a258afc053fcc;hb=16f8531e383eade0a75a3b74ea11b909b8b1e049;hp=d7e7ae186f29afc3a431ad2426c249055addec64;hpb=d5095471627f6399b277d7c6d06b6bbcb915c57f;p=quassel.git diff --git a/src/common/util.cpp b/src/common/util.cpp index d7e7ae18..4698b30d 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -91,31 +92,6 @@ QString decodeString(const QByteArray &input, QTextCodec *codec) { return codec->toUnicode(input); } -/* not needed anymore -void writeDataToDevice(QIODevice *dev, const QVariant &item) { - QByteArray block; - QDataStream out(&block, QIODevice::WriteOnly); - out.setVersion(QDataStream::Qt_4_2); - out << (quint32)0 << item; - out.device()->seek(0); - out << (quint32)(block.size() - sizeof(quint32)); - dev->write(block); -} - -bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item) { - QDataStream in(dev); - in.setVersion(QDataStream::Qt_4_2); - - if(blockSize == 0) { - if(dev->bytesAvailable() < (int)sizeof(quint32)) return false; - in >> blockSize; - } - if(dev->bytesAvailable() < blockSize) return false; - in >> item; - return true; -} -*/ - uint editingDistance(const QString &s1, const QString &s2) { uint n = s1.size()+1; uint m = s2.size()+1; @@ -150,31 +126,6 @@ uint editingDistance(const QString &s1, const QString &s2) { return matrix[n-1][m-1]; } -QDir quasselDir() { - QString quasselDir; - if(Quassel::isOptionSet("datadir")) { - quasselDir = Quassel::optionValue("datadir"); - } else { - // FIXME use QDesktopServices -#ifdef Q_OS_WIN32 - quasselDir = qgetenv("APPDATA") + "/quassel/"; -#elif defined Q_WS_MAC - quasselDir = QDir::homePath() + "/Library/Application Support/Quassel/"; -#else - 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; -} - void loadTranslation(const QLocale &locale) { QTranslator *qtTranslator = QCoreApplication::instance()->findChild("QtTr"); QTranslator *quasselTranslator = QCoreApplication::instance()->findChild("QuasselTr");