projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging r732:766 from trunk to branches/0.3.
[quassel.git]
/
src
/
client
/
buffermodel.h
diff --git
a/src/client/buffermodel.h
b/src/client/buffermodel.h
index
db8049d
..
3126f73
100644
(file)
--- a/
src/client/buffermodel.h
+++ b/
src/client/buffermodel.h
@@
-26,7
+26,6
@@
#include "types.h"
#include "selectionmodelsynchronizer.h"
#include "types.h"
#include "selectionmodelsynchronizer.h"
-#include "modelpropertymapper.h"
class NetworkModel;
class MappedSelectionModel;
class NetworkModel;
class MappedSelectionModel;
@@
-37,24
+36,24
@@
class BufferModel : public QSortFilterProxyModel {
public:
BufferModel(NetworkModel *parent = 0);
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);
QModelIndex currentIndex();
void setCurrentIndex(const QModelIndex &newCurrent);
QModelIndex currentIndex();
void setCurrentIndex(const QModelIndex &newCurrent);
+private slots:
+ void debug_currentChanged(QModelIndex current, QModelIndex previous);
+ void debug_selectionChanged(QItemSelection current , QItemSelection previous);
+
private:
SelectionModelSynchronizer _selectionModelSynchronizer;
private:
SelectionModelSynchronizer _selectionModelSynchronizer;
- ModelPropertyMapper _propertyMapper;
};
#endif // BUFFERMODEL_H
};
#endif // BUFFERMODEL_H