projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yet another protocol break (I warned you...).
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
961c1ca
..
d9598c9
100644
(file)
--- a/
src/client/networkmodel.h
+++ b/
src/client/networkmodel.h
@@
-45,7
+45,7
@@
class IrcUser;
*****************************************/
class BufferItem : public PropertyMapItem {
Q_OBJECT
*****************************************/
class BufferItem : public PropertyMapItem {
Q_OBJECT
- Q_PROPERTY(QString bufferName READ bufferName)
+ Q_PROPERTY(QString bufferName READ bufferName
WRITE setBufferName
)
Q_PROPERTY(QString topic READ topic)
Q_PROPERTY(int nickCount READ nickCount)
Q_PROPERTY(QString topic READ topic)
Q_PROPERTY(int nickCount READ nickCount)
@@
-60,6
+60,7
@@
public:
void attachIrcChannel(IrcChannel *ircChannel);
QString bufferName() const;
void attachIrcChannel(IrcChannel *ircChannel);
QString bufferName() const;
+ void setBufferName(const QString &name);
QString topic() const;
int nickCount() const;
QString topic() const;
int nickCount() const;
@@
-76,12
+77,15
@@
public:
bool setLastSeen();
QDateTime lastSeen();
bool setLastSeen();
QDateTime lastSeen();
+ virtual QString toolTip(int column) const;
+
public slots:
void setTopic(const QString &topic);
public slots:
void setTopic(const QString &topic);
- void join(
IrcUser *ircUser
);
+ void join(
const QList<IrcUser *> &ircUsers
);
void part(IrcUser *ircUser);
void addUserToCategory(IrcUser *ircUser);
void part(IrcUser *ircUser);
void addUserToCategory(IrcUser *ircUser);
+ void addUsersToCategory(const QList<IrcUser *> &ircUser);
void removeUserFromCategory(IrcUser *ircUser);
void userModeChanged(IrcUser *ircUser);
void removeUserFromCategory(IrcUser *ircUser);
void userModeChanged(IrcUser *ircUser);
@@
-91,6
+95,7
@@
private slots:
private:
BufferInfo _bufferInfo;
private:
BufferInfo _bufferInfo;
+ QString _bufferName;
Buffer::ActivityLevel _activity;
QPointer<IrcChannel> _ircChannel;
Buffer::ActivityLevel _activity;
QPointer<IrcChannel> _ircChannel;
@@
-110,14
+115,17
@@
public:
NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
virtual quint64 id() const;
NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
virtual quint64 id() const;
+ inline const NetworkId &networkId() const { return _networkId; }
virtual QVariant data(int column, int row) const;
bool isActive() const;
virtual QVariant data(int column, int row) const;
bool isActive() const;
-
+
QString networkName() const;
QString currentServer() const;
int nickCount() const;
QString networkName() const;
QString currentServer() const;
int nickCount() const;
-
+
+ virtual QString toolTip(int column) const;
+
public slots:
void setNetworkName(const QString &networkName);
void setCurrentServer(const QString &serverName);
public slots:
void setNetworkName(const QString &networkName);
void setCurrentServer(const QString &serverName);
@@
-125,8
+133,6
@@
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;
@@
-147,7
+153,7
@@
public:
virtual quint64 id() const;
virtual QVariant data(int column, int role) const;
virtual quint64 id() const;
virtual QVariant data(int column, int role) const;
- void addUser
(IrcUser *
ircUser);
+ void addUser
s(const QList<IrcUser *> &
ircUser);
bool removeUser(IrcUser *ircUser);
static int categoryFromModes(const QString &modes);
bool removeUser(IrcUser *ircUser);
static int categoryFromModes(const QString &modes);
@@
-181,9
+187,10
@@
public:
virtual quint64 id() const;
virtual QVariant data(int column, int role) const;
virtual QString toolTip(int column) const;
virtual quint64 id() 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);
+ void setAway(bool);
private:
QPointer<IrcUser> _ircUser;
private:
QPointer<IrcUser> _ircUser;
@@
-237,6
+244,7
@@
public:
public slots:
void bufferUpdated(BufferInfo bufferInfo);
public slots:
void bufferUpdated(BufferInfo bufferInfo);
+ void removeBuffer(BufferId bufferId);
void setBufferActivity(const BufferInfo &buffer, Buffer::ActivityLevel activity);
void networkRemoved(const NetworkId &networkId);
void setBufferActivity(const BufferInfo &buffer, Buffer::ActivityLevel activity);
void networkRemoved(const NetworkId &networkId);