From 21e31fe43c4577cad271b070e4df4906ead128d8 Mon Sep 17 00:00:00 2001
From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Tue, 17 Mar 2009 00:17:29 +0100
Subject: [PATCH] moving the bufferoverlay to some static place -> the client
 singleton

---
 src/client/client.cpp                  | 2 ++
 src/client/client.h                    | 3 +++
 src/client/clientbufferviewmanager.cpp | 3 +--
 src/client/clientbufferviewmanager.h   | 5 -----
 src/qtui/mainwin.cpp                   | 6 +++---
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/client/client.cpp b/src/client/client.cpp
index d90e7eb8..e6387f15 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -27,6 +27,7 @@
 #include "buffersettings.h"
 #include "buffersyncer.h"
 #include "bufferviewconfig.h"
+#include "bufferviewoverlay.h"
 #include "clientbacklogmanager.h"
 #include "clientbufferviewmanager.h"
 #include "clientirclisthelper.h"
@@ -78,6 +79,7 @@ Client::Client(QObject *parent)
     _bufferSyncer(0),
     _backlogManager(new ClientBacklogManager(this)),
     _bufferViewManager(0),
+    _bufferViewOverlay(new BufferViewOverlay(this)),
     _ircListHelper(new ClientIrcListHelper(this)),
     _inputHandler(new ClientUserInputHandler(this)),
     _messageModel(0),
diff --git a/src/client/client.h b/src/client/client.h
index 3dd5b6ac..dec806c5 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -42,6 +42,7 @@ class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
 class BufferSyncer;
+class BufferViewOverlay;
 class ClientBacklogManager;
 class ClientBufferViewManager;
 class ClientIrcListHelper;
@@ -104,6 +105,7 @@ public:
   static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; }
   static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; }
   static inline ClientBufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; }
+  static inline BufferViewOverlay *bufferViewOverlay() { return instance()->_bufferViewOverlay; }
   static inline ClientUserInputHandler *inputHandler() { return instance()->_inputHandler; }
 
   static AccountId currentCoreAccount();
@@ -204,6 +206,7 @@ private:
   BufferSyncer * _bufferSyncer;
   ClientBacklogManager *_backlogManager;
   ClientBufferViewManager *_bufferViewManager;
+  BufferViewOverlay *_bufferViewOverlay;
   ClientIrcListHelper *_ircListHelper;
   ClientUserInputHandler *_inputHandler;
 
diff --git a/src/client/clientbufferviewmanager.cpp b/src/client/clientbufferviewmanager.cpp
index a32f186a..6682caa7 100644
--- a/src/client/clientbufferviewmanager.cpp
+++ b/src/client/clientbufferviewmanager.cpp
@@ -24,8 +24,7 @@
 #include "clientbufferviewconfig.h"
 
 ClientBufferViewManager::ClientBufferViewManager(SignalProxy *proxy, QObject *parent)
-  : BufferViewManager(proxy, parent),
-    _bufferViewOverlay(new BufferViewOverlay(this))
+  : BufferViewManager(proxy, parent)
 {
 }
 
diff --git a/src/client/clientbufferviewmanager.h b/src/client/clientbufferviewmanager.h
index f9a6c53c..f190362b 100644
--- a/src/client/clientbufferviewmanager.h
+++ b/src/client/clientbufferviewmanager.h
@@ -35,13 +35,8 @@ public:
   QList<ClientBufferViewConfig *> clientBufferViewConfigs() const;
   ClientBufferViewConfig *clientBufferViewConfig(int bufferViewId) const;
 
-  inline BufferViewOverlay *bufferViewOverlay() const { return _bufferViewOverlay; }
-
 protected:
   virtual BufferViewConfig *bufferViewConfigFactory(int bufferViewConfigId);
-
-private:
-  BufferViewOverlay *_bufferViewOverlay;
 };
 
 #endif //CLIENTBUFFERVIEWMANAGER_H
diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 9769de79..c7981157 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -382,9 +382,9 @@ void MainWin::bufferViewToggled(bool enabled) {
   BufferViewDock *dock = qobject_cast<BufferViewDock *>(action->parent());
   Q_ASSERT(dock);
   if(enabled) {
-    Client::bufferViewManager()->bufferViewOverlay()->addView(dock->bufferViewId());
+    Client::bufferViewOverlay()->addView(dock->bufferViewId());
   } else {
-    Client::bufferViewManager()->bufferViewOverlay()->removeView(dock->bufferViewId());
+    Client::bufferViewOverlay()->removeView(dock->bufferViewId());
   }
 }
 
@@ -919,7 +919,7 @@ void MainWin::on_actionDebugBufferViewOverlay_triggered() {
   QTreeView *view = new QTreeView;
   view->setAttribute(Qt::WA_DeleteOnClose);
   view->setWindowTitle("Debug BufferViewOverlay View");
-  BufferViewOverlayFilter *filter = new BufferViewOverlayFilter(Client::bufferModel(), Client::bufferViewManager()->bufferViewOverlay());
+  BufferViewOverlayFilter *filter = new BufferViewOverlayFilter(Client::bufferModel(), Client::bufferViewOverlay());
   filter->setParent(view);
   view->setModel(filter);
   view->setColumnWidth(0, 250);
-- 
2.20.1