summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-06-09 00:35:57 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-06-09 00:35:57 (GMT)
commitef4378dd282ed51098d1366792e46e9cfbde727a (patch)
treee47ac57c47e40577497702b787904ccd90293e86 /src
parentb8c8c87587bcc0312f0efbb2028885adb8419fee (diff)
downloadQt-ef4378dd282ed51098d1366792e46e9cfbde727a.zip
Qt-ef4378dd282ed51098d1366792e46e9cfbde727a.tar.gz
Qt-ef4378dd282ed51098d1366792e46e9cfbde727a.tar.bz2
Compile fix for WinCE.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/extra/qfxintegermodel.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/declarative/extra/qfxintegermodel.cpp b/src/declarative/extra/qfxintegermodel.cpp
index 2a85ee1..53814cd 100644
--- a/src/declarative/extra/qfxintegermodel.cpp
+++ b/src/declarative/extra/qfxintegermodel.cpp
@@ -48,9 +48,9 @@ QML_DEFINE_TYPE(QFxIntegerModel, IntegerModel)
class QFxIntegerModelPrivate
{
public:
- QFxIntegerModelPrivate() : min(0), max(0) {}
- int min;
- int max;
+ QFxIntegerModelPrivate() : minimum(0), maximum(0) {}
+ int minimum;
+ int maximum;
};
QFxIntegerModel::QFxIntegerModel(QObject *parent)
@@ -66,27 +66,27 @@ QFxIntegerModel::~QFxIntegerModel()
int QFxIntegerModel::minimum() const
{
- return d->min;
+ return d->minimum;
}
-void QFxIntegerModel::setMinimum(int min)
+void QFxIntegerModel::setMinimum(int minimum)
{
- d->min = min;
+ d->minimum = minimum;
}
int QFxIntegerModel::maximum() const
{
- return d->max;
+ return d->maximum;
}
-void QFxIntegerModel::setMaximum(int max)
+void QFxIntegerModel::setMaximum(int maximum)
{
- d->max = max;
+ d->maximum = maximum;
}
int QFxIntegerModel::count() const
{
- return qMax(0, d->max - d->min + 1);
+ return qMax(0, d->maximum - d->minimum + 1);
}
QHash<int,QVariant> QFxIntegerModel::data(int index, const QList<int> &roles) const
@@ -98,7 +98,7 @@ QHash<int,QVariant> QFxIntegerModel::data(int index, const QList<int> &roles) co
QVariant info;
switch(role) {
case Qt::DisplayRole:
- info = QVariant(QString::number(d->min+index));
+ info = QVariant(QString::number(d->minimum+index));
break;
default:
break;