projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bufferviewoverlay'
[quassel.git]
/
src
/
client
/
clientbufferviewmanager.h
diff --git
a/src/client/clientbufferviewmanager.h
b/src/client/clientbufferviewmanager.h
index
f9a6c53
..
0963908
100644
(file)
--- a/
src/client/clientbufferviewmanager.h
+++ b/
src/client/clientbufferviewmanager.h
@@
-35,13
+35,15
@@
public:
QList<ClientBufferViewConfig *> clientBufferViewConfigs() const;
ClientBufferViewConfig *clientBufferViewConfig(int bufferViewId) const;
QList<ClientBufferViewConfig *> clientBufferViewConfigs() const;
ClientBufferViewConfig *clientBufferViewConfig(int bufferViewId) const;
- inline BufferViewOverlay *bufferViewOverlay() const { return _bufferViewOverlay; }
-
protected:
virtual BufferViewConfig *bufferViewConfigFactory(int bufferViewConfigId);
protected:
virtual BufferViewConfig *bufferViewConfigFactory(int bufferViewConfigId);
-private:
- BufferViewOverlay *_bufferViewOverlay;
+signals:
+ void viewsInitialized();
+
+private slots:
+ void waitForConfigInit();
+ void configInitBarrier();
};
#endif //CLIENTBUFFERVIEWMANAGER_H
};
#endif //CLIENTBUFFERVIEWMANAGER_H