rename QDeclarativeView, QDeclarativeComponent and QDeclarativeLoader Status enum

partially fixes kdelibs build when CMAKE_UNITY_BUILD is set to ON (build
fails due to enum clashes with stuff defined in X11 headers)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index e6e9f97..692c456 100644 (file)
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -334,7 +334,7 @@ void QDeclarativeLoaderPrivate::load()
     if (!component->isLoading()) {
         _q_sourceLoaded();
     } else {
-        QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
+        QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::ComponentStatus)),
                 q, SLOT(_q_sourceLoaded()));
         QObject::connect(component, SIGNAL(progressChanged(qreal)),
                 q, SIGNAL(progressChanged()));
@@ -444,12 +444,12 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded()
     \sa progress
 */
 
-QDeclarativeLoader::Status QDeclarativeLoader::status() const
+QDeclarativeLoader::LoaderStatus QDeclarativeLoader::status() const
 {
     Q_D(const QDeclarativeLoader);
 
     if (d->component)
-        return static_cast<QDeclarativeLoader::Status>(d->component->status());
+        return static_cast<QDeclarativeLoader::LoaderStatus>(d->component->status());
 
     if (d->item)
         return Ready;

diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p.h
index f413179..615dd66 100644 (file)
--- a/src/declarative/graphicsitems/qdeclarativeloader_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeloader_p.h
@@ -32,12 +32,12 @@ class QDeclarativeLoaderPrivate;
 class Q_AUTOTEST_EXPORT QDeclarativeLoader : public QDeclarativeImplicitSizeItem
 {
     Q_OBJECT
-    Q_ENUMS(Status)
+    Q_ENUMS(LoaderStatus)
 
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(QDeclarativeComponent *sourceComponent READ sourceComponent WRITE setSourceComponent RESET resetSourceComponent NOTIFY sourceChanged)
     Q_PROPERTY(QGraphicsObject *item READ item NOTIFY itemChanged)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(LoaderStatus status READ status NOTIFY statusChanged)
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
 
 public:
@@ -51,8 +51,8 @@ public:
     void setSourceComponent(QDeclarativeComponent *);
     void resetSourceComponent();
 
-    enum Status { Null, Ready, Loading, Error };
-    Status status() const;
+    enum LoaderStatus { Null, Ready, Loading, Error };
+    LoaderStatus status() const;
     qreal progress() const;
 
     QGraphicsObject *item() const;

diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 01dbed5..91d8957 100644 (file)
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -99,7 +99,7 @@ class QByteArray;
         // ...
         component = new QDeclarativeComponent(engine, QUrl("http://www.example.com/main.qml"));
         if (component->isLoading())
-            QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
+            QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::ComponentStatus)),
                              this, SLOT(continueLoading()));
         else
             continueLoading();
@@ -206,7 +206,7 @@ class QByteArray;
 */
 
 /*!
-    \enum QDeclarativeComponent::Status
+    \enum QDeclarativeComponent::ComponentStatus
     
     Specifies the loading status of the QDeclarativeComponent.
 
@@ -308,9 +308,9 @@ QDeclarativeComponent::~QDeclarativeComponent()
 
 /*!
     \property QDeclarativeComponent::status
-    The component's current \l{QDeclarativeComponent::Status} {status}.
+    The component's current \l{QDeclarativeComponent::ComponentStatus} {status}.
  */
