Get rid of the old path finding methods in util.cpp

[quassel.git] / src / common / util.cpp

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 1b75f29..4698b30 100644 (file)
--- 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,8 @@
 
 #include <QCoreApplication>
 #include <QDebug>
+#include <QFile>
+#include <QLibraryInfo>
 #include <QTextCodec>
 #include <QTranslator>
 
@@ -49,6 +51,17 @@ bool isChannelName(QString str) {
   return QString("#&!+").contains(str[0]);
 }
 
+QString stripFormatCodes(QString str) {
+  str.remove(QRegExp("\x03(\\d\\d?(,\\d\\d?)?)?"));
+  str.remove('\x02');
+  str.remove('\x0f');
+  str.remove('\x12');
+  str.remove('\x16');
+  str.remove('\x1d');
+  str.remove('\x1f');
+  return str;
+}
+
 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
@@ -79,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;
@@ -138,55 +126,30 @@ uint editingDistance(const QString &s1, const QString &s2) {
   return matrix[n-1][m-1];
 }
 
-QByteArray methodName(const QMetaMethod &method) {
-  QByteArray sig(method.signature());
-  return sig.left(sig.indexOf("("));
-}
-
-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<QTranslator *>("QtTr");
   QTranslator *quasselTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QuasselTr");
-  Q_ASSERT(qtTranslator);
-  Q_ASSERT(quasselTranslator);
 
-  QLocale::setDefault(locale);
+  if(!qtTranslator) {
+    qtTranslator = new QTranslator(qApp);
+    qtTranslator->setObjectName("QtTr");
+    qApp->installTranslator(qtTranslator);
+  }
+  if(!quasselTranslator) {
+    quasselTranslator = new QTranslator(qApp);
+    quasselTranslator->setObjectName("QuasselTr");
+    qApp->installTranslator(quasselTranslator);
+  }
 
-  QCoreApplication::removeTranslator(qtTranslator);
-  QCoreApplication::removeTranslator(quasselTranslator);
+  QLocale::setDefault(locale);
 
   if(locale.language() == QLocale::C)
     return;
 
-  qtTranslator->load(QString(":i18n/qt_%1").arg(locale.name()));
+  bool success = qtTranslator->load(QString(":i18n/qt_%1").arg(locale.name()));
+  if(!success)
+    qtTranslator->load(QString("%2/qt_%1").arg(locale.name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)));
   quasselTranslator->load(QString(":i18n/quassel_%1").arg(locale.name()));
-
-  QCoreApplication::installTranslator(qtTranslator);
-  QCoreApplication::installTranslator(quasselTranslator);
 }
 
 QString secondsToString(int timeInSeconds) {