Fix inconsistent enums

The CategoryModel enums did not match the those from the search models.

Change-Id: I9088910812d3624c0260b0a9482470537fd4df3a
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

3 files changed, 25 insertions, 81 deletions

diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
index 04c7f03f..3ab93a08 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
@@ -129,7 +129,8 @@ QT_USE_NAMESPACE
 */
 
 QDeclarativeSupportedCategoriesModel::QDeclarativeSupportedCategoriesModel(QObject *parent)
-:   QAbstractItemModel(parent), m_plugin(0), m_hierarchical(true), m_complete(false)
+:   QAbstractItemModel(parent), m_plugin(0), m_hierarchical(true), m_complete(false),
+    m_status(Null)
 {
 }
 
@@ -519,7 +520,7 @@ void QDeclarativeSupportedCategoriesModel::update()
         m_response = placeManager->initializeCategories();
         if (m_response) {
             connect(m_response, SIGNAL(finished()), this, SLOT(replyFinished()));
-            setStatus(QDeclarativeSupportedCategoriesModel::Updating);
+            setStatus(QDeclarativeSupportedCategoriesModel::Loading);
         } else {
             setStatus(QDeclarativeSupportedCategoriesModel::Error);
             m_errorString = QCoreApplication::translate(CONTEXT_NAME, CATEGORIES_NOT_INITIALIZED);
@@ -568,11 +569,14 @@ QString QDeclarativeSupportedCategoriesModel::errorString() const
 
     \table
         \row
+            \li CategoryModel.Null
+            \li No category fetch query has been executed.  The model is empty.
+        \row
             \li CategoryModel.Ready
             \li No error occurred during the last operation, further operations may be performed on
                the model.
         \row
-            \li CategoryModel.Updating
+            \li CategoryModel.Loading
             \li The model is being updated, no other operations may be performed until complete.
         \row
             \li CategoryModel.Error
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
index b0c10523..c9e677eb 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
@@ -105,7 +105,7 @@ public:
         ParentCategoryRole
     };  //for internal usage only
 
