X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.h;h=342356fa38a5c2a0e486f99eb25e9fb00489ad6b;hp=1a6d889f032e8c8d196ae42ba0f5a29bb4709cf7;hb=45d9ea6ed5d64eec3ca351fdcf7610c7cff3529d;hpb=077d44f36d2f5c730283ef6be839aea7dd073d56

diff --git a/src/common/util.h b/src/common/util.h
index 1a6d889f..342356fa 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by The Quassel Team                             *
+ *   Copyright (C) 2005/06 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -24,11 +24,21 @@
 #include <QIODevice>
 #include <QVariant>
 #include <QString>
+#include <QMetaMethod>
 
 QString nickFromMask(QString mask);
 QString userFromMask(QString mask);
 QString hostFromMask(QString mask);
 
+//! 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 encoding we assume if it's not utf8
+ *  \return The decoded string.
+ */
+QString decodeString(QByteArray input, QString encoding = "ISO-8859-15");
+
 bool isChannelName(QString str);
 
 /**
@@ -45,7 +55,8 @@ void writeDataToDevice(QIODevice *, const QVariant &);
 bool readDataFromDevice(QIODevice *, quint32 &, QVariant &);
 
 
+uint editingDistance(const QString &s1, const QString &s2);
 
-
+QByteArray methodName(const QMetaMethod &method);
 
 #endif