projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring the Tree- and Networkmodel (internal stuff only).
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
014cab1
..
4dcb65c
100644
(file)
--- a/
src/client/networkmodel.h
+++ b/
src/client/networkmodel.h
@@
-53,7
+53,6
@@
class NetworkItem : public PropertyMapItem {
public:
NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
public:
NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
- virtual quint64 id() const { return qHash(_networkId); }
virtual QVariant data(int column, int row) const;
inline bool isActive() const { return (bool)_network ? _network->isConnected() : false; }
virtual QVariant data(int column, int row) const;
inline bool isActive() const { return (bool)_network ? _network->isConnected() : false; }
@@
-65,6
+64,8
@@
public:
virtual QString toolTip(int column) const;
virtual QString toolTip(int column) const;
+ BufferItem *findBufferItem(BufferId bufferId);
+ inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) { return findBufferItem(bufferInfo.bufferId()); }
BufferItem *bufferItem(const BufferInfo &bufferInfo);
public slots:
BufferItem *bufferItem(const BufferInfo &bufferInfo);
public slots:
@@
-73,6
+74,7
@@
public slots:
void attachNetwork(Network *network);
void attachIrcChannel(IrcChannel *channel);
void attachNetwork(Network *network);
void attachIrcChannel(IrcChannel *channel);
+ void attachIrcUser(IrcUser *ircUser);
private:
NetworkId _networkId;
private:
NetworkId _networkId;
@@
-93,7
+95,6
@@
public:
BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent = 0);
inline const BufferInfo &bufferInfo() const { return _bufferInfo; }
BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent = 0);
inline const BufferInfo &bufferInfo() const { return _bufferInfo; }
- virtual inline quint64 id() const { return qHash(_bufferInfo.bufferId()); }
virtual QVariant data(int column, int role) const;
virtual bool setData(int column, const QVariant &value, int role);
virtual QVariant data(int column, int role) const;
virtual bool setData(int column, const QVariant &value, int role);
@@
-147,12
+148,22
@@
class QueryBufferItem : public BufferItem {
public:
QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
public:
QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
+ virtual bool isActive() const;
virtual QString toolTip(int column) const;
virtual QString toolTip(int column) const;
+
+public slots:
+ void attachIrcUser(IrcUser *ircUser);
+ void ircUserDestroyed();
+
+private:
+ IrcUser *_ircUser;
};
/*****************************************
* ChannelBufferItem
*****************************************/
};
/*****************************************
* ChannelBufferItem
*****************************************/
+class UserCategoryItem;
+
class ChannelBufferItem : public BufferItem {
Q_OBJECT
class ChannelBufferItem : public BufferItem {
Q_OBJECT
@@
-171,6
+182,7
@@
public slots:
void join(const QList<IrcUser *> &ircUsers);
void part(IrcUser *ircUser);
void join(const QList<IrcUser *> &ircUsers);
void part(IrcUser *ircUser);
+ UserCategoryItem *findCategoryItem(int categoryId);
void addUserToCategory(IrcUser *ircUser);
void addUsersToCategory(const QList<IrcUser *> &ircUser);
void removeUserFromCategory(IrcUser *ircUser);
void addUserToCategory(IrcUser *ircUser);
void addUsersToCategory(const QList<IrcUser *> &ircUser);
void removeUserFromCategory(IrcUser *ircUser);
@@
-187,6
+199,7
@@
private:
/*****************************************
* User Category Items (like @vh etc.)
*****************************************/
/*****************************************
* User Category Items (like @vh etc.)
*****************************************/
+class IrcUserItem;
class UserCategoryItem : public PropertyMapItem {
Q_OBJECT
Q_PROPERTY(QString categoryName READ categoryName)
class UserCategoryItem : public PropertyMapItem {
Q_OBJECT
Q_PROPERTY(QString categoryName READ categoryName)
@@
-195,9
+208,10
@@
public:
UserCategoryItem(int category, AbstractTreeItem *parent);
QString categoryName() const;
UserCategoryItem(int category, AbstractTreeItem *parent);
QString categoryName() const;
- virtual quint64 id() const;
+ inline int categoryId() const { return _category; }
virtual QVariant data(int column, int role) const;
virtual QVariant data(int column, int role) const;
-
+
+ IrcUserItem *findIrcUser(IrcUser *ircUser);
void addUsers(const QList<IrcUser *> &ircUser);
bool removeUser(IrcUser *ircUser);
void addUsers(const QList<IrcUser *> &ircUser);
bool removeUser(IrcUser *ircUser);
@@
-223,17
+237,11
@@
public:
bool isActive() const;
inline IrcUser *ircUser() { return _ircUser; }
bool isActive() const;
inline IrcUser *ircUser() { return _ircUser; }
- inline virtual quint64 id() const { return _id; }
virtual QVariant data(int column, int role) const;
virtual QString toolTip(int column) const;
virtual QVariant data(int column, int role) const;
virtual QString toolTip(int column) const;
-private slots:
- void setNick(QString newNick);
- void setAway(bool);
-
private:
QPointer<IrcUser> _ircUser;
private:
QPointer<IrcUser> _ircUser;
- quint64 _id;
};
};
@@
-290,10
+298,12
@@
public slots:
void networkRemoved(const NetworkId &networkId);
private:
void networkRemoved(const NetworkId &networkId);
private:
+ int networkRow(NetworkId networkId);
+ NetworkItem *findNetworkItem(NetworkId networkId);
NetworkItem *networkItem(NetworkId networkId);
NetworkItem *networkItem(NetworkId networkId);
- NetworkItem *existsNetworkItem(NetworkId networkId);
+ BufferItem *findBufferItem(const BufferInfo &bufferInfo);
+ BufferItem *findBufferItem(BufferId bufferId);
BufferItem *bufferItem(const BufferInfo &bufferInfo);
BufferItem *bufferItem(const BufferInfo &bufferInfo);
- BufferItem *existsBufferItem(const BufferInfo &bufferInfo);
};
Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);
};
Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);