projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Impelementing proper message redirection.
[quassel.git]
/
src
/
client
/
buffermodel.h
diff --git
a/src/client/buffermodel.h
b/src/client/buffermodel.h
index
4eb2230
..
37f8916
100644
(file)
--- a/
src/client/buffermodel.h
+++ b/
src/client/buffermodel.h
@@
-23,45
+23,40
@@
#include <QSortFilterProxyModel>
#include <QItemSelectionModel>
#include <QSortFilterProxyModel>
#include <QItemSelectionModel>
-#include <QPointer>
#include "types.h"
#include "types.h"
+#include "selectionmodelsynchronizer.h"
class NetworkModel;
class NetworkModel;
-#include "selectionmodelsynchronizer.h"
-#include "modelpropertymapper.h"
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;
inline const SelectionModelSynchronizer *selectionModelSynchronizer() const { return &_selectionModelSynchronizer; }
bool filterAcceptsRow(int sourceRow, const QModelIndex &parent) const;
inline const SelectionModelSynchronizer *selectionModelSynchronizer() const { return &_selectionModelSynchronizer; }
- inline const ModelPropertyMapper *propertyMapper() const { return &_propertyMapper; }
- inline QItemSelectionModel *standardSelectionModel() const { return _propertyMapper.selectionModel(); }
-
+ 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:
- QModelIndex currentIndex();
- void setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command);
+ inline QModelIndex currentIndex() { return standardSelectionModel()->currentIndex(); }
-signals:
- void selectionChanged(const QModelIndex &);
+public slots:
+ void setCurrentIndex(const QModelIndex &newCurrent);
+ void switchToBuffer(const BufferId &bufferId);
+ void switchToBufferIndex(const QModelIndex &bufferIdx);
+private slots:
+ void debug_currentChanged(QModelIndex current, QModelIndex previous);
+
private:
SelectionModelSynchronizer _selectionModelSynchronizer;
private:
SelectionModelSynchronizer _selectionModelSynchronizer;
- ModelPropertyMapper _propertyMapper;
- BufferId currentBuffer;
};
#endif // BUFFERMODEL_H
};
#endif // BUFFERMODEL_H