projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly reject invalid handshake data
[quassel.git]
/
src
/
client
/
bufferviewoverlay.h
diff --git
a/src/client/bufferviewoverlay.h
b/src/client/bufferviewoverlay.h
index
70fb927
..
313a2e3
100644
(file)
--- a/
src/client/bufferviewoverlay.h
+++ b/
src/client/bufferviewoverlay.h
@@
-34,6
+34,7
@@
class BufferViewOverlay : public QObject {
public:
BufferViewOverlay(QObject *parent = 0);
public:
BufferViewOverlay(QObject *parent = 0);
+ inline const QSet<int> &bufferViewIds() { return _bufferViewIds; }
bool allNetworks();
const QSet<NetworkId> &networkIds();
bool allNetworks();
const QSet<NetworkId> &networkIds();
@@
-41,20
+42,25
@@
public:
const QSet<BufferId> &removedBufferIds();
const QSet<BufferId> &tempRemovedBufferIds();
const QSet<BufferId> &removedBufferIds();
const QSet<BufferId> &tempRemovedBufferIds();
- bool addBuffersAutomatically();
- bool hideInactiveBuffers();
int allowedBufferTypes();
int minimumActivity();
int allowedBufferTypes();
int minimumActivity();
+ inline bool isInitialized() { return _uninitializedViewCount == 0; }
+
public slots:
void addView(int viewId);
void removeView(int viewId);
public slots:
void addView(int viewId);
void removeView(int viewId);
+ void reset();
+ void save();
+ void restore();
+
// updates propagated from the actual views
void update();
signals:
void hasChanged();
// updates propagated from the actual views
void update();
signals:
void hasChanged();
+ void initDone();
protected:
virtual void customEvent(QEvent *event);
protected:
virtual void customEvent(QEvent *event);
@@
-65,14
+71,14
@@
private slots:
private:
void updateHelper();
private:
void updateHelper();
+ QSet<BufferId> filterBuffersByConfig(const QList<BufferId> &buffers, const BufferViewConfig *config);
+
bool _aboutToUpdate;
QSet<int> _bufferViewIds;
bool _aboutToUpdate;
QSet<int> _bufferViewIds;
+ int _uninitializedViewCount;
QSet<NetworkId> _networkIds;
QSet<NetworkId> _networkIds;
-
- bool _addBuffersAutomatically;
- bool _hideInactiveBuffers;
int _allowedBufferTypes;
int _minimumActivity;
int _allowedBufferTypes;
int _minimumActivity;