Merge pull request #146 from benapetr/master

Clean up

diff --combined src/common/ircchannel.cpp
index 7a1230c,be1347b..53e495a
--- 1/src/common/ircchannel.cpp
--- 2/src/common/ircchannel.cpp
+++ b/src/common/ircchannel.cpp
@@@ -73,7 -73,7 +73,7 @@@ bool IrcChannel::isValidChannelUserMode
  {
      bool isvalid = true;
      if (mode.size() > 1) {
-         qWarning() << "Channel" << name() << "received Channel User Mode which is longer then 1 Char:" << mode;
+         qWarning() << "Channel" << name() << "received Channel User Mode which is longer than 1 Char:" << mode;
          isvalid = false;
      }
      return isvalid;
@@@ -187,8 -187,8 +187,8 @@@ void IrcChannel::joinIrcUsers(const QLi
          connect(ircuser, SIGNAL(nickSet(QString)), this, SLOT(ircUserNickSet(QString)));
  
          // connect(ircuser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
-         // if you wonder why there is no counterpart to ircUserJoined:
-         // the joines are propagted by the ircuser. the signal ircUserJoined is only for convenience
+         // If you wonder why there is no counterpart to ircUserJoined:
+         // the joins are propagated by the ircuser. The signal ircUserJoined is only for convenience
  
          newNicks << ircuser->nick();
          newModes << modes[i];
@@@ -227,8 -227,8 +227,8 @@@ void IrcChannel::part(IrcUser *ircuser
      if (isKnownUser(ircuser)) {
          _userModes.remove(ircuser);
          ircuser->partChannel(this);
-         // if you wonder why there is no counterpart to ircUserParted:
-         // the joines are propagted by the ircuser. the signal ircUserParted is only for convenience
+         // If you wonder why there is no counterpart to ircUserParted:
+         // the joins are propagted by the ircuser. The signal ircUserParted is only for convenience
          disconnect(ircuser, 0, this, 0);
          emit ircUserParted(ircuser);
  
@@@ -321,7 -321,7 +321,7 @@@ QVariantMap IrcChannel::initUserModes(
      QHash<IrcUser *, QString>::const_iterator iter = _userModes.constBegin();
      while (iter != _userModes.constEnd()) {
          usermodes[iter.key()->nick()] = iter.value();
 -        iter++;
 +        ++iter;
      }
      return usermodes;
  }
@@@ -335,7 -335,7 +335,7 @@@ void IrcChannel::initSetUserModes(cons
      while (iter != usermodes.constEnd()) {
          users << network()->newIrcUser(iter.key());
          modes << iter.value().toString();
 -        iter++;
 +        ++iter;
      }
      joinIrcUsers(users, modes);
  }
@@@ -349,7 -349,7 +349,7 @@@ QVariantMap IrcChannel::initChanModes(
      QHash<QChar, QStringList>::const_iterator A_iter = _A_channelModes.constBegin();
      while (A_iter != _A_channelModes.constEnd()) {
          A_modes[A_iter.key()] = A_iter.value();
 -        A_iter++;
 +        ++A_iter;
      }
      channelModes["A"] = A_modes;
  
@@@ -357,7 -357,7 +357,7 @@@
      QHash<QChar, QString>::const_iterator B_iter = _B_channelModes.constBegin();
      while (B_iter != _B_channelModes.constEnd()) {
          B_modes[B_iter.key()] = B_iter.value();
 -        B_iter++;
 +        ++B_iter;
      }
      channelModes["B"] = B_modes;
  
@@@ -365,7 -365,7 +365,7 @@@
      QHash<QChar, QString>::const_iterator C_iter = _C_channelModes.constBegin();
      while (C_iter != _C_channelModes.constEnd()) {
          C_modes[C_iter.key()] = C_iter.value();
 -        C_iter++;
 +        ++C_iter;
      }
      channelModes["C"] = C_modes;
  
@@@ -373,7 -373,7 +373,7 @@@
      QSet<QChar>::const_iterator D_iter = _D_channelModes.constBegin();
      while (D_iter != _D_channelModes.constEnd()) {
          D_modes += *D_iter;
 -        D_iter++;
 +        ++D_iter;
      }
      channelModes["D"] = D_modes;
  
@@@ -387,21 -387,21 +387,21 @@@ void IrcChannel::initSetChanModes(cons
      QVariantMap::const_iterator iterEnd = channelModes["A"].toMap().constEnd();
      while (iter != iterEnd) {
          _A_channelModes[iter.key()[0]] = iter.value().toStringList();
 -        iter++;
 +        ++iter;
      }
  
      iter = channelModes["B"].toMap().constBegin();
      iterEnd = channelModes["B"].toMap().constEnd();
      while (iter != iterEnd) {
          _B_channelModes[iter.key()[0]] = iter.value().toString();
 -        iter++;
 +        ++iter;
      }
  
      iter = channelModes["C"].toMap().constBegin();
      iterEnd = channelModes["C"].toMap().constEnd();
      while (iter != iterEnd) {
          _C_channelModes[iter.key()[0]] = iter.value().toString();
 -        iter++;
 +        ++iter;
      }
  
      QString D_modes = channelModes["D"].toString();
@@@ -468,7 -468,7 +468,7 @@@ void IrcChannel::ircUserNickSet(QStrin
   * C --> set value or remove
   * D --> on/off
   *
-  * B and C behave very similar... we store the data in different datastructes
+  * B and C behave very similar... we store the data in different datastructures
   * for future compatibility
   ******************************************************************************/
  
@@@ -596,21 -596,21 +596,21 @@@ QString IrcChannel::channelModeString(
      QSet<QChar>::const_iterator D_iter = _D_channelModes.constBegin();
      while (D_iter != _D_channelModes.constEnd()) {
          modeString += *D_iter;
 -        D_iter++;
 +        ++D_iter;
      }
  
      QHash<QChar, QString>::const_iterator BC_iter = _C_channelModes.constBegin();
      while (BC_iter != _C_channelModes.constEnd()) {
          modeString += BC_iter.key();
          params << BC_iter.value();
 -        BC_iter++;
 +        ++BC_iter;
      }
  
      BC_iter = _B_channelModes.constBegin();
      while (BC_iter != _B_channelModes.constEnd()) {
          modeString += BC_iter.key();
          params << BC_iter.value();
 -        BC_iter++;
 +        ++BC_iter;
      }
      if (modeString.isEmpty())
          return modeString;