X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Ftabcompleter.h;h=eb066e75584ca59d55288d392c44c7ab79fc70b0;hp=586ee5d2fa9e2eb2220303c73ed82cdb1744bb58;hb=865638f28fa7824f98ac3b438763aed5124d58ee;hpb=43e87fcf51fd300b56c65ede848a60cf11dfd682;ds=sidebyside

diff --git a/src/uisupport/tabcompleter.h b/src/uisupport/tabcompleter.h
index 586ee5d2..eb066e75 100644
--- a/src/uisupport/tabcompleter.h
+++ b/src/uisupport/tabcompleter.h
@@ -1,61 +1,69 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by the Quassel Project                          *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef _TABCOMPLETER_H_
-#define _TABCOMPLETER_H_
-
-#include <QObject>
+*   Copyright (C) 2005-09 by the Quassel Project                          *
+*   devel@quassel-irc.org                                                 *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) version 3.                                           *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU General Public License     *
+*   along with this program; if not, write to the                         *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
+
+#ifndef TABCOMPLETER_H_
+#define TABCOMPLETER_H_
+
 #include <QPointer>
 #include <QString>
 #include <QMap>
 
+#include "types.h"
+
 class InputLine;
 class IrcUser;
+class Network;
 
 class TabCompleter : public QObject {
   Q_OBJECT
-  
+
 public:
   TabCompleter(InputLine *inputLine_);
-  
+
   void reset();
   void complete();
 
   virtual bool eventFilter(QObject *obj, QEvent *event);
 
-private slots:
-  void ircUserJoinedOrParted(IrcUser *ircUser);
-  
 private:
+  struct CompletionKey {
+    inline CompletionKey(const QString &n) { nick = n; }
+    bool operator<(const CompletionKey &other) const;
+    QString nick;
+  };
+
   QPointer<InputLine> inputLine;
   bool enabled;
   QString nickSuffix;
 
-  QMap<QString, QString> completionMap;
+  static const Network *_currentNetwork;
+  static BufferId _currentBufferId;
+
+  QMap<CompletionKey, QString> completionMap;
   // QStringList completionTemplates;
-  
-  QMap<QString, QString>::Iterator nextCompletion;
+
+  QMap<CompletionKey, QString>::Iterator nextCompletion;
   int lastCompletionLength;
-  
+
   void buildCompletionList();
-  
+
 };
 
 #endif