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, 1 insertions, 17 deletions

diff --git a/src/controls/qquickstyleselector_p_p.h b/src/controls/qquickstyleselector_p_p.h
index dc91af5f..9f831428 100644
--- a/src/controls/qquickstyleselector_p_p.h
+++ b/src/controls/qquickstyleselector_p_p.h
@@ -46,30 +46,14 @@
 // We mean it.
 //
 
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-#include <private/qobject_p.h>
-#include <QtCore/qstringlist.h>
-
-#include "qquickstyleselector_p.h"
+#include <QtQuickControls/private/qquickstyleselector_p.h>
 
 QT_BEGIN_NAMESPACE
 
-struct QQuickStyleSelectorSharedData //Not QSharedData because currently is just a global store
-{
-    QStringList staticSelectors;
-    QStringList preloadedStatics;
-};
-
 class QQuickStyleSelectorPrivate
 {
 public:
-    static void updateSelectors();
-    static QStringList platformSelectors();
-    static void addStatics(const QStringList &); //For loading GUI statics from other Qt modules
-    QQuickStyleSelectorPrivate();
     QString select(const QString &filePath) const;
-    QStringList allSelectors(bool includeStyle) const;
 
     QUrl baseUrl;
 };