projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging r780:786 from trunk to branches/0.3. Plus some work-in-progress.
[quassel.git]
/
src
/
client
/
buffermodel.h
diff --git
a/src/client/buffermodel.h
b/src/client/buffermodel.h
index
4fb610d
..
7bd3fc9
100644
(file)
--- a/
src/client/buffermodel.h
+++ b/
src/client/buffermodel.h
@@
-23,45
+23,36
@@
#include <QSortFilterProxyModel>
#include <QItemSelectionModel>
#include <QSortFilterProxyModel>
#include <QItemSelectionModel>
-#include <QPointer>
-class NetworkModel;
-//class SelectionModelSynchronizer;
+#include "types.h"
#include "selectionmodelsynchronizer.h"
#include "selectionmodelsynchronizer.h"
-//class ModelPropertyMapper;
-#include "modelpropertymapper.h"
+
+class NetworkModel;
class MappedSelectionModel;
class QAbstractItemView;
class MappedSelectionModel;
class QAbstractItemView;
-class Buffer;
class BufferModel : public QSortFilterProxyModel {
Q_OBJECT
public:
BufferModel(NetworkModel *parent = 0);
class BufferModel : public QSortFilterProxyModel {
Q_OBJECT
public:
BufferModel(NetworkModel *parent = 0);
- virtual ~BufferModel();
bool filterAcceptsRow(int sourceRow, const QModelIndex &parent) const;
bool filterAcceptsRow(int sourceRow, const QModelIndex &parent) const;
- inline
SelectionModelSynchronizer *selectionModelSynchronizer() { return
_selectionModelSynchronizer; }
- inline
ModelPropertyMapper *propertyMapper() { return _propertyMapper
; }
-
+ inline
const SelectionModelSynchronizer *selectionModelSynchronizer() const { return &
_selectionModelSynchronizer; }
+ inline
QItemSelectionModel *standardSelectionModel() const { return _selectionModelSynchronizer.selectionModel()
; }
+
void synchronizeSelectionModel(MappedSelectionModel *selectionModel);
void synchronizeView(QAbstractItemView *view);
void synchronizeSelectionModel(MappedSelectionModel *selectionModel);
void synchronizeView(QAbstractItemView *view);
- void mapProperty(int column, int role, QObject *target, const QByteArray &property);
-
-public slots:
- void setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command);
- void selectBuffer(Buffer *buffer);
-signals:
- void bufferSelected(Buffer *);
- void selectionChanged(const QModelIndex &);
+ QModelIndex currentIndex();
+ void setCurrentIndex(const QModelIndex &newCurrent);
+private slots:
+ void debug_currentChanged(QModelIndex current, QModelIndex previous);
+
private:
private:
- QPointer<SelectionModelSynchronizer> _selectionModelSynchronizer;
- QPointer<ModelPropertyMapper> _propertyMapper;
- Buffer *currentBuffer;
+ SelectionModelSynchronizer _selectionModelSynchronizer;
};
#endif // BUFFERMODEL_H
};
#endif // BUFFERMODEL_H