From 23eed68958b7585552be04fab4e5871a781b7f38 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Wed, 23 Jan 2008 18:44:25 +0000 Subject: [PATCH] BufferModell::currentChanged() is history. If you need it, file a friendly complaint at /dev/null :) --- src/client/buffermodel.cpp | 15 --------------- src/client/buffermodel.h | 12 ++---------- src/client/treemodel.cpp | 2 ++ version.inc | 2 +- 4 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/client/buffermodel.cpp b/src/client/buffermodel.cpp index c9537f31..78d39605 100644 --- a/src/client/buffermodel.cpp +++ b/src/client/buffermodel.cpp @@ -35,8 +35,6 @@ BufferModel::BufferModel(NetworkModel *parent) // initialize the Property Mapper _propertyMapper.setModel(this); _selectionModelSynchronizer.addRegularSelectionModel(_propertyMapper.selectionModel()); - connect(&_selectionModelSynchronizer, SIGNAL(setCurrentIndex(QModelIndex, QItemSelectionModel::SelectionFlags)), - this, SLOT(setCurrentIndex(QModelIndex, QItemSelectionModel::SelectionFlags))); } BufferModel::~BufferModel() { @@ -67,19 +65,6 @@ void BufferModel::mapProperty(int column, int role, QObject *target, const QByte _propertyMapper.addMapping(column, role, target, property); } -// This Slot indicates that the user has selected a different buffer in the gui -void BufferModel::setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) { - Q_UNUSED(command) - BufferId newCurrentBuffer; - if(index.data(NetworkModel::ItemTypeRole) == NetworkModel::BufferItemType - && currentBuffer != (newCurrentBuffer = qVariantValue(index.data(NetworkModel::BufferIdRole)))) { - currentBuffer = newCurrentBuffer; - // FIXME: to something like: index.setData(ActivitRole, NoActivity); - // networkModel->bufferActivity(BufferItem::NoActivity, currentBuffer); - emit selectionChanged(index); - } -} - QModelIndex BufferModel::currentIndex() { return propertyMapper()->selectionModel()->currentIndex(); } diff --git a/src/client/buffermodel.h b/src/client/buffermodel.h index 4eb22308..2d6f4b47 100644 --- a/src/client/buffermodel.h +++ b/src/client/buffermodel.h @@ -23,16 +23,14 @@ #include #include -#include #include "types.h" - -class NetworkModel; #include "selectionmodelsynchronizer.h" #include "modelpropertymapper.h" + +class NetworkModel; class MappedSelectionModel; class QAbstractItemView; -class Buffer; class BufferModel : public QSortFilterProxyModel { Q_OBJECT @@ -51,17 +49,11 @@ public: 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); - -signals: - void selectionChanged(const QModelIndex &); private: SelectionModelSynchronizer _selectionModelSynchronizer; ModelPropertyMapper _propertyMapper; - BufferId currentBuffer; }; #endif // BUFFERMODEL_H diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp index e9cf7d1e..42a40f7f 100644 --- a/src/client/treemodel.cpp +++ b/src/client/treemodel.cpp @@ -247,6 +247,7 @@ bool SimpleTreeItem::setData(int column, const QVariant &value, int role) { else _itemData[column] = value; + emit dataChanged(column); return true; } @@ -284,6 +285,7 @@ bool PropertyMapItem::setData(int column, const QVariant &value, int role) { if(column >= columnCount() || role != Qt::DisplayRole) return false; + emit dataChanged(column); return setProperty(_propertyOrder[column].toAscii(), value); } diff --git a/version.inc b/version.inc index 4c2b80db..d671717a 100644 --- a/version.inc +++ b/version.inc @@ -5,7 +5,7 @@ quasselVersion = "0.2.0-pre"; quasselDate = "2008-01-23"; - quasselBuild = 378; + quasselBuild = 379; //! Minimum client build number the core needs clientBuildNeeded = 358; -- 2.20.1