projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make BufferView compile
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
634c402
..
1a5e4c4
100644
(file)
--- a/
src/client/networkmodel.h
+++ b/
src/client/networkmodel.h
@@
-72,7
+72,7
@@
public:
bool isActive() const;
inline Buffer::ActivityLevel activityLevel() const { return _activity; }
bool isActive() const;
inline Buffer::ActivityLevel activityLevel() const { return _activity; }
-
bool
setActivityLevel(Buffer::ActivityLevel level);
+
void
setActivityLevel(Buffer::ActivityLevel level);
void updateActivityLevel(Buffer::ActivityLevel level);
void setLastMsgInsert(QDateTime msgDate);
void updateActivityLevel(Buffer::ActivityLevel level);
void setLastMsgInsert(QDateTime msgDate);
@@
-211,12
+211,13
@@
public:
ItemTypeRole
};
ItemTypeRole
};
- enum itemType
s
{
- NetworkItemType,
- BufferItemType,
- UserCategoryItemType,
- IrcUserItemType
+ enum itemType {
+ NetworkItemType
= 0x01
,
+ BufferItemType
= 0x02
,
+ UserCategoryItemType
= 0x04
,
+ IrcUserItemType
= 0x08
};
};
+ Q_DECLARE_FLAGS(itemTypes, itemType);
NetworkModel(QObject *parent = 0);
static QList<QVariant> defaultHeader();
NetworkModel(QObject *parent = 0);
static QList<QVariant> defaultHeader();
@@
-252,5
+253,6
@@
private:
BufferItem *existsBufferItem(const BufferInfo &bufferInfo);
};
BufferItem *existsBufferItem(const BufferInfo &bufferInfo);
};
+Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);
#endif // NETWORKMODEL_H
#endif // NETWORKMODEL_H