Optimize tabcompleter and fix duplicate occurrence of last completion entry.

QStringList completionList is now QMap<QString,QString> completionMap.

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index fbd6904..f13636c 100644 (file)
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -41,11 +41,11 @@ TabCompleter::TabCompleter(InputLine *inputLine_)
 }
 
 void TabCompleter::buildCompletionList() {
-  completionList.clear();
+  completionMap.clear();
   // 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();
+    nextCompletion = completionMap.begin();
     return;
   }
   
@@ -71,17 +71,14 @@ 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;
 
   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 +96,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 +117,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();
+    }
   }
   
 }

diff --git a/src/uisupport/tabcompleter.h b/src/uisupport/tabcompleter.h
index 193b2f5..586ee5d 100644 (file)
--- a/src/uisupport/tabcompleter.h
+++ b/src/uisupport/tabcompleter.h
@@ -22,8 +22,9 @@
 #define _TABCOMPLETER_H_
 
 #include <QObject>
-#include <QStringList>
 #include <QPointer>
+#include <QString>
+#include <QMap>
 
 class InputLine;
 class IrcUser;
@@ -47,10 +48,10 @@ private:
   bool enabled;
   QString nickSuffix;
 
-  QStringList completionList;
+  QMap<QString, QString> completionMap;
   // QStringList completionTemplates;
   
-  QStringList::Iterator nextCompletion;
+  QMap<QString, QString>::Iterator nextCompletion;
   int lastCompletionLength;
   
   void buildCompletionList();