summaryrefslogtreecommitdiff
path: root/src/controls/Private/qquickspinboxvalidator_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/qquickspinboxvalidator_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/qquickspinboxvalidator_p.h')
-rw-r--r--src/controls/Private/qquickspinboxvalidator_p.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/controls/Private/qquickspinboxvalidator_p.h b/src/controls/Private/qquickspinboxvalidator_p.h
index 8de18410..7ca6901e 100644
--- a/src/controls/Private/qquickspinboxvalidator_p.h
+++ b/src/controls/Private/qquickspinboxvalidator_p.h
@@ -45,7 +45,7 @@
QT_BEGIN_NAMESPACE
-class QQuickSpinBoxValidator : public QValidator, public QQmlParserStatus
+class QQuickSpinBoxValidator1 : public QValidator, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QQmlParserStatus)
@@ -59,8 +59,8 @@ class QQuickSpinBoxValidator : public QValidator, public QQmlParserStatus
Q_PROPERTY(QString suffix READ suffix WRITE setSuffix NOTIFY suffixChanged)
public:
- explicit QQuickSpinBoxValidator(QObject *parent = 0);
- virtual ~QQuickSpinBoxValidator();
+ explicit QQuickSpinBoxValidator1(QObject *parent = 0);
+ virtual ~QQuickSpinBoxValidator1();
QString text() const;
@@ -116,11 +116,11 @@ private:
bool m_initialized;
QDoubleValidator m_validator;
- Q_DISABLE_COPY(QQuickSpinBoxValidator)
+ Q_DISABLE_COPY(QQuickSpinBoxValidator1)
};
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QQuickSpinBoxValidator)
+QML_DECLARE_TYPE(QQuickSpinBoxValidator1)
#endif // QQUICKSPINBOXVALIDATOR_P_H