X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.h;h=bb90355e76e3a3f69f8e273009233d819bad8217;hp=28639ba97be6b1e3efe726ae2dddf06f7a89665f;hb=800b9cc3f9730953c74156f31aeff4d59ec7bade;hpb=6f99a6e2f39aaacabe8bb51a7bb1ff53c1b2082f

diff --git a/src/common/util.h b/src/common/util.h
index 28639ba9..bb90355e 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-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,19 +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>
 
-
 // TODO Use versions from Network instead
 QString nickFromMask(QString mask);
 QString userFromMask(QString mask);
@@ -37,6 +35,9 @@ 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);
 
 //! Take a string and decode it using the specified text codec, recognizing utf8.
@@ -50,41 +51,28 @@ QString decodeString(const QByteArray &input, QTextCodec *codec = 0);
 
 uint editingDistance(const QString &s1, const QString &s2);
 
-QDir quasselDir();
-
-//! Returns a list of data directory paths
-/** There are several locations for applications to install their data files in. On Unix,
- *  a common location is /usr/share; others include $PREFIX/share and additional directories
- *  specified in the env variable XDG_DATA_DIRS.
- *  \return A list of directory paths to look for data files in
- */
-QStringList dataDirPaths();
-
-//! Searches for a data file in the possible data directories
-/** Data files can reside in $DATA_DIR/apps/quassel, where $DATA_DIR is one of the directories
- *  returned by \sa dataDirPaths().
- *  \return The full path to the data file if found; a null QString else
- */
-QString findDataFilePath(const QString &fileName);
-
-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;
 }
 
+
+QByteArray prettyDigest(const QByteArray &digest);
+
 #endif