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);
QString _bufferName;
Buffer::ActivityLevel _activity;
- QPointer<IrcChannel> _ircChannel;
+ IrcChannel *_ircChannel;
};
*****************************************/
class UserCategoryItem : public PropertyMapItem {
Q_OBJECT
- Q_PROPERTY(QString categoryId READ categoryId)
+ Q_PROPERTY(QString categoryName READ categoryName)
public:
UserCategoryItem(int category, AbstractTreeItem *parent);
- QString categoryId();
+ QString categoryName() const;
virtual quint64 id() const;
virtual QVariant data(int column, int role) const;
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;
};
/*****************************************
public:
enum myRoles {
- BufferTypeRole = Qt::UserRole,
+ BufferTypeRole = TreeModel::UserRole,
ItemActiveRole,
BufferActivityRole,
BufferIdRole,
ItemTypeRole
};
- enum itemTypes {
- 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();
BufferItem *existsBufferItem(const BufferInfo &bufferInfo);
};
+Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);
#endif // NETWORKMODEL_H