projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Made BufferId, NetworkId and BufferInfo available from all childs of BufferItems...
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
dfea333
..
8213648
100644
(file)
--- a/
src/client/networkmodel.h
+++ b/
src/client/networkmodel.h
@@
-116,8
+116,8
@@
class NetworkItem : public PropertyMapItem {
public:
NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
public:
NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
- virtual QVariant data(int column, int row) const;
virtual quint64 id() const;
virtual quint64 id() const;
+ virtual QVariant data(int column, int row) const;
bool isActive() const;
bool isActive() const;
@@
-150,7
+150,8
@@
public:
QString categoryId();
virtual quint64 id() const;
QString categoryId();
virtual quint64 id() const;
-
+ virtual QVariant data(int column, int role) const;
+
void addUser(IrcUser *ircUser);
static int categoryFromModes(const QString &modes);
void addUser(IrcUser *ircUser);
static int categoryFromModes(const QString &modes);
@@
-180,9
+181,9
@@
public:
QString nickName() const;
IrcUser *ircUser();
virtual quint64 id() const;
QString nickName() const;
IrcUser *ircUser();
virtual quint64 id() const;
-
virtual QVariant data(int column, int role) const;
virtual QVariant data(int column, int role) const;
-
+ virtual QString toolTip(int column) const;
+
private slots:
void setNick(QString newNick);
private slots:
void setNick(QString newNick);
@@
-208,11
+209,10
@@
public:
};
enum itemTypes {
};
enum itemTypes {
- AbstractItemType,
- SimpleItemType,
NetworkItemType,
BufferItemType,
NetworkItemType,
BufferItemType,
- NickItemType
+ UserCategoryItemType,
+ IrcUserItemType
};
NetworkModel(QObject *parent = 0);
};
NetworkModel(QObject *parent = 0);