Rename QQuickFileSelector to QQuickStyleSelector

Also moved to QtLabsControls lib.

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

7 files changed, 53 insertions, 50 deletions

diff --git a/src/controls/controls.pri b/src/controls/controls.pri
index ae85b4a7..63cba222 100644
--- a/src/controls/controls.pri
+++ b/src/controls/controls.pri
@@ -1,5 +1,8 @@
 HEADERS += \
+    $$PWD/qquickstyleselector_p.h \
+    $$PWD/qquickstyleselector_p_p.h \
     $$PWD/qquickpaddedrectangle_p.h
 
 SOURCES += \
+    $$PWD/qquickstyleselector.cpp \
     $$PWD/qquickpaddedrectangle.cpp
diff --git a/src/imports/controls/qquickfileselector.cpp b/src/controls/qquickstyleselector.cpp
index bc09df9f..2cf297a9 100644
--- a/src/imports/controls/qquickfileselector.cpp
+++ b/src/controls/qquickstyleselector.cpp
@@ -1,5 +1,6 @@
 /***************************************************************************
 **
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
 ** Contact: http://www.qt.io/licensing/
 **
@@ -31,8 +32,8 @@
 **
 ****************************************************************************/
 
-#include "qquickfileselector_p.h"
-#include "qquickfileselector_p_p.h"
+#include "qquickstyleselector_p.h"
+#include "qquickstyleselector_p_p.h"
 
 #include <QtCore/QFile>
 #include <QtCore/QDir>
@@ -48,26 +49,26 @@ QT_BEGIN_NAMESPACE
 //Environment variable to allow tooling full control of file selectors
 static const char env_override[] = "QT_LABS_CONTROLS_NO_STYLE";
 
-Q_GLOBAL_STATIC(QQuickFileSelectorSharedData, sharedData);
+Q_GLOBAL_STATIC(QQuickStyleSelectorSharedData, sharedData);
 static QBasicMutex sharedDataMutex;
 
-QQuickFileSelectorPrivate::QQuickFileSelectorPrivate()
+QQuickStyleSelectorPrivate::QQuickStyleSelectorPrivate()
     : QObjectPrivate()
 {
 }
 
-QQuickFileSelector::QQuickFileSelector(QObject *parent)
-    : QObject(*(new QQuickFileSelectorPrivate()), parent)
+QQuickStyleSelector::QQuickStyleSelector(QObject *parent)
+    : QObject(*(new QQuickStyleSelectorPrivate()), parent)
 {
 }
 
-QQuickFileSelector::~QQuickFileSelector()
+QQuickStyleSelector::~QQuickStyleSelector()
 {
 }
 
-QString QQuickFileSelector::select(const QString &filePath) const
+QString QQuickStyleSelector::select(const QString &filePath) const
 {
-    Q_D(const QQuickFileSelector);
+    Q_D(const QQuickStyleSelector);
     return select(QUrl(d->baseUrl.toString() + filePath)).toString();
 }
 
@@ -80,9 +81,9 @@ static bool isLocalScheme(const QString &file)
     return local;
 }
 
