replaced Client::fakeInput() with Client::userInpt() (now static but no longer a...

[quassel.git] / src / client / client.h

diff --git a/src/client/client.h b/src/client/client.h
index 26e67cc..4df6685 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -54,14 +54,14 @@ public:
   static void destroy();
   static void init(AbstractUi *);
 
-  static QList<Network *> networks();
-  static Network *network(NetworkId networkid);
-
   static QList<BufferInfo> allBufferInfos();
   static QList<Buffer *> buffers();
   static Buffer *buffer(BufferId bufferUid);
   static Buffer *buffer(BufferInfo);
 
+  static QList<NetworkId> networkIds();
+  static const Network * network(NetworkId);
+
   static QList<IdentityId> identityIds();
   static const Identity * identity(IdentityId);
 
@@ -97,8 +97,7 @@ public:
   static bool isConnected();
   static bool isSynced();
 
-  static void fakeInput(BufferId bufferUid, QString message);
-  static void fakeInput(BufferInfo bufferInfo, QString message);
+  static void userInput(BufferInfo bufferInfo, QString message);
 
   static void storeSessionData(const QString &key, const QVariant &data);
   static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
@@ -144,6 +143,8 @@ signals:
   //! Sent to the core when an identity shall be removed. Should not be used elsewhere.
   void requestRemoveIdentity(IdentityId);
 
+  void networkAdded(NetworkId id);
+
 public slots:
   //void selectBuffer(Buffer *);
 
@@ -153,14 +154,11 @@ public slots:
 
   void setCoreConfiguration(const QVariantMap &settings);
 
-
 private slots:
   void recvSessionData(const QString &key, const QVariant &data);
 
   //void coreSocketError(QAbstractSocket::SocketError);
 
-  void userInput(BufferInfo, QString);
-
   //void networkConnected(NetworkId);
   //void networkDisconnected(NetworkId);