fixes #484 - issues with ssl status indicator

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

diff --git a/src/client/client.h b/src/client/client.h
index 610e732..ea30bcd 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *

  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -90,7 +90,7 @@ public:
    */
   static void removeIdentity(IdentityId id);
 
    */
   static void removeIdentity(IdentityId id);
 

-  static void createNetwork(const NetworkInfo &info);
+  static void createNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());

   static void updateNetwork(const NetworkInfo &info);
   static void removeNetwork(NetworkId id);
 
   static void updateNetwork(const NetworkInfo &info);
   static void removeNetwork(NetworkId id);
 


@@ -108,15 +108,20 @@ public:
 
   static bool isConnected();
   static bool isSynced();
 
   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 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 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();
 signals:
   void sendInput(BufferInfo, QString message);
   void requestNetworkStates();


@@ -124,7 +129,6 @@ signals:
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();

-  void securedConnection();

   void disconnected();
   void coreConnectionStateChanged(bool);
 
   void disconnected();
   void coreConnectionStateChanged(bool);
 


@@ -149,7 +153,7 @@ signals:
   void networkCreated(NetworkId id);
   void networkRemoved(NetworkId id);
 
   void networkCreated(NetworkId id);
   void networkRemoved(NetworkId id);
 

-  void requestCreateNetwork(const NetworkInfo &info);
+  void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());

   void requestRemoveNetwork(NetworkId);
 
   void newClientSyncer(ClientSyncer *);
   void requestRemoveNetwork(NetworkId);
 
   void newClientSyncer(ClientSyncer *);


@@ -163,6 +167,7 @@ public slots:
 
   void bufferRemoved(BufferId bufferId);
   void bufferRenamed(BufferId bufferId, const QString &newName);
 
   void bufferRemoved(BufferId bufferId);
   void bufferRenamed(BufferId bufferId, const QString &newName);

+  void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);

 
 private slots:
   void disconnectedFromCore();
 
 private slots:
   void disconnectedFromCore();


@@ -179,8 +184,9 @@ private slots:
   void setConnectedToCore(AccountId id, QIODevice *socket = 0);
   void setSyncedToCore();
   void requestInitialBacklog();
   void setConnectedToCore(AccountId id, QIODevice *socket = 0);
   void setSyncedToCore();
   void requestInitialBacklog();

-  void setSecuredConnection();
-
+  void createDefaultBufferView();
+  void createDefaultIdentity();
+  void createDefaultNetworks();

 
 private:
   Client(QObject *parent = 0);
 
 private:
   Client(QObject *parent = 0);


@@ -208,6 +214,7 @@ private:
   ClientMode clientMode;
 
   bool _connectedToCore, _syncedToCore;
   ClientMode clientMode;
 
   bool _connectedToCore, _syncedToCore;

+  bool _internalCore;

 
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;
 
   QHash<NetworkId, Network *> _networks;
   QHash<IdentityId, Identity *> _identities;