Default: rename QQuickDialRing to QQuickDefaultDial

This is consistent with the other existing internal Default style
visuals QQuickDefaultBusyIndicator and QQuickDefaultProgressBar.

Change-Id: I3a84edfdd6fb8bbd8a040c633c5b6411dd5350d8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

6 files changed, 26 insertions, 26 deletions

diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml
index db8203fe..f33ebf72 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/Dial.qml
@@ -45,7 +45,7 @@ T.Dial {
     implicitWidth: 184
     implicitHeight: 184
 
-    background: DialRing {
+    background: DialImpl {
         width: control.availableWidth
         height: control.availableHeight
         color: control.visualFocus ? Default.focusColor : Default.frameDarkColor
diff --git a/src/imports/controls/controls.pri b/src/imports/controls/controls.pri
index 41347aa7..5b0f3000 100644
--- a/src/imports/controls/controls.pri
+++ b/src/imports/controls/controls.pri
@@ -1,12 +1,12 @@
 HEADERS += \
-    $$PWD/qquickdialring_p.h \
     $$PWD/qquickdefaultbusyindicator_p.h \
+    $$PWD/qquickdefaultdial_p.h \
     $$PWD/qquickdefaultprogressbar_p.h \
     $$PWD/qquickdefaultstyle_p.h \
 
 SOURCES += \
-    $$PWD/qquickdialring.cpp \
     $$PWD/qquickdefaultbusyindicator.cpp \
+    $$PWD/qquickdefaultdial.cpp \
     $$PWD/qquickdefaultprogressbar.cpp \
     $$PWD/qquickdefaultstyle.cpp
 
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index 7f779637..13d54abe 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -42,6 +42,15 @@ Module {
         exportMetaObjectRevisions: [0]
     }
     Component {
+        name: "QQuickDefaultDial"
+        defaultProperty: "data"
+        prototype: "QQuickPaintedItem"
+        exports: ["QtQuick.Controls.impl/DialImpl 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "progress"; type: "double" }
+        Property { name: "color"; type: "QColor" }
+    }
+    Component {
         name: "QQuickDefaultProgressBar"
         defaultProperty: "data"
         prototype: "QQuickItem"
@@ -98,15 +107,6 @@ Module {
         Property { name: "disabledLightColor"; type: "QColor"; isReadonly: true }
     }
     Component {
-        name: "QQuickDialRing"
-        defaultProperty: "data"
-        prototype: "QQuickPaintedItem"
-        exports: ["QtQuick.Controls.impl/DialRing 2.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "progress"; type: "double" }
-        Property { name: "color"; type: "QColor" }
-    }
-    Component {
         name: "QQuickIconImage"
         defaultProperty: "data"
         prototype: "QQuickImage"
diff --git a/src/imports/controls/qquickdialring.cpp b/src/imports/controls/qquickdefaultdial.cpp
index d5193459..845e634d 100644
--- a/src/imports/controls/qquickdialring.cpp
+++ b/src/imports/controls/qquickdefaultdial.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickdialring_p.h"
+#include "qquickdefaultdial_p.h"
 
 #include <QtCore/qmath.h>
 #include <QtGui/qpainter.h>
@@ -42,19 +42,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickDialRing::QQuickDialRing(QQuickItem *parent) :
+QQuickDefaultDial::QQuickDefaultDial(QQuickItem *parent) :
     QQuickPaintedItem(parent),
     m_progress(0),
     m_color(Qt::black)
 {
 }
 
-qreal QQuickDialRing::progress() const
+qreal QQuickDefaultDial::progress() const
 {
     return m_progress;
 }
 
-void QQuickDialRing::setProgress(qreal progress)
+void QQuickDefaultDial::setProgress(qreal progress)
 {
     if (progress == m_progress)
         return;
@@ -63,12 +63,12 @@ void QQuickDialRing::setProgress(qreal progress)
     update();
 }
 
-QColor QQuickDialRing::color() const
+QColor QQuickDefaultDial::color() const
 {
     return m_color;
 }
 
-void QQuickDialRing::setColor(const QColor &color)
+void QQuickDefaultDial::setColor(const QColor &color)
 {
     if (color == m_color)
         return;
@@ -77,7 +77,7 @@ void QQuickDialRing::setColor(const QColor &color)
     update();
 }
 
-void QQuickDialRing::paint(QPainter *painter)
+void QQuickDefaultDial::paint(QPainter *painter)
 {
     if (width() <= 0 || height() <= 0)
         return;
diff --git a/src/imports/controls/qquickdialring_p.h b/src/imports/controls/qquickdefaultdial_p.h
index 421f2253..10490610 100644
--- a/src/imports/controls/qquickdialring_p.h
+++ b/src/imports/controls/qquickdefaultdial_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKDIALRING_P_H
-#define QQUICKDIALRING_P_H
+#ifndef QQUICKDEFAULTDIAL_P_H
+#define QQUICKDEFAULTDIAL_P_H
 
 //
 //  W A R N I N G
@@ -53,14 +53,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDialRing : public QQuickPaintedItem
+class QQuickDefaultDial : public QQuickPaintedItem
 {
     Q_OBJECT
     Q_PROPERTY(qreal progress READ progress WRITE setProgress FINAL)
     Q_PROPERTY(QColor color READ color WRITE setColor FINAL)
 
 public:
-    QQuickDialRing(QQuickItem *parent = nullptr);
+    explicit QQuickDefaultDial(QQuickItem *parent = nullptr);
 
     qreal progress() const;
     void setProgress(qreal progress);
@@ -77,4 +77,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQUICKDIALRING_P_H
+#endif // QQUICKDEFAULTDIAL_P_H
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 1effbbd8..a1d8a2bb 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -53,9 +53,9 @@
 #include <QtQuickTemplates2/private/qquickicon_p.h>
 
 #include "qquickdefaultbusyindicator_p.h"
+#include "qquickdefaultdial_p.h"
 #include "qquickdefaultprogressbar_p.h"
 #include "qquickdefaultstyle_p.h"
-#include "qquickdialring_p.h"
 
 static inline void initResources()
 {
@@ -184,8 +184,8 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur
     qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2...
 
     qmlRegisterType<QQuickDefaultBusyIndicator>(import, 2, 0, "BusyIndicatorImpl");
+    qmlRegisterType<QQuickDefaultDial>(import, 2, 0, "DialImpl");
     qmlRegisterType<QQuickDefaultProgressBar>(import, 2, 0, "ProgressBarImpl");
-    qmlRegisterType<QQuickDialRing>(import, 2, 0, "DialRing");
     qmlRegisterType<QQuickPlaceholderText>(import, 2, 2, "PlaceholderText");
 #if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview)
     qmlRegisterType<QQuickTumblerView>(import, 2, 1, "TumblerView");