X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=45f99e9b5894c83f8cd8d38893d18e8a297de8d6;hp=14435bde118fe4d0367aaf73b84e40c12d9f7188;hb=68ee619cbd98ba95c12efb12a7d32d5ca567b40e;hpb=f8275c3b697f1ee43d93bb4e5e688e87ca0405ce diff --git a/src/common/util.cpp b/src/common/util.cpp index 14435bde..45f99e9b 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2010 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,7 +15,7 @@ * 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. * ***************************************************************************/ #include "util.h" @@ -29,119 +29,143 @@ class QMetaMethod; -QString nickFromMask(QString mask) { - return mask.section('!', 0, 0); +// MIBenum values from http://www.iana.org/assignments/character-sets/character-sets.xml#table-character-sets-1 +static QList utf8DetectionBlacklist = QList() + << 39 /* ISO-2022-JP */; + +QString nickFromMask(QString mask) +{ + return mask.section('!', 0, 0); } -QString userFromMask(QString mask) { - QString userhost = mask.section('!', 1); - if(userhost.isEmpty()) return QString(); - return userhost.section('@', 0, 0); + +QString userFromMask(QString mask) +{ + QString userhost = mask.section('!', 1); + if (userhost.isEmpty()) return QString(); + return userhost.section('@', 0, 0); } -QString hostFromMask(QString mask) { - QString userhost = mask.section('!', 1); - if(userhost.isEmpty()) return QString(); - return userhost.section('@', 1); + +QString hostFromMask(QString mask) +{ + QString userhost = mask.section('!', 1); + if (userhost.isEmpty()) return QString(); + return userhost.section('@', 1); } -bool isChannelName(QString str) { - return QString("#&!+").contains(str[0]); + +bool isChannelName(QString str) +{ + return QString("#&!+").contains(str[0]); } -QString stripFormatCodes(QString str) { - str.remove(QRegExp("\x03(\\d\\d?(,\\d\\d?)?)?")); - str.remove('\x02'); - str.remove('\x0f'); - str.remove('\x12'); - str.remove('\x16'); - str.remove('\x1d'); - str.remove('\x1f'); - return str; + +QString stripFormatCodes(QString str) +{ + str.remove(QRegExp("\x03(\\d\\d?(,\\d\\d?)?)?")); + str.remove('\x02'); + str.remove('\x0f'); + str.remove('\x12'); + str.remove('\x16'); + str.remove('\x1d'); + str.remove('\x1f'); + return str; } -QString stripAcceleratorMarkers(const QString &label_) { - QString label = label_; - int p = 0; - forever { - p = label.indexOf('&', p); - if(p < 0 || p + 1 >= label.length()) - break; - if(label.at(p + 1).isLetterOrNumber() || label.at(p + 1) == '&') - label.remove(p, 1); +QString stripAcceleratorMarkers(const QString &label_) +{ + QString label = label_; + int p = 0; + forever { + p = label.indexOf('&', p); + if (p < 0 || p + 1 >= label.length()) + break; + + if (label.at(p + 1).isLetterOrNumber() || label.at(p + 1) == '&') + label.remove(p, 1); - ++p; - } - return label; + ++p; + } + return label; } -QString decodeString(const QByteArray &input, QTextCodec *codec) { - // First, we check if it's utf8. It is very improbable to encounter a string that looks like - // valid utf8, but in fact is not. This means that if the input string passes as valid utf8, it - // is safe to assume that it is. - // Q_ASSERT(sizeof(const char) == sizeof(quint8)); // In God we trust... - bool isUtf8 = true; - int cnt = 0; - for(int i = 0; i < input.size(); i++) { - if(cnt) { - // 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; + +QString decodeString(const QByteArray &input, QTextCodec *codec) +{ + if (codec && utf8DetectionBlacklist.contains(codec->mibEnum())) + return codec->toUnicode(input); + + // First, we check if it's utf8. It is very improbable to encounter a string that looks like + // valid utf8, but in fact is not. This means that if the input string passes as valid utf8, it + // is safe to assume that it is. + // Q_ASSERT(sizeof(const char) == sizeof(quint8)); // In God we trust... + bool isUtf8 = true; + int cnt = 0; + for (int i = 0; i < input.size(); i++) { + if (cnt) { + // 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) == 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; + return s; } - 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; - return s; - } - //QTextCodec *codec = QTextCodec::codecForName(encoding.toAscii()); - if(!codec) return QString::fromAscii(input); - return codec->toUnicode(input); + //QTextCodec *codec = QTextCodec::codecForName(encoding.toAscii()); + if (!codec) return QString::fromAscii(input); + return codec->toUnicode(input); } -uint editingDistance(const QString &s1, const QString &s2) { - uint n = s1.size()+1; - uint m = s2.size()+1; - QVector< QVector< uint > >matrix(n,QVector(m,0)); - for(uint i = 0; i < n; i++) - matrix[i][0] = i; +uint editingDistance(const QString &s1, const QString &s2) +{ + uint n = s1.size()+1; + uint m = s2.size()+1; + QVector > matrix(n, QVector(m, 0)); + + for (uint i = 0; i < n; i++) + matrix[i][0] = i; - for(uint i = 0; i < m; i++) - matrix[0][i] = 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; + 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 (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; - } + if (s1[i-1] == s2[j-1]) { + uint inheritChar = matrix[i-1][j-1]; + if (inheritChar < min) + min = inheritChar; + } - matrix[i][j] = min; + matrix[i][j] = min; + } } - } - return matrix[n-1][m-1]; + return matrix[n-1][m-1]; } -QString secondsToString(int timeInSeconds) { - QList< QPair > timeUnit; + +QString secondsToString(int timeInSeconds) +{ + QList > timeUnit; timeUnit.append(qMakePair(365*24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year"))); timeUnit.append(qMakePair(24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "day"))); timeUnit.append(qMakePair(60*60, QCoreApplication::translate("Quassel::secondsToString()", "h"))); @@ -149,23 +173,25 @@ QString secondsToString(int timeInSeconds) { timeUnit.append(qMakePair(1, QCoreApplication::translate("Quassel::secondsToString()", "sec"))); QStringList returnString; - for(int i=0; i < timeUnit.size(); i++) { - int n = timeInSeconds / timeUnit[i].first; - if(n > 0) { - returnString += QString("%1 %2").arg(QString::number(n), timeUnit[i].second); - } - timeInSeconds = timeInSeconds % timeUnit[i].first; + for (int i = 0; i < timeUnit.size(); i++) { + int n = timeInSeconds / timeUnit[i].first; + if (n > 0) { + returnString += QString("%1 %2").arg(QString::number(n), timeUnit[i].second); + } + timeInSeconds = timeInSeconds % timeUnit[i].first; } return returnString.join(", "); } -QByteArray prettyDigest(const QByteArray &digest) { - QByteArray hexDigest = digest.toHex().toUpper(); - QByteArray prettyDigest; - prettyDigest.fill(':', hexDigest.count() + (hexDigest.count() / 2) - 1); - for(int i = 0; i * 2 < hexDigest.count(); i++) { - prettyDigest.replace(i * 3, 2, hexDigest.mid(i * 2, 2)); - } - return prettyDigest; +QByteArray prettyDigest(const QByteArray &digest) +{ + QByteArray hexDigest = digest.toHex().toUpper(); + QByteArray prettyDigest; + prettyDigest.fill(':', hexDigest.count() + (hexDigest.count() / 2) - 1); + + for (int i = 0; i * 2 < hexDigest.count(); i++) { + prettyDigest.replace(i * 3, 2, hexDigest.mid(i * 2, 2)); + } + return prettyDigest; }