X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientbufferviewmanager.cpp;h=166cda1f679c12480b222edd829c9f6dbca2e12d;hp=315c2a8e03c44c3f41fe39fe980a050d0aa3db51;hb=62b7bed21f011037a34d7a4ea797d79fbdeff687;hpb=09cc362cca645192f04aaac58953e1f1bace6d59

diff --git a/src/client/clientbufferviewmanager.cpp b/src/client/clientbufferviewmanager.cpp
index 315c2a8e..166cda1f 100644
--- a/src/client/clientbufferviewmanager.cpp
+++ b/src/client/clientbufferviewmanager.cpp
@@ -22,10 +22,10 @@
 
 #include "clientbufferviewconfig.h"
 
+INIT_SYNCABLE_OBJECT(ClientBufferViewManager)
 ClientBufferViewManager::ClientBufferViewManager(SignalProxy *proxy, QObject *parent)
   : BufferViewManager(proxy, parent)
 {
-  connect(this, SIGNAL(initDone()), this, SLOT(waitForConfigInit()));
 }
 
 BufferViewConfig *ClientBufferViewManager::bufferViewConfigFactory(int bufferViewConfigId) {
@@ -43,28 +43,3 @@ QList<ClientBufferViewConfig *> ClientBufferViewManager::clientBufferViewConfigs
 ClientBufferViewConfig *ClientBufferViewManager::clientBufferViewConfig(int bufferViewId) const {
   return static_cast<ClientBufferViewConfig *>(bufferViewConfig(bufferViewId));
 }
-
-void ClientBufferViewManager::waitForConfigInit() {
-  bool initialized = true;
-  foreach(BufferViewConfig *config, bufferViewConfigs()) {
-    initialized &= config->isInitialized();
-    if(config->isInitialized())
-      continue;
-    connect(config, SIGNAL(initDone()), this, SLOT(configInitBarrier()));
-  }
-  if(initialized)
-    QMetaObject::invokeMethod(this, "viewsInitialized", Qt::QueuedConnection);
-}
-
-void ClientBufferViewManager::configInitBarrier() {
-  BufferViewConfig *config = qobject_cast<BufferViewConfig *>(sender());
-  Q_ASSERT(config);
-  disconnect(config, SIGNAL(initDone()), this, SLOT(configInitBarrier()));
-
-  bool initialized = true;
-  foreach(BufferViewConfig *config, bufferViewConfigs()) {
-    initialized &= config->isInitialized();
-  }
-  if(initialized)
-    QMetaObject::invokeMethod(this, "viewsInitialized", Qt::QueuedConnection);
-}