X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.h;h=92c9a5f4db6ae6906d367b4395fde15a834396b6;hp=36ef8139694005a1574dd2a933146d9c22463866;hb=41686743dca5b254a6f53a4a9e8f8b8d91acd041;hpb=665faa937a52fc6175741292737c4a52875b4f75

diff --git a/src/common/util.h b/src/common/util.h
index 36ef8139..92c9a5f4 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by the Quassel Project                          *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,18 +15,17 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef UTIL_H
 #define UTIL_H
 
 #include <QDir>
-#include <QLocale>
 #include <QVariant>
 #include <QString>
 #include <QMetaMethod>
-
+#include <QDateTime>
 
 // TODO Use versions from Network instead
 QString nickFromMask(QString mask);
@@ -34,6 +33,11 @@ QString userFromMask(QString mask);
 QString hostFromMask(QString mask);
 bool isChannelName(QString str);
 
+//! Strip mIRC format codes
+QString stripFormatCodes(QString);
+
+//! Remove accelerator markers (&) from the string
+QString stripAcceleratorMarkers(const QString &);
 
 QString secondsToString(int timeInSeconds);
 
@@ -48,10 +52,36 @@ QString decodeString(const QByteArray &input, QTextCodec *codec = 0);
 
 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;
+}
+
 
-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;
+}
 
-void loadTranslation(const QLocale &locale);
+
+QByteArray prettyDigest(const QByteArray &digest);
+
+/**
+ * Format a string with %%<text>%% to current date/timestamp via QDateTime.
+ *
+ * @param[in] formatStr String with format codes
+ * @return String with current date/time substituted in via formatting codes
+ */
+QString formatCurrentDateTimeInString(const QString &formatStr);
 
 #endif