-    enum Status {Ready, Updating, Error};
+    enum Status {Null, Ready, Loading, Error};
 
     void setPlugin(QDeclarativeGeoServiceProvider *plugin);
     QDeclarativeGeoServiceProvider *plugin() const;
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index b11aa9f7..8de010d6 100644
--- a/src/imports/location/plugins.qmltypes
+++ b/src/imports/location/plugins.qmltypes
@@ -2,6 +2,8 @@ import QtQuick.tooling 1.1
 
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
+//
+// This file was auto-generated with the command 'qmlplugindump QtLocation 5.0 /home/devel/depot/qt/qt5/qtlocation/src/imports/'.
 
 Module {
     Component {
@@ -366,8 +368,6 @@ Module {
             isReadonly: true
             isPointer: true
         }
-        Property { name: "pinch"; type: "QDeclarativeGeoMapPinchArea"; isReadonly: true; isPointer: true }
-        Property { name: "flick"; type: "QDeclarativeGeoMapFlickable"; isReadonly: true; isPointer: true }
         Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
         Property { name: "minimumZoomLevel"; type: "double"; isReadonly: true }
         Property { name: "maximumZoomLevel"; type: "double"; isReadonly: true }
@@ -384,9 +384,9 @@ Module {
         Property { name: "tilt"; type: "double" }
         Property { name: "bearing"; type: "double" }
         Signal {
-            name: "wheel"
+            name: "wheelAngleChanged"
             type: "void"
-            Parameter { name: "delta"; type: "double" }
+            Parameter { name: "angleDelta"; type: "QPoint" }
         }
         Signal {
             name: "pluginChanged"
@@ -419,13 +419,6 @@ Module {
         Signal { name: "maximumZoomLevelChanged"; type: "void" }
         Signal { name: "mapItemsChanged"; type: "void" }
         Method {
-            name: "pan"
-            type: "void"
-            Parameter { name: "dx"; type: "int" }
-            Parameter { name: "dy"; type: "int" }
-        }
-        Method { name: "cameraStopped"; type: "void" }
-        Method {
             name: "removeMapItem"
             type: "void"
             Parameter { name: "item"; type: "QDeclarativeGeoMapItemBase"; isPointer: true }
@@ -447,19 +440,13 @@ Module {
             Parameter { name: "coordinate"; type: "QDeclarativeCoordinate"; isPointer: true }
         }
         Method { name: "fitViewportToMapItems"; type: "void" }
-    }
-    Component {
-        name: "QDeclarativeGeoMapFlickable"
-        prototype: "QObject"
-        exports: ["MapFlickable 5.0"]
-        Property { name: "deceleration"; type: "double" }
-        Property { name: "enabled"; type: "bool" }
-        Signal { name: "decelerationChanged"; type: "void" }
-        Signal { name: "enabledChanged"; type: "void" }
-        Signal { name: "movementStarted"; type: "void" }
-        Signal { name: "movementEnded"; type: "void" }
-        Signal { name: "flickStarted"; type: "void" }
-        Signal { name: "flickEnded"; type: "void" }
+        Method {
+            name: "pan"
+            type: "void"
+            Parameter { name: "dx"; type: "int" }
+            Parameter { name: "dy"; type: "int" }
+        }
+        Method { name: "cameraStopped"; type: "void" }
     }
     Component {
         name: "QDeclarativeGeoMapGestureArea"
@@ -537,8 +524,10 @@ Module {
         exports: ["MapItemView 5.0"]
         Property { name: "model"; type: "QVariant" }
         Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "autoFitViewport"; type: "bool" }
         Signal { name: "modelChanged"; type: "void" }
         Signal { name: "delegateChanged"; type: "void" }
+        Signal { name: "autoFitViewportChanged"; type: "void" }
     }
     Component {
         name: "QDeclarativeGeoMapMouseArea"
@@ -565,56 +554,6 @@ Module {
         Property { name: "coordinate"; type: "QDeclarativeCoordinate"; isReadonly: true; isPointer: true }
     }
     Component {
-        name: "QDeclarativeGeoMapPinchArea"
-        prototype: "QObject"
-        exports: ["MapPinchArea 5.0"]
-        Enum {
-            name: "ActiveGesture"
-            values: {
-                "NoGesture": 0,
-                "ZoomGesture": 1,
-                "RotationGesture": 2,
-                "TiltGesture": 4
-            }
-        }
-        Enum {
-            name: "ActiveGestures"
-            values: {
-                "NoGesture": 0,
-                "ZoomGesture": 1,
-                "RotationGesture": 2,
-                "TiltGesture": 4
-            }
-        }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "active"; type: "bool"; isReadonly: true }
-        Property { name: "activeGestures"; type: "ActiveGestures" }
-        Property { name: "maximumZoomLevelChange"; type: "double" }
-        Property { name: "rotationFactor"; type: "double" }
-        Property { name: "flickDeceleration"; type: "double" }
-        Signal { name: "activeChanged"; type: "void" }
-        Signal { name: "enabledChanged"; type: "void" }
-        Signal { name: "maximumZoomLevelChangeChanged"; type: "void" }
-        Signal { name: "rotationFactorChanged"; type: "void" }
-        Signal { name: "activeGesturesChanged"; type: "void" }
-        Signal { name: "flickDecelerationChanged"; type: "void" }
-        Signal {
-            name: "pinchStarted"
-            type: "void"
-            Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true }
-        }
-        Signal {
-            name: "pinchUpdated"
-            type: "void"
-            Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true }
-        }
-        Signal {
-            name: "pinchFinished"
-            type: "void"
-            Parameter { name: "pinch"; type: "QDeclarativeGeoMapPinchEvent"; isPointer: true }
-        }
-    }
-    Component {
         name: "QDeclarativeGeoMapPinchEvent"
         prototype: "QObject"
         exports: ["MapPinchEvent 5.0"]
@@ -1661,9 +1600,10 @@ Module {
         Enum {
             name: "Status"
             values: {
-                "Ready": 0,
-                "Updating": 1,
-                "Error": 2
+                "Null": 0,
+                "Ready": 1,
+                "Loading": 2,
+                "Error": 3
             }
         }
         Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }