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

diff --git a/src/common/util.h b/src/common/util.h
index 1a6d889f..01797233 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -29,6 +29,15 @@ 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 +54,7 @@ void writeDataToDevice(QIODevice *, const QVariant &);
 bool readDataFromDevice(QIODevice *, quint32 &, QVariant &);
 
 
-
+uint editingDistance(const QString &s1, const QString &s2);
 
 
 #endif