mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

A bit of code cleanup.

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-11-11 17:28:52 -02:00 committed by Dirk Hohndel
parent 1841eb98b9
commit 819d358f8c
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qt-ui/models.cpp
View file

@ -2253,7 +2253,7 @@ int LanguageModel::rowCount(const QModelIndex &parent) const
} }
TagFilterModel::TagFilterModel(QObject *parent) : QStringListModel(parent), checkState(NULL) TagFilterModel::TagFilterModel(QObject *parent) : QStringListModel(parent)
{ {
} }
@ -2366,7 +2366,7 @@ bool TagFilterModel::filterRow(int source_row, const QModelIndex &source_parent,
return false; return false;
} }
BuddyFilterModel::BuddyFilterModel(QObject *parent) : QStringListModel(parent), checkState(NULL) BuddyFilterModel::BuddyFilterModel(QObject *parent) : QStringListModel(parent)
{ {
} }
@ -2482,7 +2482,7 @@ bool BuddyFilterModel::setData(const QModelIndex &index, const QVariant &value,
return false; return false;
} }
LocationFilterModel::LocationFilterModel(QObject *parent) : QStringListModel(parent), checkState(NULL) LocationFilterModel::LocationFilterModel(QObject *parent) : QStringListModel(parent)
{ {
} }

9
qt-ui/models.h
View file

@ -440,7 +440,10 @@ private:
class MultiFilterInterface { class MultiFilterInterface {
public: public:
MultiFilterInterface() : checkState(NULL){};
virtual bool filterRow(int source_row, const QModelIndex &source_parent, QAbstractItemModel *sourceModel) const = 0; virtual bool filterRow(int source_row, const QModelIndex &source_parent, QAbstractItemModel *sourceModel) const = 0;
bool *checkState;
bool anyChecked;
}; };
class TagFilterModel : public QStringListModel, public MultiFilterInterface{ class TagFilterModel : public QStringListModel, public MultiFilterInterface{
@ -451,8 +454,6 @@ public:
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
virtual Qt::ItemFlags flags(const QModelIndex &index) const; virtual Qt::ItemFlags flags(const QModelIndex &index) const;
virtual bool filterRow(int source_row, const QModelIndex &source_parent, QAbstractItemModel *sourceModel) const; virtual bool filterRow(int source_row, const QModelIndex &source_parent, QAbstractItemModel *sourceModel) const;
bool *checkState;
bool anyChecked;
public public
slots: slots:
void repopulate(); void repopulate();
@ -469,8 +470,6 @@ public:
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
virtual Qt::ItemFlags flags(const QModelIndex &index) const; virtual Qt::ItemFlags flags(const QModelIndex &index) const;
virtual bool filterRow(int source_row, const QModelIndex &source_parent, QAbstractItemModel *sourceModel) const; virtual bool filterRow(int source_row, const QModelIndex &source_parent, QAbstractItemModel *sourceModel) const;
bool *checkState;
bool anyChecked;
public public
slots: slots:
void repopulate(); void repopulate();
@ -487,8 +486,6 @@ public:
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
virtual Qt::ItemFlags flags(const QModelIndex &index) const; virtual Qt::ItemFlags flags(const QModelIndex &index) const;
virtual bool filterRow(int source_row, const QModelIndex &source_parent, QAbstractItemModel *sourceModel) const; virtual bool filterRow(int source_row, const QModelIndex &source_parent, QAbstractItemModel *sourceModel) const;
bool *checkState;
bool anyChecked;
public public
slots: slots:
void repopulate(); void repopulate();

2
qt-ui/simplewidgets.cpp
View file

@ -569,7 +569,7 @@ MultiFilter::MultiFilter(QWidget *parent) : QScrollArea(parent)
tb->addWidget(closeBtn); tb->addWidget(closeBtn);
connect(closeBtn, SIGNAL(clicked(bool)), this, SLOT(hide())); connect(closeBtn, SIGNAL(clicked(bool)), this, SLOT(hide()));
connect(clearBtn, SIGNAL(clicked(bool)), MultiFilterSortModel::instance(), SLOT(clearFilter()));
l->addWidget(tb); l->addWidget(tb);
l->addWidget(tagFilter); l->addWidget(tagFilter);
l->addWidget(new BuddyFilter()); l->addWidget(new BuddyFilter());