From eb5d0aaa1c8017f6d17da9b04ac8896690820581 Mon Sep 17 00:00:00 2001 From: Sebastian Goth Date: Tue, 1 Jul 2008 19:56:17 +0200 Subject: [PATCH] Ignore leading non-alphabetical characters. Fixes BR205 In addition, sorting of completionList is now correct(tm). --- src/uisupport/tabcompleter.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp index 8c29e8ab..63c1ed09 100644 --- a/src/uisupport/tabcompleter.cpp +++ b/src/uisupport/tabcompleter.cpp @@ -28,6 +28,8 @@ #include "ircchannel.h" #include "ircuser.h" +#include + TabCompleter::TabCompleter(InputLine *inputLine_) : QObject(inputLine_), inputLine(inputLine_), @@ -68,12 +70,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 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(); } -- 2.20.1