X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.h;h=0e205fd88626da7e487fdf532a26946e82a3385d;hp=ba47adfa5ce7096955588a2975373c5856a306ed;hb=79fbcfb49f7cc92a89f0158ebac1a3006a559e8a;hpb=e008cd12ef319c4b5f9fe5a8cc1524829551771d

diff --git a/src/common/util.h b/src/common/util.h
index ba47adfa..0e205fd8 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005/06 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,37 +18,55 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef UTIL_H
+#define UTIL_H
 
-#include <QIODevice>
+#include <QDir>
 #include <QVariant>
 #include <QString>
 #include <QMetaMethod>
 
 
-// TODO Use versions from NetworkInfo instead
+// TODO Use versions from Network instead
 QString nickFromMask(QString mask);
 QString userFromMask(QString mask);
 QString hostFromMask(QString mask);
 bool isChannelName(QString str);
 
+//! Strip mIRC format codes
+QString stripFormatCodes(QString);
+
+QString secondsToString(int timeInSeconds);
 
 //! Take a string and decode it using the specified text codec, recognizing utf8.
 /** This function takes a string and first checks if it is encoded in utf8, in which case it is
  *  decoded appropriately. Otherwise, the specified text codec is used to transform the string.
  *  \param input The input string containing encoded data
- *  \param encoding The text codec we use if the input is not utf8
+ *  \param codec The text codec we use if the input is not utf8
  *  \return The decoded string.
  */
 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);
+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;
+}
+
+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;
+}
+
+QByteArray prettyDigest(const QByteArray &digest);
 
 #endif