X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Futil.h;h=9354620a941d4dfb05a84a485da21e12624308cf;hb=0d53027b95e4bd9ca369bd909c17cf13612f7dd5;hp=6fb9c9767fb4a4532fca476fdad829bf10a2cf61;hpb=8699dd758516d0ded076811e8ea656adc95e69d0;p=quassel.git diff --git a/src/common/util.h b/src/common/util.h index 6fb9c976..9354620a 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -27,7 +27,7 @@ #include -// TODO Use versions from NetworkInfo instead +// TODO Use versions from Network instead QString nickFromMask(QString mask); QString userFromMask(QString mask); QString hostFromMask(QString mask); @@ -38,7 +38,7 @@ bool isChannelName(QString str); /** 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 codec we use if the input is not utf8 + * \param codec The text codec we use if the input is not utf8 * \return The decoded string. */ QString decodeString(const QByteArray &input, QTextCodec *codec = 0);