X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Ftabcompleter.cpp;h=93a0fa4c57ff387ad8d4f1f26074aa8971e5e6a0;hp=fbd69047c9c62a3dde1968d972660adac55ae32b;hb=7c9c1b348382b8b77f96a883945c522d32a478d5;hpb=f5539e2ce05f5beac9d789ec615ded695f325fc7 diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp index fbd69047..93a0fa4c 100644 --- a/src/uisupport/tabcompleter.cpp +++ b/src/uisupport/tabcompleter.cpp @@ -41,47 +41,50 @@ 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(); - 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); - QMap sortMap; - - foreach(IrcUser *ircUser, channel->ircUsers()) { - if(regex.indexIn(ircUser->nick()) > -1) { - sortMap[ircUser->nick().toLower()] = ircUser->nick(); + QRegExp regex(QString("^[^a-zA-Z]*").append(QRegExp::escape(tabAbbrev)), Qt::CaseInsensitive); + + switch(static_cast(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; } - foreach (QString str, sortMap) - completionList << str; - - nextCompletion = completionList.begin(); + + nextCompletion = completionMap.begin(); lastCompletionLength = tabAbbrev.length(); } @@ -99,7 +102,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(); @@ -113,14 +116,17 @@ 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(); } // we're at the end of the list -> start over again } else { - nextCompletion = completionList.begin(); + if(!completionMap.isEmpty()) { + nextCompletion = completionMap.begin(); + complete(); + } } }