X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Futil.h;h=9354620a941d4dfb05a84a485da21e12624308cf;hb=48ed2b53aeb10bcbda6cdc46696bf649c0f6e670;hp=ba47adfa5ce7096955588a2975373c5856a306ed;hpb=e008cd12ef319c4b5f9fe5a8cc1524829551771d;p=quassel.git diff --git a/src/common/util.h b/src/common/util.h index ba47adfa..9354620a 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005/06 by the Quassel IRC Team * + * Copyright (C) 2005/06 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -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);