projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some minor improvements to the NetworkModel and added a sanity check to TreeModel
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
8213648
..
7bd7219
100644
(file)
--- a/
src/client/networkmodel.h
+++ b/
src/client/networkmodel.h
@@
-53,6
+53,7
@@
public:
const BufferInfo &bufferInfo() const;
virtual quint64 id() const;
virtual QVariant data(int column, int role) const;
const BufferInfo &bufferInfo() const;
virtual quint64 id() const;
virtual QVariant data(int column, int role) const;
+ virtual bool setData(int column, const QVariant &value, int role);
void attachIrcChannel(IrcChannel *ircChannel);
void attachIrcChannel(IrcChannel *ircChannel);
@@
-81,7
+82,7
@@
public:
ActivityLevel activity() const;
void setActivity(const ActivityLevel &level);
ActivityLevel activity() const;
void setActivity(const ActivityLevel &level);
- void
add
Activity(const ActivityLevel &level);
+ void
update
Activity(const ActivityLevel &level);
public slots:
void setTopic(const QString &topic);
public slots:
void setTopic(const QString &topic);
@@
-131,6
+132,8
@@
public slots:
void attachNetwork(Network *network);
void attachIrcChannel(const QString &channelName);
void attachNetwork(Network *network);
void attachIrcChannel(const QString &channelName);
+
+ void setActive(bool connected);
private:
NetworkId _networkId;
private:
NetworkId _networkId;
@@
-153,6
+156,7
@@
public:
virtual QVariant data(int column, int role) const;
void addUser(IrcUser *ircUser);
virtual QVariant data(int column, int role) const;
void addUser(IrcUser *ircUser);
+ bool removeUser(IrcUser *ircUser);
static int categoryFromModes(const QString &modes);
static int categoryFromModes(const QString &modes);
@@
-202,6
+206,7
@@
public:
enum myRoles {
BufferTypeRole = Qt::UserRole,
ItemActiveRole,
enum myRoles {
BufferTypeRole = Qt::UserRole,
ItemActiveRole,
+ BufferActivityRole,
BufferIdRole,
NetworkIdRole,
BufferInfoRole,
BufferIdRole,
NetworkIdRole,
BufferInfoRole,
@@
-233,7
+238,7
@@
public:
public slots:
void bufferUpdated(BufferInfo bufferInfo);
public slots:
void bufferUpdated(BufferInfo bufferInfo);
- void
bufferActivity(BufferItem::ActivityLevel, BufferInfo bufferInfo
);
+ void
updateBufferActivity(const Message &msg
);
private:
QModelIndex networkIndex(NetworkId networkId);
private:
QModelIndex networkIndex(NetworkId networkId);