Cleanup QQuickStyleSelector

Remove some unneeded cruft that originates from QFileSelector and what
we don't need in this specialized selector. Also, fix the header guards
and include directives to use the same convention than all other classes.

Change-Id: I728beba1156c0934bd0dd171038fc7560a556708
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/controls/qquickstyleselector_p.h b/src/controls/qquickstyleselector_p.h
index 86e550e7..5c6434cb 100644
--- a/src/controls/qquickstyleselector_p.h
+++ b/src/controls/qquickstyleselector_p.h
@@ -47,6 +47,7 @@
 //
 
 #include <QtCore/qurl.h>
+#include <QtCore/qstring.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
 
@@ -57,15 +58,16 @@ class QQuickStyleSelectorPrivate;
 class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickStyleSelector
 {
 public:
-    explicit QQuickStyleSelector();
+    QQuickStyleSelector();
     ~QQuickStyleSelector();
 
-    QString select(const QString &fileName) const;
-
-    void setBaseUrl(const QUrl &base);
     QUrl baseUrl() const;
+    void setBaseUrl(const QUrl &url);
+
+    QString select(const QString &fileName) const;
 
 private:
+    Q_DISABLE_COPY(QQuickStyleSelector)
     Q_DECLARE_PRIVATE(QQuickStyleSelector)
     QScopedPointer<QQuickStyleSelectorPrivate> d_ptr;
 };