-QUrl QQuickFileSelector::select(const QUrl &filePath) const
+QUrl QQuickStyleSelector::select(const QUrl &filePath) const
 {
-    Q_D(const QQuickFileSelector);
+    Q_D(const QQuickStyleSelector);
     if (!isLocalScheme(filePath.scheme()) && !filePath.isLocalFile())
         return filePath;
     QUrl ret(filePath);
@@ -122,9 +123,9 @@ static QString selectionHelper(const QString &path, const QString &fileName, con
     return path + fileName;
 }
 
-QString QQuickFileSelectorPrivate::select(const QString &filePath) const
+QString QQuickStyleSelectorPrivate::select(const QString &filePath) const
 {
-    Q_Q(const QQuickFileSelector);
+    Q_Q(const QQuickStyleSelector);
     QFileInfo fi(filePath);
     // If file doesn't exist, don't select
     if (!fi.exists())
@@ -138,40 +139,40 @@ QString QQuickFileSelectorPrivate::select(const QString &filePath) const
     return filePath;
 }
 
-QString QQuickFileSelector::style() const
+QString QQuickStyleSelector::style() const
 {
-    Q_D(const QQuickFileSelector);
+    Q_D(const QQuickStyleSelector);
     return d->style;
 }
 
-void QQuickFileSelector::setStyle(const QString &s)
+void QQuickStyleSelector::setStyle(const QString &s)
 {
-    Q_D(QQuickFileSelector);
+    Q_D(QQuickStyleSelector);
     d->style = s;
 }
 
-QStringList QQuickFileSelector::allSelectors() const
+QStringList QQuickStyleSelector::allSelectors() const
 {
-    Q_D(const QQuickFileSelector);
+    Q_D(const QQuickStyleSelector);
     QMutexLocker locker(&sharedDataMutex);
-    QQuickFileSelectorPrivate::updateSelectors();
+    QQuickStyleSelectorPrivate::updateSelectors();
     return QStringList(d->style) + sharedData->staticSelectors;
 }
 
-void QQuickFileSelector::setBaseUrl(const QUrl &base)
+void QQuickStyleSelector::setBaseUrl(const QUrl &base)
 {
-    Q_D(QQuickFileSelector);
+    Q_D(QQuickStyleSelector);
     if (d->baseUrl != base)
         d->baseUrl = base;
 }
 
-QUrl QQuickFileSelector::baseUrl() const
+QUrl QQuickStyleSelector::baseUrl() const
 {
-    Q_D(const QQuickFileSelector);
+    Q_D(const QQuickStyleSelector);
     return d->baseUrl;
 }
 
-void QQuickFileSelectorPrivate::updateSelectors()
+void QQuickStyleSelectorPrivate::updateSelectors()
 {
     if (!sharedData->staticSelectors.isEmpty())
         return; //Already loaded
@@ -193,7 +194,7 @@ void QQuickFileSelectorPrivate::updateSelectors()
     sharedData->staticSelectors << platformSelectors();
 }
 
-QStringList QQuickFileSelectorPrivate::platformSelectors()
+QStringList QQuickStyleSelectorPrivate::platformSelectors()
 {
     // similar, but not identical to QSysInfo::osType
     QStringList ret;
@@ -223,7 +224,7 @@ QStringList QQuickFileSelectorPrivate::platformSelectors()
     return ret;
 }
 
-void QQuickFileSelectorPrivate::addStatics(const QStringList &statics)
+void QQuickStyleSelectorPrivate::addStatics(const QStringList &statics)
 {
     QMutexLocker locker(&sharedDataMutex);
     sharedData->preloadedStatics << statics;
@@ -231,4 +232,4 @@ void QQuickFileSelectorPrivate::addStatics(const QStringList &statics)
 
 QT_END_NAMESPACE
 
-#include "moc_qquickfileselector_p.cpp"
+#include "moc_qquickstyleselector_p.cpp"
diff --git a/src/imports/controls/qquickfileselector_p.h b/src/controls/qquickstyleselector_p.h
index ed1cd7d5..89cfed71 100644
--- a/src/imports/controls/qquickfileselector_p.h
+++ b/src/controls/qquickstyleselector_p.h
@@ -1,5 +1,6 @@
 /***************************************************************************
 **
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
 ** Contact: http://www.qt.io/licensing/
 **
@@ -31,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFILESELECTOR_H
-#define QFILESELECTOR_H
+#ifndef QQUICKSTYLESELECTOR_P_H
+#define QQUICKSTYLESELECTOR_P_H
 
 //
 //  W A R N I N G
@@ -50,13 +51,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickFileSelectorPrivate;
-class QQuickFileSelector : public QObject
+class QQuickStyleSelectorPrivate;
+class QQuickStyleSelector : public QObject
 {
     Q_OBJECT
 public:
-    explicit QQuickFileSelector(QObject *parent = Q_NULLPTR);
-    ~QQuickFileSelector();
+    explicit QQuickStyleSelector(QObject *parent = Q_NULLPTR);
+    ~QQuickStyleSelector();
 
     QString select(const QString &filePath) const;
 
@@ -71,9 +72,9 @@ public:
 private:
     QUrl select(const QUrl &filePath) const;
 
-    Q_DECLARE_PRIVATE(QQuickFileSelector)
+    Q_DECLARE_PRIVATE(QQuickStyleSelector)
 };
 
 QT_END_NAMESPACE
 
-#endif
+#endif // QQUICKSTYLESELECTOR_P_H
diff --git a/src/imports/controls/qquickfileselector_p_p.h b/src/controls/qquickstyleselector_p_p.h
index eb849554..bf11fd1c 100644
--- a/src/imports/controls/qquickfileselector_p_p.h
+++ b/src/controls/qquickstyleselector_p_p.h
@@ -1,5 +1,6 @@
 /***************************************************************************
 **
+** Copyright (C) 2015 The Qt Company Ltd.
 ** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
 ** Contact: http://www.qt.io/licensing/
 **
@@ -31,8 +32,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFILESELECTOR_P_H
-#define QFILESELECTOR_P_H
+#ifndef QQUICKSTYLESELECTOR_P_P_H
+#define QQUICKSTYLESELECTOR_P_P_H
 
 //
 //  W A R N I N G
@@ -49,24 +50,24 @@
 #include <QtCore/QUrl>
 #include <private/qobject_p.h>
 
-#include "qquickfileselector_p.h"
+#include "qquickstyleselector_p.h"
 
 QT_BEGIN_NAMESPACE
 
-struct QQuickFileSelectorSharedData //Not QSharedData because currently is just a global store
+struct QQuickStyleSelectorSharedData //Not QSharedData because currently is just a global store
 {
     QStringList staticSelectors;
     QStringList preloadedStatics;
 };
 
-class QQuickFileSelectorPrivate : QObjectPrivate //Exported for use in other modules (like QtGui)
+class QQuickStyleSelectorPrivate : QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickFileSelector)
+    Q_DECLARE_PUBLIC(QQuickStyleSelector)
 public:
     static void updateSelectors();
     static QStringList platformSelectors();
     static void addStatics(const QStringList &); //For loading GUI statics from other Qt modules
-    QQuickFileSelectorPrivate();
+    QQuickStyleSelectorPrivate();
     QString select(const QString &filePath) const;
 
     QString style;
@@ -75,5 +76,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif
+#endif // QQUICKSTYLESELECTOR_P_P_H
 
diff --git a/src/imports/controls/controls.pri b/src/imports/controls/controls.pri
index 530ca6f4..fa493508 100644
--- a/src/imports/controls/controls.pri
+++ b/src/imports/controls/controls.pri
@@ -29,12 +29,9 @@ QML_FILES = \
     Tumbler.qml
 
 HEADERS += \
-    $$PWD/qquickfileselector_p.h \
-    $$PWD/qquickfileselector_p_p.h \
     $$PWD/qquickthemedata_p.h \
     $$PWD/qquicktheme_p.h
 
 SOURCES += \
-    $$PWD/qquickfileselector.cpp \
     $$PWD/qquicktheme.cpp \
     $$PWD/qquickthemedata.cpp
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index 5057675f..786a5724 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.pro
@@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/controls
 IMPORT_VERSION = 1.0
 
 QT += qml quick
-QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private
+QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private labscontrols-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
diff --git a/src/imports/controls/qtlabscontrolsplugin.cpp b/src/imports/controls/qtlabscontrolsplugin.cpp
index 20f1750e..8c65abc5 100644
--- a/src/imports/controls/qtlabscontrolsplugin.cpp
+++ b/src/imports/controls/qtlabscontrolsplugin.cpp
@@ -40,9 +40,9 @@
 #include <QtGui/private/qguiapplication_p.h>
 
 #include <QtLabsTemplates/private/qquickbuttongroup_p.h>
+#include <QtLabsControls/private/qquickstyleselector_p.h>
 
 #include "qquicktheme_p.h"
-#include "qquickfileselector_p.h"
 
 void initResources()
 {
@@ -71,7 +71,7 @@ void QtLabsControlsPlugin::registerTypes(const char *uri)
     QString styleOverride = QGuiApplicationPrivate::styleOverride;
 
     // TODO: read the style from application manifest file
-    QQuickFileSelector selector;
+    QQuickStyleSelector selector;
     selector.setBaseUrl(baseUrl());
 
     if (!styleOverride.isEmpty())