summaryrefslogtreecommitdiff
path: root/src/controls/Private/qquickrangemodel_p.h
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@theqtcompany.com>2016-03-17 16:34:58 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-18 08:12:15 +0000
commit5cf6ad9165cc38b7b2a7e2421d70f0d93256c866 (patch)
tree09f63a49f570bc5f4d3b3a922c4112a1d2ab37d1 /src/controls/Private/qquickrangemodel_p.h
parent463b8d7bb53ae5ea08ec6caafdf1754ca015603a (diff)
downloadqtquickcontrols-5cf6ad9165cc38b7b2a7e2421d70f0d93256c866.tar.gz
Controls: append "1" to all C++ classes
This is consistent with the classes that have already had this done. It prevents clashes with Qt Quick Controls 2. These classes are not available to the user, so it doesn't affect compatibility. Change-Id: Iee73ee6bc530182732ae95993e1f4fc3766eb8e0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/Private/qquickrangemodel_p.h')
-rw-r--r--src/controls/Private/qquickrangemodel_p.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/controls/Private/qquickrangemodel_p.h b/src/controls/Private/qquickrangemodel_p.h
index 6e82b009..0c93bed3 100644
--- a/src/controls/Private/qquickrangemodel_p.h
+++ b/src/controls/Private/qquickrangemodel_p.h
@@ -45,9 +45,9 @@
QT_BEGIN_NAMESPACE
-class QQuickRangeModelPrivate;
+class QQuickRangeModel1Private;
-class QQuickRangeModel : public QObject
+class QQuickRangeModel1 : public QObject
{
Q_OBJECT
Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged USER true)
@@ -60,8 +60,8 @@ class QQuickRangeModel : public QObject
Q_PROPERTY(bool inverted READ inverted WRITE setInverted NOTIFY invertedChanged)
public:
- QQuickRangeModel(QObject *parent = 0);
- virtual ~QQuickRangeModel();
+ QQuickRangeModel1(QObject *parent = 0);
+ virtual ~QQuickRangeModel1();
void setRange(qreal min, qreal max);
void setPositionRange(qreal min, qreal max);
@@ -112,17 +112,17 @@ Q_SIGNALS:
void positionAtMaximumChanged(qreal max);
protected:
- QQuickRangeModel(QQuickRangeModelPrivate &dd, QObject *parent);
- QQuickRangeModelPrivate* d_ptr;
+ QQuickRangeModel1(QQuickRangeModel1Private &dd, QObject *parent);
+ QQuickRangeModel1Private* d_ptr;
private:
- Q_DISABLE_COPY(QQuickRangeModel)
- Q_DECLARE_PRIVATE(QQuickRangeModel)
+ Q_DISABLE_COPY(QQuickRangeModel1)
+ Q_DECLARE_PRIVATE(QQuickRangeModel1)
};
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QQuickRangeModel)
+QML_DECLARE_TYPE(QQuickRangeModel1)
#endif // QQUICKRANGEMODEL_P_H