X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Ftabcompleter.cpp;h=cd82ee2b8d4f38e0fd87ce3ffdc69e871b0de6b1;hp=fbd69047c9c62a3dde1968d972660adac55ae32b;hb=599218b03a48c53299b6c539208508a25f855164;hpb=f5539e2ce05f5beac9d789ec615ded695f325fc7

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index fbd69047..cd82ee2b 100644
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -41,13 +41,14 @@ TabCompleter::TabCompleter(InputLine *inputLine_)
 }
 
 void TabCompleter::buildCompletionList() {
-  completionList.clear();
+  // 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 = completionList.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();
@@ -70,18 +71,15 @@ void TabCompleter::buildCompletionList() {
   */
 
   QString tabAbbrev = inputLine->text().left(inputLine->cursorPosition()).section(' ',-1,-1);
-  QRegExp regex(QString("^[^a-zA-Z]*").append(tabAbbrev), Qt::CaseInsensitive);
-  QMap<QString, QString> sortMap;
+  QRegExp regex(QString("^[^a-zA-Z]*").append(QRegExp::escape(tabAbbrev)), Qt::CaseInsensitive);
 
   foreach(IrcUser *ircUser, channel->ircUsers()) {
     if(regex.indexIn(ircUser->nick()) > -1) {
-      sortMap[ircUser->nick().toLower()] = ircUser->nick();
+      completionMap[ircUser->nick().toLower()] = ircUser->nick();
     }
   }
-  foreach (QString str, sortMap)
-    completionList << str;
 
-  nextCompletion = completionList.begin();
+  nextCompletion = completionMap.begin();
   lastCompletionLength = tabAbbrev.length();
 }
 
@@ -99,7 +97,7 @@ void TabCompleter::complete() {
     enabled = true;
   }
   
-  if (nextCompletion != completionList.end()) {
+  if (nextCompletion != completionMap.end()) {
     // clear previous completion
     for (int i = 0; i < lastCompletionLength; i++) {
       inputLine->backspace();
@@ -120,7 +118,10 @@ void TabCompleter::complete() {
 
   // we're at the end of the list -> start over again
   } else {
-    nextCompletion = completionList.begin();
+    if(!completionMap.isEmpty()) {
+      nextCompletion = completionMap.begin();
+      complete();
+    }
   }
   
 }