-QDeclarativeComponent::Status QDeclarativeComponent::status() const
+QDeclarativeComponent::ComponentStatus QDeclarativeComponent::status() const
 {
     Q_D(const QDeclarativeComponent);
 
@@ -349,7 +349,7 @@ qreal QDeclarativeComponent::progress() const
 */
 
 /*!
-    \fn void QDeclarativeComponent::statusChanged(QDeclarativeComponent::Status status)
+    \fn void QDeclarativeComponent::statusChanged(QDeclarativeComponent::ComponentStatus status)
 
     Emitted whenever the component's status changes.  \a status will be the
     new status.

diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index 6da2167..8f09259 100644 (file)
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -44,7 +44,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeComponent : public QObject
     Q_DECLARE_PRIVATE(QDeclarativeComponent)
 
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(ComponentStatus status READ status NOTIFY statusChanged)
     Q_PROPERTY(QUrl url READ url CONSTANT)
 
 public:
@@ -54,18 +54,18 @@ public:
     QDeclarativeComponent(QDeclarativeEngine *, const QUrl &url, QObject *parent = nullptr);
     virtual ~QDeclarativeComponent();
 
-    Q_ENUMS(Status)
-    enum Status { Null, Ready, Loading, Error };
-    Status status() const;
+    Q_ENUMS(ComponentStatus)
+    enum ComponentStatus { Null, Ready, Loading, Error };
+    ComponentStatus status() const;
 
     inline bool isNull() const
-        { return status() == Null; }
+        { return status() == ComponentStatus::Null; }
     inline bool isReady() const
-        { return status() == Ready; }
+        { return status() == ComponentStatus::Ready; }
     inline bool isError() const
-        { return status() == Error; }
+        { return status() == ComponentStatus::Error; }
     inline bool isLoading() const
-        { return status() == Loading; }
+        { return status() == ComponentStatus::Loading; }
 
     QList<QDeclarativeError> errors() const;
     Q_INVOKABLE QString errorString() const;
@@ -86,7 +86,7 @@ public:
     static QDeclarativeComponentAttached *qmlAttachedProperties(QObject *);
 
 Q_SIGNALS:
-    void statusChanged(QDeclarativeComponent::Status);
+    void statusChanged(QDeclarativeComponent::ComponentStatus);
     void progressChanged(qreal);
 
 protected:
@@ -105,7 +105,7 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QDeclarativeComponent::Status)
+Q_DECLARE_METATYPE(QDeclarativeComponent::ComponentStatus)
 QML_DECLARE_TYPE(QDeclarativeComponent)
 QML_DECLARE_TYPEINFO(QDeclarativeComponent, QML_HAS_ATTACHED_PROPERTIES)
 

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 60fa677..b557cc8 100644 (file)
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -494,7 +494,7 @@ void QDeclarativeEnginePrivate::init()
     qRegisterMetaType<QVariant>("QVariant");
     qRegisterMetaType<QDeclarativeScriptString>("QDeclarativeScriptString");
     qRegisterMetaType<QScriptValue>("QScriptValue");
-    qRegisterMetaType<QDeclarativeComponent::Status>("QDeclarativeComponent::Status");
+    qRegisterMetaType<QDeclarativeComponent::ComponentStatus>("QDeclarativeComponent::ComponentStatus");
 
     QDeclarativeData::init();
 

diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index f69d874..cfdfb77 100644 (file)
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -98,7 +98,7 @@ void QDeclarativeViewPrivate::execute()
         if (!component->isLoading()) {
             q->continueExecute();
         } else {
-            QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), q, SLOT(continueExecute()));
+            QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::ComponentStatus)), q, SLOT(continueExecute()));
         }
     }
 }
@@ -168,7 +168,7 @@ void QDeclarativeViewPrivate::itemGeometryChanged(QDeclarativeItem *resizeItem,
   This signal is emitted when the view is resized to \a size.
 */
 
-/*! \fn void QDeclarativeView::statusChanged(QDeclarativeView::Status status)
+/*! \fn void QDeclarativeView::statusChanged(QDeclarativeView::ViewStatus status)
     This signal is emitted when the component's current \a status changes.
 */
 
@@ -288,7 +288,7 @@ QDeclarativeContext* QDeclarativeView::rootContext() const
 }
 
 /*!
-    \enum QDeclarativeView::Status
+    \enum QDeclarativeView::ViewStatus
     Specifies the loading status of the QDeclarativeView.
 
     \value Null This QDeclarativeView has no source set.
@@ -308,16 +308,16 @@ QDeclarativeContext* QDeclarativeView::rootContext() const
 
 /*!
     \property QDeclarativeView::status
-    The component's current \l{QDeclarativeView::Status} {status}.
+    The component's current \l{QDeclarativeView::ViewStatus} {status}.
 */
 
-QDeclarativeView::Status QDeclarativeView::status() const
+QDeclarativeView::ViewStatus QDeclarativeView::status() const
 {
     Q_D(const QDeclarativeView);
     if (!d->component)
         return QDeclarativeView::Null;
 
-    return QDeclarativeView::Status(d->component->status());
+    return QDeclarativeView::ViewStatus(d->component->status());
 }
 
 /*!
@@ -452,7 +452,7 @@ QDeclarativeView::ResizeMode QDeclarativeView::resizeMode() const
 void QDeclarativeView::continueExecute()
 {
     Q_D(QDeclarativeView);
-    disconnect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(continueExecute()));
+    disconnect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::ComponentStatus)), this, SLOT(continueExecute()));
 
     if (d->component->isError()) {
         QList<QDeclarativeError> errorList = d->component->errors();

diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h
index e325314..857ae38 100644 (file)
--- a/src/declarative/util/qdeclarativeview.h
+++ b/src/declarative/util/qdeclarativeview.h
@@ -42,9 +42,9 @@ class Q_DECLARATIVE_EXPORT QDeclarativeView : public QGraphicsView
 {
     Q_OBJECT
     Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(ViewStatus status READ status NOTIFY statusChanged)
     Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
-    Q_ENUMS(ResizeMode Status)
+    Q_ENUMS(ResizeMode ViewStatus)
 public:
     explicit QDeclarativeView(QWidget *parent = nullptr);
     QDeclarativeView(const QUrl &source, QWidget *parent = nullptr);
@@ -62,8 +62,8 @@ public:
     ResizeMode resizeMode() const;
     void setResizeMode(ResizeMode);
 
-    enum Status { Null, Ready, Loading, Error };
-    Status status() const;
+    enum ViewStatus { Null, Ready, Loading, Error };
+    ViewStatus status() const;
 
     QList<QDeclarativeError> errors() const;
 
@@ -72,7 +72,7 @@ public:
 
 Q_SIGNALS:
     void sceneResized(QSize size); // ???
-    void statusChanged(QDeclarativeView::Status);
+    void statusChanged(QDeclarativeView::ViewStatus);
 
 private Q_SLOTS:
     void continueExecute();