Make Client::mainUi() accessible, needed for some things in uisupport

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 1643757..575314c 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -56,21 +56,21 @@ Client *Client::instance() {
 
 void Client::destroy() {
   if(instanceptr) {
 
 void Client::destroy() {
   if(instanceptr) {

-    delete instanceptr->mainUi;
+    delete instanceptr->mainUi();

     instanceptr->deleteLater();
     instanceptr = 0;
   }
 }
 
 void Client::init(AbstractUi *ui) {
     instanceptr->deleteLater();
     instanceptr = 0;
   }
 }
 
 void Client::init(AbstractUi *ui) {

-  instance()->mainUi = ui;
+  instance()->_mainUi = ui;

   instance()->init();
 }
 
 Client::Client(QObject *parent)
   : QObject(parent),
     _signalProxy(new SignalProxy(SignalProxy::Client, this)),
   instance()->init();
 }
 
 Client::Client(QObject *parent)
   : QObject(parent),
     _signalProxy(new SignalProxy(SignalProxy::Client, this)),

-    mainUi(0),
+    _mainUi(0),

     _networkModel(0),
     _bufferModel(0),
     _bufferSyncer(0),
     _networkModel(0),
     _bufferModel(0),
     _bufferSyncer(0),


@@ -98,8 +98,8 @@ void Client::init() {
           _networkModel, SLOT(networkRemoved(NetworkId)));
 
   _bufferModel = new BufferModel(_networkModel);
           _networkModel, SLOT(networkRemoved(NetworkId)));
 
   _bufferModel = new BufferModel(_networkModel);

-  _messageModel = mainUi->createMessageModel(this);
-  _messageProcessor = mainUi->createMessageProcessor(this);
+  _messageModel = mainUi()->createMessageModel(this);
+  _messageProcessor = mainUi()->createMessageProcessor(this);

 
   SignalProxy *p = signalProxy();
 
 
   SignalProxy *p = signalProxy();
 


@@ -122,10 +122,10 @@ void Client::init() {
 
   connect(p, SIGNAL(disconnected()), this, SLOT(disconnectedFromCore()));
 
 
   connect(p, SIGNAL(disconnected()), this, SLOT(disconnectedFromCore()));
 

-  //connect(mainUi, SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &)));
-  connect(mainUi, SIGNAL(disconnectFromCore()), this, SLOT(disconnectFromCore()));
-  connect(this, SIGNAL(connected()), mainUi, SLOT(connectedToCore()));
-  connect(this, SIGNAL(disconnected()), mainUi, SLOT(disconnectedFromCore()));
+  //connect(mainUi(), SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &)));
+  connect(mainUi(), SIGNAL(disconnectFromCore()), this, SLOT(disconnectFromCore()));
+  connect(this, SIGNAL(connected()), mainUi(), SLOT(connectedToCore()));
+  connect(this, SIGNAL(disconnected()), mainUi(), SLOT(disconnectedFromCore()));

 
   // attach backlog manager
   p->synchronize(backlogManager());
 
   // attach backlog manager
   p->synchronize(backlogManager());


@@ -134,6 +134,10 @@ void Client::init() {
 
 /*** public static methods ***/
 
 
 /*** public static methods ***/
 

+AbstractUi *Client::mainUi() {
+  return instance()->_mainUi;
+}
+

 AccountId Client::currentCoreAccount() {
   return _currentCoreAccount;
 }
 AccountId Client::currentCoreAccount() {
   return _currentCoreAccount;
 }

diff --git a/src/client/client.h b/src/client/client.h
index 40086ac..40949ac 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -62,6 +62,7 @@ public:
   static Client *instance();
   static void destroy();
   static void init(AbstractUi *);
   static Client *instance();
   static void destroy();
   static void init(AbstractUi *);

+  static AbstractUi *mainUi();

 
   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);
 
   static QList<NetworkId> networkIds();
   static const Network * network(NetworkId);


@@ -192,7 +193,7 @@ private:
   static QPointer<Client> instanceptr;
 
   SignalProxy * _signalProxy;
   static QPointer<Client> instanceptr;
 
   SignalProxy * _signalProxy;

-  AbstractUi * mainUi;
+  AbstractUi * _mainUi;

   NetworkModel * _networkModel;
   BufferModel * _bufferModel;
   BufferSyncer * _bufferSyncer;
   NetworkModel * _networkModel;
   BufferModel * _bufferModel;
   BufferSyncer * _bufferSyncer;