X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=2c65e1ee60982303c45538a259ef8897dba28f36;hb=e531fd1f1ea36a360a9d876c94e73b0f3b1bcd22;hp=610e732fa399a0fe4ff77839671901a1e61c22db;hpb=ac21cc48d22f0cf58a98b74754fa94564a8e3f45;p=quassel.git

diff --git a/src/client/client.h b/src/client/client.h
index 610e732f..2c65e1ee 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -108,15 +108,20 @@ public:
 
   static bool isConnected();
   static bool isSynced();
+  static inline bool internalCore() { return instance()->_internalCore; }
 
   static void userInput(BufferInfo bufferInfo, QString message);
 
   static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
   static void removeBuffer(BufferId id);
+  static void renameBuffer(BufferId bufferId, const QString &newName);
+  static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2);
 
   static void logMessage(QtMsgType type, const char *msg);
   static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
 
+  static inline void registerClientSyncer(ClientSyncer *syncer) { emit instance()->newClientSyncer(syncer); }
+
 signals:
   void sendInput(BufferInfo, QString message);
   void requestNetworkStates();
@@ -163,6 +168,7 @@ public slots:
 
   void bufferRemoved(BufferId bufferId);
   void bufferRenamed(BufferId bufferId, const QString &newName);
+  void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
 
 private slots:
   void disconnectedFromCore();
@@ -179,6 +185,7 @@ private slots:
   void setConnectedToCore(AccountId id, QIODevice *socket = 0);
   void setSyncedToCore();
   void requestInitialBacklog();
+  void createDefautBufferView();
   void setSecuredConnection();
 
 
@@ -208,6 +215,7 @@ private:
   ClientMode clientMode;
 
   bool _connectedToCore, _syncedToCore;
+  bool _internalCore;
 
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;