X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=14435bde118fe4d0367aaf73b84e40c12d9f7188;hp=a8a38875da75717a41329d8f6cb3bb71c626f456;hb=32023e27e875eede980d7323c1d05b5d4cc795d8;hpb=6f99a6e2f39aaacabe8bb51a7bb1ff53c1b2082f

diff --git a/src/common/util.cpp b/src/common/util.cpp
index a8a38875..14435bde 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,9 +23,7 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QFile>
-#include <QLibraryInfo>
 #include <QTextCodec>
-#include <QTranslator>
 
 #include "quassel.h"
 
@@ -62,6 +60,22 @@ QString stripFormatCodes(QString str) {
   return str;
 }
 
+QString stripAcceleratorMarkers(const QString &label_) {
+  QString label = label_;
+  int p = 0;
+  forever {
+    p = label.indexOf('&', p);
+    if(p < 0 || p + 1 >= label.length())
+      break;
+
+    if(label.at(p + 1).isLetterOrNumber() || label.at(p + 1) == '&')
+      label.remove(p, 1);
+
+    ++p;
+  }
+  return label;
+}
+
 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
@@ -92,31 +106,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;
@@ -135,14 +124,14 @@ uint editingDistance(const QString &s1, const QString &s2) {
       uint insertChar = matrix[i][j-1] + 1;
 
       if(deleteChar < insertChar)
-	min = deleteChar;
+        min = deleteChar;
       else
-	min = insertChar;
+        min = insertChar;
 
       if(s1[i-1] == s2[j-1]) {
-	uint inheritChar = matrix[i-1][j-1];
-	if(inheritChar < min)
-	  min = inheritChar;
+        uint inheritChar = matrix[i-1][j-1];
+        if(inheritChar < min)
+          min = inheritChar;
       }
 
       matrix[i][j] = min;
@@ -151,85 +140,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;
-}
-
-QStringList dataDirPaths() {
-  QStringList dataDirNames = QString(qgetenv("XDG_DATA_DIRS")).split(':', QString::SkipEmptyParts);
-
-  // Provide a fallback
-# ifdef Q_OS_UNIX
-  if(dataDirNames.isEmpty()) dataDirNames.append("/usr/share");
-  // on UNIX, we always check our install prefix
-  QString appDir = QCoreApplication::applicationDirPath();
-  int binpos = appDir.lastIndexOf("/bin");
-  if(binpos >= 0) {
-    appDir.replace(binpos, 4, "/share");
-    if(!dataDirNames.contains(appDir)) dataDirNames.append(appDir);
-  }
-# endif
-
-  return dataDirNames;
-}
-
-QString findDataFilePath(const QString &fileName) {
-  QStringList dataDirs = dataDirPaths();
-  foreach(QString dataDir, dataDirs) {
-    QString path = dataDir + "/apps/quassel/" + fileName;
-    if(QFile::exists(path))
-      return path;
-  }
-  return QString();
-}
-
-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")));
@@ -248,3 +158,14 @@ QString secondsToString(int timeInSeconds) {
     }
     return returnString.join(", ");
 }
+
+QByteArray prettyDigest(const QByteArray &digest) {
+  QByteArray hexDigest = digest.toHex().toUpper();
+  QByteArray prettyDigest;
+  prettyDigest.fill(':', hexDigest.count() + (hexDigest.count() / 2) - 1);
+
+  for(int i = 0; i * 2 < hexDigest.count(); i++) {
+    prettyDigest.replace(i * 3, 2, hexDigest.mid(i * 2, 2));
+  }
+  return prettyDigest;
+}