projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed inconsistency issues. Upgrade and Distclean is strongly recommended
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
b038f9d
..
244b99b
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;
@@
-81,9
+83,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
+101,14
@@
public slots:
private slots:
void ircChannelDestroyed();
private slots:
void ircChannelDestroyed();
+ void ircUserDestroyed();
private:
BufferInfo _bufferInfo;
ActivityLevel _activity;
Type _type;
private:
BufferInfo _bufferInfo;
ActivityLevel _activity;
Type _type;
+ QDateTime _lastMsgInsert;
+ QDateTime _lastSeen;
QPointer<IrcChannel> _ircChannel;
};
QPointer<IrcChannel> _ircChannel;
};
@@
-183,6
+192,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
+203,8
@@
private slots:
void setNick(QString newNick);
private:
void setNick(QString newNick);
private:
- IrcUser *_ircUser;
+ QPointer<IrcUser> _ircUser;
+ quint64 _id;
};
};
@@
-210,7
+222,8
@@
public:
BufferIdRole,
NetworkIdRole,
BufferInfoRole,
BufferIdRole,
NetworkIdRole,
BufferInfoRole,
- ItemTypeRole
+ ItemTypeRole,
+ LastSeenRole
};
enum itemTypes {
};
enum itemTypes {