projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merging branches/0.2/0.2@r44 with trunk
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
861d07c
..
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);
@@
-100,7
+100,7
@@
private:
QString _bufferName;
Buffer::ActivityLevel _activity;
QString _bufferName;
Buffer::ActivityLevel _activity;
-
QPointer<IrcChannel>
_ircChannel;
+
IrcChannel *
_ircChannel;
};
};
@@
-146,12
+146,12
@@
private:
*****************************************/
class UserCategoryItem : public PropertyMapItem {
Q_OBJECT
*****************************************/
class UserCategoryItem : public PropertyMapItem {
Q_OBJECT
- Q_PROPERTY(QString category
Id READ categoryId
)
+ Q_PROPERTY(QString category
Name READ categoryName
)
public:
UserCategoryItem(int category, AbstractTreeItem *parent);
public:
UserCategoryItem(int category, AbstractTreeItem *parent);
- QString category
Id()
;
+ QString category
Name() const
;
virtual quint64 id() const;
virtual QVariant data(int column, int role) const;
virtual quint64 id() const;
virtual QVariant data(int column, int role) const;
@@
-163,13
+163,7
@@
public:
private:
int _category;
private:
int _category;
- struct Category {
- QChar mode;
- QString displayString;
- inline Category(QChar mode_, QString displayString_) : mode(mode_), displayString(displayString_) {};
- };
-
- static const QList<Category> categories;
+ static const QList<QChar> categories;
};
/*****************************************
};
/*****************************************
@@
-208,7
+202,7
@@
class NetworkModel : public TreeModel {
public:
enum myRoles {
public:
enum myRoles {
- BufferTypeRole =
Qt
::UserRole,
+ BufferTypeRole =
TreeModel
::UserRole,
ItemActiveRole,
BufferActivityRole,
BufferIdRole,
ItemActiveRole,
BufferActivityRole,
BufferIdRole,
@@
-217,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();
@@
-258,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