projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging branches/0.2/@r859 with trunk
[quassel.git]
/
src
/
qtui
/
chatscene.h
diff --git
a/src/qtui/chatscene.h
b/src/qtui/chatscene.h
index
a0bcefc
..
5f8057a
100644
(file)
--- a/
src/qtui/chatscene.h
+++ b/
src/qtui/chatscene.h
@@
-21,10
+21,9
@@
#ifndef _CHATSCENE_H_
#define _CHATSCENE_H_
#ifndef _CHATSCENE_H_
#define _CHATSCENE_H_
+#include <QAbstractItemModel>
#include <QGraphicsScene>
#include <QGraphicsScene>
-#include "messagemodel.h"
-
class AbstractUiMsg;
class Buffer;
class ChatItem;
class AbstractUiMsg;
class Buffer;
class ChatItem;
@@
-35,11
+34,11
@@
class ChatScene : public QGraphicsScene {
Q_OBJECT
public:
Q_OBJECT
public:
- ChatScene(
Message
Model *model, QObject *parent);
+ ChatScene(
QAbstractItem
Model *model, QObject *parent);
virtual ~ChatScene();
Buffer *buffer() const;
virtual ~ChatScene();
Buffer *buffer() const;
- inline
Message
Model *model() const { return _model; }
+ inline
QAbstractItem
Model *model() const { return _model; }
public slots:
void setWidth(int);
public slots:
void setWidth(int);
@@
-54,7
+53,7
@@
class ChatScene : public QGraphicsScene {
private:
int _width, _height;
int _timestampWidth, _senderWidth;
private:
int _width, _height;
int _timestampWidth, _senderWidth;
-
Message
Model *_model;
+
QAbstractItem
Model *_model;
QList<ChatLine *> _lines;
};
QList<ChatLine *> _lines;
};