X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircchannel.cpp;h=eb63dd57da467f2cd6fbeda8081d2b683ca3f863;hp=f5710ba2f2871ac2e69e3337a0e555eb01de7938;hb=cd0868fff76dd067470881134fd736e1a1d97e71;hpb=723db5bff304ad3fdf5a0609198c65a66bfbaea7

diff --git a/src/common/ircchannel.cpp b/src/common/ircchannel.cpp
index f5710ba2..eb63dd57 100644
--- a/src/common/ircchannel.cpp
+++ b/src/common/ircchannel.cpp
@@ -73,18 +73,6 @@ bool IrcChannel::isValidChannelUserMode(const QString &mode) const {
   return isvalid;
 }
 
-QString IrcChannel::name() const {
-  return _name;
-}
-
-QString IrcChannel::topic() const {
-  return _topic;
-}
-
-QList<IrcUser *> IrcChannel::ircUsers() const {
-  return _userModes.keys();
-}
-
 QString IrcChannel::userModes(IrcUser *ircuser) const {
   if(_userModes.contains(ircuser))
     return _userModes[ircuser];
@@ -96,10 +84,6 @@ QString IrcChannel::userModes(const QString &nick) const {
   return userModes(network->ircUser(nick));
 }
 
-QTextCodec *IrcChannel::codecForEncoding() const {
-  return _codecForEncoding;
-}
-
 void IrcChannel::setCodecForEncoding(const QString &name) {
   setCodecForEncoding(QTextCodec::codecForName(name.toAscii()));
 }
@@ -108,10 +92,6 @@ void IrcChannel::setCodecForEncoding(QTextCodec *codec) {
   _codecForEncoding = codec;
 }
 
-QTextCodec *IrcChannel::codecForDecoding() const {
-  return _codecForDecoding;
-}
-
 void IrcChannel::setCodecForDecoding(const QString &name) {
   setCodecForDecoding(QTextCodec::codecForName(name.toAscii()));
 }
@@ -140,21 +120,67 @@ void IrcChannel::setTopic(const QString &topic) {
   emit topicSet(topic);
 }
 
-void IrcChannel::join(IrcUser *ircuser) {
-  if(!_userModes.contains(ircuser) && ircuser) {
-    _userModes[ircuser] = QString();
+void IrcChannel::setPassword(const QString &password) {
+  _password = password;
+  emit passwordSet(password);
+}
+
+void IrcChannel::joinIrcUsers(const QList<IrcUser *> &users, const QStringList &modes) {
+  if(users.isEmpty())
+    return;
+
+  if(users.count() != modes.count()) {
+    qWarning() << "IrcChannel::addUsers(): number of nicks does not match number of modes!";
+    return;
+  }
+
+  QStringList newNicks;
+  QStringList newModes;
+  QList<IrcUser *> newUsers;
+
+  IrcUser *ircuser;
+  for(int i = 0; i < users.count(); i++) {
+    ircuser = users[i];
+    if(!ircuser || _userModes.contains(ircuser))
+      continue;
+
+    _userModes[ircuser] = modes[i];
     ircuser->joinChannel(this);
     //qDebug() << "JOIN" << name() << ircuser->nick() << ircUsers().count();
     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
-    emit ircUserJoined(ircuser);
+
+    newNicks << ircuser->nick();
+    newModes << modes[i];
+    newUsers << ircuser;
   }
+
+  if(newNicks.isEmpty())
+    return;
+  
+  emit ircUsersJoined(newUsers);
+  emit ircUsersJoined(newNicks, newModes);
+}
+
+void IrcChannel::joinIrcUsers(const QStringList &nicks, const QStringList &modes) {
+  QList<IrcUser *> users;
+  foreach(QString nick, nicks)
+    users << network->newIrcUser(nick);
+  joinIrcUsers(users, modes);
+}
+		      
+void IrcChannel::joinIrcUsers(IrcUser *ircuser) {
+  QList <IrcUser *> users;
+  users << ircuser;
+  QStringList modes;
+  modes << QString();
+  joinIrcUsers(users, modes);
 }
 
-void IrcChannel::join(const QString &nick) {
-  join(network->ircUser(nick));
+void IrcChannel::joinIrcUsers(const QString &nick) {
+  joinIrcUsers(network->newIrcUser(nick));
 }
 
 void IrcChannel::part(IrcUser *ircuser) {