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 db1c6da..4698b30 100644 (file)
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,8 +19,15 @@
  ***************************************************************************/
 
 #include "util.h"
+
+#include <QCoreApplication>
 #include <QDebug>
+#include <QFile>
+#include <QLibraryInfo>
 #include <QTextCodec>
+#include <QTranslator>
+
+#include "quassel.h"
 
 class QMetaMethod;
 
@@ -44,11 +51,22 @@ bool isChannelName(QString str) {
   return QString("#&!+").contains(str[0]);
 }
 
-QString decodeString(QByteArray input, QString encoding) {
+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
   // 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,42 +87,14 @@ 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);
 }
 
-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;
-  //uint matrix[n][m];
   QVector< QVector< uint > >matrix(n,QVector<uint>(m,0));
 
   for(uint i = 0; i < n; i++)
@@ -123,7 +113,7 @@ uint editingDistance(const QString &s1, const QString &s2) {
        min = deleteChar;
       else
        min = insertChar;
-      
+
       if(s1[i-1] == s2[j-1]) {
        uint inheritChar = matrix[i-1][j-1];
        if(inheritChar < min)
@@ -136,7 +126,47 @@ 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("("));
+void loadTranslation(const QLocale &locale) {
+  QTranslator *qtTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QtTr");
+  QTranslator *quasselTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QuasselTr");
+
+  if(!qtTranslator) {
+    qtTranslator = new QTranslator(qApp);
+    qtTranslator->setObjectName("QtTr");
+    qApp->installTranslator(qtTranslator);
+  }
+  if(!quasselTranslator) {
+    quasselTranslator = new QTranslator(qApp);
+    quasselTranslator->setObjectName("QuasselTr");
+    qApp->installTranslator(quasselTranslator);
+  }
+
+  QLocale::setDefault(locale);
+
+  if(locale.language() == QLocale::C)
+    return;
+
+  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()));
+}
+
+QString secondsToString(int timeInSeconds) {
+    QList< QPair<int, QString> > timeUnit;
+    timeUnit.append(qMakePair(365*24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")));
+    timeUnit.append(qMakePair(24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "day")));
+    timeUnit.append(qMakePair(60*60, QCoreApplication::translate("Quassel::secondsToString()", "h")));
+    timeUnit.append(qMakePair(60, QCoreApplication::translate("Quassel::secondsToString()", "min")));
+    timeUnit.append(qMakePair(1, QCoreApplication::translate("Quassel::secondsToString()", "sec")));
+
+    QStringList returnString;
+    for(int i=0; i < timeUnit.size(); i++) {
+      int n = timeInSeconds / timeUnit[i].first;
+      if(n > 0) {
+        returnString += QString("%1 %2").arg(QString::number(n), timeUnit[i].second);
+      }
+      timeInSeconds = timeInSeconds % timeUnit[i].first;
+    }
+    return returnString.join(", ");
 }