X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=5cbfc861b9219961a71562be94955869b9c5714e;hp=675a735a60c9093648245078f4d5f2feddf2c954;hb=a7f5d6a23f7214b11f6db85346a67fd7d02767da;hpb=8c3b7e4773e9f20ad9ea264cbaafaa52485bdf86

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 675a735a..5cbfc861 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -22,6 +22,8 @@
 #include <QDebug>
 #include <QTextCodec>
 
+class QMetaMethod;
+
 QString nickFromMask(QString mask) {
   return mask.section('!', 0, 0);
 }
@@ -51,19 +53,20 @@ QString decodeString(QByteArray input, QString encoding) {
   int cnt = 0;
   for(int i = 0; i < input.size(); i++) {
     if(cnt) {
-      if((input[i] & 0xc0) != 0x80) { isUtf8 = false; break; }  // Following byte does not start with 10
+      // We check a part of a multibyte char. These need to be of the form 10yyyyyy.
+      if((input[i] & 0xc0) != 0x80) { isUtf8 = false; break; }
       cnt--;
       continue;
     }
-    if(!(input[i] & 0x80)) continue; // 7 bit is ok
-    if((input[i] & 0xf8) == 0xf0) { cnt = 3; continue; }
-    if((input[i] & 0xf0) == 0xe0) { cnt = 2; continue; }
-    if((input[i] & 0xe0) == 0xc0) { cnt = 1; continue; }
+    if((input[i] & 0x80) == 0x00) continue; // 7 bit is always ok
+    if((input[i] & 0xf8) == 0xf0) { cnt = 3; continue; }  // 4-byte char 11110xxx 10yyyyyy 10zzzzzz 10vvvvvv
+    if((input[i] & 0xf0) == 0xe0) { cnt = 2; continue; }  // 3-byte char 1110xxxx 10yyyyyy 10zzzzzz
+    if((input[i] & 0xe0) == 0xc0) { cnt = 1; continue; }  // 2-byte char 110xxxxx 10yyyyyy
     isUtf8 = false; break;  // 8 bit char, but not utf8!
   }
   if(isUtf8 && cnt == 0) {
     QString s = QString::fromUtf8(input);
-    qDebug() << "Detected utf8:" << s;
+    //qDebug() << "Detected utf8:" << s;
     return s;
   }
   QTextCodec *codec = QTextCodec::codecForName(encoding.toAscii());
@@ -96,3 +99,44 @@ bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item) {
   in >> item;
   return true;
 }
+
+
+uint editingDistance(const QString &s1, const QString &s2) {
+  uint n = s1.size()+1;
+  uint m = s2.size()+1;
+  //uint matrix[n][m];
+  QVector< QVector< uint > >matrix(n,QVector<uint>(m,0));
+
+  for(uint i = 0; i < n; i++)
+    matrix[i][0] = i;
+
+  for(uint i = 0; i < m; i++)
+    matrix[0][i] = i;
+
+  uint min;
+  for(uint i = 1; i < n; i++) {
+    for(uint j = 1; j < m; j++) {
+      uint deleteChar = matrix[i-1][j] + 1;
+      uint insertChar = matrix[i][j-1] + 1;
+
+      if(deleteChar < insertChar)
+	min = deleteChar;
+      else
+	min = insertChar;
+      
+      if(s1[i-1] == s2[j-1]) {
+	uint inheritChar = matrix[i-1][j-1];
+	if(inheritChar < min)
+	  min = inheritChar;
+      }
+
+      matrix[i][j] = min;
+    }
+  }
+  return matrix[n-1][m-1];
+}
+
+QByteArray methodName(const QMetaMethod &method) {
+  QByteArray sig(method.signature());
+  return sig.left(sig.indexOf("("));
+}