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

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

diff --git a/src/common/util.h b/src/common/util.h
index 5c954b2..66a36e2 100644 (file)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -18,11 +18,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef UTIL_H
+#define UTIL_H
 
 #include <QDir>
-#include <QIODevice>
+#include <QLocale>
 #include <QVariant>
 #include <QString>
 #include <QMetaMethod>
@@ -34,6 +34,8 @@ QString userFromMask(QString mask);
 QString hostFromMask(QString mask);
 bool isChannelName(QString str);
 
+//! Strip mIRC format codes
+QString stripFormatCodes(QString);
 
 QString secondsToString(int timeInSeconds);
 
@@ -46,14 +48,26 @@ QString secondsToString(int timeInSeconds);
  */
 QString decodeString(const QByteArray &input, QTextCodec *codec = 0);
 
-// NOTE: We have static copies of these in SignalProxy...
-//void writeDataToDevice(QIODevice *, const QVariant &);
-//bool readDataFromDevice(QIODevice *, quint32 &, QVariant &);
-
 uint editingDistance(const QString &s1, const QString &s2);
 
-QByteArray methodName(const QMetaMethod &method);
+void loadTranslation(const QLocale &locale);
+
+template<typename T>
+QVariantList toVariantList(const QList<T> &list) {
+  QVariantList variants;
+  for(int i = 0; i < list.count(); i++) {
+    variants << QVariant::fromValue<T>(list[i]);
+  }
+  return variants;
+}
 
-QDir quasselDir();
+template<typename T>
+QList<T> fromVariantList(const QVariantList &variants) {
+  QList<T> list;
+  for(int i = 0; i < variants.count(); i++) {
+    list << variants[i].value<T>();
+  }
+  return list;
+}
 
 #endif