Deuglify channel state icons

[quassel.git] / src / uisupport / tabcompleter.cpp

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index f13636c..93a0fa4 100644 (file)
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -41,43 +41,49 @@ TabCompleter::TabCompleter(InputLine *inputLine_)
 }
 
 void TabCompleter::buildCompletionList() {
+  // ensure a safe state in case we return early.
   completionMap.clear();
+  nextCompletion = completionMap.begin();
+
   // this is the first time tab is pressed -> build up the completion list and it's iterator
   QModelIndex currentIndex = Client::bufferModel()->currentIndex();
-  if(!currentIndex.data(NetworkModel::BufferIdRole).isValid()) {
-    nextCompletion = completionMap.begin();
+  if(!currentIndex.data(NetworkModel::BufferIdRole).isValid())
     return;
-  }
   
   NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
-  QString channelName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
+  QString bufferName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
 
   const Network *network = Client::network(networkId);
   if(!network)
     return;
 
-  IrcChannel *channel = network->ircChannel(channelName);
-  if(!channel)
-    return;
-
-  // FIXME commented for debugging
-  /*
-  disconnect(this, SLOT(ircUserJoinedOrParted(IrcUser *)));
-  connect(channel, SIGNAL(ircUserJoined(IrcUser *)),
-         this, SLOT(ircUserJoinedOrParted(IrcUser *)));
-  connect(channel, SIGNAL(ircUserParted(IrcUser *)),
-         this, SLOT(ircUserJoinedOrParted(IrcUser *)));
-  */
 
   QString tabAbbrev = inputLine->text().left(inputLine->cursorPosition()).section(' ',-1,-1);
-  QRegExp regex(QString("^[^a-zA-Z]*").append(tabAbbrev), Qt::CaseInsensitive);
-
-  foreach(IrcUser *ircUser, channel->ircUsers()) {
-    if(regex.indexIn(ircUser->nick()) > -1) {
-      completionMap[ircUser->nick().toLower()] = ircUser->nick();
+  QRegExp regex(QString("^[^a-zA-Z]*").append(QRegExp::escape(tabAbbrev)), Qt::CaseInsensitive);
+
+  switch(static_cast<BufferInfo::Type>(currentIndex.data(NetworkModel::BufferTypeRole).toInt())) {
+  case BufferInfo::ChannelBuffer:
+    { // scope is needed for local var declaration
+      IrcChannel *channel = network->ircChannel(bufferName);
+      if(!channel)
+       return;
+      foreach(IrcUser *ircUser, channel->ircUsers()) {
+       if(regex.indexIn(ircUser->nick()) > -1)
+         completionMap[ircUser->nick().toLower()] = ircUser->nick();
+      }
     }
+    break;
+  case BufferInfo::QueryBuffer:
+    if(regex.indexIn(bufferName) > -1)
+      completionMap[bufferName.toLower()] = bufferName;
+  case BufferInfo::StatusBuffer:
+    if(!network->myNick().isEmpty() && regex.indexIn(network->myNick()) > -1)
+      completionMap[network->myNick().toLower()] = network->myNick();
+    break;
+  default:
+    return;
   }
-
+  
   nextCompletion = completionMap.begin();
   lastCompletionLength = tabAbbrev.length();
 }
@@ -110,7 +116,7 @@ void TabCompleter::complete() {
     nextCompletion++;
     
     // we're completing the first word of the line
-    if(inputLine->text().length() == lastCompletionLength) {
+    if(inputLine->cursorPosition() == lastCompletionLength) {
       inputLine->insert(nickSuffix);
       lastCompletionLength += nickSuffix.length();
     }