X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Ftabcompleter.cpp;h=8c29e8ab6f8950c4ec6323afaaff0ee554adf884;hp=60a74fb880597c10fbe4a591f723e1dfca5593c0;hb=c030e0d5e910fe8af376e5462c9e58d45fd59e40;hpb=50706d89d4d60e258ebb6873d3778383621898e4

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index 60a74fb8..8c29e8ab 100644
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -34,18 +34,21 @@ TabCompleter::TabCompleter(InputLine *inputLine_)
     enabled(false),
     nickSuffix(": ")
 {
+  inputLine->installEventFilter(this);
 }
 
 void TabCompleter::buildCompletionList() {
+  completionList.clear();
+  nextCompletion = completionList.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())
     return;
   
-  NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).toUInt();
+  NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
   QString channelName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
 
-  Network *network = Client::network(networkId);
+  const Network *network = Client::network(networkId);
   if(!network)
     return;
 
@@ -53,12 +56,15 @@ void TabCompleter::buildCompletionList() {
   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 *)));
-	     
+  */
+
   completionList.clear();
   QString tabAbbrev = inputLine->text().left(inputLine->cursorPosition()).section(' ',-1,-1);
   completionList.clear();
@@ -70,7 +76,6 @@ void TabCompleter::buildCompletionList() {
   completionList.sort();
   nextCompletion = completionList.begin();
   lastCompletionLength = tabAbbrev.length();
-  
 }
 
 void TabCompleter::ircUserJoinedOrParted(IrcUser *ircUser) {
@@ -114,3 +119,18 @@ void TabCompleter::reset() {
   enabled = false;
 }
 
+bool TabCompleter::eventFilter(QObject *obj, QEvent *event) {
+  if(obj != inputLine || event->type() != QEvent::KeyPress)
+    return QObject::eventFilter(obj, event);
+
+  QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+  
+  if(keyEvent->key() == Qt::Key_Tab) {
+    complete();
+    return true;
+  } else {
+    reset();
+    return false;
+  }
+}
+