projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed crash when joining new channels
[quassel.git]
/
src
/
client
/
buffertreemodel.h
diff --git
a/src/client/buffertreemodel.h
b/src/client/buffertreemodel.h
index
3f4e597
..
7053ef7
100644
(file)
--- a/
src/client/buffertreemodel.h
+++ b/
src/client/buffertreemodel.h
@@
-24,6
+24,7
@@
#include <QtCore>
#include "treemodel.h"
#include <QtCore>
#include "treemodel.h"
+class BufferInfo;
#include "buffer.h"
/*****************************************
#include "buffer.h"
/*****************************************
@@
-36,12
+37,13
@@
public:
BufferTreeItem(Buffer *, TreeItem *parent = 0);
virtual uint id() const;
BufferTreeItem(Buffer *, TreeItem *parent = 0);
virtual uint id() const;
-
QVariant data(int column, int role) const;
QVariant data(int column, int role) const;
+ virtual Qt::ItemFlags flags() const;
+
Buffer *buffer() const { return buf; }
void setActivity(const Buffer::ActivityLevel &);
Buffer *buffer() const { return buf; }
void setActivity(const Buffer::ActivityLevel &);
-pr
otected
:
+pr
ivate
:
QString text(int column) const;
QColor foreground(int column) const;
QString text(int column) const;
QColor foreground(int column) const;
@@
-59,6
+61,7
@@
public:
NetworkTreeItem(const QString &, TreeItem *parent = 0);
virtual uint id() const;
NetworkTreeItem(const QString &, TreeItem *parent = 0);
virtual uint id() const;
+ virtual Qt::ItemFlags flags() const;
private:
QString net;
private:
QString net;
@@
-72,17
+75,15
@@
class BufferTreeModel : public TreeModel {
Q_OBJECT
public:
Q_OBJECT
public:
- enum
myRoles {
+ enum myRoles {
BufferTypeRole = Qt::UserRole,
BufferActiveRole,
BufferNameRole,
BufferTypeRole = Qt::UserRole,
BufferActiveRole,
BufferNameRole,
- BufferI
d
Role
+ BufferI
nfo
Role
};
BufferTreeModel(QObject *parent = 0);
static QList<QVariant> defaultHeader();
};
BufferTreeModel(QObject *parent = 0);
static QList<QVariant> defaultHeader();
-
- virtual Qt::ItemFlags flags(const QModelIndex &index) const;
public slots:
void bufferUpdated(Buffer *);
public slots:
void bufferUpdated(Buffer *);
@@
-94,7
+95,7
@@
public slots:
signals:
void bufferSelected(Buffer *);
void invalidateFilter();
signals:
void bufferSelected(Buffer *);
void invalidateFilter();
- void fakeUserInput(BufferI
d
, QString);
+ void fakeUserInput(BufferI
nfo
, QString);
void selectionChanged(const QModelIndex &);
private:
void selectionChanged(const QModelIndex &);
private: