X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=e7ddd7f14a537217df86f9a7941fd8812f304013;hp=34c903ea9f1646a2da99b38138528f1aeee2bf48;hb=4295cdd849be0ae914387d0f62afb6f653f5f27f;hpb=d1b6499b0b848d4287efae89107576548533502c

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 34c903ea..e7ddd7f1 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -122,18 +122,6 @@ void Client::init() {
 
 /*** public static methods ***/
 
-
-QList<Network *> Client::networks() {
-  return instance()->_networks.values();
-}
-
-Network *Client::network(uint networkid) {
-  if(instance()->_networks.contains(networkid))
-    return instance()->_networks[networkid];
-  else
-    return 0;
-}
-
 QList<BufferInfo> Client::allBufferInfos() {
   QList<BufferInfo> bufferids;
   foreach(Buffer *buffer, buffers()) {
@@ -200,6 +188,17 @@ bool Client::isSynced() {
   return instance()->_syncedToCore;
 }
 
+/*** Network handling ***/
+
+QList<NetworkId> Client::networkIds() {
+  return instance()->_networks.keys();
+}
+
+const Network * Client::network(NetworkId networkid) {
+  if(instance()->_networks.contains(networkid)) return instance()->_networks[networkid];
+  else return 0;
+}
+
 /*** Identity handling ***/
 
 QList<IdentityId> Client::identityIds() {
@@ -245,16 +244,12 @@ void Client::coreIdentityRemoved(IdentityId id) {
 
 /***  ***/
 
-void Client::fakeInput(uint bufferUid, QString message) {
+void Client::fakeInput(BufferId bufferUid, QString message) {
   Buffer *buff = buffer(bufferUid);
   if(!buff)
     qWarning() << "No Buffer with uid" << bufferUid << "can't send Input" << message;
   else
-    emit instance()->sendInput(buff->bufferInfo(), message);
-}
-
-void Client::fakeInput(BufferInfo bufferInfo, QString message) {
-  fakeInput(bufferInfo, message);
+    instance()->userInput(buff->bufferInfo(), message);
 }
 
 /*** core connection stuff ***/
@@ -284,16 +279,6 @@ void Client::disconnectFromCore() {
   // Clear internal data. Hopefully nothing relies on it at this point.
   _networkModel->clear();
 
-  QHash<BufferId, Buffer *>::iterator bufferIter =  _buffers.begin();
-  while(bufferIter != _buffers.end()) {
-    Buffer *buffer = bufferIter.value();
-    disconnect(buffer, SIGNAL(destroyed()), this, 0);
-    bufferIter = _buffers.erase(bufferIter);
-    buffer->deleteLater();
-  }
-  Q_ASSERT(_buffers.isEmpty());
-
-
   QHash<NetworkId, Network*>::iterator netIter = _networks.begin();
   while(netIter != _networks.end()) {
     Network *net = netIter.value();
@@ -303,6 +288,15 @@ void Client::disconnectFromCore() {
   }
   Q_ASSERT(_networks.isEmpty());
 
+  QHash<BufferId, Buffer *>::iterator bufferIter =  _buffers.begin();
+  while(bufferIter != _buffers.end()) {
+    Buffer *buffer = bufferIter.value();
+    disconnect(buffer, SIGNAL(destroyed()), this, 0);
+    bufferIter = _buffers.erase(bufferIter);
+    buffer->deleteLater();
+  }
+  Q_ASSERT(_buffers.isEmpty());
+
   QHash<IdentityId, Identity*>::iterator idIter = _identities.begin();
   while(idIter != _identities.end()) {
     Identity *id = idIter.value();
@@ -387,6 +381,7 @@ void Client::addNetwork(Network *net) {
   networkModel()->attachNetwork(net);
   connect(net, SIGNAL(destroyed()), instance(), SLOT(networkDestroyed()));
   instance()->_networks[net->networkId()] = net;
+  emit instance()->networkAdded(net->networkId());
   //if(net->networkId() == 1) net->requestConnect(); // FIXME
 }