projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly return pointers for IrcUserRole and IrcChannelRole
[quassel.git]
/
src
/
client
/
networkmodel.h
diff --git
a/src/client/networkmodel.h
b/src/client/networkmodel.h
index
0ffc0a0
..
807403e
100644
(file)
--- a/
src/client/networkmodel.h
+++ b/
src/client/networkmodel.h
@@
-158,7
+158,7
@@
public:
public slots:
void attachIrcUser(IrcUser *ircUser);
public slots:
void attachIrcUser(IrcUser *ircUser);
- void ircUser
Destroy
ed();
+ void ircUser
Quit
ed();
private:
IrcUser *_ircUser;
private:
IrcUser *_ircUser;
@@
-175,6
+175,7
@@
class ChannelBufferItem : public BufferItem {
public:
ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent);
public:
ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent);
+ virtual QVariant data(int column, int role) const;
virtual inline bool isActive() const { return (bool)_ircChannel; }
virtual QString toolTip(int column) const;
virtual inline bool isActive() const { return (bool)_ircChannel; }
virtual QString toolTip(int column) const;
@@
-194,7
+195,7
@@
public slots:
void userModeChanged(IrcUser *ircUser);
private slots:
void userModeChanged(IrcUser *ircUser);
private slots:
- void ircChannel
Destroy
ed();
+ void ircChannel
Part
ed();
private:
IrcChannel *_ircChannel;
private:
IrcChannel *_ircChannel;
@@
-245,7
+246,7
@@
public:
virtual QString toolTip(int column) const;
private slots:
virtual QString toolTip(int column) const;
private slots:
- inline void ircUser
Destroy
ed() { parent()->removeChild(this); }
+ inline void ircUser
Quit
ed() { parent()->removeChild(this); }
private:
QPointer<IrcUser> _ircUser;
private:
QPointer<IrcUser> _ircUser;
@@
-268,7
+269,8
@@
public:
BufferInfoRole,
ItemTypeRole,
UserAwayRole,
BufferInfoRole,
ItemTypeRole,
UserAwayRole,
- IrcUserRole
+ IrcUserRole,
+ IrcChannelRole
};
enum ItemType {
};
enum ItemType {