X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.h;h=61530a0961e5bab0e5ae074578c55724068c83ce;hp=bbacda048a7027c77dabd8fd30fce43ce460c663;hb=b06a827aea68b050bf23c37e0162189a94595ee9;hpb=d5095471627f6399b277d7c6d06b6bbcb915c57f;ds=sidebyside

diff --git a/src/common/util.h b/src/common/util.h
index bbacda04..61530a09 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,28 +15,26 @@
  *   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
+#pragma once
 
-#include <QDir>
-#include <QLocale>
-#include <QVariant>
+#include <QList>
 #include <QString>
-#include <QMetaMethod>
-
+#include <QVariant>
 
-// TODO Use versions from Network instead
-QString nickFromMask(QString mask);
-QString userFromMask(QString mask);
-QString hostFromMask(QString mask);
-bool isChannelName(QString str);
+QString nickFromMask(const QString &mask);
+QString userFromMask(const QString &mask);
+QString hostFromMask(const QString &mask);
+bool isChannelName(const QString &str);
 
 //! Strip mIRC format codes
 QString stripFormatCodes(QString);
 
+//! Remove accelerator markers (&) from the string
+QString stripAcceleratorMarkers(const QString &);
+
 QString secondsToString(int timeInSeconds);
 
 //! Take a string and decode it using the specified text codec, recognizing utf8.
@@ -50,26 +48,34 @@ QString decodeString(const QByteArray &input, QTextCodec *codec = 0);
 
 uint editingDistance(const QString &s1, const QString &s2);
 
-QDir quasselDir();
-
-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;
+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;
+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
+
+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);