projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correctly handle the recent NetworkInfo extension. This fixes the problem
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
b038f9d
..
8c36233
100644
(file)
--- a/
src/client/networkmodel.h
+++ b/
src/client/networkmodel.h
@@
-32,6
+32,8
@@
class BufferInfo;
#include "selectionmodelsynchronizer.h"
#include "modelpropertymapper.h"
#include "selectionmodelsynchronizer.h"
#include "modelpropertymapper.h"
+#include "clientsettings.h"
+
class MappedSelectionModel;
class QAbstractItemView;
class Network;
class MappedSelectionModel;
class QAbstractItemView;
class Network;
@@
-60,15
+62,9
@@
public:
QString bufferName() const;
QString topic() const;
int nickCount() const;
QString bufferName() const;
QString topic() const;
int nickCount() const;
-
- enum Type {
- StatusType,
- ChannelType,
- QueryType
- };
bool isStatusBuffer() const;
bool isStatusBuffer() const;
- Type bufferType() const;
+
BufferInfo::
Type bufferType() const;
bool isActive() const;
bool isActive() const;
@@
-81,9
+77,13
@@
public:
Q_DECLARE_FLAGS(ActivityLevel, Activity)
ActivityLevel activity() const;
Q_DECLARE_FLAGS(ActivityLevel, Activity)
ActivityLevel activity() const;
-
void
setActivity(const ActivityLevel &level);
+
bool
setActivity(const ActivityLevel &level);
void updateActivity(const ActivityLevel &level);
void updateActivity(const ActivityLevel &level);
+ void setLastMsgInsert(QDateTime msgDate);
+ bool setLastSeen();
+ QDateTime lastSeen();
+
public slots:
void setTopic(const QString &topic);
void join(IrcUser *ircUser);
public slots:
void setTopic(const QString &topic);
void join(IrcUser *ircUser);
@@
-95,11
+95,13
@@
public slots:
private slots:
void ircChannelDestroyed();
private slots:
void ircChannelDestroyed();
+ void ircUserDestroyed();
private:
BufferInfo _bufferInfo;
ActivityLevel _activity;
private:
BufferInfo _bufferInfo;
ActivityLevel _activity;
- Type _type;
+ QDateTime _lastMsgInsert;
+ QDateTime _lastSeen;
QPointer<IrcChannel> _ircChannel;
};
QPointer<IrcChannel> _ircChannel;
};
@@
-183,6
+185,8
@@
public:
IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
QString nickName() const;
IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
QString nickName() const;
+ bool isActive() const;
+
IrcUser *ircUser();
virtual quint64 id() const;
virtual QVariant data(int column, int role) const;
IrcUser *ircUser();
virtual quint64 id() const;
virtual QVariant data(int column, int role) const;
@@
-192,7
+196,8
@@
private slots:
void setNick(QString newNick);
private:
void setNick(QString newNick);
private:
- IrcUser *_ircUser;
+ QPointer<IrcUser> _ircUser;
+ quint64 _id;
};
};
@@
-210,7
+215,8
@@
public:
BufferIdRole,
NetworkIdRole,
BufferInfoRole,
BufferIdRole,
NetworkIdRole,
BufferInfoRole,
- ItemTypeRole
+ ItemTypeRole,
+ LastSeenRole
};
enum itemTypes {
};
enum itemTypes {
@@
-241,7
+247,8
@@
public:
public slots:
void bufferUpdated(BufferInfo bufferInfo);
void updateBufferActivity(const Message &msg);
public slots:
void bufferUpdated(BufferInfo bufferInfo);
void updateBufferActivity(const Message &msg);
-
+ void networkRemoved(const NetworkId &networkId);
+
private:
QModelIndex networkIndex(NetworkId networkId);
NetworkItem *networkItem(NetworkId networkId);
private:
QModelIndex networkIndex(NetworkId networkId);
NetworkItem *networkItem(NetworkId networkId);