From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 1 Jul 2008 18:14:39 +0000 (+0200)
Subject: Merge branch 'seezer'
X-Git-Tag: 0.3.0~329
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=bf01681e9e6108517bfa997422b84e04b801a40a;hp=6ad19e08fcfcf299f7c7746de01a2b1c7d1b6974

Merge branch 'seezer'
---

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index c68b6953..87a745ad 100644
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -29,6 +29,8 @@
 #include "ircuser.h"
 #include "uisettings.h"
 
+#include <QRegExp>
+
 TabCompleter::TabCompleter(InputLine *inputLine_)
   : QObject(inputLine_),
     inputLine(inputLine_),
@@ -69,12 +71,17 @@ void TabCompleter::buildCompletionList() {
   completionList.clear();
   QString tabAbbrev = inputLine->text().left(inputLine->cursorPosition()).section(' ',-1,-1);
   completionList.clear();
+  QRegExp regex(QString("^[^a-zA-Z]*").append(tabAbbrev), Qt::CaseInsensitive);
+  QMap<QString, QString> sortMap;
+
   foreach(IrcUser *ircUser, channel->ircUsers()) {
-    if(ircUser->nick().toLower().startsWith(tabAbbrev.toLower())) {
-      completionList << ircUser->nick();
+    if(regex.indexIn(ircUser->nick()) > -1) {
+      sortMap[ircUser->nick().toLower()] = ircUser->nick();
     }
   }
-  completionList.sort();
+  foreach (QString str, sortMap)
+    completionList << str;
+
   nextCompletion = completionList.begin();
   lastCompletionLength = tabAbbrev.length();
 }