jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Changed parameter name in code to model instead of type to allow scanning

Browse source
This commit is contained in:
Stefan Persson 2011-05-13 08:55:42 +00:00
parent 7ec1ed838d
commit 228e0302ce
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
telldus-gui/TelldusGui/filtereddeviceproxymodel.cpp
View file

@ -15,11 +15,11 @@ public:
class FilteredDeviceProxyModel::PrivateData::Filter { class FilteredDeviceProxyModel::PrivateData::Filter {
public: public:
Filter(QString p, QString t); Filter(QString p, QString t);
QString protocol, type; QString protocol, model;
}; };
FilteredDeviceProxyModel::PrivateData::Filter::Filter(QString p, QString t) FilteredDeviceProxyModel::PrivateData::Filter::Filter(QString p, QString t)
:protocol(p), type(t) :protocol(p), model(t)
{} {}
FilteredDeviceProxyModel::FilteredDeviceProxyModel( QObject * parent ) FilteredDeviceProxyModel::FilteredDeviceProxyModel( QObject * parent )
@ -41,14 +41,14 @@ void FilteredDeviceProxyModel::setSourceModel( VendorDeviceModel * sourceModel )
void FilteredDeviceProxyModel::addFilter( const QString &filter ) { void FilteredDeviceProxyModel::addFilter( const QString &filter ) {
d->filtered = true; d->filtered = true;
QString protocol, type; QString protocol, model;
foreach(QString parameter, filter.split(';', QString::SkipEmptyParts)) { foreach(QString parameter, filter.split(';', QString::SkipEmptyParts)) {
QString name = parameter.section(':', 0, 0); QString name = parameter.section(':', 0, 0);
QString value = parameter.section(':', -1); QString value = parameter.section(':', -1);
if (name == "protocol") { if (name == "protocol") {
protocol = value; protocol = value;
} else if (name == "model") { } else if (name == "model") {
type = value; model = value;
} else if (name == "method") { } else if (name == "method") {
} else { } else {
emit setParameter(name, value); emit setParameter(name, value);
@ -59,12 +59,12 @@ void FilteredDeviceProxyModel::addFilter( const QString &filter ) {
if (d->filters.at(i).protocol != protocol) { if (d->filters.at(i).protocol != protocol) {
continue; continue;
} }
if (d->filters.at(i).type != type) { if (d->filters.at(i).model != model) {
continue; continue;
} }
return; return;
} }
d->filters << PrivateData::Filter(protocol, type); d->filters << PrivateData::Filter(protocol, model);
invalidateFilter(); invalidateFilter();
} }
@ -104,7 +104,7 @@ bool FilteredDeviceProxyModel::filterAcceptsRow ( int sourceRow, const QModelInd
if (strModel.startsWith("selflearning-")) { if (strModel.startsWith("selflearning-")) {
strModel = "selflearning"; strModel = "selflearning";
} }
if (strModel == d->filters.at(i).type) { if (strModel == d->filters.at(i).model) {
return true; return true;
} }
} }