diff options
443 files changed, 5915 insertions, 3310 deletions
diff --git a/demos/demos.pro b/demos/demos.pro deleted file mode 100644 index 8cff09b3..00000000 --- a/demos/demos.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += mapsdemo diff --git a/examples/declarative/flickr/flickr.pro b/examples/declarative/flickr/flickr.pro index adcc0a5a..85401ca2 100644 --- a/examples/declarative/flickr/flickr.pro +++ b/examples/declarative/flickr/flickr.pro @@ -12,8 +12,8 @@ symbian { RESOURCES += \ flickr.qrc -target.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/flickr +target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/flickr sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.qml flickrcommon flickrmobile -sources.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/flickr +sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/flickr INSTALLS += target sources diff --git a/examples/declarative/landmarkmap/landmarkmap.pro b/examples/declarative/landmarkmap/landmarkmap.pro index de018240..623658a3 100644 --- a/examples/declarative/landmarkmap/landmarkmap.pro +++ b/examples/declarative/landmarkmap/landmarkmap.pro @@ -15,10 +15,10 @@ RESOURCES += \ landmarkmap.qrc install_files.files += nmealog.txt mylm.lmx landmarkmapcommon landmarkmapmobile landmarkmap.qml -install_files.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/landmark +install_files.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/landmark -target.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/landmark +target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/landmark sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/landmark +sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/landmark INSTALLS += target sources install_files diff --git a/examples/declarative/mapviewer/Dialog.qml b/examples/declarative/mapviewer/Dialog.qml index 095db36d..586cc24e 100644 --- a/examples/declarative/mapviewer/Dialog.qml +++ b/examples/declarative/mapviewer/Dialog.qml @@ -52,33 +52,28 @@ Item { property alias dialogModel: dialogModel property alias length: dialogModel.count property int gap: 20 - property int listItemHeight: 54 + property int listItemHeight: 30 + + opacity: 0 function setModel(objects) { + dialogModel.clear() + for (var i=0; i< objects.length; i++){ - dialogModel.append({"label": objects[i][0], "inputText": objects[i][1]}) + dialogModel.append({"labelText": objects[i][0], "inputText": objects[i][1]}) } } - Rectangle { - id: fader - anchors.fill: parent - opacity: 0.7 - color: "darkgrey" - MouseArea { - id: mouseArea - anchors.fill: parent - } - } + Common.Fader {} Rectangle { id: dialogRectangle color: "lightsteelblue" - opacity: 1 + opacity: parent.opacity width: parent.width - gap; - height: listview.height + titleBar.height + buttonGo.height + gap*2 + height: listview.height + titleBar.height + buttons.height + gap*2 anchors { top: parent.top @@ -95,7 +90,7 @@ Item { id: titleBar; width: parent.width; height: 40; anchors.top: parent.top; anchors.left: parent.left; - opacity: 0.9; text: dialog.title; + opacity: 0.9 onClicked: { dialog.cancelButtonClicked() } } @@ -108,32 +103,16 @@ Item { Column { id: column1 height: listItemHeight - Text { id: fieldTitle; text: label; height: 24;} - Rectangle { - id: inputRectangle - width: dialogRectangle.width - gap; height: 30 - color: "whitesmoke" - border.width: 1 - radius: 5 - TextInput { - id: inputField - text: inputText - focus: true - width: parent.width - anchors.leftMargin - - anchors { - left: parent.left; - verticalCenter: parent.verticalCenter; - leftMargin: 5 - } - onTextChanged: - { - dialogModel.set(index, {"inputText": text}) - } - } - MouseArea { - anchors.fill: parent - onClicked: inputField.forceActiveFocus(); + TextWithLabel { + id: textWithLabel + label: labelText + text: inputText + width: dialogRectangle.width - gap + labelWidth: 75 + + onTextChanged: + { + dialogModel.set(index, {"inputText": text}) } } } @@ -149,23 +128,37 @@ Item { } model: dialogModel delegate: listDelegate - spacing: gap + spacing: gap/2 interactive: false Component.onCompleted: { - height = (listItemHeight + gap)*length + height = (listItemHeight + gap/2)*length + gap/2 } } - Common.Button { - id: buttonGo - text: "Go!" + Row { + id: buttons anchors.top: listview.bottom - width: 80; height: 32 anchors.horizontalCenter: parent.horizontalCenter - onClicked: { - dialog.goButtonClicked () + spacing: gap/3 + height: 32 + Common.Button { + id: buttonClearAll + text: "Clear All" + width: 80; height: parent.height + onClicked: { + for (var i = 0; i<length; i++){ + dialogModel.set(i, {"inputText": ""}) + } + } + } + Common.Button { + id: buttonGo + text: "Go!" + width: 80; height: parent.height + onClicked: { + dialog.goButtonClicked () + } } } } } - diff --git a/examples/declarative/mapviewer/MapComponent.qml b/examples/declarative/mapviewer/MapComponent.qml new file mode 100644 index 00000000..52f67465 --- /dev/null +++ b/examples/declarative/mapviewer/MapComponent.qml @@ -0,0 +1,418 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +import Qt.location 5.0 +import "common" as Common + +Map { + id: map + plugin : defaultPlugin + zoomLevel: 9 + focus: true + width: parent.width + center: defaultCoordinates + property int longPressDuration: 1000 + + property list<Marker> markers + property int numberOfMarkers: 0 //actual length of markers array + property int counter: 0 // counter for total amount of markers. Resets to 0 when numberOfMarkers = 0 + property Marker currentMarker + + property RouteQuery routeQuery: RouteQuery {} + property RouteModel routeModel: RouteModel { + plugin : map.plugin + query: routeQuery + onStatusChanged:{ + if (status == RouteModel.Ready){ + if (count == 1) showRouteInfo() + } + else if (status == RouteModel.Error){ + map.routeError() + } + } + } + property GeocodeModel geocodeModel: GeocodeModel { + plugin : map.plugin; + onStatusChanged:{ + if ((status == GeocodeModel.Ready) || (status == GeocodeModel.Error)) map.geocodeFinished() + } + onLocationsChanged: + { + if (count == 1) map.center = get(0).coordinate + } + } + + signal mousePressed() // replace with + // signal mousePressed(MouseEvent mouse) + // when QTBUG-14550 is fixed + signal sliderUpdated() + signal coordinatesCaptured(double latitude, double longitude) + signal showRouteInfo() + signal geocodeFinished() + signal showGeocodeInfo() + signal moveMarker() + signal routeError() + + Component.onCompleted: { + markers = [] + } + + onNumberOfMarkersChanged: { + if (numberOfMarkers == 0) counter = 0 + } + + Component { + id: routeDelegate + MapRoute { + route: path + color: routeMouseArea.containsMouse ? "lime" :"red" + MapMouseArea { + id: routeMouseArea + hoverEnabled: true + onPressed : {routeTimer.start(); map.state = ""} + onReleased : { if (routeTimer.running) routeTimer.stop() }//SHORT PRESS + onPositionChanged: { if (routeTimer.running) routeTimer.stop()} + + Timer { + id: routeTimer + interval: longPressDuration; running: false; repeat: false + onTriggered: { //LONG PRESS + map.showRouteInfo() + } + } + } + } + } + + Component { + id: pointDelegate + MapCircle { + radius: 1000 + color: circleMouseArea.containsMouse ? "lime" : "#80FF0000" + center: place.coordinate + MapMouseArea { + id: circleMouseArea + hoverEnabled: true + onPressed : { circleTimer.start(); map.state = ""} + onReleased : { if (circleTimer.running) circleTimer.stop() }//SHORT PRESS + onPositionChanged: { + if (circleTimer.running) circleTimer.stop() + if (mouse.button == Qt.LeftButton) radius = center.distanceTo(mouse.coordinate) + } + + Timer { + id: circleTimer + interval: longPressDuration; running: false; repeat: false + onTriggered: { //LONG PRESS + map.showGeocodeInfo() + } + } + } + } + } + + MapObjectView { + model: routeModel + delegate: routeDelegate + } + + MapObjectView { + model: geocodeModel + delegate: pointDelegate + } + + Plugin { + id: defaultPlugin + name : "nokia" + } + + Coordinate { + id: defaultCoordinates + latitude : -27.575 + longitude : 153.088 + } + + Common.Slider { + id: zoomSlider; + parent: map.parent //todo: remove the line + minimum: map.minimumZoomLevel; + maximum: map.maximumZoomLevel; + opacity: 1 + z: map.z + anchors { + bottom: parent.bottom; + bottomMargin: 50; rightMargin: 5; leftMargin: 5 + left: parent.left + } + width: parent.width - anchors.rightMargin - anchors.leftMargin + value: map.zoomLevel + onValueChanged: { + map.zoomLevel = value + map.sliderUpdated() + } + } + + Common.Menu { + id: markerMenu + orientation: ListView.Vertical + z: map.z + 2 + opacity: 0 + + itemHeight: 30; + itemWidth: 150 + x: 0 + y: 0 + onClicked: { + map.state = "" + switch (button) { + case 0: {//remove marker + map.removeMarker(currentMarker) + break; + } + case 1: {//move marker + map.moveMarker() + break; + } + case 2: {//show marker's coordinates + map.coordinatesCaptured(currentMarker.coordinate.latitude, currentMarker.coordinate.longitude) + break; + } + case 3: {//calculate route + map.calculateRoute(currentMarker) + break; + } + } + } + } + + Common.Menu { + id: popupMenu + orientation: ListView.Vertical + z: map.z +2 + opacity: 0 + + itemHeight: 30; + itemWidth: 150 + x: 0 + y: 0 + + onClicked: { + switch (button) { + case 0: { //add Marker + addMarker() + break; + } + case 1: { + map.coordinatesCaptured(mouseArea.lastCoordinate.latitude, mouseArea.lastCoordinate.longitude) + break; + } + case 2: { + map.deleteAllMarkers() + break; + } + } + map.state = "" + } + } + + function deleteAllMarkers(){ + for (var i = 0; i<numberOfMarkers; i++){ + map.removeMapObject(map.markers[i]) + map.markers[i].destroy() + } + map.numberOfMarkers = 0 + map.markers = [] + } + + function addMarker(){ + + var marker, myArray + counter++ + marker = Qt.createQmlObject ('Marker {}', map) + map.addMapObject(marker) + + //update list of markers + myArray = new Array() + for (var i = 0; i<numberOfMarkers; i++){ + myArray.push(markers[i]) + } + myArray.push(marker) + markers = myArray + ++numberOfMarkers + } + + function removeMarker(marker){ + //update list of markers + var myArray = new Array() + for (var i = 0; i<map.numberOfMarkers; i++){ + if (marker != map.markers[i]) myArray.push(map.markers[i]) + } + + map.removeMapObject(marker) + marker.destroy() + --map.numberOfMarkers + map.markers = myArray + } + + function markerLongPress(){ + var array + + if (currentMarker == markers[numberOfMarkers-1]) array = ["Delete", "Move to", "Coordinates"] + else if (numberOfMarkers > 2){ + if (currentMarker == markers[numberOfMarkers-2]) array = ["Delete", "Move to", "Coordinates", "Route to next point"] + else array = ["Delete", "Move to", "Coordinates", "Route to next points"] + } + else array = ["Delete", "Move to", "Coordinates", "Route to next point"] + + markerMenu.setModel(array) + map.state = "MarkerPopupMenu" + } + + function updateMarkers(){ + for (var i = 0; i<map.numberOfMarkers; i++){ + map.markers[i].update() + } + } + + function calculateRoute(marker){ + routeQuery.clearWaypoints(); + var startPointFound = false + for (var i = 0; i< numberOfMarkers; i++){ + if (startPointFound != true){ + if (markers[i] == marker){ + startPointFound = true + routeQuery.addWaypoint(marker.coordinate) + } + } + else routeQuery.addWaypoint(markers[i].coordinate) + } + routeQuery.travelModes = RouteQuery.CarTravel + routeQuery.routeOptimizations = RouteQuery.ShortestRoute + routeModel.update(); + } + + onCenterChanged: { + map.updateMarkers() + } + + onZoomLevelChanged:{ + map.updateMarkers() + zoomSlider.value = map.zoomLevel + } + + MapMouseArea { + id: mouseArea + property int lastX : -1 + property int lastY : -1 + property Coordinate lastCoordinate: Coordinate { latitude : 0; longitude : 0} + + onPressed : { + mapTimer.start() + map.state = "" + lastX = mouse.x + lastY = mouse.y + lastCoordinate = mouse.coordinate + map.mousePressed() + } + onReleased : { + if (mapTimer.running) { mapTimer.stop() //SHORT PRESS + lastX = -1 + lastY = -1 + } + } + onPositionChanged: { + if (mapTimer.running) mapTimer.stop() + if ((mouse.button == Qt.LeftButton) & (map.state == "")) { + if ((lastX != -1) && (lastY != -1)) { + var dx = mouse.x - lastX + var dy = mouse.y - lastY + map.pan(-dx, -dy) + } + lastX = mouse.x + lastY = mouse.y + } + } + onDoubleClicked: { + map.center = mouse.coordinate + if (mouse.button == Qt.LeftButton){ + map.zoomLevel += 1 + } else if (mouse.button == Qt.RightButton){ + map.zoomLevel -= 1 + } + lastX = -1 + lastY = -1 + } + Timer { + id: mapTimer + interval: longPressDuration; running: false; repeat: false + onTriggered: { //LONG PRESS + if (numberOfMarkers != 0) popupMenu.setModel(["Set Marker","Capture","Delete all markers"]) + else popupMenu.setModel(["Set Marker","Capture"]) + + map.state = "PopupMenu" + } + } + } + + Keys.onPressed: { + if ((event.key == Qt.Key_Plus) || (event.key == Qt.Key_VolumeUp)) { + map.zoomLevel += 1 + } else if ((event.key == Qt.Key_Minus) || (event.key == Qt.Key_VolumeDown)){ + map.zoomLevel -= 1 + } + } + + // states of map + states: [ + State { + name: "PopupMenu" + PropertyChanges { target: popupMenu; opacity: 1} + PropertyChanges { target: popupMenu; x: ((mouseArea.lastX + popupMenu.width > map.width) ? map.width - popupMenu.width : mouseArea.lastX)} + PropertyChanges { target: popupMenu; y: ((mouseArea.lastY + popupMenu.height > map.height) ? map.height - popupMenu.height : mouseArea.lastY)} + }, + State { + name: "MarkerPopupMenu" + PropertyChanges { target: markerMenu; opacity: 1} + PropertyChanges { target: markerMenu; x: ((currentMarker.lastMouseX + markerMenu.width > map.width) ? map.width - markerMenu.width : currentMarker.lastMouseX )} + PropertyChanges { target: markerMenu; y: ((currentMarker.lastMouseY + markerMenu.height > map.height) ? map.height - markerMenu.height : currentMarker.lastMouseY)} + } + ] +} diff --git a/examples/declarative/mapviewer/Marker.qml b/examples/declarative/mapviewer/Marker.qml new file mode 100644 index 00000000..bd68b77f --- /dev/null +++ b/examples/declarative/mapviewer/Marker.qml @@ -0,0 +1,139 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7; +import Qt.location 5.0 +import "common" as Common + + MapImage { //to be used inside MapComponent only + id: marker + source: markerMouseArea.pressed ? "resources/marker_selected.png" : "resources/marker.png" //TODO replace with following lane when QTBUG-20096 fixed +// source: markerMouseArea.containsMouse ? (markerMouseArea.pressed ? "resources/marker_selected.png" :"resources/marker_hovered.png") : "resources/marker.png" + coordinate: Coordinate { latitude : 0; longitude : 0 } + offset.x: -13 + offset.y: -32 + property alias lastMouseX: markerMouseArea.lastX + property alias lastMouseY: markerMouseArea.lastY + property alias text: markerIndex.text + + Component.onCompleted: { + coordinate = mouseArea.lastCoordinate + } + + MapMouseArea { + id: markerMouseArea + property int dX: 0 + property int dY: 0 + property int lastX: -1 + property int lastY: -1 + property bool longPress: false + hoverEnabled: true + onPressed: { + marker.z++ + var newX, newY, oldX, oldY + newX = map.toScreenPosition(mouse.coordinate).x + newY = map.toScreenPosition(mouse.coordinate).y + oldX = map.toScreenPosition(marker.coordinate).x + oldY = map.toScreenPosition(marker.coordinate).y + dX = oldX - newX + dY = oldY - newY + lastX = mouse.x + lastY = mouse.y + + markerTimer.start() + map.currentMarker = marker + map.state = "" + } + onReleased: { + if (markerTimer.running) markerTimer.stop(); + marker.z-- + longPress = false + } + + onPositionChanged: { + var newX, newY + if (markerTimer.running) markerTimer.stop(); + if ((mouse.button == Qt.LeftButton) && (longPress != true)){ + lastX = mouse.x + lastY = mouse.y + newX = map.toScreenPosition(mouse.coordinate).x + dX + newY = map.toScreenPosition(mouse.coordinate).y + dY + marker.coordinate = map.toCoordinate(Qt.point(newX,newY)) + textArea.x = map.toScreenPosition(marker.coordinate).x + offset.x + textArea.y = map.toScreenPosition(marker.coordinate).y + offset.y + } + } + + Timer { + id: markerTimer + interval: 1000 + running: false + repeat: false + onTriggered: { + markerMouseArea.longPress = true + map.markerLongPress() + } + } + } + + Item { + id: textArea + width: 26 + height: 32 + x: map.toScreenPosition(marker.coordinate).x + offset.x + y: map.toScreenPosition(marker.coordinate).y + offset.y + Text { + id: markerIndex + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + z: marker.z + color: "white" + font.bold: true + Component.onCompleted: { + text = map.counter + } + } + } + + function update(){ + textArea.x = map.toScreenPosition(marker.coordinate).x + marker.offset.x + textArea.y = map.toScreenPosition(marker.coordinate).y + marker.offset.y + } + } diff --git a/examples/declarative/mapviewer/Message.qml b/examples/declarative/mapviewer/Message.qml new file mode 100644 index 00000000..c5531cba --- /dev/null +++ b/examples/declarative/mapviewer/Message.qml @@ -0,0 +1,110 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +import "common" as Common + +Item { + id: dialog + + anchors.fill: parent + + property alias title: titleBar.text + property alias text: message.text + property int gap: 20 + + signal okButtonClicked + signal cancelButtonClicked + opacity: 0 + + Common.Fader {} + + Rectangle { + id: dialogRectangle + + color: "lightsteelblue" + width: parent.width - gap; + height: titleBar.height + message.height + okButton.height + gap*3 + anchors { + top: parent.top + topMargin: 50 + left: parent.left + leftMargin: gap/2 + } + + border.width: 1 + border.color: "darkblue" + radius: 5 + + Common.TitleBar { + id: titleBar; + width: parent.width; height: 40; + anchors.top: parent.top; anchors.left: parent.left; + opacity: 0.9; + onClicked: { dialog.cancelButtonClicked() } + } + + Text { + id: message + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Text.AlignHCenter + anchors.top: titleBar.bottom + width: dialogRectangle.width - gap + anchors.topMargin: gap + textFormat: Text.RichText + wrapMode: Text.Wrap + onLinkActivated: { + Qt.openUrlExternally(link) + } + } + + Common.Button { + id: okButton + text: "Ok" + anchors.top: message.bottom + anchors.topMargin: gap + width: 80; height: 32 + anchors.horizontalCenter: parent.horizontalCenter + onClicked: { + dialog.okButtonClicked () + } + } + } +} diff --git a/examples/declarative/mapviewer/RouteDialog.qml b/examples/declarative/mapviewer/RouteDialog.qml new file mode 100644 index 00000000..8ee2eab0 --- /dev/null +++ b/examples/declarative/mapviewer/RouteDialog.qml @@ -0,0 +1,406 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +import Qt.location 5.0 +import "common" as Common + +Item { + id: dialog + signal goButtonClicked + signal cancelButtonClicked + + anchors.fill: parent + property int gap: 10 + opacity: 0 + + property alias title: titleBar.text + property alias startLatitude: latFrom.text + property alias startLongitude: longFrom.text + property alias endLatitude: latTo.text + property alias endLongitude: longTo.text + property alias startStreet: streetFrom.text + property alias startCity: cityFrom.text + property alias startCountry: countryFrom.text + property alias endStreet: streetTo.text + property alias endCity: cityTo.text + property alias endCountry: countryTo.text + property alias byCoordinates: coord.enabled + property int travelMode: RouteQuery.CarTravel // CarTravel, PedestrianTravel, BicycleTravel, PublicTransitTravel, TruckTravel + property int routeOptimization: RouteQuery.ShortestRoute // ShortestRoute, FastestRoute, MostEconomicRoute, MostScenicRoute + // TODO NoFeature, TollFeature, HighwayFeature, PublicTransitFeature, FerryFeature, TunnelFeature, DirtRoadFeature, ParksFeature, MotorPoolLaneFeature + + Common.Fader {} + + Rectangle { + id: dialogRectangle + color: "lightsteelblue" + opacity: 1 + width: parent.width - gap*2; + height: options.height + gap*3 + buttons.height + titleBar.height + + anchors { + top: parent.top + topMargin: 50 + left: parent.left + leftMargin: gap + } + + border.width: 1 + border.color: "darkblue" + radius: 5 + + Common.TitleBar { + id: titleBar; + width: parent.width; height: 40; + anchors.top: parent.top; anchors.left: parent.left; + opacity: 0.9 + text: "Route" + onClicked: { dialog.cancelButtonClicked() } + } + + Column { + id: options + spacing: gap + width: dialogRectangle.width - gap*2 + + anchors { + top: titleBar.bottom + topMargin: gap + left: dialogRectangle.left + leftMargin: gap + } + + states: [ + State { + name: "Address" + PropertyChanges { target: coord; enabled: false } + PropertyChanges { target: address; enabled: true } + } + ] + + +//by coordinates + Row { + id: row1 + spacing: gap + Image { + id: optionButtonCoord + anchors.verticalCenter:parent.verticalCenter + source: coord.enabled ? "resources/option_button_selected.png" : "resources/option_button.png" + MouseArea { + anchors.fill: parent + onClicked: { options.state = "" } + } + } + + Rectangle { + id: coord + color: dialogRectangle.color + border.width: 1 + border.color: enabled ? "black" : "grey" + radius: 5 + width:options.width - optionButtonCoord.width - row1.spacing + height: longTo.y + longTo.height + gap + enabled: true + +//start point + Text { + id: fromLabel; + font.bold: true; + enabled: coord.enabled + anchors { + top: latFrom.top + topMargin:latFrom.height + gap/6 - fromLabel.height/2 + left: parent.left; + leftMargin: gap + } + text: "From" + color: enabled ? "black" : "grey" + } + + TextWithLabel { + id: latFrom + width: parent.width - fromLabel.width - gap*3 + text: "-27.575" + label: "latitude" + enabled: coord.enabled + anchors { + left: fromLabel.right + leftMargin: gap + top: parent.top + topMargin:gap + } + } + + TextWithLabel { + id: longFrom + width: latFrom.width + text: "153.088" + label: "longitude" + enabled: coord.enabled + anchors { + left: latFrom.left + top: latFrom.bottom + topMargin:gap/3 + } + } + +//end point + Text { + id: toLabel; + font.bold: true; + width: fromLabel.width + enabled: coord.enabled + anchors { + top: latTo.top + topMargin:latTo.height + gap/6 - toLabel.height/2 + left: parent.left; + leftMargin: gap; + } + text: "To" + color: enabled ? "black" : "grey" + } + + TextWithLabel { + id: latTo + width: latFrom.width + text: "-27.465" + label: "latitude" + enabled: coord.enabled + anchors { + left: toLabel.right + leftMargin: gap + top: longFrom.bottom + topMargin:gap + } + } + + TextWithLabel { + id: longTo + width: latTo.width + text: "153.023" + label: "longitude" + enabled: coord.enabled + anchors { + left: latTo.left + top: latTo.bottom + topMargin:gap/3 + } + } + } + } + +//by address + Row { + id: row2 + spacing: gap + + Image { + id: optionButtonAddress + source: address.enabled ? "resources/option_button_selected.png" : "resources/option_button.png" + anchors.verticalCenter: parent.verticalCenter + MouseArea { + anchors.fill: parent + onClicked: { options.state = "Address" } + } + } + + Rectangle { + id: address + color: dialogRectangle.color + border.width: 1 + border.color: enabled ? "black" : "grey" + radius: 5 + width:coord.width + height: countryTo.y + countryTo.height + gap + enabled: false + +//start point + Text { + id: fromLabel2; + font.bold: true; + enabled: address.enabled + anchors { + top: cityFrom.top + left: parent.left; + leftMargin: gap + } + text: "From" + color: enabled ? "black" : "grey" + } + + TextWithLabel { + id: streetFrom + width: parent.width - fromLabel2.width - gap*3 + text: "Brandl st" + label: "street" + enabled: address.enabled + anchors { + left: fromLabel2.right + leftMargin: gap + top: parent.top + topMargin:gap + } + } + + TextWithLabel { + id: cityFrom + width: streetFrom.width + text: "Eight Mile Plains" + label: "city" + enabled: address.enabled + anchors { + left: streetFrom.left + top: streetFrom.bottom + topMargin:gap/3 + } + } + + TextWithLabel { + id: countryFrom + width: streetFrom.width + text: "Australia" + label: "country" + enabled: address.enabled + anchors { + left: streetFrom.left + top: cityFrom.bottom + topMargin:gap/3 + } + } + + +//end point + Text { + id: toLabel2; + font.bold: true; + enabled: address.enabled + anchors { + top: cityTo.top + left: parent.left; + leftMargin: gap + } + text: "To" + color: enabled ? "black" : "grey" + } + + TextWithLabel { + id: streetTo + width: parent.width - fromLabel2.width - gap*3 + text: "Brunswick st" + label: "street" + enabled: address.enabled + anchors { + left: fromLabel2.right + leftMargin: gap + top: countryFrom.bottom + topMargin:gap + } + } + + TextWithLabel { + id: cityTo + width: streetTo.width + text: "New Farm" + label: "city" + enabled: address.enabled + anchors { + left: streetTo.left + top: streetTo.bottom + topMargin:gap/3 + } + } + + TextWithLabel { + id: countryTo + width: streetTo.width + text: "Australia" + label: "country" + enabled: address.enabled + anchors { + left: streetTo.left + top: cityTo.bottom + topMargin:gap/3 + } + } + + } + } + } + + Row { + id: buttons + anchors.top: options.bottom + anchors.topMargin: gap + anchors.horizontalCenter: parent.horizontalCenter + spacing: gap/3 + height: 32 + Common.Button { + text: "Clear" + width: 80; height: parent.height + onClicked: { + if (byCoordinates == true){ + latFrom.text = "" + longFrom.text = "" + latTo.text = "" + longTo.text = "" + } + else { + streetFrom.text = "" + cityFrom.text = "" + countryFrom.text = "" + streetTo.text = "" + cityTo.text = "" + countryTo.text = "" + } + } + } + + Common.Button { + text: "Go!" + width: 80; height: parent.height + onClicked: { + dialog.goButtonClicked () + } + } + } + } +} diff --git a/examples/declarative/mapviewer/TextWithLabel.qml b/examples/declarative/mapviewer/TextWithLabel.qml new file mode 100644 index 00000000..40242bb4 --- /dev/null +++ b/examples/declarative/mapviewer/TextWithLabel.qml @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Row { + id: textWithLabel + height: inputRectangle.height + + property alias label: label.text + property alias text: inputField.text + property alias labelWidth: label.width + + Text { + id: label; + width:55; + enabled: textWithLabel.enabled + color: enabled ? "black" : "grey" + anchors { + top: parent.top; + topMargin: (inputRectangle.height-height)/2 + } + } + + Rectangle { + id: inputRectangle + width: textWithLabel.width - label.width; height: 30 + color: enabled ? "whitesmoke" : "gainsboro" + border.width: 1 + border.color: enabled ? "black" : "grey" + radius: 5 + TextInput { + id: inputField + focus: true + width: parent.width - anchors.leftMargin + enabled: textWithLabel.enabled + color: enabled ? "black" : "grey" + horizontalAlignment: Text.AlignLeft + + anchors { + left: parent.left; + verticalCenter: parent.verticalCenter; + leftMargin: 5 + } + } + } +} diff --git a/examples/declarative/mapviewer/common/Button.qml b/examples/declarative/mapviewer/common/Button.qml index dc643d53..529ef147 100755 --- a/examples/declarative/mapviewer/common/Button.qml +++ b/examples/declarative/mapviewer/common/Button.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/declarative/mapviewer/TitleBar.qml b/examples/declarative/mapviewer/common/Fader.qml index 0490393d..c6a064fd 100755..100644 --- a/examples/declarative/mapviewer/TitleBar.qml +++ b/examples/declarative/mapviewer/common/Fader.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -40,37 +40,29 @@ import Qt 4.7 -Item { - id: titleBar - BorderImage { source: "titlebar.sci"; width: parent.width; height: parent.height + 14; y: -7 } - - Item { - id: container - width: (parent.width * 2) - 55 ; height: parent.height +Rectangle { + id: fader + anchors.fill: parent + opacity: 0.7 + color: "darkgrey" + MouseArea { + id: mouseArea + anchors.fill: parent + hoverEnabled: true + } - Image { - id: quitButton - anchors.left: parent.left//; anchors.leftMargin: 0 - anchors.verticalCenter: parent.verticalCenter - source: "quit.png" - MouseArea { - anchors.fill: parent - onClicked: Qt.quit() - } - } + Component.onCompleted: { + var globalXY + var root = parent - Text { - id: categoryText - anchors { - left: quitButton.right; leftMargin: 10; rightMargin: 10 - verticalCenter: parent.verticalCenter - } - elide: Text.ElideLeft - text: "Mapviewer example" - font.bold: true; color: "White"; style: Text.Raised; styleColor: "Black" + if (root != null) { + while (root.parent) root = root.parent + width = root.width; height = root.height; + globalXY = mapFromItem(root, root.x, root.y); + } else { + globalXY = mapFromItem(null, 0, 0); } - } - transitions: Transition { - NumberAnimation { properties: "x"; easing.type: Easing.InOutQuad } + x = globalXY.x; + y = globalXY.y; } } diff --git a/examples/declarative/mapviewer/common/Menu.qml b/examples/declarative/mapviewer/common/Menu.qml index 6273f91a..b246060d 100644 --- a/examples/declarative/mapviewer/common/Menu.qml +++ b/examples/declarative/mapviewer/common/Menu.qml @@ -1,24 +1,68 @@ -import QtQuick 1.0 +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 Item { id: menu property int gap: 0 - property int button: 0 + property int button: -1 property alias orientation: menuView.orientation property alias count: menuModel.count - property int itemHeight //to create menu just set menu item height and width, do not set menu's height and width explicitly + property int itemHeight //to create menu just set menu item height and width, do not set menu's height and width explicitly property int itemWidth -// height: (menuView.orientation == ListView.Horizontal)? itemHeight : itemHeight * count + height: (menuView.orientation == ListView.Horizontal)? itemHeight : itemHeight * count width: (menuView.orientation == ListView.Horizontal)? itemWidth * count : itemWidth + property bool keepPreviousValue: false + property string nestedMenuSign: "\u25c2" + property string nestedPressedMenuSign: "\u25c0" signal clicked function setModel(objects) { + menuModel.clear() for (var i=0; i< objects.length; i++){ menuModel.append({"label": objects[i], "enabledItem" : true}) } - height = (menuView.orientation == ListView.Horizontal)? itemHeight : itemHeight * count + menuView.positionViewAtIndex(0,ListView.Beginning) } function disableItem(index){ @@ -52,9 +96,9 @@ Item { text: label; elide: Text.ElideLeft font.bold: true; - color: "white" + color: enabledItem ? ((index == menuView.currentIndex) ? "crimson" :"white") : "dimgrey" style: Text.Raised; - styleColor: "dimgrey" + styleColor:"dimgrey" anchors.verticalCenter: parent.verticalCenter Component.onCompleted: { if (menuView.orientation == ListView.Horizontal){ @@ -88,6 +132,26 @@ Item { name: "Hovered" when: mouseRegion.containsMouse == true PropertyChanges { target: menuItemImage; source: "../resources/menuItem_hovered.png"} + StateChangeScript { + name: "myScript" + script:{ + var str = menuItemText.text + if (str.charAt(0) == menu.nestedMenuSign ) menuItemText.text = menu.nestedPressedMenuSign + str.substring(1, str.length) + else if (str.charAt(str.length -1) == menu.nestedMenuSign ) menuItemText.text = str.substring(0, str.length-1) + menu.nestedPressedMenuSign + } + } + }, + State { + name: "Released" + when: mouseRegion.containsMouse == false + StateChangeScript { + name: "myScript" + script:{ + var str = menuItemText.text + if (str.charAt(0) == menu.nestedPressedMenuSign ) menuItemText.text = menu.nestedMenuSign + str.substring(1, str.length) + else if (str.charAt(str.length-1) == menu.nestedPressedMenuSign ) menuItemText.text = str.substring(0, str.length-1) + menu.nestedMenuSign + } + } }, State { name: "Disabled" @@ -105,5 +169,6 @@ Item { delegate: menuItemDelegate spacing: gap interactive: false + currentIndex: (menu.keepPreviousValue == false) ? -1 : menu.button } } diff --git a/examples/declarative/mapviewer/common/Slider.qml b/examples/declarative/mapviewer/common/Slider.qml index af62f915..2b7aeb5b 100644 --- a/examples/declarative/mapviewer/common/Slider.qml +++ b/examples/declarative/mapviewer/common/Slider.qml @@ -1,6 +1,6 @@ -/*/**************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -43,12 +43,11 @@ import Qt 4.7 Item { id: slider; height: 40 - // value is read/write. - property int value + property int value // value is read/write. property real minimum: 0 property real maximum: 1 property int xMin: 2 - property int xMax: slider.width - handle.width-xMin + property int xMax: width - handle.width-xMin Rectangle { anchors.fill: parent @@ -61,8 +60,8 @@ Item { Rectangle { id: handle; smooth: true width: 30; - y: xMin; - x: xMin + (value - minimum) * slider.xMax / (maximum - minimum) + y: slider.xMin; + x: slider.xMin + (slider.value - slider.minimum) * slider.xMax / (slider.maximum - slider.minimum) height: slider.height-4; radius: 6 gradient: normalGradient diff --git a/examples/declarative/mapviewer/common/TitleBar.qml b/examples/declarative/mapviewer/common/TitleBar.qml index ed175f50..fcb58903 100755 --- a/examples/declarative/mapviewer/common/TitleBar.qml +++ b/examples/declarative/mapviewer/common/TitleBar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/declarative/mapviewer/mapviewer.pro b/examples/declarative/mapviewer/mapviewer.pro index 5a787021..ac651716 100644 --- a/examples/declarative/mapviewer/mapviewer.pro +++ b/examples/declarative/mapviewer/mapviewer.pro @@ -12,8 +12,8 @@ symbian { RESOURCES += \ mapviewer.qrc -target.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/mapviewer +target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/mapviewer sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.qml *.png *.sci -sources.path = $$[QT_INSTALL_DEMOS]/qtlocation/declarative/mapviewer +sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/mapviewer INSTALLS += target sources diff --git a/examples/declarative/mapviewer/mapviewer.qml b/examples/declarative/mapviewer/mapviewer.qml index fbd22981..2d175d50 100644 --- a/examples/declarative/mapviewer/mapviewer.qml +++ b/examples/declarative/mapviewer/mapviewer.qml @@ -45,45 +45,28 @@ import "common" as Common FocusScope { anchors.fill: parent id: page + focus: true Rectangle { + id: backgroundRect anchors.fill: parent color: "darkgrey" z:2 } - Common.TitleBar { - id: titleBar; z: 4; width: parent.width; height: 40; opacity: 0.9; text: "QML mapviewer example" + id: titleBar; z: mainMenu.z; width: parent.width; height: 40; opacity: 0.9; text: "QML mapviewer example" onClicked: { Qt.quit() } } - Common.Slider { - id: zoomSlider; - minimum: map.minimumZoomLevel; - maximum: map.maximumZoomLevel; - opacity: 1 - z: 4 - anchors { - bottom: mainMenu.top; - bottomMargin: 5; rightMargin: 5; leftMargin: 5 - left: parent.left - } - width: parent.width - anchors.rightMargin - anchors.leftMargin - value: map.zoomLevel - onValueChanged: { - map.zoomLevel = value - } - } - - // Menus +//=====================Menus===================== Common.Menu { id: mainMenu itemHeight: 40 itemWidth: page.width / count anchors.bottom: parent.bottom orientation: ListView.Horizontal - z: 5 + z: map.z + 3 Component.onCompleted: { setModel(["Options","Settings"]) } @@ -99,106 +82,303 @@ FocusScope { } } } - } - Common.Menu { - id: optionsMenu - orientation: ListView.Vertical - z: mainMenu.z - 1 - Component.onCompleted: { - setModel(["Reverse geocode", "Geocode","Search", "Route"]) - disableItem(2) - } - itemHeight: 30; - itemWidth: mainMenu.itemWidth - anchors.left: mainMenu.left - y: page.height - - onClicked: { - switch (button) { - case 0: { - page.state = "RevGeocode" - break; - } - case 1: { - page.state = "Geocode" - break; - } - case 2: { - page.state = "Search" - break; - } - case 3: { - page.state = "Route" - break; - } + Common.Menu { + id: optionsMenu + orientation: ListView.Vertical + z: mainMenu.z - 1 + Component.onCompleted: { + setModel(["Reverse geocode", "Geocode","Search", "Route"]) + disableItem(2) + } + itemHeight: 30; + itemWidth: mainMenu.itemWidth + anchors.left: mainMenu.left + y: page.height + + onClicked: { + switch (button) { + case 0: { + page.state = "RevGeocode" + break; + } + case 1: { + page.state = "Geocode" + break; + } + case 2: { + page.state = "Search" + break; + } + case 3: { + page.state = "Route" + break; } } } + } - Common.Menu { - id: settingsMenu - orientation: ListView.Vertical - z: mainMenu.z - 1 - Component.onCompleted: { - setModel(["Map type", "Provider"]) - disableItem(0) - disableItem(1) + Common.Menu { + id: settingsMenu + orientation: ListView.Vertical + z: mainMenu.z - 1 + Component.onCompleted: { + setModel([ settingsMenu.nestedMenuSign + " Map type", settingsMenu.nestedMenuSign + " Connectivity", " Provider"]) + } + + itemHeight: 30; + itemWidth: mainMenu.itemWidth + y: page.height + anchors.right: mainMenu.right + + onClicked: { + switch (button) { + case 0: { + page.state = "MapType" + break; + } + case 1: { + page.state = "Connectivity" + break; + } + case 2: { + messageDialog.state = "Provider" + page.state = "Message" + break; + } } + } + } - itemHeight: 30; - itemWidth: mainMenu.itemWidth - y: page.height - anchors.right: mainMenu.right + Common.Menu { + id: mapTypeMenu + orientation: ListView.Vertical + z: mainMenu.z - 1 + keepPreviousValue: true + opacity: 0 - onClicked: { - switch (button) { - case 0: { - console.log("Map type"); - break; - } - case 1: { - console.log("Provider") - break; - } + itemHeight: 30; + itemWidth: mainMenu.itemWidth*2/3 + anchors.bottom: mainMenu.top + anchors.right: settingsMenu.left + + Component.onCompleted: { + setModel(["Street", "Satellite", "Satellite Night", "Terrain"]) + disableItem(2) // Nokia map engine supports only Street, Satellite and Terrain map types + button = 0 // Nokia plugin's default map type is Map.StreetMap + } + + onClicked: { + page.state = "" + } + + onButtonChanged: { + switch (button) { + case 0: { + map.mapType = Map.StreetMap + break; + } + case 1: { + map.mapType = Map.SatelliteMapDay + break; + } + case 2: { + map.mapType = Map.SatelliteMapNight + break; + } + case 3: { + map.mapType = Map.TerrainMap + break; } } } + } - // Dialogs - Dialog { - id: routeDialog - title: "Routing from map center to" - z: 5 + Common.Menu { + id: connectivityModeMenu + orientation: ListView.Vertical + z: mainMenu.z - 1 + keepPreviousValue: true opacity: 0 + itemHeight: 30; + itemWidth: mainMenu.itemWidth/2 + anchors.bottom: mainMenu.top + anchors.right: settingsMenu.left + Component.onCompleted: { - var obj = [["latitude:", "51.2207"],["and longitude:", "0.1"]] - setModel(obj) + setModel(["Offline", "Online", "Hybrid"]) + disableItem(0) // Nokia map engine supports online mode + disableItem(2) + button = 1 } - Coordinate { - id: endCoordinate + + onClicked: { + page.state = "" + } + + onButtonChanged: { + switch (button) { + case 0: { + map.connectivityMode = Map.OfflineMode + break; + } + case 1: { + map.connectivityMode = Map.OnlineMode + break; + } + case 2: { + map.connectivityMode = Map.HybridMode + break; + } + } + } + } + +//=====================Dialogs===================== + Message { + id: messageDialog + z: mainMenu.z + 1 + onOkButtonClicked: { + page.state = "" + } + onCancelButtonClicked: { + page.state = "" + } + + states: [ + State{ + name: "Provider" + PropertyChanges { target: messageDialog; title: "Provider" } + PropertyChanges { target: messageDialog; text: "Nokia OVI <a href=\http://doc.qt.nokia.com/qtmobility-1.2/location-overview.html#the-nokia-plugin\">map plugin</a>." } + }, + State{ + name: "GeocodeError" + PropertyChanges { target: messageDialog; title: "Geocode Error" } + PropertyChanges { target: messageDialog; text: "Unable to find location for the given point" } + }, + State{ + name: "UnknownGeocodeError" + PropertyChanges { target: messageDialog; title: "Geocode Error" } + PropertyChanges { target: messageDialog; text: "Unsuccessful geocode" } + }, + State{ + name: "AmbiguousGeocode" + PropertyChanges { target: messageDialog; title: "Ambiguous geocode" } + PropertyChanges { target: messageDialog; text: map.geocodeModel.count + " results found for the given address, please specify location" } + }, + State{ + name: "RouteError" + PropertyChanges { target: messageDialog; title: "Route Error" } + PropertyChanges { target: messageDialog; text: "Unable to find a route for the given points"} + }, + State{ + name: "LocationInfo" + PropertyChanges { target: messageDialog; title: "Location" } + PropertyChanges { target: messageDialog; text: geocodeMessage() } + } + ] + } + +//Route Dialog + RouteDialog { + id: routeDialog + z: mainMenu.z + 1 + + Coordinate { id: endCoordinate } + Coordinate { id: startCoordinate } + Address { id:startAddress } + Address { id:endAddress } + + GeocodeModel { + id: tempGeocodeModel + plugin : map.plugin + property int success: 0 + onStatusChanged:{ + if ((status == GeocodeModel.Ready) && (count == 1)) { + success++ + if (success == 1){ + startCoordinate.latitude = get(0).coordinate.latitude + startCoordinate.longitude = get(0).coordinate.longitude + clear() + query = endAddress + update(); + } + if (success == 2) + { + endCoordinate.latitude = get(0).coordinate.latitude + endCoordinate.longitude = get(0).coordinate.longitude + success = 0 + routeDialog.calculateRoute() + } + } + else if ((status == GeocodeModel.Ready) || (status == GeocodeModel.Error)){ + var st = (success == 0 ) ? "start" : "end" + messageDialog.state = "" + if ((status == GeocodeModel.Ready) && (count == 0 )) messageDialog.state = "UnknownGeocodeError" + else if (status == GeocodeModel.Error) { + messageDialog.state = "GeocodeError" + messageDialog.text = "Unable to find location for the " + st + " point" + } + else if ((status == GeocodeModel.Ready) && (count > 1 )){ + messageDialog.state = "AmbiguousGeocode" + messageDialog.text = count + " results found for the " + st + " point, please specify location" + } + console.log(" state = " + messageDialog.state) + success = 0 + page.state = "Message" + } + } } + onGoButtonClicked: { + var status = true + + messageDialog.state = "" + if (routeDialog.byCoordinates) { + startCoordinate.latitude = routeDialog.startLatitude + startCoordinate.longitude = routeDialog.startLongitude + endCoordinate.latitude = routeDialog.endLatitude + endCoordinate.longitude = routeDialog.endLongitude + + calculateRoute() + } + else { + startAddress.country = routeDialog.startCountry + startAddress.street = routeDialog.startStreet + startAddress.city = routeDialog.startCity + + endAddress.country = routeDialog.endCountry + endAddress.street = routeDialog.endStreet + endAddress.city = routeDialog.endCity + + tempGeocodeModel.query = startAddress + tempGeocodeModel.update(); + } page.state = "" - endCoordinate.latitude = dialogModel.get(0).inputText - endCoordinate.longitude = dialogModel.get(1).inputText - routeQuery.clearWaypoints(); - routeQuery.addWaypoint(map.center) // Starting coordinate - routeQuery.addWaypoint(endCoordinate) // Ending coordinate - routeModel.update(); } + onCancelButtonClicked: { page.state = "" } + + function calculateRoute(){ + map.routeQuery.clearWaypoints(); + map.center = startCoordinate + map.routeQuery.addWaypoint(startCoordinate) + map.routeQuery.addWaypoint(endCoordinate) + map.routeQuery.travelModes = routeDialog.travelMode + map.routeQuery.routeOptimizations = routeDialog.routeOptimization + map.routeModel.update(); + } } +//Search Dialog Dialog { id: searchDialog title: "Search" - z: 5 - opacity: 0 + z: mainMenu.z + 1 onGoButtonClicked: { page.state = "" @@ -214,64 +394,96 @@ FocusScope { } } +//Geocode Dialog Dialog { id: geocodeDialog title: "Geocode" - z: 5 - opacity: 0 + z: mainMenu.z + 1 Component.onCompleted: { - var obj = [["Country:","Australia"],["Street:", "Brandl St 53"],["District:","Eight Mile Plains"]] + var obj = [["Street", "Brandl St"],["District",""],["City", "Eight Mile Plains"], ["County", ""],["State", ""],["Country code",""],["Country","Australia"], ["Post code", ""]] setModel(obj) } + + Address { + id: geocodeAddress + } + onGoButtonClicked: { page.state = "" - geocodeAddress.country = dialogModel.get(0).inputText - geocodeAddress.street = dialogModel.get(1).inputText - geocodeAddress.district = dialogModel.get(2).inputText - geocodeModel.query = geocodeAddress - geocodeModel.update(); + messageDialog.state = "" + geocodeAddress.street = dialogModel.get(0).inputText + geocodeAddress.district = dialogModel.get(1).inputText + geocodeAddress.city = dialogModel.get(2).inputText + geocodeAddress.county = dialogModel.get(3).inputText + geocodeAddress.state = dialogModel.get(4).inputText + geocodeAddress.countryCode = dialogModel.get(5).inputText + geocodeAddress.country = dialogModel.get(6).inputText + geocodeAddress.postcode = dialogModel.get(7).inputText + map.geocodeModel.clear() + map.geocodeModel.query = geocodeAddress + map.geocodeModel.update(); } onCancelButtonClicked: { page.state = "" } } +//Reverse Geocode Dialog Dialog { id: reverseGeocodeDialog title: "Reverse Geocode" - z: 5 - opacity: 0 + z: mainMenu.z + 1 Component.onCompleted: { - var obj = [["Latitude:","51"],["Longitude:", "0"]] + var obj = [["Latitude","-27.575"],["Longitude", "153.088"]] setModel(obj) } + + Coordinate { + id: reverseGeocodeCoordinate + } + onGoButtonClicked: { page.state = "" + messageDialog.state = "" + reverseGeocodeCoordinate.latitude = dialogModel.get(0).inputText reverseGeocodeCoordinate.longitude = dialogModel.get(1).inputText - geocodeModel.query = reverseGeocodeCoordinate - geocodeModel.update(); + map.geocodeModel.clear() + map.geocodeModel.query = reverseGeocodeCoordinate + map.geocodeModel.update(); } + onCancelButtonClicked: { page.state = "" } } - RouteModel { - id : routeModel - plugin : Plugin { name : "nokia"} - query: RouteQuery { - id: routeQuery + +//Get new coordinates for marker + Dialog { + id: coordinatesDialog + title: "New coordinates" + z: mainMenu.z + 1 + + Component.onCompleted: { + var obj = [["Latitude", ""],["Longitude", ""]] + setModel(obj) } - } - Address { - id: geocodeAddress - } - Coordinate { - id: reverseGeocodeCoordinate + onGoButtonClicked: { + page.state = "" + messageDialog.state = "" + map.currentMarker.coordinate.latitude = dialogModel.get(0).inputText + map.currentMarker.coordinate.longitude = dialogModel.get(1).inputText + map.center = map.currentMarker.coordinate + } + + onCancelButtonClicked: { + page.state = "" + } } + GeocodeModel { id: geocodeModel plugin : Plugin { name : "nokia"} @@ -283,27 +495,16 @@ FocusScope { } } - Map { + +//=====================Map===================== + MapComponent{ id: map - z : 3 - plugin : Plugin {name : "nokia"} + z : backgroundRect.z + 1 size.width: parent.width - size.height: parent.height - zoomLevel: 9 - focus : true - center: Coordinate { - latitude: 51.5 - longitude: -0.11 - } + size.height: parent.height - mainMenu.height - MapObjectView { - model: routeModel - delegate: Component { - MapRoute { - // TODO this interface is bit unclear - route: path - } - } + onMousePressed: { + page.state = "" } MapObjectView { @@ -317,98 +518,125 @@ FocusScope { } } - MapCircle { - id : circle - center : Coordinate { - latitude : 51.5 - longitude : -0.11 - } - color : "#80FF0000" - radius : 1000.0 - MapMouseArea { - onPositionChanged: { - if (mouse.button == Qt.LeftButton) - circle.center = mouse.coordinate - if (mouse.button == Qt.RightButton) - circle.radius = circle.center.distanceTo(mouse.coordinate) - } - } + onSliderUpdated: { + page.state = "" } - MapMouseArea { - property int lastX : -1 - property int lastY : -1 + onCoordinatesCaptured: { + messageDialog.title = "Coordinates" + messageDialog.text = "<b>Latitude:</b> " + roundNumber(latitude,4) + "<br/><b>Longitude:</b> " + roundNumber(longitude,4); + page.state = "Message" + } - onPressed : { - if (page.state != "") page.state ="" - else { - lastX = mouse.x - lastY = mouse.y - } - } - onReleased : { - lastX = -1 - lastY = -1 - } - onPositionChanged: { - if (mouse.button == Qt.LeftButton) { - if ((lastX != -1) && (lastY != -1)) { - var dx = mouse.x - lastX - var dy = mouse.y - lastY - map.pan(-dx, -dy) - } - lastX = mouse.x - lastY = mouse.y - } - } - onDoubleClicked: { - map.center = mouse.coordinate - if (mouse.button == Qt.LeftButton){ - map.zoomLevel += 1 - } else if (mouse.button == Qt.RightButton){ - map.zoomLevel -= 1 - } - lastX = -1 - lastY = -1 - } + onShowRouteInfo: { + var value = map.routeModel.get(0).travelTime + var seconds = value % 60 + value /= 60 + value = Math.round(value) + var minutes = value % 60 + value /= 60 + value = Math.round(value) + var hours = value + var dist = roundNumber(map.routeModel.get(0).distance,0) + + if (dist>1000) dist = dist/1000 + " km" + else dist = dist + " m" + + messageDialog.title = "Route info" + messageDialog.text = "<b>Travel time:</b> " + hours + "h:"+ minutes + "m<br/><b>Distance:</b> " + dist; + + page.state = "Message" } - } // Map - - Keys.onPressed: { - if ((event.key == Qt.Key_Plus) || (event.key == Qt.Key_VolumeUp)) { - map.zoomLevel += 1 - } else if ((event.key == Qt.Key_Minus) || (event.key == Qt.Key_VolumeDown)){ - map.zoomLevel -= 1 - } else if (event.key == Qt.Key_T) { - if (map.mapType == Map.StreetMap) { - map.mapType = Map.SatelliteMapDay - } else if (map.mapType == Map.SatelliteMapDay) { - map.mapType = Map.StreetMap + + onGeocodeFinished:{ + var street, district, city, county, state, countryCode, country, latitude, longitude, text + + if (map.geocodeModel.status == GeocodeModel.Ready){ + if (map.geocodeModel.count == 0) messageDialog.state = "UnknownGeocodeError" + else if (map.geocodeModel.count > 1) messageDialog.state = "AmbiguousGeocode" + else messageDialog.state = "LocationInfo"; } + else if (map.geocodeModel.status == GeocodeModel.Error) messageDialog.state = "GeocodeError" + page.state = "Message" + } + + onShowGeocodeInfo:{ + messageDialog.state = "LocationInfo" + page.state = "Message" } + + onMoveMarker: { + page.state = "Coordinates" + } + + onRouteError: { + messageDialog.state = "RouteError" + page.state = "Message" + } + } + + function geocodeMessage(){ + var street, district, city, county, state, countryCode, country, postcode, latitude, longitude, text + latitude = map.geocodeModel.get(0).coordinate.latitude + longitude = map.geocodeModel.get(0).coordinate.longitude + street = map.geocodeModel.get(0).address.street + district = map.geocodeModel.get(0).address.district + city = map.geocodeModel.get(0).address.city + county = map.geocodeModel.get(0).address.county + state = map.geocodeModel.get(0).address.state + countryCode = map.geocodeModel.get(0).address.countryCode + country = map.geocodeModel.get(0).address.country + postcode = map.geocodeModel.get(0).address.postcode + + text = "<b>Latitude:</b> " + latitude + "<br/>" + text +="<b>Longitude:</b> " + longitude + "<br/>" + "<br/>" + if (street) text +="<b>Street: </b>"+ street + " <br/>" + if (district) text +="<b>District: </b>"+ district +" <br/>" + if (city) text +="<b>City: </b>"+ city + " <br/>" + if (county) text +="<b>County: </b>"+ county + " <br/>" + if (state) text +="<b>State: </b>"+ state + " <br/>" + if (countryCode) text +="<b>Country code: </b>"+ countryCode + " <br/>" + if (country) text +="<b>Country: </b>"+ country + " <br/>" + if (postcode) text +="<b>Postcode: </b>"+ postcode + " <br/>" + return text } - // states of page + + function roundNumber(number, digits) { + var multiple = Math.pow(10, digits); + var rndedNum = Math.round(number * multiple) / multiple; + return rndedNum; + } + +//=====================States of page===================== states: [ + State { + name: "" + PropertyChanges { target: map; focus: true } + }, State { name: "RevGeocode" PropertyChanges { target: reverseGeocodeDialog; opacity: 1 } - PropertyChanges { target: titleBar; hoverEnabled: false } }, State { name: "Route" PropertyChanges { target: routeDialog; opacity: 1 } - PropertyChanges { target: titleBar; hoverEnabled: false } }, State { name: "Search" PropertyChanges { target: searchDialog; opacity: 1 } - PropertyChanges { target: titleBar; hoverEnabled: false } }, State { name: "Geocode" PropertyChanges { target: geocodeDialog; opacity: 1 } - PropertyChanges { target: titleBar; hoverEnabled: false } + }, + State { + name: "Coordinates" + PropertyChanges { target: coordinatesDialog; opacity: 1 } + }, + State { + name: "Message" + PropertyChanges { target: messageDialog; opacity: 1 } }, State { name : "Options" @@ -417,12 +645,47 @@ FocusScope { State { name : "Settings" PropertyChanges { target: settingsMenu; y: page.height - settingsMenu.height - mainMenu.height } + }, + State { + name : "MapType" + PropertyChanges { target: mapTypeMenu; opacity: 1} + PropertyChanges { target: settingsMenu; y: page.height - settingsMenu.height - mainMenu.height } + }, + State { + name : "Connectivity" + PropertyChanges { target: connectivityModeMenu; opacity: 1} + PropertyChanges { target: settingsMenu; y: page.height - settingsMenu.height - mainMenu.height } } ] - // state-transition animations for page +//=====================State-transition animations for page===================== transitions: [ Transition { + to: "RevGeocode" + NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear } + }, + Transition { + to: "Route" + NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear } + }, + Transition { + to: "Search" + NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear } + }, + Transition { + to: "Geocode" + NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear } + }, + Transition { + to: "Coordinates" + NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear } + }, + Transition { + to: "Message" + NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear } + }, + Transition { + to: "" NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear } }, Transition { diff --git a/examples/declarative/mapviewer/mapviewer.qrc b/examples/declarative/mapviewer/mapviewer.qrc index 653be933..3f622246 100644 --- a/examples/declarative/mapviewer/mapviewer.qrc +++ b/examples/declarative/mapviewer/mapviewer.qrc @@ -19,5 +19,16 @@ <file>resources/menuItem_hovered.png</file> <file>resources/button_pressed.png</file> <file>resources/button_hovered.png</file> + <file>Message.qml</file> + <file>common/Fader.qml</file> + <file>RouteDialog.qml</file> + <file>TextWithLabel.qml</file> + <file>resources/option_button_selected.png</file> + <file>resources/option_button.png</file> + <file>MapComponent.qml</file> + <file>Marker.qml</file> + <file>resources/marker.png</file> + <file>resources/marker_selected.png</file> + <file>resources/marker_hovered.png</file> </qresource> </RCC> diff --git a/examples/declarative/mapviewer/qmlmapviewer.cpp b/examples/declarative/mapviewer/qmlmapviewer.cpp index c4466df8..86b29f47 100644 --- a/examples/declarative/mapviewer/qmlmapviewer.cpp +++ b/examples/declarative/mapviewer/qmlmapviewer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/declarative/mapviewer/quit.png b/examples/declarative/mapviewer/quit.png Binary files differdeleted file mode 100755 index 5bda1b6e..00000000 --- a/examples/declarative/mapviewer/quit.png +++ /dev/null diff --git a/examples/declarative/mapviewer/resources/marker.png b/examples/declarative/mapviewer/resources/marker.png Binary files differnew file mode 100755 index 00000000..e2375e3c --- /dev/null +++ b/examples/declarative/mapviewer/resources/marker.png diff --git a/examples/declarative/mapviewer/resources/marker_hovered.png b/examples/declarative/mapviewer/resources/marker_hovered.png Binary files differnew file mode 100755 index 00000000..a974e721 --- /dev/null +++ b/examples/declarative/mapviewer/resources/marker_hovered.png diff --git a/examples/declarative/mapviewer/resources/marker_selected.png b/examples/declarative/mapviewer/resources/marker_selected.png Binary files differnew file mode 100755 index 00000000..5d97a17d --- /dev/null +++ b/examples/declarative/mapviewer/resources/marker_selected.png diff --git a/examples/declarative/mapviewer/resources/option_button.png b/examples/declarative/mapviewer/resources/option_button.png Binary files differnew file mode 100755 index 00000000..cf8dcda7 --- /dev/null +++ b/examples/declarative/mapviewer/resources/option_button.png diff --git a/examples/declarative/mapviewer/resources/option_button_selected.png b/examples/declarative/mapviewer/resources/option_button_selected.png Binary files differnew file mode 100755 index 00000000..a0c01cf7 --- /dev/null +++ b/examples/declarative/mapviewer/resources/option_button_selected.png diff --git a/examples/declarative/mapviewer/titlebar.png b/examples/declarative/mapviewer/titlebar.png Binary files differdeleted file mode 100755 index 51c90082..00000000 --- a/examples/declarative/mapviewer/titlebar.png +++ /dev/null diff --git a/examples/declarative/mapviewer/titlebar.sci b/examples/declarative/mapviewer/titlebar.sci deleted file mode 100755 index 0418d94c..00000000 --- a/examples/declarative/mapviewer/titlebar.sci +++ /dev/null @@ -1,5 +0,0 @@ -border.left: 10 -border.top: 12 -border.bottom: 12 -border.right: 10 -source: titlebar.png diff --git a/examples/examples.pro b/examples/examples.pro index 03c4a217..1161e17a 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += declarative +SUBDIRS += declarative \ + maps diff --git a/demos/mapsdemo/icons/endmarker.png b/examples/maps/icons/endmarker.png Binary files differindex 5701d916..5701d916 100644 --- a/demos/mapsdemo/icons/endmarker.png +++ b/examples/maps/icons/endmarker.png diff --git a/demos/mapsdemo/icons/mylocation.png b/examples/maps/icons/mylocation.png Binary files differindex 877adbb1..877adbb1 100644 --- a/demos/mapsdemo/icons/mylocation.png +++ b/examples/maps/icons/mylocation.png diff --git a/demos/mapsdemo/icons/pathmarker.png b/examples/maps/icons/pathmarker.png Binary files differindex ae046384..ae046384 100644 --- a/demos/mapsdemo/icons/pathmarker.png +++ b/examples/maps/icons/pathmarker.png diff --git a/demos/mapsdemo/icons/searchmarker.png b/examples/maps/icons/searchmarker.png Binary files differindex 4c3c4d84..4c3c4d84 100644 --- a/demos/mapsdemo/icons/searchmarker.png +++ b/examples/maps/icons/searchmarker.png diff --git a/demos/mapsdemo/icons/startmarker.png b/examples/maps/icons/startmarker.png Binary files differindex d188161e..d188161e 100644 --- a/demos/mapsdemo/icons/startmarker.png +++ b/examples/maps/icons/startmarker.png diff --git a/demos/mapsdemo/icons/waypointmarker.png b/examples/maps/icons/waypointmarker.png Binary files differindex 6dd1acfa..6dd1acfa 100644 --- a/demos/mapsdemo/icons/waypointmarker.png +++ b/examples/maps/icons/waypointmarker.png diff --git a/demos/mapsdemo/main.cpp b/examples/maps/main.cpp index 44a166f4..44a166f4 100644 --- a/demos/mapsdemo/main.cpp +++ b/examples/maps/main.cpp diff --git a/demos/mapsdemo/mainwindow.cpp b/examples/maps/mainwindow.cpp index 4ffd6930..4ffd6930 100644 --- a/demos/mapsdemo/mainwindow.cpp +++ b/examples/maps/mainwindow.cpp diff --git a/demos/mapsdemo/mainwindow.h b/examples/maps/mainwindow.h index d1480757..d1480757 100644 --- a/demos/mapsdemo/mainwindow.h +++ b/examples/maps/mainwindow.h diff --git a/demos/mapsdemo/mapsdemo.pro b/examples/maps/maps.pro index 9c2bb26b..46e8665b 100644 --- a/demos/mapsdemo/mapsdemo.pro +++ b/examples/maps/maps.pro @@ -1,12 +1,12 @@ TEMPLATE = app -TARGET = mapsdemo +TARGET = maps CONFIG += qt warn_on QT += network location -RESOURCES += mapsdemo.qrc +RESOURCES += maps.qrc symbian: { TARGET.CAPABILITY = Location \ @@ -35,7 +35,7 @@ SOURCES += \ navigator.cpp #install -target.path = $$[QT_INSTALL_DEMOS]/qtlocation/mapsdemo +target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/maps sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_DEMOS]/qtlocation/mapsdemo +sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/maps INSTALLS += target sources diff --git a/demos/mapsdemo/mapsdemo.qrc b/examples/maps/maps.qrc index a46ea7db..a46ea7db 100644 --- a/demos/mapsdemo/mapsdemo.qrc +++ b/examples/maps/maps.qrc diff --git a/demos/mapsdemo/mapswidget.cpp b/examples/maps/mapswidget.cpp index cf8fad12..cf8fad12 100644 --- a/demos/mapsdemo/mapswidget.cpp +++ b/examples/maps/mapswidget.cpp diff --git a/demos/mapsdemo/mapswidget.h b/examples/maps/mapswidget.h index 07ef4d89..07ef4d89 100644 --- a/demos/mapsdemo/mapswidget.h +++ b/examples/maps/mapswidget.h diff --git a/demos/mapsdemo/marker.cpp b/examples/maps/marker.cpp index 53efc908..53efc908 100644 --- a/demos/mapsdemo/marker.cpp +++ b/examples/maps/marker.cpp diff --git a/demos/mapsdemo/marker.h b/examples/maps/marker.h index c6ae4e00..c6ae4e00 100644 --- a/demos/mapsdemo/marker.h +++ b/examples/maps/marker.h diff --git a/demos/mapsdemo/markerdialog.cpp b/examples/maps/markerdialog.cpp index e9464332..e9464332 100644 --- a/demos/mapsdemo/markerdialog.cpp +++ b/examples/maps/markerdialog.cpp diff --git a/demos/mapsdemo/markerdialog.h b/examples/maps/markerdialog.h index 7f083f32..7f083f32 100644 --- a/demos/mapsdemo/markerdialog.h +++ b/examples/maps/markerdialog.h diff --git a/demos/mapsdemo/navigatedialog.cpp b/examples/maps/navigatedialog.cpp index d9184f36..d9184f36 100644 --- a/demos/mapsdemo/navigatedialog.cpp +++ b/examples/maps/navigatedialog.cpp diff --git a/demos/mapsdemo/navigatedialog.h b/examples/maps/navigatedialog.h index 443f7801..443f7801 100644 --- a/demos/mapsdemo/navigatedialog.h +++ b/examples/maps/navigatedialog.h diff --git a/demos/mapsdemo/navigator.cpp b/examples/maps/navigator.cpp index c3b93ff0..c3b93ff0 100644 --- a/demos/mapsdemo/navigator.cpp +++ b/examples/maps/navigator.cpp diff --git a/demos/mapsdemo/navigator.h b/examples/maps/navigator.h index b48e6c25..b48e6c25 100644 --- a/demos/mapsdemo/navigator.h +++ b/examples/maps/navigator.h diff --git a/demos/mapsdemo/searchdialog.cpp b/examples/maps/searchdialog.cpp index d8f50168..d8f50168 100644 --- a/demos/mapsdemo/searchdialog.cpp +++ b/examples/maps/searchdialog.cpp diff --git a/demos/mapsdemo/searchdialog.h b/examples/maps/searchdialog.h index 39bce7a4..39bce7a4 100644 --- a/demos/mapsdemo/searchdialog.h +++ b/examples/maps/searchdialog.h diff --git a/qtlocation.pro b/qtlocation.pro index a5d63662..a973bac1 100644 --- a/qtlocation.pro +++ b/qtlocation.pro @@ -3,21 +3,21 @@ TEMPLATE = subdirs module_qtlocation_src.subdir = src module_qtlocation_src.target = module-qtlocation-src -module_qtlocation_demos.subdir = demos -module_qtlocation_demos.target = module-qtlocation-demos -module_qtlocation_demos.depends = module_qtlocation_src - -module_qtlocation_examples.subdir = examples/declarative +module_qtlocation_examples.subdir = examples module_qtlocation_examples.target = module-qtlocation-examples module_qtlocation_examples.depends = module_qtlocation_src +!contains(QT_BUILD_PARTS,examples) { + module_qtlocation_examples.CONFIG += no_default_install no_default_target +} module_qtlocation_tests.subdir = tests module_qtlocation_tests.target = module-qtlocation-tests module_qtlocation_tests.depends = module_qtlocation_src -module_qtlocation_tests.CONFIG = no_default_target no_default_install +!contains(QT_BUILD_PARTS,tests) { + module_qtlocation_tests.CONFIG = no_default_target no_default_install +} SUBDIRS += module_qtlocation_src \ - module_qtlocation_demos \ module_qtlocation_examples \ -# module_qtlocation_tests \ + module_qtlocation_tests \ diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 1830234d..eb46826f 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -7,29 +7,29 @@ ** This file is part of the plugins of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -103,7 +103,6 @@ #include <QDebug> QT_BEGIN_NAMESPACE -QTM_USE_NAMESPACE class QLocationDeclarativeModule: public QDeclarativeExtensionPlugin { diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro index e6458912..b6515fd1 100644 --- a/src/imports/location/location.pro +++ b/src/imports/location/location.pro @@ -4,7 +4,7 @@ TARGETPATH = Qt/location # Compatibility demands old path too. #TARGETPATH = QtMobility/location -include(../qimportbase.pri) +include(qlocationimport.pri) QT += declarative network location diff --git a/src/imports/location/qdeclarativecoordinate.cpp b/src/imports/location/qdeclarativecoordinate.cpp index 31aec957..4ce5a34b 100644 --- a/src/imports/location/qdeclarativecoordinate.cpp +++ b/src/imports/location/qdeclarativecoordinate.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -43,7 +43,7 @@ #include <qnumeric.h> #include "qdeclarative.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Coordinate @@ -176,5 +176,5 @@ qreal QDeclarativeCoordinate::distanceTo(QObject* coordinate) #include "moc_qdeclarativecoordinate_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativecoordinate_p.h b/src/imports/location/qdeclarativecoordinate_p.h index c1bf61d9..e37af0fe 100644 --- a/src/imports/location/qdeclarativecoordinate_p.h +++ b/src/imports/location/qdeclarativecoordinate_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -47,7 +47,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeCoordinate : public QObject { @@ -85,8 +85,8 @@ private: QGeoCoordinate m_coordinate; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeCoordinate)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCoordinate)); #endif diff --git a/src/imports/location/qdeclarativegeoaddress.cpp b/src/imports/location/qdeclarativegeoaddress.cpp index 621a101c..178fe6a6 100644 --- a/src/imports/location/qdeclarativegeoaddress.cpp +++ b/src/imports/location/qdeclarativegeoaddress.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -41,7 +41,7 @@ #include "qdeclarativegeoaddress_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Address QDeclarativeGeoAddress @@ -245,4 +245,4 @@ void QDeclarativeGeoAddress::setPostcode(const QString& postcode) #include "moc_qdeclarativegeoaddress_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoaddress_p.h b/src/imports/location/qdeclarativegeoaddress_p.h index b750fb3c..373c7f6d 100644 --- a/src/imports/location/qdeclarativegeoaddress_p.h +++ b/src/imports/location/qdeclarativegeoaddress_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -46,7 +46,7 @@ #include <QtCore> #include <QtDeclarative/qdeclarative.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoAddress : public QObject { @@ -97,7 +97,7 @@ private: QGeoAddress m_address; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoAddress)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoAddress)); #endif // QDECLARATIVEGEOADDRESS_P_H diff --git a/src/imports/location/qdeclarativegeoboundingbox.cpp b/src/imports/location/qdeclarativegeoboundingbox.cpp index d00d0e14..dba963a0 100644 --- a/src/imports/location/qdeclarativegeoboundingbox.cpp +++ b/src/imports/location/qdeclarativegeoboundingbox.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -42,7 +42,7 @@ #include <qnumeric.h> #include "qdeclarativegeoboundingbox_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass BoundingBox QDeclarativeGeoBoundingBox @@ -277,4 +277,4 @@ void QDeclarativeGeoBoundingBox::synchronizeDeclarative() #include "moc_qdeclarativegeoboundingbox_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoboundingbox_p.h b/src/imports/location/qdeclarativegeoboundingbox_p.h index 9a6e8f55..49de789b 100644 --- a/src/imports/location/qdeclarativegeoboundingbox_p.h +++ b/src/imports/location/qdeclarativegeoboundingbox_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -49,7 +49,7 @@ #include <QtCore> #include <QtDeclarative/qdeclarative.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoBoundingBox : public QDeclarativeGeoBoundingArea { @@ -107,7 +107,7 @@ private: double m_width; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoBoundingBox)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoBoundingBox)); #endif // QDECLARATIVEGEOBOUNDINGBOX_P_H diff --git a/src/imports/location/qdeclarativegeoboundingcircle.cpp b/src/imports/location/qdeclarativegeoboundingcircle.cpp index be0809cf..a12e9d42 100644 --- a/src/imports/location/qdeclarativegeoboundingcircle.cpp +++ b/src/imports/location/qdeclarativegeoboundingcircle.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -42,7 +42,7 @@ #include <qnumeric.h> #include "qdeclarativegeoboundingcircle_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Yippiaiee! TODO @@ -109,4 +109,4 @@ void QDeclarativeGeoBoundingCircle::setRadius(const qreal radius) #include "moc_qdeclarativegeoboundingcircle_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoboundingcircle_p.h b/src/imports/location/qdeclarativegeoboundingcircle_p.h index d101c677..44f9db0e 100644 --- a/src/imports/location/qdeclarativegeoboundingcircle_p.h +++ b/src/imports/location/qdeclarativegeoboundingcircle_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -50,7 +50,7 @@ #include <QPointer> #include <QtDeclarative/qdeclarative.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoBoundingCircle : public QDeclarativeGeoBoundingArea { @@ -79,7 +79,7 @@ private: QGeoBoundingCircle circle_; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoBoundingCircle)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoBoundingCircle)); #endif diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp index 8a8ac9d6..d4342eb9 100644 --- a/src/imports/location/qdeclarativegeocodemodel.cpp +++ b/src/imports/location/qdeclarativegeocodemodel.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -47,7 +47,7 @@ #include <qgeoserviceprovider.h> #include <qgeosearchmanager.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeocodeModel::QDeclarativeGeocodeModel(QObject* parent) : QAbstractListModel(parent), @@ -381,4 +381,4 @@ void QDeclarativeGeocodeModel::setAutoUpdate(bool update) #include "moc_qdeclarativegeocodemodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeocodemodel_p.h b/src/imports/location/qdeclarativegeocodemodel_p.h index 48b84dec..f388d315 100644 --- a/src/imports/location/qdeclarativegeocodemodel_p.h +++ b/src/imports/location/qdeclarativegeocodemodel_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -53,7 +53,7 @@ #include <QAbstractListModel> #include <QPointer> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoServiceProvider; class QGeoSearchManager; @@ -165,6 +165,6 @@ private: QDeclarativeGeoAddress* address_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeomaneuver.cpp b/src/imports/location/qdeclarativegeomaneuver.cpp index 63d08ae8..cff58c51 100644 --- a/src/imports/location/qdeclarativegeomaneuver.cpp +++ b/src/imports/location/qdeclarativegeomaneuver.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -41,7 +41,7 @@ #include "qdeclarativegeomaneuver_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoManeuver::QDeclarativeGeoManeuver(QObject *parent) : QObject(parent) @@ -97,4 +97,4 @@ QDeclarativeCoordinate* QDeclarativeGeoManeuver::waypoint() const #include "moc_qdeclarativegeomaneuver_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomaneuver_p.h b/src/imports/location/qdeclarativegeomaneuver_p.h index b97016c0..9025c0b3 100644 --- a/src/imports/location/qdeclarativegeomaneuver_p.h +++ b/src/imports/location/qdeclarativegeomaneuver_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -48,7 +48,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoManeuver : public QObject { @@ -98,6 +98,6 @@ private: QDeclarativeCoordinate* waypoint_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeomapcircleobject.cpp b/src/imports/location/qdeclarativegeomapcircleobject.cpp index 59b64e06..bfb092ba 100644 --- a/src/imports/location/qdeclarativegeomapcircleobject.cpp +++ b/src/imports/location/qdeclarativegeomapcircleobject.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -44,7 +44,7 @@ #include <QColor> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapCircle @@ -239,5 +239,5 @@ void QDeclarativeGeoMapCircleObject::borderWidthChanged(int width) #include "moc_qdeclarativegeomapcircleobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapcircleobject_p.h b/src/imports/location/qdeclarativegeomapcircleobject_p.h index 57027232..bc5076b9 100644 --- a/src/imports/location/qdeclarativegeomapcircleobject_p.h +++ b/src/imports/location/qdeclarativegeomapcircleobject_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -50,7 +50,7 @@ class QColor; class QBrush; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapCircleObject : public QDeclarativeGeoMapObject { @@ -95,8 +95,8 @@ private: QDeclarativeGeoMapObjectBorder border_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapCircleObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapCircleObject)); #endif diff --git a/src/imports/location/qdeclarativegeomapgroupobject.cpp b/src/imports/location/qdeclarativegeomapgroupobject.cpp index 29cbb0c8..29cd3364 100644 --- a/src/imports/location/qdeclarativegeomapgroupobject.cpp +++ b/src/imports/location/qdeclarativegeomapgroupobject.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -41,7 +41,7 @@ #include "qdeclarativegeomapgroupobject_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapGroup @@ -241,5 +241,5 @@ void QDeclarativeGeoMapGroupObject::moveEvent(QDeclarativeGeoMapMouseEvent *even #include "moc_qdeclarativegeomapgroupobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapgroupobject_p.h b/src/imports/location/qdeclarativegeomapgroupobject_p.h index 3ccf4db8..2e58eb01 100644 --- a/src/imports/location/qdeclarativegeomapgroupobject_p.h +++ b/src/imports/location/qdeclarativegeomapgroupobject_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -48,7 +48,7 @@ #include <QtDeclarative/qdeclarative.h> #include <QDeclarativeListProperty> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -85,8 +85,8 @@ private: QList<QDeclarativeGeoMapObject*> objects_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapGroupObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapGroupObject)); #endif diff --git a/src/imports/location/qdeclarativegeomapmousearea.cpp b/src/imports/location/qdeclarativegeomapmousearea.cpp index eb3c4d21..f6efe35b 100644 --- a/src/imports/location/qdeclarativegeomapmousearea.cpp +++ b/src/imports/location/qdeclarativegeomapmousearea.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -45,7 +45,7 @@ #include "qdeclarativegeomapobject_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapMouseArea QDeclarativeGeoMapMouseArea @@ -425,4 +425,4 @@ void QDeclarativeGeoMapMouseArea::moveEvent(QDeclarativeGeoMapMouseEvent *event) #include "moc_qdeclarativegeomapmousearea_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapmousearea_p.h b/src/imports/location/qdeclarativegeomapmousearea_p.h index d7c386c8..92174ab1 100644 --- a/src/imports/location/qdeclarativegeomapmousearea_p.h +++ b/src/imports/location/qdeclarativegeomapmousearea_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -48,7 +48,7 @@ #include <QtDeclarative/qdeclarativeitem.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapMouseArea : public QDeclarativeItem { @@ -139,8 +139,8 @@ private: QDeclarativeGraphicsGeoMap* map_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapMouseArea)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapMouseArea)); #endif diff --git a/src/imports/location/qdeclarativegeomapmouseevent.cpp b/src/imports/location/qdeclarativegeomapmouseevent.cpp index 51d717f7..c979e836 100644 --- a/src/imports/location/qdeclarativegeomapmouseevent.cpp +++ b/src/imports/location/qdeclarativegeomapmouseevent.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -41,7 +41,7 @@ #include "qdeclarativegeomapmouseevent_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapMouseEvent QDeclarativeGeoMapMouseEvent @@ -199,4 +199,4 @@ QDeclarativeCoordinate* QDeclarativeGeoMapMouseEvent::coordinate() #include "moc_qdeclarativegeomapmouseevent_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapmouseevent_p.h b/src/imports/location/qdeclarativegeomapmouseevent_p.h index 5949e280..f1da2afe 100644 --- a/src/imports/location/qdeclarativegeomapmouseevent_p.h +++ b/src/imports/location/qdeclarativegeomapmouseevent_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -46,7 +46,7 @@ #include <QtDeclarative/qdeclarative.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapMouseEvent : public QObject { @@ -95,8 +95,8 @@ private: QDeclarativeCoordinate *coordinate_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapMouseEvent)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapMouseEvent)); #endif diff --git a/src/imports/location/qdeclarativegeomapobject.cpp b/src/imports/location/qdeclarativegeomapobject.cpp index 7ecb0c92..b9ca7cce 100644 --- a/src/imports/location/qdeclarativegeomapobject.cpp +++ b/src/imports/location/qdeclarativegeomapobject.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -42,13 +42,14 @@ #include "qdeclarativegeomapobject_p.h" #include "qdeclarativegeomapmousearea_p.h" #include "qdeclarativelandmark_p.h" +#include "qdeclarativegeomapgroupobject_p.h" #include "qgeomapdata.h" #include <QDeclarativeParserStatus> #include <QAbstractItemModel> #include <QDeclarativeContext> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoMapObject::QDeclarativeGeoMapObject(QDeclarativeItem *parent) : QDeclarativeItem(parent), @@ -345,7 +346,10 @@ void QDeclarativeGeoMapObjectView::removeInstantiatedItems() if (!mapObjects.isEmpty()) { for (int i = 0; i < mapObjects.size(); i++) { group_.removeChildObject(mapObjects.at(i)); - delete map_->objectMap_.take(mapObjects.at(i)); + + QDeclarativeGeoMapObject *mapObject = map_->objectMap_.value(mapObjects.at(i)); + map_->recursiveRemoveFromObjectMap(mapObjects.at(i)); + delete mapObject; } } declarativeObjectList_.clear(); @@ -373,7 +377,7 @@ void QDeclarativeGeoMapObjectView::repopulate() mapObject->setMap(map_); group_.addChildObject(mapObject->mapObject()); // Needed in order for mouse areas to work. - map_->objectMap_.insert(mapObject->mapObject(), mapObject); + map_->recursiveAddToObjectMap(mapObject); } } @@ -481,4 +485,4 @@ qreal QDeclarativeGeoMapObjectView::zValue() #include "moc_qdeclarativegeomapobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapobject_p.h b/src/imports/location/qdeclarativegeomapobject_p.h index e17619ca..26904dfd 100644 --- a/src/imports/location/qdeclarativegeomapobject_p.h +++ b/src/imports/location/qdeclarativegeomapobject_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -50,7 +50,7 @@ #include <QtDeclarative/qdeclarativeitem.h> class QAbstractItemModel; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGraphicsGeoMap; class QDeclarativeGeoMapMouseArea; @@ -152,8 +152,8 @@ private: QList<QDeclarativeGeoMapObject*> declarativeObjectList_; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapObject)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapObjectView)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapObjectView)); #endif diff --git a/src/imports/location/qdeclarativegeomapobjectborder.cpp b/src/imports/location/qdeclarativegeomapobjectborder.cpp index aadb51ec..11cd109d 100644 --- a/src/imports/location/qdeclarativegeomapobjectborder.cpp +++ b/src/imports/location/qdeclarativegeomapobjectborder.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -44,7 +44,7 @@ #include <QColor> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoMapObjectBorder::QDeclarativeGeoMapObjectBorder(QObject *parent) : QObject(parent), @@ -82,5 +82,5 @@ int QDeclarativeGeoMapObjectBorder::width() const #include "moc_qdeclarativegeomapobjectborder_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapobjectborder_p.h b/src/imports/location/qdeclarativegeomapobjectborder_p.h index 75f34a08..d082082c 100644 --- a/src/imports/location/qdeclarativegeomapobjectborder_p.h +++ b/src/imports/location/qdeclarativegeomapobjectborder_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -48,7 +48,7 @@ #include <QObject> #include <QColor> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapObjectBorder : public QObject { @@ -77,8 +77,8 @@ private: Q_DISABLE_COPY(QDeclarativeGeoMapObjectBorder) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapObjectBorder)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapObjectBorder)); #endif diff --git a/src/imports/location/qdeclarativegeomappixmapobject.cpp b/src/imports/location/qdeclarativegeomappixmapobject.cpp index 4533fe8f..cdf2f508 100644 --- a/src/imports/location/qdeclarativegeomappixmapobject.cpp +++ b/src/imports/location/qdeclarativegeomappixmapobject.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -53,7 +53,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapImage @@ -349,5 +349,5 @@ void QDeclarativeGeoMapPixmapObject::error(QNetworkReply::NetworkError error) #include "moc_qdeclarativegeomappixmapobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomappixmapobject_p.h b/src/imports/location/qdeclarativegeomappixmapobject_p.h index bf869efb..78e2d0cb 100644 --- a/src/imports/location/qdeclarativegeomappixmapobject_p.h +++ b/src/imports/location/qdeclarativegeomappixmapobject_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -50,7 +50,7 @@ #include <QUrl> #include <QNetworkReply> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapPixmapObject : public QDeclarativeGeoMapObject { @@ -110,8 +110,8 @@ private: Q_DISABLE_COPY(QDeclarativeGeoMapPixmapObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapPixmapObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapPixmapObject)); #endif diff --git a/src/imports/location/qdeclarativegeomappolygonobject.cpp b/src/imports/location/qdeclarativegeomappolygonobject.cpp index dfea44ef..d0e922cc 100644 --- a/src/imports/location/qdeclarativegeomappolygonobject.cpp +++ b/src/imports/location/qdeclarativegeomappolygonobject.cpp @@ -8,29 +8,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -47,7 +47,7 @@ #include <QtDeclarative/qdeclarativeinfo.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapPolygon @@ -323,5 +323,5 @@ Q_INVOKABLE void QDeclarativeGeoMapPolygonObject::clearCoordinates() #include "moc_qdeclarativegeomappolygonobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomappolygonobject_p.h b/src/imports/location/qdeclarativegeomappolygonobject_p.h index 700693d5..468bba01 100644 --- a/src/imports/location/qdeclarativegeomappolygonobject_p.h +++ b/src/imports/location/qdeclarativegeomappolygonobject_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -52,7 +52,7 @@ class QColor; class QBrush; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapPolygonObject : public QDeclarativeGeoMapObject { @@ -103,8 +103,8 @@ private: bool componentCompleted_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapPolygonObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapPolygonObject)); #endif diff --git a/src/imports/location/qdeclarativegeomappolylineobject.cpp b/src/imports/location/qdeclarativegeomappolylineobject.cpp index b10aed43..65c73450 100644 --- a/src/imports/location/qdeclarativegeomappolylineobject.cpp +++ b/src/imports/location/qdeclarativegeomappolylineobject.cpp @@ -8,29 +8,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -47,7 +47,7 @@ #include <QtDeclarative/qdeclarativeinfo.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapPolyline @@ -297,5 +297,5 @@ void QDeclarativeGeoMapPolylineObject::removeCoordinate(QDeclarativeCoordinate* #include "moc_qdeclarativegeomappolylineobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomappolylineobject_p.h b/src/imports/location/qdeclarativegeomappolylineobject_p.h index 7bd63129..bda86a26 100644 --- a/src/imports/location/qdeclarativegeomappolylineobject_p.h +++ b/src/imports/location/qdeclarativegeomappolylineobject_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -52,7 +52,7 @@ class QColor; class QBrush; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapPolylineObject : public QDeclarativeGeoMapObject { @@ -96,8 +96,8 @@ private: bool componentCompleted_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapPolylineObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapPolylineObject)); #endif diff --git a/src/imports/location/qdeclarativegeomaprectangleobject.cpp b/src/imports/location/qdeclarativegeomaprectangleobject.cpp index c49ea49e..9b51ee4d 100644 --- a/src/imports/location/qdeclarativegeomaprectangleobject.cpp +++ b/src/imports/location/qdeclarativegeomaprectangleobject.cpp @@ -10,29 +10,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -47,7 +47,7 @@ #include <QColor> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapRectangle @@ -274,5 +274,5 @@ void QDeclarativeGeoMapRectangleObject::borderWidthChanged(int width) #include "moc_qdeclarativegeomaprectangleobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomaprectangleobject_p.h b/src/imports/location/qdeclarativegeomaprectangleobject_p.h index ccd5a4f3..2e1dcd1e 100644 --- a/src/imports/location/qdeclarativegeomaprectangleobject_p.h +++ b/src/imports/location/qdeclarativegeomaprectangleobject_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -50,7 +50,7 @@ class QColor; class QBrush; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapRectangleObject : public QDeclarativeGeoMapObject { @@ -101,8 +101,8 @@ private: QDeclarativeGeoMapObjectBorder border_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapRectangleObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapRectangleObject)); #endif diff --git a/src/imports/location/qdeclarativegeomaprouteobject.cpp b/src/imports/location/qdeclarativegeomaprouteobject.cpp index 8739a2cf..cd6b7c67 100644 --- a/src/imports/location/qdeclarativegeomaprouteobject.cpp +++ b/src/imports/location/qdeclarativegeomaprouteobject.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -42,7 +42,7 @@ #include <QPen> #include "qdeclarativegeomaprouteobject_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoMapRouteObject::QDeclarativeGeoMapRouteObject(QDeclarativeItem *parent) : QDeclarativeGeoMapObject(parent), route_(0) @@ -104,4 +104,4 @@ quint32 QDeclarativeGeoMapRouteObject::detailLevel() const #include "moc_qdeclarativegeomaprouteobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomaprouteobject_p.h b/src/imports/location/qdeclarativegeomaprouteobject_p.h index 04df9930..2895aba1 100644 --- a/src/imports/location/qdeclarativegeomaprouteobject_p.h +++ b/src/imports/location/qdeclarativegeomaprouteobject_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -47,7 +47,7 @@ #include "qdeclarativegeoroute_p.h" #include "qgeomaprouteobject.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapRouteObject : public QDeclarativeGeoMapObject { @@ -83,8 +83,8 @@ private: QColor color_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapRouteObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapRouteObject)); #endif diff --git a/src/imports/location/qdeclarativegeomaptextobject.cpp b/src/imports/location/qdeclarativegeomaptextobject.cpp index b54943ca..8a2348f7 100644 --- a/src/imports/location/qdeclarativegeomaptextobject.cpp +++ b/src/imports/location/qdeclarativegeomaptextobject.cpp @@ -8,29 +8,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -45,7 +45,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapText @@ -402,5 +402,5 @@ void QDeclarativeGeoMapTextObject::setVerticalAlignment(QDeclarativeGeoMapTextOb #include "moc_qdeclarativegeomaptextobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomaptextobject_p.h b/src/imports/location/qdeclarativegeomaptextobject_p.h index 3f54b106..a8d842e2 100644 --- a/src/imports/location/qdeclarativegeomaptextobject_p.h +++ b/src/imports/location/qdeclarativegeomaptextobject_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -48,7 +48,7 @@ #include <QColor> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapTextObject : public QDeclarativeGeoMapObject { @@ -123,8 +123,8 @@ private: VerticalAlignment vAlignment_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapTextObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapTextObject)); #endif diff --git a/src/imports/location/qdeclarativegeoplace.cpp b/src/imports/location/qdeclarativegeoplace.cpp index 7e607207..4b4d1d32 100644 --- a/src/imports/location/qdeclarativegeoplace.cpp +++ b/src/imports/location/qdeclarativegeoplace.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -41,7 +41,7 @@ #include "qdeclarativegeoplace_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Place QDeclarativeGeoPlace @@ -155,4 +155,4 @@ void QDeclarativeGeoPlace::setAddress(QDeclarativeGeoAddress* address) #include "moc_qdeclarativegeoplace_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoplace_p.h b/src/imports/location/qdeclarativegeoplace_p.h index fb638514..c933c174 100644 --- a/src/imports/location/qdeclarativegeoplace_p.h +++ b/src/imports/location/qdeclarativegeoplace_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -50,7 +50,7 @@ #include <QVariant> #include <QtDeclarative/qdeclarative.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoPlace : public QObject { @@ -85,10 +85,10 @@ private: QDeclarativeGeoAddress m_declarativeAddress; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QGeoPlace)) +Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGeoPlace)) -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoPlace)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoPlace)); #endif // QDECLARATIVEGEOPLACE_P_H diff --git a/src/imports/location/qdeclarativegeoroute.cpp b/src/imports/location/qdeclarativegeoroute.cpp index 3b4e89aa..66c2ee19 100644 --- a/src/imports/location/qdeclarativegeoroute.cpp +++ b/src/imports/location/qdeclarativegeoroute.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -41,7 +41,7 @@ #include "qdeclarativegeoroute_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoRoute::QDeclarativeGeoRoute(QObject *parent) : QObject(parent) @@ -150,4 +150,4 @@ void QDeclarativeGeoRoute::segments_clear(QDeclarativeListProperty<QDeclarativeG #include "moc_qdeclarativegeoroute_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoroute_p.h b/src/imports/location/qdeclarativegeoroute_p.h index 0f090ccf..353912c4 100644 --- a/src/imports/location/qdeclarativegeoroute_p.h +++ b/src/imports/location/qdeclarativegeoroute_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -50,7 +50,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoRoute : public QObject { @@ -93,6 +93,6 @@ private: friend class QDeclarativeGeoMapRouteObject; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp index 45ba1b72..91beeca1 100644 --- a/src/imports/location/qdeclarativegeoroutemodel.cpp +++ b/src/imports/location/qdeclarativegeoroutemodel.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -46,7 +46,7 @@ #include <qgeoroutingmanager.h> #include <QtDeclarative/qdeclarativeinfo.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoRouteModel::QDeclarativeGeoRouteModel(QObject *parent) : QAbstractListModel(parent), @@ -697,4 +697,4 @@ QGeoRouteRequest& QDeclarativeGeoRouteQuery::routeRequest() #include "moc_qdeclarativegeoroutemodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoroutemodel_p.h b/src/imports/location/qdeclarativegeoroutemodel_p.h index 96143f9e..3c104583 100644 --- a/src/imports/location/qdeclarativegeoroutemodel_p.h +++ b/src/imports/location/qdeclarativegeoroutemodel_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -56,7 +56,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoServiceProvider; class QGeoRoutingManager; @@ -310,6 +310,6 @@ private: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeoroutesegment.cpp b/src/imports/location/qdeclarativegeoroutesegment.cpp index a88a3239..d5379941 100644 --- a/src/imports/location/qdeclarativegeoroutesegment.cpp +++ b/src/imports/location/qdeclarativegeoroutesegment.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -41,7 +41,7 @@ #include "qdeclarativegeoroutesegment_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoRouteSegment::QDeclarativeGeoRouteSegment(QObject *parent) : QObject(parent) @@ -111,4 +111,4 @@ void QDeclarativeGeoRouteSegment::path_clear(QDeclarativeListProperty<QDeclarati #include "moc_qdeclarativegeoroutesegment_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoroutesegment_p.h b/src/imports/location/qdeclarativegeoroutesegment_p.h index bbabd654..08688482 100644 --- a/src/imports/location/qdeclarativegeoroutesegment_p.h +++ b/src/imports/location/qdeclarativegeoroutesegment_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -48,7 +48,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoRouteSegment : public QObject { @@ -79,6 +79,6 @@ private: QList<QDeclarativeCoordinate*> path_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeoroutingmodel.cpp b/src/imports/location/qdeclarativegeoroutingmodel.cpp index 7ec49bf3..288ab1c8 100644 --- a/src/imports/location/qdeclarativegeoroutingmodel.cpp +++ b/src/imports/location/qdeclarativegeoroutingmodel.cpp @@ -45,7 +45,7 @@ #include <qgeoserviceprovider.h> #include <qgeoroutingmanager.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoRoutingModel::QDeclarativeGeoRoutingModel(QObject *parent) : QAbstractListModel(parent), @@ -387,4 +387,4 @@ void QDeclarativeGeoRoutingModel::routingError(QGeoRouteReply *reply, #include "moc_qdeclarativegeoroutingmodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoroutingmodel_p.h b/src/imports/location/qdeclarativegeoroutingmodel_p.h index dc233ca8..a3c2a784 100644 --- a/src/imports/location/qdeclarativegeoroutingmodel_p.h +++ b/src/imports/location/qdeclarativegeoroutingmodel_p.h @@ -56,7 +56,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoServiceProvider; class QGeoRoutingManager; @@ -213,6 +213,6 @@ private: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeosearchmodel.cpp b/src/imports/location/qdeclarativegeosearchmodel.cpp index 476472eb..220fffca 100644 --- a/src/imports/location/qdeclarativegeosearchmodel.cpp +++ b/src/imports/location/qdeclarativegeosearchmodel.cpp @@ -47,7 +47,7 @@ #include <qgeoserviceprovider.h> #include <qgeosearchmanager.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoSearchModel::QDeclarativeGeoSearchModel(QObject* parent) : QAbstractListModel(parent), @@ -218,4 +218,4 @@ void QDeclarativeGeoSearchModel::setPlaces(const QList<QGeoPlace> &places) #include "moc_qdeclarativegeosearchmodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeosearchmodel_p.h b/src/imports/location/qdeclarativegeosearchmodel_p.h index d3be1bfb..175a5721 100644 --- a/src/imports/location/qdeclarativegeosearchmodel_p.h +++ b/src/imports/location/qdeclarativegeosearchmodel_p.h @@ -50,7 +50,7 @@ #include <QDeclarativeParserStatus> #include <QAbstractListModel> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoServiceProvider; class QGeoSearchManager; @@ -132,6 +132,6 @@ private: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/imports/location/qdeclarativegeoserviceprovider.cpp index 91abe887..105e051d 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider.cpp +++ b/src/imports/location/qdeclarativegeoserviceprovider.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -47,7 +47,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Plugin @@ -328,5 +328,5 @@ QVariant QDeclarativeGeoServiceProviderParameter::value() const #include "moc_qdeclarativegeoserviceprovider_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/imports/location/qdeclarativegeoserviceprovider_p.h index d88b3b60..ecab2601 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider_p.h +++ b/src/imports/location/qdeclarativegeoserviceprovider_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -49,7 +49,7 @@ #include <QString> #include <QVariant> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoServiceProviderParameter : public QObject { @@ -138,9 +138,9 @@ private: Q_DISABLE_COPY(QDeclarativeGeoServiceProvider) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoServiceProviderParameter)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoServiceProvider)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoServiceProviderParameter)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoServiceProvider)); #endif diff --git a/src/imports/location/qdeclarativegraphicsgeomap.cpp b/src/imports/location/qdeclarativegraphicsgeomap.cpp index ed72cc53..90994398 100644 --- a/src/imports/location/qdeclarativegraphicsgeomap.cpp +++ b/src/imports/location/qdeclarativegraphicsgeomap.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -45,6 +45,7 @@ #include "qdeclarativecoordinate_p.h" #include "qdeclarativegeoserviceprovider_p.h" #include "qdeclarativelandmark_p.h" +#include "qdeclarativegeomapgroupobject_p.h" #include <qgeoserviceprovider.h> #include <qgeomappingmanager.h> @@ -58,7 +59,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Map @@ -150,6 +151,36 @@ void QDeclarativeGraphicsGeoMap::componentComplete() populateMap(); } +void QDeclarativeGraphicsGeoMap::recursiveAddToObjectMap(QDeclarativeGeoMapObject *mapObject) +{ + objectMap_.insert(mapObject->mapObject(), mapObject); + + QDeclarativeGeoMapGroupObject *groupObject = + qobject_cast<QDeclarativeGeoMapGroupObject *>(mapObject); + + if (groupObject) { + QDeclarativeListReference ref(groupObject, "objects"); + for (int i = 0; i < ref.count(); ++i) { + QDeclarativeGeoMapObject *subObject = + qobject_cast<QDeclarativeGeoMapObject *>(ref.at(i)); + + if (subObject) + recursiveAddToObjectMap(subObject); + } + } +} + +void QDeclarativeGraphicsGeoMap::recursiveRemoveFromObjectMap(QGeoMapObject *mapObject) +{ + objectMap_.remove(mapObject); + + QGeoMapGroupObject *groupObject = qobject_cast<QGeoMapGroupObject *>(mapObject); + if (groupObject) { + foreach (QGeoMapObject *subObject, groupObject->childObjects()) + recursiveRemoveFromObjectMap(subObject); + } +} + void QDeclarativeGraphicsGeoMap::populateMap() { if (!mapData_ || !componentCompleted_) @@ -166,7 +197,7 @@ void QDeclarativeGraphicsGeoMap::populateMap() QDeclarativeGeoMapObject *mapObject = qobject_cast<QDeclarativeGeoMapObject*>(kids.at(i)); if (mapObject) { mapObjects_.append(mapObject); - objectMap_.insert(mapObject->mapObject(), mapObject); + recursiveAddToObjectMap(mapObject); mapData_->addMapObject(mapObject->mapObject()); mapObject->setMap(this); continue; @@ -863,7 +894,7 @@ void QDeclarativeGraphicsGeoMap::addMapObject(QDeclarativeGeoMapObject *object) if (!mapData_ || !object || objectMap_.contains(object->mapObject())) return; mapObjects_.append(object); - objectMap_.insert(object->mapObject(), object); + recursiveAddToObjectMap(object); mapData_->addMapObject(object->mapObject()); object->setMap(this); } @@ -889,7 +920,7 @@ void QDeclarativeGraphicsGeoMap::removeMapObject(QDeclarativeGeoMapObject *objec qmlInfo(this) << tr("Map plugin is not set, map object cannot be removed."); if (!mapData_ || !object || !objectMap_.contains(object->mapObject())) return; - objectMap_.remove(object->mapObject()); + recursiveRemoveFromObjectMap(object->mapObject()); mapObjects_.removeOne(object); mapData_->removeMapObject(object->mapObject()); } @@ -912,4 +943,4 @@ int QDeclarativeGraphicsGeoMap::testGetDeclarativeMapObjectCount() #include "moc_qdeclarativegraphicsgeomap_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegraphicsgeomap_p.h b/src/imports/location/qdeclarativegraphicsgeomap_p.h index 6b73b15c..603d8270 100644 --- a/src/imports/location/qdeclarativegraphicsgeomap_p.h +++ b/src/imports/location/qdeclarativegraphicsgeomap_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -48,7 +48,7 @@ #include "qdeclarativegeomapobject_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoMapObject; @@ -177,6 +177,8 @@ private Q_SLOTS: private: void setupMapView(QDeclarativeGeoMapObjectView *view); void populateMap(); + void recursiveAddToObjectMap(QDeclarativeGeoMapObject *mapObject); + void recursiveRemoveFromObjectMap(QGeoMapObject *mapObject); QDeclarativeGeoMapObject* createItem(int modelIndex); QDeclarativeGeoMapMouseEvent* createMapMouseEvent(QGraphicsSceneMouseEvent *event); @@ -207,8 +209,8 @@ private: Q_DISABLE_COPY(QDeclarativeGraphicsGeoMap) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGraphicsGeoMap)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGraphicsGeoMap)); #endif diff --git a/src/imports/location/qdeclarativelandmark.cpp b/src/imports/location/qdeclarativelandmark.cpp index 1e1527ba..2e6d700c 100644 --- a/src/imports/location/qdeclarativelandmark.cpp +++ b/src/imports/location/qdeclarativelandmark.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -41,7 +41,7 @@ #include "qdeclarativelandmark_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Landmark QDeclarativeLandmark @@ -222,4 +222,4 @@ QLandmark QDeclarativeLandmark::landmark() #include "moc_qdeclarativelandmark_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativelandmark_p.h b/src/imports/location/qdeclarativelandmark_p.h index 177a5831..bcbe9df1 100644 --- a/src/imports/location/qdeclarativelandmark_p.h +++ b/src/imports/location/qdeclarativelandmark_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -57,7 +57,7 @@ #include <QDebug> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeLandmark : public QDeclarativeGeoPlace { @@ -108,7 +108,7 @@ private: QLandmark m_landmark; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmark)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmark)); #endif // QDECLARATIVELANDMARK_P_H diff --git a/src/imports/location/qdeclarativelandmarkcategory.cpp b/src/imports/location/qdeclarativelandmarkcategory.cpp index 78d480f7..cd109725 100644 --- a/src/imports/location/qdeclarativelandmarkcategory.cpp +++ b/src/imports/location/qdeclarativelandmarkcategory.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -41,7 +41,7 @@ #include "qdeclarativelandmarkcategory_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass LandmarkCategory QDeclarativeLandmarkCategory @@ -121,4 +121,4 @@ void QDeclarativeLandmarkCategory::setCategory(const QLandmarkCategory& category #include "moc_qdeclarativelandmarkcategory_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativelandmarkcategory_p.h b/src/imports/location/qdeclarativelandmarkcategory_p.h index 9d890b46..6e2acd57 100644 --- a/src/imports/location/qdeclarativelandmarkcategory_p.h +++ b/src/imports/location/qdeclarativelandmarkcategory_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -48,7 +48,7 @@ #include <QAbstractListModel> #include <QtCore> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeLandmarkCategory : public QObject { @@ -79,7 +79,7 @@ private: void setCategory(const QLandmarkCategory& category); }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkCategory)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkCategory)); #endif // QDECLARATIVELANDMARKCATEGORY_P_H diff --git a/src/imports/location/qdeclarativelandmarkcategorymodel.cpp b/src/imports/location/qdeclarativelandmarkcategorymodel.cpp index 9255cae8..ee4b018f 100644 --- a/src/imports/location/qdeclarativelandmarkcategorymodel.cpp +++ b/src/imports/location/qdeclarativelandmarkcategorymodel.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -48,7 +48,7 @@ #include <QDebug> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass LandmarkCategoryModel QDeclarativeLandmarkCategoryModel @@ -340,4 +340,4 @@ void QDeclarativeLandmarkCategoryModel::categories_clear(QDeclarativeListPropert #include "moc_qdeclarativelandmarkcategorymodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativelandmarkcategorymodel_p.h b/src/imports/location/qdeclarativelandmarkcategorymodel_p.h index 9d21e337..5638f726 100644 --- a/src/imports/location/qdeclarativelandmarkcategorymodel_p.h +++ b/src/imports/location/qdeclarativelandmarkcategorymodel_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -54,7 +54,7 @@ #include <QtDeclarative/qdeclarative.h> #include <QAbstractListModel> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeLandmarkCategoryModel: public QDeclarativeLandmarkAbstractModel { @@ -112,7 +112,7 @@ private: QDeclarativeLandmark* m_landmark; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkCategoryModel)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkCategoryModel)); #endif // QDECLARATIVELANDMARKCATEGORYMODEL_P_H diff --git a/src/imports/location/qdeclarativelandmarkfilters.cpp b/src/imports/location/qdeclarativelandmarkfilters.cpp index 798698b6..40d5f398 100644 --- a/src/imports/location/qdeclarativelandmarkfilters.cpp +++ b/src/imports/location/qdeclarativelandmarkfilters.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -42,7 +42,7 @@ #include "qdeclarativelandmarkfilters_p.h" #include "qdeclarativeposition_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass LandmarkNameFilter QDeclarativeLandmarkNameFilter @@ -442,4 +442,4 @@ QLandmarkFilter* QDeclarativeLandmarkIntersectionFilter::filter() #include "moc_qdeclarativelandmarkfilters_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativelandmarkfilters_p.h b/src/imports/location/qdeclarativelandmarkfilters_p.h index bd000ed2..ef9a0c72 100644 --- a/src/imports/location/qdeclarativelandmarkfilters_p.h +++ b/src/imports/location/qdeclarativelandmarkfilters_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -56,7 +56,7 @@ #include <QDeclarativeListProperty> #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeLandmarkFilterBase : public QObject { @@ -229,12 +229,12 @@ private: QLandmarkIntersectionFilter m_filter; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkNameFilter)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkCategoryFilter)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkBoxFilter)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkProximityFilter)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkUnionFilter)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkIntersectionFilter)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkNameFilter)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkCategoryFilter)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkBoxFilter)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkProximityFilter)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkUnionFilter)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkIntersectionFilter)); #endif // QDECLARATIVELANDMARKFILTERS_P_H diff --git a/src/imports/location/qdeclarativelandmarkmodel.cpp b/src/imports/location/qdeclarativelandmarkmodel.cpp index 969c0b7a..75fa1e9e 100644 --- a/src/imports/location/qdeclarativelandmarkmodel.cpp +++ b/src/imports/location/qdeclarativelandmarkmodel.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -47,7 +47,7 @@ #include <QDebug> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! @@ -823,4 +823,4 @@ void QDeclarativeLandmarkModel::fetchRequestStateChanged(QLandmarkAbstractReques #include "moc_qdeclarativelandmarkmodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativelandmarkmodel_p.h b/src/imports/location/qdeclarativelandmarkmodel_p.h index 86cb24ff..c6f705d5 100644 --- a/src/imports/location/qdeclarativelandmarkmodel_p.h +++ b/src/imports/location/qdeclarativelandmarkmodel_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -55,7 +55,7 @@ #include <QDeclarativeParserStatus> #include <QAbstractListModel> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeLandmarkAbstractModel : public QAbstractListModel, public QDeclarativeParserStatus @@ -225,7 +225,7 @@ private: QSet<QString> m_landmarkIdSet; // For faster lookups when updating items }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkModel)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkModel)); #endif // QDECLARATIVELANDMARKMODEL_P_H diff --git a/src/imports/location/qdeclarativeposition.cpp b/src/imports/location/qdeclarativeposition.cpp index 2619be69..f065c33e 100644 --- a/src/imports/location/qdeclarativeposition.cpp +++ b/src/imports/location/qdeclarativeposition.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -45,7 +45,7 @@ #include <QFile> #include <QApplication> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Position @@ -361,4 +361,4 @@ void QDeclarativePosition::invalidate() #include "moc_qdeclarativeposition_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativeposition_p.h b/src/imports/location/qdeclarativeposition_p.h index d851af33..565742ae 100644 --- a/src/imports/location/qdeclarativeposition_p.h +++ b/src/imports/location/qdeclarativeposition_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -56,7 +56,7 @@ #include <QDebug> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativePosition : public QObject { @@ -126,7 +126,7 @@ private: QDeclarativeCoordinate m_coordinate; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativePosition)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativePosition)); #endif diff --git a/src/imports/location/qdeclarativepositionsource.cpp b/src/imports/location/qdeclarativepositionsource.cpp index 86a194b9..e7a9f47a 100644 --- a/src/imports/location/qdeclarativepositionsource.cpp +++ b/src/imports/location/qdeclarativepositionsource.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -51,7 +51,7 @@ #include <e32std.h> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass PositionSource @@ -417,4 +417,4 @@ void QDeclarativePositionSource::positionUpdateReceived(const QGeoPositionInfo& #include "moc_qdeclarativepositionsource_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativepositionsource_p.h b/src/imports/location/qdeclarativepositionsource_p.h index edfe310f..45dc4876 100644 --- a/src/imports/location/qdeclarativepositionsource_p.h +++ b/src/imports/location/qdeclarativepositionsource_p.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -51,7 +51,7 @@ class QFile; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativePositionSource : public QObject { @@ -111,7 +111,7 @@ private: int m_updateInterval; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativePositionSource)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativePositionSource)); #endif diff --git a/src/imports/location/qdeclarativereversegeocodemodel.cpp b/src/imports/location/qdeclarativereversegeocodemodel.cpp index f019cafd..ecd46014 100644 --- a/src/imports/location/qdeclarativereversegeocodemodel.cpp +++ b/src/imports/location/qdeclarativereversegeocodemodel.cpp @@ -43,7 +43,7 @@ #include <qgeosearchmanager.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeReverseGeocodeModel::QDeclarativeReverseGeocodeModel(QObject *parent) : QDeclarativeGeoSearchModel(parent), @@ -141,4 +141,4 @@ QVariant QDeclarativeReverseGeocodeModel::headerData(int section, Qt::Orientatio #include "moc_qdeclarativereversegeocodemodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativereversegeocodemodel_p.h b/src/imports/location/qdeclarativereversegeocodemodel_p.h index 9d0a1748..fd58e7b6 100644 --- a/src/imports/location/qdeclarativereversegeocodemodel_p.h +++ b/src/imports/location/qdeclarativereversegeocodemodel_p.h @@ -46,7 +46,7 @@ #include "qdeclarativecoordinate_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeReverseGeocodeModel : public QDeclarativeGeoSearchModel { @@ -79,6 +79,6 @@ private: QDeclarativeCoordinate coordinate_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/qimportbase.pri b/src/imports/location/qlocationimport.pri index 8647f05c..c4d502ed 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/location/qlocationimport.pri @@ -1,6 +1,6 @@ load(qt_module) -symbian:include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) +symbian:load(qt_plugin) TEMPLATE = lib CONFIG += qt plugin @@ -15,7 +15,7 @@ isEmpty(TARGET) { QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir copy2build.input = QMLDIRFILE -copy2build.output = $$QT.declarative.imports/$$TARGETPATH/qmldir +copy2build.output = $$QT.location.imports/$$TARGETPATH/qmldir !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copy2build.name = COPY ${QMAKE_FILE_IN} @@ -27,7 +27,7 @@ QMAKE_EXTRA_COMPILERS += copy2build TARGET = $$qtLibraryTarget($$TARGET) contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -include($$QT_SOURCE_TREE/src/qt_targets.pri) +load(qt_targets) wince*:LIBS += $$QMAKE_LIBS_GUI diff --git a/src/location/dbuscomm_maemo.cpp b/src/location/dbuscomm_maemo.cpp index e86655db..9912b36c 100644 --- a/src/location/dbuscomm_maemo.cpp +++ b/src/location/dbuscomm_maemo.cpp @@ -44,7 +44,7 @@ #include <iostream> using namespace std; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE const QString DBusComm::positioningdService = QString("com.nokia.positioningd.client"); const QString DBusComm::positioningdPath = QString("/com/nokia/positioningd/client"); @@ -253,5 +253,5 @@ bool DBusComm::createUniqueName() } #include "moc_dbuscomm_maemo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/dbuscomm_maemo_p.h b/src/location/dbuscomm_maemo_p.h index b08df739..90d21567 100644 --- a/src/location/dbuscomm_maemo_p.h +++ b/src/location/dbuscomm_maemo_p.h @@ -63,7 +63,7 @@ #include "qgeosatelliteinfosource.h" #include "dbusserver_maemo_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class DBusComm: public QObject, DBusServerIF { @@ -123,6 +123,6 @@ private Q_SLOTS: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/dbusserver_maemo.cpp b/src/location/dbusserver_maemo.cpp index cddccd0b..184cbb6c 100644 --- a/src/location/dbusserver_maemo.cpp +++ b/src/location/dbusserver_maemo.cpp @@ -41,7 +41,7 @@ #include "dbusserver_maemo_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE DBusServer::DBusServer(QObject *obj, DBusServerIF *iface) : QDBusAbstractAdaptor(obj), interface(iface) @@ -86,5 +86,5 @@ Q_NOREPLY void DBusServer::satellitesInUseUpdate(const QByteArray &message) } #include "moc_dbusserver_maemo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/dbusserver_maemo_p.h b/src/location/dbusserver_maemo_p.h index 41e26951..854f449c 100644 --- a/src/location/dbusserver_maemo_p.h +++ b/src/location/dbusserver_maemo_p.h @@ -58,7 +58,7 @@ #include "qgeopositioninfosource.h" #include "qgeosatelliteinfo.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class DBusServerIF { public: @@ -88,6 +88,6 @@ private: DBusServerIF *interface; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/gconfitem.cpp b/src/location/gconfitem.cpp deleted file mode 100644 index 508d7664..00000000 --- a/src/location/gconfitem.cpp +++ /dev/null @@ -1,364 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QString> -#include <QStringList> -#include <QByteArray> -#include <QVariant> -#include <QtDebug> - -#include "gconfitem_p.h" - -#include <glib.h> -#include <gconf/gconf-value.h> -#include <gconf/gconf-client.h> - -struct GConfItemPrivate { - QString key; - QVariant value; - guint notify_id; - - static void notify_trampoline(GConfClient*, guint, GConfEntry *, gpointer); -}; - -#define withClient(c) for(GConfClient *c = (g_type_init(), gconf_client_get_default()); c; g_object_unref(c), c=NULL) - -static QByteArray convertKey(QString key) -{ - if (key.startsWith('/')) - return key.toUtf8(); - else { - qWarning() << "Using dot-separated key names with GConfItem is deprecated."; - qWarning() << "Please use" << '/' + key.replace('.', '/') << "instead of" << key; - return '/' + key.replace('.', '/').toUtf8(); - } -} - -static QString convertKey(const char *key) -{ - return QString::fromUtf8(key); -} - -static QVariant convertValue(GConfValue *src) -{ - if (!src) { - return QVariant(); - } else { - switch (src->type) { - case GCONF_VALUE_INVALID: - return QVariant(QVariant::Invalid); - case GCONF_VALUE_BOOL: - return QVariant((bool)gconf_value_get_bool(src)); - case GCONF_VALUE_INT: - return QVariant(gconf_value_get_int(src)); - case GCONF_VALUE_FLOAT: - return QVariant(gconf_value_get_float(src)); - case GCONF_VALUE_STRING: - return QVariant(QString::fromUtf8(gconf_value_get_string(src))); - case GCONF_VALUE_LIST: - switch (gconf_value_get_list_type(src)) { - case GCONF_VALUE_STRING: { - QStringList result; - for (GSList *elts = gconf_value_get_list(src); elts; elts = elts->next) - result.append(QString::fromUtf8(gconf_value_get_string((GConfValue *)elts->data))); - return QVariant(result); - } - default: { - QList<QVariant> result; - for (GSList *elts = gconf_value_get_list(src); elts; elts = elts->next) - result.append(convertValue((GConfValue *)elts->data)); - return QVariant(result); - } - } - case GCONF_VALUE_SCHEMA: - default: - return QVariant(); - } - } -} - -static GConfValue *convertString(const QString &str) -{ - GConfValue *v = gconf_value_new(GCONF_VALUE_STRING); - gconf_value_set_string(v, str.toUtf8().data()); - return v; -} - -static GConfValueType primitiveType(const QVariant &elt) -{ - switch (elt.type()) { - case QVariant::String: - return GCONF_VALUE_STRING; - case QVariant::Int: - return GCONF_VALUE_INT; - case QVariant::Double: - return GCONF_VALUE_FLOAT; - case QVariant::Bool: - return GCONF_VALUE_BOOL; - default: - return GCONF_VALUE_INVALID; - } -} - -static GConfValueType uniformType(const QList<QVariant> &list) -{ - GConfValueType result = GCONF_VALUE_INVALID; - - foreach(const QVariant &elt, list) { - GConfValueType elt_type = primitiveType(elt); - - if (elt_type == GCONF_VALUE_INVALID) - return GCONF_VALUE_INVALID; - - if (result == GCONF_VALUE_INVALID) - result = elt_type; - else if (result != elt_type) - return GCONF_VALUE_INVALID; - } - - if (result == GCONF_VALUE_INVALID) - return GCONF_VALUE_STRING; // empty list. - else - return result; -} - -static int convertValue(const QVariant &src, GConfValue **valp) -{ - GConfValue *v; - - switch (src.type()) { - case QVariant::Invalid: - v = NULL; - break; - case QVariant::Bool: - v = gconf_value_new(GCONF_VALUE_BOOL); - gconf_value_set_bool(v, src.toBool()); - break; - case QVariant::Int: - v = gconf_value_new(GCONF_VALUE_INT); - gconf_value_set_int(v, src.toInt()); - break; - case QVariant::Double: - v = gconf_value_new(GCONF_VALUE_FLOAT); - gconf_value_set_float(v, src.toDouble()); - break; - case QVariant::String: - v = convertString(src.toString()); - break; - case QVariant::StringList: { - GSList *elts = NULL; - v = gconf_value_new(GCONF_VALUE_LIST); - gconf_value_set_list_type(v, GCONF_VALUE_STRING); - foreach(const QString &str, src.toStringList()) - elts = g_slist_prepend(elts, convertString(str)); - gconf_value_set_list_nocopy(v, g_slist_reverse(elts)); - break; - } - case QVariant::List: { - GConfValueType elt_type = uniformType(src.toList()); - if (elt_type == GCONF_VALUE_INVALID) - v = NULL; - else { - GSList *elts = NULL; - v = gconf_value_new(GCONF_VALUE_LIST); - gconf_value_set_list_type(v, elt_type); - foreach(const QVariant &elt, src.toList()) { - GConfValue *val = NULL; - convertValue(elt, &val); // guaranteed to succeed. - elts = g_slist_prepend(elts, val); - } - gconf_value_set_list_nocopy(v, g_slist_reverse(elts)); - } - break; - } - default: - return 0; - } - - *valp = v; - return 1; -} - -void GConfItemPrivate::notify_trampoline(GConfClient*, - guint, - GConfEntry *, - gpointer data) -{ - GConfItem *item = (GConfItem *)data; - item->update_value(true); -} - -void GConfItem::update_value(bool emit_signal) -{ - QVariant new_value; - - withClient(client) { - GError *error = NULL; - QByteArray k = convertKey(priv->key); - GConfValue *v = gconf_client_get(client, k.data(), &error); - - if (error) { - qWarning() << error->message; - g_error_free(error); - new_value = priv->value; - } else { - new_value = convertValue(v); - if (v) - gconf_value_free(v); - } - } - - if (new_value != priv->value) { - priv->value = new_value; - if (emit_signal) - emit valueChanged(); - } -} - -QString GConfItem::key() const -{ - return priv->key; -} - -QVariant GConfItem::value() const -{ - return priv->value; -} - -QVariant GConfItem::value(const QVariant &def) const -{ - if (priv->value.isNull()) - return def; - else - return priv->value; -} - -void GConfItem::set(const QVariant &val) -{ - withClient(client) { - QByteArray k = convertKey(priv->key); - GConfValue *v; - if (convertValue(val, &v)) { - GError *error = NULL; - - if (v) { - gconf_client_set(client, k.data(), v, &error); - gconf_value_free(v); - } else { - gconf_client_unset(client, k.data(), &error); - } - - if (error) { - qWarning() << error->message; - g_error_free(error); - } else if (priv->value != val) { - priv->value = val; - emit valueChanged(); - } - - } else - qWarning() << "Can't store a" << val.typeName(); - } -} - -void GConfItem::unset() -{ - set(QVariant()); -} - -QList<QString> GConfItem::listDirs() const -{ - QList<QString> children; - - withClient(client) { - QByteArray k = convertKey(priv->key); - GSList *dirs = gconf_client_all_dirs(client, k.data(), NULL); - for (GSList *d = dirs; d; d = d->next) { - children.append(convertKey((char *)d->data)); - g_free(d->data); - } - g_slist_free(dirs); - } - - return children; -} - -QList<QString> GConfItem::listEntries() const -{ - QList<QString> children; - - withClient(client) { - QByteArray k = convertKey(priv->key); - GSList *entries = gconf_client_all_entries(client, k.data(), NULL); - for (GSList *e = entries; e; e = e->next) { - children.append(convertKey(((GConfEntry *)e->data)->key)); - gconf_entry_free((GConfEntry *)e->data); - } - g_slist_free(entries); - } - - return children; -} - -GConfItem::GConfItem(const QString &key, QObject *parent) - : QObject(parent) -{ - priv = new GConfItemPrivate; - priv->key = key; - withClient(client) { - update_value(false); - QByteArray k = convertKey(priv->key); - gconf_client_add_dir(client, k.data(), GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); - priv->notify_id = gconf_client_notify_add(client, k.data(), - GConfItemPrivate::notify_trampoline, this, - NULL, NULL); - } -} - -GConfItem::~GConfItem() -{ - withClient(client) { - QByteArray k = convertKey(priv->key); - gconf_client_notify_remove(client, priv->notify_id); - gconf_client_remove_dir(client, k.data(), NULL); - } - delete priv; -} diff --git a/src/location/gconfitem_p.h b/src/location/gconfitem_p.h deleted file mode 100644 index ba4c8d63..00000000 --- a/src/location/gconfitem_p.h +++ /dev/null @@ -1,166 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef GCONFITEM_H -#define GCONFITEM_H - -#include <QVariant> -#include <QStringList> -#include <QObject> - -/*! - - \brief GConfItem is a simple C++ wrapper for GConf. - - Creating a GConfItem instance gives you access to a single GConf - key. You can get and set its value, and connect to its - valueChanged() signal to be notified about changes. - - The value of a GConf key is returned to you as a QVariant, and you - pass in a QVariant when setting the value. GConfItem converts - between a QVariant and GConf values as needed, and according to the - following rules: - - - A QVariant of type QVariant::Invalid denotes an unset GConf key. - - - QVariant::Int, QVariant::Double, QVariant::Bool are converted to - and from the obvious equivalents. - - - QVariant::String is converted to/from a GConf string and always - uses the UTF-8 encoding. No other encoding is supported. - - - QVariant::StringList is converted to a list of UTF-8 strings. - - - QVariant::List (which denotes a QList<QVariant>) is converted - to/from a GConf list. All elements of such a list must have the - same type, and that type must be one of QVariant::Int, - QVariant::Double, QVariant::Bool, or QVariant::String. (A list of - strings is returned as a QVariant::StringList, however, when you - get it back.) - - - Any other QVariant or GConf value is essentially ignored. - - \warning GConfItem is as thread-safe as GConf. - -*/ - -class GConfItem : public QObject -{ - Q_OBJECT - -public: - /*! Initializes a GConfItem to access the GConf key denoted by - \a key. Key names should follow the normal GConf conventions - like "/myapp/settings/first". - - \param key The name of the key. - \param parent Parent object - */ - explicit GConfItem(const QString &key, QObject *parent = 0); - - /*! Finalizes a GConfItem. - */ - virtual ~GConfItem(); - - /*! Returns the key of this item, as given to the constructor. - */ - QString key() const; - - /*! Returns the current value of this item, as a QVariant. - */ - QVariant value() const; - - /*! Returns the current value of this item, as a QVariant. If - * there is no value for this item, return \a def instead. - */ - QVariant value(const QVariant &def) const; - - /*! Set the value of this item to \a val. If \a val can not be - represented in GConf or GConf refuses to accept it for other - reasons, the current value is not changed and nothing happens. - - When the new value is different from the old value, the - changedValue() signal is emitted on this GConfItem as part - of calling set(), but other GConfItem:s for the same key do - only receive a notification once the main loop runs. - - \param val The new value. - */ - void set(const QVariant &val); - - /*! Unset this item. This is equivalent to - - \code - item.set(QVariant(QVariant::Invalid)); - \endcode - */ - void unset(); - - /*! Return a list of the directories below this item. The - returned strings are absolute key names like - "/myapp/settings". - - A directory is a key that has children. The same key might - also have a value, but that is confusing and best avoided. - */ - QList<QString> listDirs() const; - - /*! Return a list of entries below this item. The returned - strings are absolute key names like "/myapp/settings/first". - - A entry is a key that has a value. The same key might also - have children, but that is confusing and is best avoided. - */ - QList<QString> listEntries() const; - -signals: - /*! Emitted when the value of this item has changed. - */ - void valueChanged(); - -private: - friend struct GConfItemPrivate; - struct GConfItemPrivate *priv; - - void update_value(bool emit_signal); -}; - -#endif // GCONFITEM_H diff --git a/src/location/landmarks/qlandmark.cpp b/src/location/landmarks/qlandmark.cpp index 87623c45..f1b42402 100644 --- a/src/location/landmarks/qlandmark.cpp +++ b/src/location/landmarks/qlandmark.cpp @@ -62,13 +62,12 @@ #include <QDebug> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE uint qHash(const QLandmarkCategoryId& key) { return qHash(key.localId()) + qHash(key.managerUri()); } -QTM_END_NAMESPACE -QTM_USE_NAMESPACE + // ----- QLandmarkPrivate ----- @@ -209,6 +208,7 @@ QLandmark::QLandmark() QGeoPlace ordinaryPlace; QLandmark lm3 = ordinarPlace; //(2)lm3 has the details of ordinaryPlace's coordinate, address and viewport. /endcode + \since 1.1 */ QLandmark::QLandmark(const QGeoPlace &other) : QGeoPlace(other) @@ -228,6 +228,7 @@ QLandmark::QLandmark(const QGeoPlace &other) /*! Constructs a copy of \a other. + \since 1.1 */ QLandmark::QLandmark(const QLandmark &other) : QGeoPlace(other) @@ -243,6 +244,7 @@ QLandmark::~QLandmark() /*! Assigns \a other to this landmark and returns a reference to this landmark. + \since 1.1 */ QLandmark &QLandmark::operator= (const QLandmark & other) { @@ -267,6 +269,7 @@ inline const QLandmarkPrivate* QLandmark::d_func() const Two landmarks are considered equal if both the landmark details and identifiers are equal. + \since 1.1 \sa operator!=() */ bool QLandmark::operator== (const QLandmark &other) const @@ -281,11 +284,13 @@ bool QLandmark::operator== (const QLandmark &other) const Returns true if this landmark not is equal to \a other, otherwise returns false. + \since 1.1 \sa operator==() */ /*! Returns the name of the landmark. + \since 1.1 */ QString QLandmark::name() const { @@ -297,6 +302,7 @@ QString QLandmark::name() const Sets the \a name of the landmark. Using the default manager on the Symbian platform, the name is restricted to a length of 256 characters. + \since 1.1 */ void QLandmark::setName(const QString &name) { @@ -308,6 +314,7 @@ void QLandmark::setName(const QString &name) Returns a of list identifiers of categories that this landmark belongs to. + \since 1.1 \sa setCategoryIds() */ QList<QLandmarkCategoryId> QLandmark::categoryIds() const @@ -320,6 +327,7 @@ QList<QLandmarkCategoryId> QLandmark::categoryIds() const Sets the categories that this landmark belongs to via a list of \a categoryIds. + \since 1.1 \sa addCategoryId(), removeCategoryId() */ @@ -339,6 +347,7 @@ void QLandmark::setCategoryIds(const QList<QLandmarkCategoryId> &categoryIds) Adds another category that this landmark will be associated with via its \a categoryId. + \since 1.1 \sa setCategoryIds(), removeCategoryId() */ void QLandmark::addCategoryId(const QLandmarkCategoryId &categoryId) @@ -351,6 +360,7 @@ void QLandmark::addCategoryId(const QLandmarkCategoryId &categoryId) /*! Removes a category from a landmark, by using its \a categoryId. + \since 1.1 \sa addCategoryId(), categoryIds() */ void QLandmark::removeCategoryId(const QLandmarkCategoryId &categoryId) @@ -361,6 +371,7 @@ void QLandmark::removeCategoryId(const QLandmarkCategoryId &categoryId) /*! Returns a description of the landmark. + \since 1.1 */ QString QLandmark::description() const { @@ -372,6 +383,7 @@ QString QLandmark::description() const Sets the \a description of the landmark. Using the default manager on the Symbian platform, the description is restricted to a length of 4096 characters. + \since 1.1 */ void QLandmark::setDescription(const QString &description) { @@ -381,6 +393,7 @@ void QLandmark::setDescription(const QString &description) /*! Returns the url of the landmark's icon. + \since 1.1 */ QUrl QLandmark::iconUrl() const { @@ -390,6 +403,7 @@ QUrl QLandmark::iconUrl() const /*! Sets the \a url of the landmark's icon. + \since 1.1 */ void QLandmark::setIconUrl(const QUrl &url) { @@ -403,6 +417,7 @@ void QLandmark::setIconUrl(const QUrl &url) The coverage radius is relevant for large landmarks such as cities. Note that landmark searches over a given area do not factor in the coverage radius. + \since 1.1 */ qreal QLandmark::radius() const { @@ -413,6 +428,7 @@ qreal QLandmark::radius() const /*! Sets the coverage \a radius of the landmark. The unit of the \a radius is meters. + \since 1.1 */ void QLandmark::setRadius(qreal radius) { @@ -425,6 +441,7 @@ void QLandmark::setRadius(qreal radius) /*! Returns the phone number of the landmark. + \since 1.1 */ QString QLandmark::phoneNumber() const { @@ -434,6 +451,7 @@ QString QLandmark::phoneNumber() const /*! Sets the \a phoneNumber of the landmark. + \since 1.1 */ void QLandmark::setPhoneNumber(const QString &phoneNumber) { @@ -442,6 +460,7 @@ void QLandmark::setPhoneNumber(const QString &phoneNumber) } /*! Returns the url of the landmark. + \since 1.1 */ QUrl QLandmark::url() const { @@ -451,6 +470,7 @@ QUrl QLandmark::url() const /*! Sets the \a url of the landmark. + \since 1.1 */ void QLandmark::setUrl(const QUrl &url) { @@ -460,6 +480,7 @@ void QLandmark::setUrl(const QUrl &url) /*! Returns the identifier of the landmark. + \since 1.1 */ QLandmarkId QLandmark::landmarkId() const { @@ -472,6 +493,7 @@ QLandmarkId QLandmark::landmarkId() const Note that saving a new landmark using a QLandmarkManager will automatically assign the landmark a valid identifier. + \since 1.1 */ void QLandmark::setLandmarkId(const QLandmarkId &id) { @@ -481,6 +503,7 @@ void QLandmark::setLandmarkId(const QLandmarkId &id) /*! Clears all the data fields of the landmark. + \since 1.1 */ void QLandmark::clear() { @@ -498,3 +521,4 @@ void QLandmark::clear() d->id = QLandmarkId(); } +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmark.h b/src/location/landmarks/qlandmark.h index b0ef9593..08adcb22 100644 --- a/src/location/landmarks/qlandmark.h +++ b/src/location/landmarks/qlandmark.h @@ -55,7 +55,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkPrivate; class Q_LOCATION_EXPORT QLandmark : public QGeoPlace @@ -104,11 +104,11 @@ private: const QLandmarkPrivate* d_func() const; }; -QTM_END_NAMESPACE +Q_DECLARE_TYPEINFO(QLandmark, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmark)) +QT_END_NAMESPACE -Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmark), Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(QLandmark) QT_END_HEADER diff --git a/src/location/landmarks/qlandmark_p.h b/src/location/landmarks/qlandmark_p.h index 68fd4809..f989d8dc 100644 --- a/src/location/landmarks/qlandmark_p.h +++ b/src/location/landmarks/qlandmark_p.h @@ -60,7 +60,7 @@ #include <QSharedData> #include <QUrl> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkPrivate : public QGeoPlacePrivate { @@ -86,6 +86,6 @@ public: static QStringList commonKeys; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkabstractrequest.cpp b/src/location/landmarks/qlandmarkabstractrequest.cpp index 9c4ce58c..f5cc51f8 100644 --- a/src/location/landmarks/qlandmarkabstractrequest.cpp +++ b/src/location/landmarks/qlandmarkabstractrequest.cpp @@ -45,7 +45,8 @@ #include <QDebug> #include <QMutexLocker> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE + QLandmarkAbstractRequestPrivate::QLandmarkAbstractRequestPrivate(QLandmarkManager *mgr) : type(QLandmarkAbstractRequest::InvalidRequest), @@ -193,6 +194,7 @@ QLandmarkAbstractRequest::QLandmarkAbstractRequest(QLandmarkAbstractRequestPriva the enine implementation, even though the request itself has been destroyed. The sqlite engine continues the operation behind the scenes if the request is destroyed whilst active. For the symbian engine see the note below. + \since 1.1 */ QLandmarkAbstractRequest::~QLandmarkAbstractRequest() { @@ -202,6 +204,7 @@ QLandmarkAbstractRequest::~QLandmarkAbstractRequest() /*! Returns the type of this asynchronous request. + \since 1.1 */ QLandmarkAbstractRequest::RequestType QLandmarkAbstractRequest::type() const { @@ -211,6 +214,7 @@ QLandmarkAbstractRequest::RequestType QLandmarkAbstractRequest::type() const /*! Returns the state of the request + \since 1.1 */ QLandmarkAbstractRequest::State QLandmarkAbstractRequest::state() { @@ -221,6 +225,7 @@ QLandmarkAbstractRequest::State QLandmarkAbstractRequest::state() /*! Returns true if the request is in the \c QLandmarkAbstractRequest::Inactive state; otherwise, returns false. + \since 1.1 \sa state() */ bool QLandmarkAbstractRequest::isInactive() const @@ -232,6 +237,7 @@ bool QLandmarkAbstractRequest::isInactive() const /*! Returns true if the request is in the \c QLandmarkAbstractRequest::Active state; otherwise, returns false. + \since 1.1 \sa state() */ bool QLandmarkAbstractRequest::isActive() const @@ -243,6 +249,7 @@ bool QLandmarkAbstractRequest::isActive() const /*! Returns true if the request is in the \c QLandmarkAbstractRequest::Finished state; otherwise, returns false. + \since 1.1 \sa state() */ bool QLandmarkAbstractRequest::isFinished() const @@ -253,6 +260,7 @@ bool QLandmarkAbstractRequest::isFinished() const /*! Returns the overall error of the most recent asynchronous operation. + \since 1.1 \sa errorString() */ QLandmarkManager::Error QLandmarkAbstractRequest::error() const @@ -265,6 +273,7 @@ QLandmarkManager::Error QLandmarkAbstractRequest::error() const Returns a human readable string of the last error that occurred. This error string is intended to be used by developers only and should not be seen by end users. + \since 1.1 \sa error() */ QString QLandmarkAbstractRequest::errorString() const @@ -276,6 +285,7 @@ QString QLandmarkAbstractRequest::errorString() const /*! Returns a pointer to the landmark manager which this request operates on. + \since 1.1 */ QLandmarkManager *QLandmarkAbstractRequest::manager() const { @@ -292,6 +302,7 @@ QLandmarkManager *QLandmarkAbstractRequest::manager() const A manager cannot be assigned while the request is in the QLandmarkAbstractRequest::ActiveState. + \since 1.1 */ void QLandmarkAbstractRequest::setManager(QLandmarkManager *manager) { @@ -306,6 +317,7 @@ void QLandmarkAbstractRequest::setManager(QLandmarkManager *manager) Returns true if the request was started, otherwise false. Trying to start a request that is already active returns false. + \since 1.1 \sa cancel(). */ bool QLandmarkAbstractRequest::start() @@ -313,14 +325,14 @@ bool QLandmarkAbstractRequest::start() QMutexLocker ml(&d_ptr->mutex); if (!d_ptr->manager) { d_ptr->error = QLandmarkManager::BadArgumentError; - d_ptr->errorString = "No manager assigned to landmark request object"; + d_ptr->errorString = QLatin1String("No manager assigned to landmark request object"); qWarning() << d_ptr->errorString; return false; } QLandmarkManagerEngine *engine = d_ptr->manager->engine(); if (!engine) { d_ptr->error = QLandmarkManager::InvalidManagerError; - d_ptr->errorString = "The manager is invalid"; + d_ptr->errorString = QLatin1String("The manager is invalid"); return false; } @@ -342,6 +354,7 @@ bool QLandmarkAbstractRequest::start() could not be made or the request is not in the QLandmarkManager::Active state. + \since 1.1 \sa start() */ bool QLandmarkAbstractRequest::cancel() @@ -349,7 +362,7 @@ bool QLandmarkAbstractRequest::cancel() QMutexLocker ml(&d_ptr->mutex); if (!d_ptr->manager) { d_ptr->error = QLandmarkManager::BadArgumentError; - d_ptr->errorString = "No manager assigned to landmark request object"; + d_ptr->errorString = QLatin1String("No manager assigned to landmark request object"); qWarning() << d_ptr->errorString; return false; } @@ -380,6 +393,7 @@ bool QLandmarkAbstractRequest::cancel() the calling thread's event loop is dispatched. If your code depends on your slots being invoked, you may need to process events after calling this function. + \since 1.1 */ bool QLandmarkAbstractRequest::waitForFinished(int msecs) { @@ -387,7 +401,7 @@ bool QLandmarkAbstractRequest::waitForFinished(int msecs) QMutexLocker ml(&d_ptr->mutex); if (!d_ptr->manager) { d_ptr->error = QLandmarkManager::BadArgumentError; - d_ptr->errorString = "No manager assigned to landmark request object"; + d_ptr->errorString = QLatin1String("No manager assigned to landmark request object"); qWarning() << d_ptr->errorString; return false; } @@ -411,6 +425,7 @@ bool QLandmarkAbstractRequest::waitForFinished(int msecs) or derived-class specific results which are accessible through the derived class API. + \since 1.1 \sa error() */ @@ -418,10 +433,13 @@ bool QLandmarkAbstractRequest::waitForFinished(int msecs) \fn void QLandmarkAbstractRequest::stateChanged(QLandmarkAbstractRequest::State newState) This signal is emitted when the state of the request is changed. The new state of the request will be contained in \a newState. + \since 1.1 */ #include "moc_qlandmarkabstractrequest.cpp" +QT_END_NAMESPACE + diff --git a/src/location/landmarks/qlandmarkabstractrequest.h b/src/location/landmarks/qlandmarkabstractrequest.h index 9ecc90a5..4c1f88d1 100644 --- a/src/location/landmarks/qlandmarkabstractrequest.h +++ b/src/location/landmarks/qlandmarkabstractrequest.h @@ -45,7 +45,7 @@ #include "qlandmarkmanager.h" #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkAbstractRequestPrivate; class Q_LOCATION_EXPORT QLandmarkAbstractRequest : public QObject @@ -108,6 +108,6 @@ private: friend class QLandmarkAbstractRequestPrivate; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkabstractrequest_p.h b/src/location/landmarks/qlandmarkabstractrequest_p.h index 1f79ae2c..79fd36e0 100644 --- a/src/location/landmarks/qlandmarkabstractrequest_p.h +++ b/src/location/landmarks/qlandmarkabstractrequest_p.h @@ -58,7 +58,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkAbstractRequestPrivate { @@ -76,6 +76,6 @@ public: mutable QMutex mutex; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkattributefilter.cpp b/src/location/landmarks/qlandmarkattributefilter.cpp index 74f871a7..f2bda00c 100644 --- a/src/location/landmarks/qlandmarkattributefilter.cpp +++ b/src/location/landmarks/qlandmarkattributefilter.cpp @@ -43,7 +43,7 @@ #include "qlandmarkfilter_p.h" #include <QHash> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkAttributeFilterPrivate : public QLandmarkFilterPrivate { @@ -156,6 +156,7 @@ QLandmarkAttributeFilter::QLandmarkAttributeFilter() /*! \fn QLandmarkAttributeFilter::QLandmarkAttributeFilter(const QLandmarkFilter &other) Constructs a copy of \a other if possible, otherwise constructs a new attribute filter. + \since 1.1 */ /*! @@ -169,6 +170,7 @@ QLandmarkAttributeFilter::~QLandmarkAttributeFilter() Returns the value of the attribute corresponding to \a key. If the attribute isn't set an invalid QVariant is returned. + \since 1.1 */ QVariant QLandmarkAttributeFilter::attribute(const QString &key) const { @@ -183,6 +185,7 @@ QVariant QLandmarkAttributeFilter::attribute(const QString &key) const to define how the string values should be matched. For non-string based attributes the \a flags are ignored. The beahviour of the filter is undefined if an invalid QVariant is used as a \a value + \since 1.1 */ void QLandmarkAttributeFilter::setAttribute(const QString &key, const QVariant &value, QLandmarkFilter::MatchFlags flags) { @@ -198,6 +201,7 @@ void QLandmarkAttributeFilter::setAttribute(const QString &key, const QVariant & set of matching \a flags can be provided to define how the string values should be matched. For non-string based attributes the \a flags are ignored. The behaviour of the filter is undefined if an invalid QVariant is used as \a value. + \since 1.1 */ void QLandmarkAttributeFilter::setAttributes(const QStringList &keys, const QVariant &value, QLandmarkFilter::MatchFlags flags) { @@ -210,6 +214,7 @@ void QLandmarkAttributeFilter::setAttributes(const QStringList &keys, const QVar /*! Removes the attribute corresponding to \a key from the filter. + \since 1.1 */ void QLandmarkAttributeFilter::removeAttribute(const QString &key) { @@ -220,6 +225,7 @@ void QLandmarkAttributeFilter::removeAttribute(const QString &key) /*! Clears all attributes from the filter. + \since 1.1 */ void QLandmarkAttributeFilter::clearAttributes() { @@ -230,6 +236,7 @@ void QLandmarkAttributeFilter::clearAttributes() /*! Returns the keys of all attributes set in the filter. + \since 1.1 */ QStringList QLandmarkAttributeFilter::attributeKeys() const { @@ -240,6 +247,7 @@ QStringList QLandmarkAttributeFilter::attributeKeys() const /*! Returns the operation to be used by the filter when multiple attributes are provided. + \since 1.1 */ QLandmarkAttributeFilter::OperationType QLandmarkAttributeFilter::operationType() const { @@ -250,6 +258,7 @@ QLandmarkAttributeFilter::OperationType QLandmarkAttributeFilter::operationType( /*! Sets the operation to be used by the filter when multiple attributes are provided to \a operationType. + \since 1.1 */ void QLandmarkAttributeFilter::setOperationType(QLandmarkAttributeFilter::OperationType operationType) { @@ -260,6 +269,7 @@ void QLandmarkAttributeFilter::setOperationType(QLandmarkAttributeFilter::Operat /*! Returns the match flags for a particular \a key. The match flags are only take into consideration when the attribute for a particular key is a string. In all other cases the match flags are ignored. + \since 1.1 */ QLandmarkFilter::MatchFlags QLandmarkAttributeFilter::matchFlags(const QString &key) const { @@ -267,4 +277,4 @@ QLandmarkFilter::MatchFlags QLandmarkAttributeFilter::matchFlags(const QString & return d->flags.value(key); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkattributefilter.h b/src/location/landmarks/qlandmarkattributefilter.h index cb4d0917..4bbadf64 100644 --- a/src/location/landmarks/qlandmarkattributefilter.h +++ b/src/location/landmarks/qlandmarkattributefilter.h @@ -47,7 +47,7 @@ #include <QString> #include <QStringList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmark; class QLandmarkAttributeFilterPrivate; @@ -76,6 +76,6 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkAttributeFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkboxfilter.cpp b/src/location/landmarks/qlandmarkboxfilter.cpp index ae3ce4d9..6c32b8a2 100644 --- a/src/location/landmarks/qlandmarkboxfilter.cpp +++ b/src/location/landmarks/qlandmarkboxfilter.cpp @@ -43,7 +43,7 @@ #include "qlandmarkboxfilter_p.h" #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkBoxFilter @@ -62,6 +62,7 @@ Q_IMPLEMENT_LANDMARKFILTER_PRIVATE(QLandmarkBoxFilter); /*! Creates a filter that will search for landmarks within a bounding box defined by the \a topLeft and \a bottomRight coordinates. + \since 1.1 */ QLandmarkBoxFilter::QLandmarkBoxFilter(const QGeoCoordinate &topLeft, const QGeoCoordinate &bottomRight) @@ -71,6 +72,7 @@ QLandmarkBoxFilter::QLandmarkBoxFilter(const QGeoCoordinate &topLeft, /*! Creates a filter that will search for landmarks within the \a boundingBox. + \since 1.1 */ QLandmarkBoxFilter::QLandmarkBoxFilter(const QGeoBoundingBox &boundingBox) : QLandmarkFilter(new QLandmarkBoxFilterPrivate(boundingBox)) @@ -80,6 +82,7 @@ QLandmarkBoxFilter::QLandmarkBoxFilter(const QGeoBoundingBox &boundingBox) /*! \fn QLandmarkBoxFilter::QLandmarkBoxFilter(const QLandmarkFilter &other) Constructs a copy of \a other if possible, otherwise constructs a new box filter. + \since 1.1 */ /*! @@ -92,6 +95,7 @@ QLandmarkBoxFilter::~QLandmarkBoxFilter() /*! Returns the filter's bounding box. + \since 1.1 */ QGeoBoundingBox QLandmarkBoxFilter::boundingBox() const { @@ -101,6 +105,7 @@ QGeoBoundingBox QLandmarkBoxFilter::boundingBox() const /*! Sets the \a boundingBox of the filter. + \since 1.1 */ void QLandmarkBoxFilter::setBoundingBox(const QGeoBoundingBox &boundingBox) { @@ -110,6 +115,7 @@ void QLandmarkBoxFilter::setBoundingBox(const QGeoBoundingBox &boundingBox) /*! Returns the top left coordinate of the box filter. + \since 1.1 */ QGeoCoordinate QLandmarkBoxFilter::topLeft() { @@ -119,6 +125,7 @@ QGeoCoordinate QLandmarkBoxFilter::topLeft() /*! Sets the \a topLeft coordinate of the box filter. + \since 1.1 */ void QLandmarkBoxFilter::setTopLeft(const QGeoCoordinate &topLeft) { @@ -129,6 +136,7 @@ void QLandmarkBoxFilter::setTopLeft(const QGeoCoordinate &topLeft) /*! Returns the bottom right coordinate of the box filter. + \since 1.1 */ QGeoCoordinate QLandmarkBoxFilter::bottomRight() { @@ -138,6 +146,7 @@ QGeoCoordinate QLandmarkBoxFilter::bottomRight() /*! Sets the \a bottomRight coordinate of the box filter. + \since 1.1 */ void QLandmarkBoxFilter::setBottomRight(const QGeoCoordinate &bottomRight) { @@ -161,4 +170,4 @@ QLandmarkBoxFilterPrivate::QLandmarkBoxFilterPrivate(const QLandmarkBoxFilterPri QLandmarkBoxFilterPrivate::~QLandmarkBoxFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkboxfilter.h b/src/location/landmarks/qlandmarkboxfilter.h index cefd788f..6f524c4e 100644 --- a/src/location/landmarks/qlandmarkboxfilter.h +++ b/src/location/landmarks/qlandmarkboxfilter.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkBoxFilterPrivate; class Q_LOCATION_EXPORT QLandmarkBoxFilter : public QLandmarkFilter @@ -74,7 +74,7 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkBoxFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/landmarks/qlandmarkboxfilter_p.h b/src/location/landmarks/qlandmarkboxfilter_p.h index 8e94b43f..851202f9 100644 --- a/src/location/landmarks/qlandmarkboxfilter_p.h +++ b/src/location/landmarks/qlandmarkboxfilter_p.h @@ -56,7 +56,7 @@ #include "qlandmarkfilter_p.h" #include "qgeoboundingbox.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -78,6 +78,6 @@ public: QGeoBoundingBox boundingBox; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategory.cpp b/src/location/landmarks/qlandmarkcategory.cpp index eb2f441e..dc3e2870 100644 --- a/src/location/landmarks/qlandmarkcategory.cpp +++ b/src/location/landmarks/qlandmarkcategory.cpp @@ -50,7 +50,7 @@ #include <QDebug> #endif -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE // ----- QLandmarkCategoryPrivate ----- @@ -138,6 +138,7 @@ QLandmarkCategory::QLandmarkCategory() /*! Constructs a copy of \a other. + \since 1.1 */ QLandmarkCategory::QLandmarkCategory(const QLandmarkCategory &other) : d(other.d) @@ -152,6 +153,7 @@ QLandmarkCategory::~QLandmarkCategory() } /*! Assigns \a other to this category and returns a reference to this category. + \since 1.1 */ QLandmarkCategory& QLandmarkCategory::operator= (const QLandmarkCategory & other) { @@ -163,6 +165,7 @@ QLandmarkCategory& QLandmarkCategory::operator= (const QLandmarkCategory & other Returns true if this category is equal to \a other, otherwise returns false. + \since 1.1 \sa operator!=() */ bool QLandmarkCategory::operator== (const QLandmarkCategory &other) const @@ -174,6 +177,7 @@ bool QLandmarkCategory::operator== (const QLandmarkCategory &other) const Returns true if this category is not equal to \a other, otherwise returns false. + \since 1.1 \sa operator==() */ bool QLandmarkCategory::operator!= (const QLandmarkCategory &other) const @@ -183,6 +187,7 @@ bool QLandmarkCategory::operator!= (const QLandmarkCategory &other) const /*! Returns the name of the category. + \since 1.1 */ QString QLandmarkCategory::name() const { @@ -193,6 +198,7 @@ QString QLandmarkCategory::name() const Sets the \a name of the category. Using the default manager on the Symbian platform, the catgory name is retricted to a length of 124 characters. + \since 1.1 */ void QLandmarkCategory::setName(const QString &name) { @@ -201,6 +207,7 @@ void QLandmarkCategory::setName(const QString &name) /*! Returns the url of the category's icon. + \since 1.1 */ QUrl QLandmarkCategory::iconUrl() const { @@ -209,6 +216,7 @@ QUrl QLandmarkCategory::iconUrl() const /*! Sets the \a url of the category's icon + \since 1.1 */ void QLandmarkCategory::setIconUrl(const QUrl &url) { @@ -218,6 +226,7 @@ void QLandmarkCategory::setIconUrl(const QUrl &url) /*! Returns the identifier of the category. + \since 1.1 */ QLandmarkCategoryId QLandmarkCategory::categoryId() const { @@ -229,6 +238,7 @@ QLandmarkCategoryId QLandmarkCategory::categoryId() const Note that saving a new category using a QLandmarkManager will automatically assign the category a valid identifier. + \since 1.1 */ void QLandmarkCategory::setCategoryId(const QLandmarkCategoryId &id) { @@ -237,6 +247,7 @@ void QLandmarkCategory::setCategoryId(const QLandmarkCategoryId &id) /*! Clears all the data fields of the category. + \since 1.1 */ void QLandmarkCategory::clear() { @@ -244,3 +255,5 @@ void QLandmarkCategory::clear() d->iconUrl.clear(); d->id = QLandmarkCategoryId(); } + +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategory.h b/src/location/landmarks/qlandmarkcategory.h index 00edcb01..9f1a7cfc 100644 --- a/src/location/landmarks/qlandmarkcategory.h +++ b/src/location/landmarks/qlandmarkcategory.h @@ -46,13 +46,12 @@ #include <QVariant> #include <QSharedDataPointer> +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE class QStringList; class QUrl; - -QT_BEGIN_HEADER - -QTM_BEGIN_NAMESPACE class QLandmarkCategoryId; class QLandmarkCategoryPrivate; @@ -82,11 +81,11 @@ private: QSharedDataPointer<QLandmarkCategoryPrivate> d; }; -QTM_END_NAMESPACE +Q_DECLARE_TYPEINFO(QLandmarkCategory, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkCategory)) +QT_END_NAMESPACE -Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkCategory), Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(QLandmarkCategory) QT_END_HEADER diff --git a/src/location/landmarks/qlandmarkcategory_p.h b/src/location/landmarks/qlandmarkcategory_p.h index bba844b6..87c90b7c 100644 --- a/src/location/landmarks/qlandmarkcategory_p.h +++ b/src/location/landmarks/qlandmarkcategory_p.h @@ -58,7 +58,7 @@ #include <QUrl> #include <QSharedData> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryPrivate : public QSharedData { @@ -79,6 +79,6 @@ public: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp index 429a2675..7fdf9a60 100644 --- a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp +++ b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include "qlandmarkcategory.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkCategoryFetchByIdRequest @@ -68,7 +68,7 @@ QTM_BEGIN_NAMESPACE \inmodule QtLocation \ingroup landmarks-request - \since 1.2 + \since 1.1 */ /*! @@ -88,6 +88,7 @@ QLandmarkCategoryFetchByIdRequest::~QLandmarkCategoryFetchByIdRequest() /*! Returns a list of identifiers of categories which are to be retrieved by this request. + \since 1.1 */ QList<QLandmarkCategoryId> QLandmarkCategoryFetchByIdRequest::categoryIds() const { @@ -98,6 +99,7 @@ QList<QLandmarkCategoryId> QLandmarkCategoryFetchByIdRequest::categoryIds() cons /*! Sets this request to retrieve a list of categories identified by \a categoryIds. + \since 1.1 */ void QLandmarkCategoryFetchByIdRequest::setCategoryIds(const QList<QLandmarkCategoryId> &categoryIds) { @@ -109,6 +111,7 @@ void QLandmarkCategoryFetchByIdRequest::setCategoryIds(const QList<QLandmarkCate /*! Convenience function that sets a single category, specified by \a categoryId, to be retrieved by this request. + \since 1.1 */ void QLandmarkCategoryFetchByIdRequest::setCategoryId(const QLandmarkCategoryId &categoryId) { @@ -120,6 +123,7 @@ void QLandmarkCategoryFetchByIdRequest::setCategoryId(const QLandmarkCategoryId /*! Returns the list of categories fetched by this request + \since 1.1 */ QList<QLandmarkCategory> QLandmarkCategoryFetchByIdRequest::categories() const { @@ -131,6 +135,7 @@ QList<QLandmarkCategory> QLandmarkCategoryFetchByIdRequest::categories() const /*! Returns the mapping of input category id list indices to the errors which occurred. + \since 1.1 */ QMap<int, QLandmarkManager::Error> QLandmarkCategoryFetchByIdRequest::errorMap() const { @@ -141,4 +146,4 @@ QMap<int, QLandmarkManager::Error> QLandmarkCategoryFetchByIdRequest::errorMap() #include "moc_qlandmarkcategoryfetchbyidrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.h b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.h index 9ebc9647..3e01b91b 100644 --- a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.h +++ b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.h @@ -45,7 +45,7 @@ #include "qlandmarkabstractrequest.h" #include "qlandmarkcategoryid.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryFetchByIdRequestPrivate; class Q_LOCATION_EXPORT QLandmarkCategoryFetchByIdRequest : public QLandmarkAbstractRequest @@ -68,6 +68,6 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp b/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp index 2432795d..7632f250 100644 --- a/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp +++ b/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include "qlandmarkcategory.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkCategoryFetchRequest @@ -82,6 +82,7 @@ QLandmarkCategoryFetchRequest::~QLandmarkCategoryFetchRequest() /*! Returns the list of categories that have been found during the request. + \since 1.1 */ QList<QLandmarkCategory> QLandmarkCategoryFetchRequest::categories() const { @@ -94,6 +95,7 @@ QList<QLandmarkCategory> QLandmarkCategoryFetchRequest::categories() const Returns the sorting of the categories. By default the sorting is case insensitive and in ascending order according to the category name. + \since 1.1 */ QLandmarkNameSort QLandmarkCategoryFetchRequest::sorting() const { @@ -104,6 +106,7 @@ QLandmarkNameSort QLandmarkCategoryFetchRequest::sorting() const /*! Sets \a nameSort to specify the sorting of the returned categories. + \since 1.1 */ void QLandmarkCategoryFetchRequest::setSorting(const QLandmarkNameSort &nameSort) { @@ -115,6 +118,7 @@ void QLandmarkCategoryFetchRequest::setSorting(const QLandmarkNameSort &nameSort /*! Returns the maximum number of categories to be returned. By default the limit is -1 indicating that all categories should be retrieved. + \since 1.1 */ int QLandmarkCategoryFetchRequest::limit() const { @@ -128,6 +132,7 @@ int QLandmarkCategoryFetchRequest::limit() const A limit of -1 will retrieve all categories. (A limit of 0 will retrieve no categories.) + \since 1.1 */ void QLandmarkCategoryFetchRequest::setLimit(int limit) { @@ -144,6 +149,7 @@ void QLandmarkCategoryFetchRequest::setLimit(int limit) For example, if there are 10 categories in the landmark store, setting the offset to 2 and limit to 5 will retrieve the 3rd to 7th categories inclusively. (The order of categories is specified by the sorting field). + \since 1.1 */ int QLandmarkCategoryFetchRequest::offset() const { @@ -154,6 +160,7 @@ int QLandmarkCategoryFetchRequest::offset() const /*! Sets the index \a offset for the request. + \since 1.1 */ void QLandmarkCategoryFetchRequest::setOffset(int offset) { Q_D(QLandmarkCategoryFetchRequest); @@ -163,4 +170,4 @@ void QLandmarkCategoryFetchRequest::setOffset(int offset) { #include "moc_qlandmarkcategoryfetchrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategoryfetchrequest.h b/src/location/landmarks/qlandmarkcategoryfetchrequest.h index 262e4e8b..92dbbb78 100644 --- a/src/location/landmarks/qlandmarkcategoryfetchrequest.h +++ b/src/location/landmarks/qlandmarkcategoryfetchrequest.h @@ -46,7 +46,7 @@ #include "qlandmarkcategoryid.h" #include "qlandmarknamesort.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryFetchRequestPrivate; class Q_LOCATION_EXPORT QLandmarkCategoryFetchRequest : public QLandmarkAbstractRequest @@ -73,6 +73,6 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategoryfilter.cpp b/src/location/landmarks/qlandmarkcategoryfilter.cpp index 8303c719..852bd216 100644 --- a/src/location/landmarks/qlandmarkcategoryfilter.cpp +++ b/src/location/landmarks/qlandmarkcategoryfilter.cpp @@ -43,7 +43,7 @@ #include "qlandmarkcategoryfilter_p.h" #include "qlandmarkcategoryid.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkCategoryFilter @@ -61,6 +61,7 @@ Q_IMPLEMENT_LANDMARKFILTER_PRIVATE(QLandmarkCategoryFilter) /*! Creates a filter that searches for landmarks that belong to the category identified by \a categoryId. + \since 1.1 */ QLandmarkCategoryFilter::QLandmarkCategoryFilter(const QLandmarkCategoryId &categoryId) : QLandmarkFilter(new QLandmarkCategoryFilterPrivate(categoryId)) @@ -70,6 +71,7 @@ QLandmarkCategoryFilter::QLandmarkCategoryFilter(const QLandmarkCategoryId &cate /*! \fn QLandmarkCategoryFilter::QLandmarkCategoryFilter(const QLandmarkFilter &other) Constructs a copy of \a other if possible, otherwise constructs a new category filter. + \since 1.1 */ /*! @@ -82,6 +84,7 @@ QLandmarkCategoryFilter::~QLandmarkCategoryFilter() /*! Returns the category identifier that this filter matches by. + \since 1.1 */ QLandmarkCategoryId QLandmarkCategoryFilter::categoryId() const { @@ -92,6 +95,7 @@ QLandmarkCategoryId QLandmarkCategoryFilter::categoryId() const /*! Sets the category identifier that this filter matches by to \a categoryId. + \since 1.1 */ void QLandmarkCategoryFilter::setCategoryId(const QLandmarkCategoryId &categoryId) { @@ -102,6 +106,7 @@ void QLandmarkCategoryFilter::setCategoryId(const QLandmarkCategoryId &categoryI /*! Convenience function to set the \a category that this filter matches by. It is equivalent to calling setCategory(category.categoryId()). + \since 1.1 */ void QLandmarkCategoryFilter::setCategory(const QLandmarkCategory &category) { @@ -124,4 +129,4 @@ QLandmarkCategoryFilterPrivate::QLandmarkCategoryFilterPrivate(const QLandmarkCa QLandmarkCategoryFilterPrivate::~QLandmarkCategoryFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategoryfilter.h b/src/location/landmarks/qlandmarkcategoryfilter.h index bef2b6a3..cb9e3edb 100644 --- a/src/location/landmarks/qlandmarkcategoryfilter.h +++ b/src/location/landmarks/qlandmarkcategoryfilter.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryId; @@ -68,7 +68,7 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkCategoryFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/landmarks/qlandmarkcategoryfilter_p.h b/src/location/landmarks/qlandmarkcategoryfilter_p.h index 0cbf37ac..f3142b6f 100644 --- a/src/location/landmarks/qlandmarkcategoryfilter_p.h +++ b/src/location/landmarks/qlandmarkcategoryfilter_p.h @@ -55,7 +55,7 @@ #include "qlandmarkfilter_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryId; @@ -77,6 +77,6 @@ public: Q_IMPLEMENT_LANDMARKFILTER_VIRTUALCTORS(QLandmarkCategoryFilter, QLandmarkFilter::CategoryFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategoryid.cpp b/src/location/landmarks/qlandmarkcategoryid.cpp index 386723c5..2056aac0 100644 --- a/src/location/landmarks/qlandmarkcategoryid.cpp +++ b/src/location/landmarks/qlandmarkcategoryid.cpp @@ -43,7 +43,7 @@ #include "qlandmarkcategoryid_p.h" #include <QString> -QTM_USE_NAMESPACE + /*! \class QLandmarkCategoryId @@ -89,6 +89,7 @@ QLandmarkCategoryId::~QLandmarkCategoryId() /*! Returns true if the identifier is valid, meaning that both a manager URI and local id have been set + \since 1.1 */ bool QLandmarkCategoryId::isValid() const { @@ -99,6 +100,7 @@ bool QLandmarkCategoryId::isValid() const Returns the local id of the category identifier. This id is specific to a particular landmark manager. + \since 1.1 */ QString QLandmarkCategoryId::localId() const { @@ -107,6 +109,7 @@ QString QLandmarkCategoryId::localId() const /*! Sets the local \a id of the category identifier. + \since 1.1 */ void QLandmarkCategoryId::setLocalId(const QString &id) { @@ -116,6 +119,7 @@ void QLandmarkCategoryId::setLocalId(const QString &id) /*! Returns the URI of the manager which this category identifer belongs to. + \since 1.1 */ QString QLandmarkCategoryId::managerUri() const { @@ -125,6 +129,7 @@ QString QLandmarkCategoryId::managerUri() const /*! Sets the manager \a uri which this category identifier belongs to. + \since 1.1 */ void QLandmarkCategoryId::setManagerUri(const QString &uri) { @@ -134,6 +139,7 @@ void QLandmarkCategoryId::setManagerUri(const QString &uri) /*! Assigns \a other to this category identifier and returns a reference to this category identifier. + \since 1.1 */ QLandmarkCategoryId &QLandmarkCategoryId::operator=(const QLandmarkCategoryId & other) { @@ -148,6 +154,7 @@ QLandmarkCategoryId &QLandmarkCategoryId::operator=(const QLandmarkCategoryId & Two QLandmarkCategoryIds are considered equal if both have the same manager URI and local id. + \since 1.1 \sa operator!=() */ bool QLandmarkCategoryId::operator==(const QLandmarkCategoryId &other) const @@ -163,6 +170,7 @@ bool QLandmarkCategoryId::operator==(const QLandmarkCategoryId &other) const If either the manager URIs or local ids differ, then the QLandmarkCategoryIds are not considered equal. + \since 1.1 \sa operator==() */ bool QLandmarkCategoryId::operator!=(const QLandmarkCategoryId &other) const diff --git a/src/location/landmarks/qlandmarkcategoryid.h b/src/location/landmarks/qlandmarkcategoryid.h index 962bd1b9..4dbed695 100644 --- a/src/location/landmarks/qlandmarkcategoryid.h +++ b/src/location/landmarks/qlandmarkcategoryid.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryIdPrivate; class Q_LOCATION_EXPORT QLandmarkCategoryId @@ -73,11 +73,12 @@ private: QSharedDataPointer<QLandmarkCategoryIdPrivate> d; }; -QTM_END_NAMESPACE +Q_DECLARE_TYPEINFO(QLandmarkCategoryId, Q_MOVABLE_TYPE); -QT_END_HEADER +QT_END_NAMESPACE + +Q_DECLARE_METATYPE(QLandmarkCategoryId) -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkCategoryId)) +QT_END_HEADER -Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkCategoryId), Q_MOVABLE_TYPE); #endif diff --git a/src/location/landmarks/qlandmarkcategoryid_p.h b/src/location/landmarks/qlandmarkcategoryid_p.h index 243612c9..aa380643 100644 --- a/src/location/landmarks/qlandmarkcategoryid_p.h +++ b/src/location/landmarks/qlandmarkcategoryid_p.h @@ -57,7 +57,7 @@ #include <QSharedData> #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryIdPrivate : public QSharedData { @@ -79,6 +79,6 @@ public: QString m_uri; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp b/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp index 8b44116d..62d9bec0 100644 --- a/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp +++ b/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include "qlandmarkcategoryid.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkCategoryIdFetchRequest @@ -83,6 +83,7 @@ QLandmarkCategoryIdFetchRequest::~QLandmarkCategoryIdFetchRequest() /*! Returns the list of category identifiers that have been found during the request. + \since 1.1 */ QList<QLandmarkCategoryId> QLandmarkCategoryIdFetchRequest::categoryIds() const { @@ -95,6 +96,7 @@ QList<QLandmarkCategoryId> QLandmarkCategoryIdFetchRequest::categoryIds() const Returns the sorting of the categories. By default the sorting is case insensitive and in ascending order according to the category name. + \since 1.1 */ QLandmarkNameSort QLandmarkCategoryIdFetchRequest::sorting() const { @@ -105,6 +107,7 @@ QLandmarkNameSort QLandmarkCategoryIdFetchRequest::sorting() const /*! Sets \a nameSort to specify the sorting of the returned category ids. + \since 1.1 */ void QLandmarkCategoryIdFetchRequest::setSorting(const QLandmarkNameSort &nameSort) { @@ -116,6 +119,7 @@ void QLandmarkCategoryIdFetchRequest::setSorting(const QLandmarkNameSort &nameSo /*! Returns the maximum number of category IDs to be returned. By default the limit is set to -1 indicating that IDs of all categories should be retrieved. + \since 1.1 */ int QLandmarkCategoryIdFetchRequest::limit() const { @@ -130,6 +134,7 @@ int QLandmarkCategoryIdFetchRequest::limit() const A limit of -1 indicates that IDs of all categories are to be retrieved. (A limit of 0 will retrieve no categories.) + \since 1.1 */ void QLandmarkCategoryIdFetchRequest::setLimit(int limit) { @@ -146,6 +151,7 @@ void QLandmarkCategoryIdFetchRequest::setLimit(int limit) For example, if there are 10 categories in the landmark store, setting the offset to 2 and limit to 5 will retrieve the 3rd to 7th category ids inclusively. (The order of category ids is specified by the sorting field). + \since 1.1 */ int QLandmarkCategoryIdFetchRequest::offset() const { @@ -156,6 +162,7 @@ int QLandmarkCategoryIdFetchRequest::offset() const /*! Sets the index \a offset for the request. + \since 1.1 */ void QLandmarkCategoryIdFetchRequest::setOffset(int offset) { Q_D(QLandmarkCategoryIdFetchRequest); @@ -165,7 +172,7 @@ void QLandmarkCategoryIdFetchRequest::setOffset(int offset) { #include "moc_qlandmarkcategoryidfetchrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategoryidfetchrequest.h b/src/location/landmarks/qlandmarkcategoryidfetchrequest.h index ab643b4a..ec25746e 100644 --- a/src/location/landmarks/qlandmarkcategoryidfetchrequest.h +++ b/src/location/landmarks/qlandmarkcategoryidfetchrequest.h @@ -45,7 +45,7 @@ #include "qlandmarkabstractrequest.h" #include "qlandmarknamesort.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryIdFetchRequestPrivate; class Q_LOCATION_EXPORT QLandmarkCategoryIdFetchRequest : public QLandmarkAbstractRequest @@ -72,6 +72,6 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategoryremoverequest.cpp b/src/location/landmarks/qlandmarkcategoryremoverequest.cpp index 51fd9d35..741599a8 100644 --- a/src/location/landmarks/qlandmarkcategoryremoverequest.cpp +++ b/src/location/landmarks/qlandmarkcategoryremoverequest.cpp @@ -45,7 +45,7 @@ #include <QMap> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkCategoryRemoveRequest @@ -83,6 +83,7 @@ QLandmarkCategoryRemoveRequest::~QLandmarkCategoryRemoveRequest() /*! Returns the list of identifiers of categories which will be removed. + \since 1.1 */ QList<QLandmarkCategoryId> QLandmarkCategoryRemoveRequest::categoryIds() const { @@ -94,6 +95,7 @@ QList<QLandmarkCategoryId> QLandmarkCategoryRemoveRequest::categoryIds() const /*! Sets the list of \a categoryIds of categories which will be removed. + \since 1.1 \sa setCategories(), setCategoryId() */ void QLandmarkCategoryRemoveRequest::setCategoryIds(const QList<QLandmarkCategoryId> &categoryIds) @@ -108,6 +110,7 @@ void QLandmarkCategoryRemoveRequest::setCategoryIds(const QList<QLandmarkCategor It is the equivalent of calling setCategoryIds() with a single \a categoryId in the ID list. + \since 1.1 \sa setCategory(), setCategoryIds() */ void QLandmarkCategoryRemoveRequest::setCategoryId(const QLandmarkCategoryId &categoryId) @@ -123,6 +126,7 @@ void QLandmarkCategoryRemoveRequest::setCategoryId(const QLandmarkCategoryId &ca This function effectively calls setCategoryIds() with the IDs of the \a categories. + \since 1.1 \sa setCategory(), setCategoryIds() */ void QLandmarkCategoryRemoveRequest::setCategories(const QList<QLandmarkCategory> &categories) @@ -138,6 +142,7 @@ void QLandmarkCategoryRemoveRequest::setCategories(const QList<QLandmarkCategory Convenience function that sets a single \a category to be removed. This function effectively calls setCategoryIds() with the ID of \a category. + \since 1.1 \sa setCategories(), setCategoryId() */ void QLandmarkCategoryRemoveRequest::setCategory(const QLandmarkCategory &category) @@ -151,6 +156,7 @@ void QLandmarkCategoryRemoveRequest::setCategory(const QLandmarkCategory &catego /*! Returns the mapping of input category ID list indices to the errors which occurred. + \since 1.1 */ QMap<int, QLandmarkManager::Error> QLandmarkCategoryRemoveRequest::errorMap() const { @@ -161,6 +167,6 @@ QMap<int, QLandmarkManager::Error> QLandmarkCategoryRemoveRequest::errorMap() co #include "moc_qlandmarkcategoryremoverequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategoryremoverequest.h b/src/location/landmarks/qlandmarkcategoryremoverequest.h index 84d3d686..40551e0d 100644 --- a/src/location/landmarks/qlandmarkcategoryremoverequest.h +++ b/src/location/landmarks/qlandmarkcategoryremoverequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryRemoveRequestPrivate; class Q_LOCATION_EXPORT QLandmarkCategoryRemoveRequest : public QLandmarkAbstractRequest @@ -68,7 +68,7 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategorysaverequest.cpp b/src/location/landmarks/qlandmarkcategorysaverequest.cpp index 6acc59a7..440315d5 100644 --- a/src/location/landmarks/qlandmarkcategorysaverequest.cpp +++ b/src/location/landmarks/qlandmarkcategorysaverequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include "qlandmarkcategory.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkCategorySaveRequest @@ -84,6 +84,7 @@ QLandmarkCategorySaveRequest::~QLandmarkCategorySaveRequest() finished, any new categories saved will have had their QLandmarkCategoryId set. (Categories which were updated or failed to save will remain unchanged, use the errorMap() function to determine which particular categories failed to save.) + \since 1.1 */ QList<QLandmarkCategory> QLandmarkCategorySaveRequest::categories() const { @@ -94,6 +95,7 @@ QList<QLandmarkCategory> QLandmarkCategorySaveRequest::categories() const /*! Sets the list of \a categories to be saved. + \since 1.1 \sa setCategory() */ void QLandmarkCategorySaveRequest::setCategories(const QList<QLandmarkCategory> &categories) @@ -107,6 +109,7 @@ void QLandmarkCategorySaveRequest::setCategories(const QList<QLandmarkCategory> Convenience function to set a single \a category to be saved. This function is the equivalent of calling setCategories() with a single \a category. + \since 1.1 \sa setCategories() */ void QLandmarkCategorySaveRequest::setCategory(const QLandmarkCategory& category) @@ -120,6 +123,7 @@ void QLandmarkCategorySaveRequest::setCategory(const QLandmarkCategory& category /*! Returns the mapping of the input category list indices to the errors which occurred. + \since 1.1 */ QMap<int, QLandmarkManager::Error> QLandmarkCategorySaveRequest::errorMap() const { @@ -130,6 +134,6 @@ QMap<int, QLandmarkManager::Error> QLandmarkCategorySaveRequest::errorMap() cons #include "moc_qlandmarkcategorysaverequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategorysaverequest.h b/src/location/landmarks/qlandmarkcategorysaverequest.h index d327c148..a07b7f01 100644 --- a/src/location/landmarks/qlandmarkcategorysaverequest.h +++ b/src/location/landmarks/qlandmarkcategorysaverequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategory; @@ -67,7 +67,7 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkexportrequest.cpp b/src/location/landmarks/qlandmarkexportrequest.cpp index 20ac4031..999dcd34 100644 --- a/src/location/landmarks/qlandmarkexportrequest.cpp +++ b/src/location/landmarks/qlandmarkexportrequest.cpp @@ -45,7 +45,7 @@ #include <QFile> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkExportRequest @@ -85,6 +85,7 @@ QLandmarkExportRequest::~QLandmarkExportRequest() /*! Returns the device to which landmarks are written. + \since 1.1 */ QIODevice *QLandmarkExportRequest::device() const { @@ -95,6 +96,7 @@ QIODevice *QLandmarkExportRequest::device() const /*! Sets the \a device to which landmarks are written. + \since 1.1 */ void QLandmarkExportRequest::setDevice(QIODevice *device) { @@ -108,6 +110,7 @@ void QLandmarkExportRequest::setDevice(QIODevice *device) been called, this function returns the name of the file to be written to. In all other cases, it returns an empty string. + \since 1.1 \sa setFileName(), setDevice() */ QString QLandmarkExportRequest::fileName() const @@ -123,6 +126,7 @@ QString QLandmarkExportRequest::fileName() const QLandmarkExportRequest will create a QFile use this as the device to export to. + \since 1.1 \sa fileName(), setDevice() */ void QLandmarkExportRequest::setFileName(const QString &fileName) @@ -134,6 +138,7 @@ void QLandmarkExportRequest::setFileName(const QString &fileName) /*! Returns the data format for the export operation. + \since 1.1 */ QString QLandmarkExportRequest::format() const { @@ -144,6 +149,7 @@ QString QLandmarkExportRequest::format() const /*! Sets the data \a format for the export operation. + \since 1.1 */ void QLandmarkExportRequest::setFormat(const QString &format) { @@ -158,6 +164,7 @@ void QLandmarkExportRequest::setFormat(const QString &format) during the export operation. The default option is QLandmarkManager::IncludeCategoryData. + \since 1.1 */ QLandmarkManager::TransferOption QLandmarkExportRequest::transferOption() const { @@ -170,6 +177,7 @@ QLandmarkManager::TransferOption QLandmarkExportRequest::transferOption() const Sets the transfer \a option of the export request. The transfer \a option defines how categories are treated during the export operation. + \since 1.1 */ void QLandmarkExportRequest::setTransferOption(QLandmarkManager::TransferOption option) { @@ -182,6 +190,7 @@ void QLandmarkExportRequest::setTransferOption(QLandmarkManager::TransferOption Returns the list of identifiers of landmarks that will be exported. By default the list of identifiers is empty, indicating that all landmarks should be exported. + \since 1.1 */ QList<QLandmarkId> QLandmarkExportRequest::landmarkIds() const { @@ -193,6 +202,7 @@ QList<QLandmarkId> QLandmarkExportRequest::landmarkIds() const /*! Sets the landmarks to be exported by specifying a list of \a landmarkIds. + \since 1.1 */ void QLandmarkExportRequest::setLandmarkIds(const QList<QLandmarkId> &landmarkIds) { @@ -203,6 +213,6 @@ void QLandmarkExportRequest::setLandmarkIds(const QList<QLandmarkId> &landmarkId #include "moc_qlandmarkexportrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkexportrequest.h b/src/location/landmarks/qlandmarkexportrequest.h index cc2fb7c4..304b8f3b 100644 --- a/src/location/landmarks/qlandmarkexportrequest.h +++ b/src/location/landmarks/qlandmarkexportrequest.h @@ -43,9 +43,9 @@ #define QLANDMARKEXPORTREQUEST_H #include "qlandmarkabstractrequest.h" -class QIODevice; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QIODevice; class QLandmarkExportRequestPrivate; class Q_LOCATION_EXPORT QLandmarkExportRequest : public QLandmarkAbstractRequest { @@ -74,7 +74,7 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkfetchbyidrequest.cpp b/src/location/landmarks/qlandmarkfetchbyidrequest.cpp index ea5fb961..72ffb103 100644 --- a/src/location/landmarks/qlandmarkfetchbyidrequest.cpp +++ b/src/location/landmarks/qlandmarkfetchbyidrequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include "qlandmark.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkFetchByIdRequest @@ -82,6 +82,7 @@ QLandmarkFetchByIdRequest::~QLandmarkFetchByIdRequest() /*! Returns a list of identifiers of landmarks which are to be retrieved by this request. + \since 1.1 */ QList<QLandmarkId> QLandmarkFetchByIdRequest::landmarkIds() const { @@ -92,6 +93,7 @@ QList<QLandmarkId> QLandmarkFetchByIdRequest::landmarkIds() const /*! Sets the \a landmarkIds to be retrieved by this request. + \since 1.1 */ void QLandmarkFetchByIdRequest::setLandmarkIds(const QList<QLandmarkId> &landmarkIds) { @@ -104,6 +106,7 @@ void QLandmarkFetchByIdRequest::setLandmarkIds(const QList<QLandmarkId> &landmar Convenience function that sets a single landmark, specified by \a landmarkId, to be retrieved by this request. + \since 1.1 */ void QLandmarkFetchByIdRequest::setLandmarkId(const QLandmarkId &landmarkId) { @@ -116,6 +119,7 @@ void QLandmarkFetchByIdRequest::setLandmarkId(const QLandmarkId &landmarkId) /*! Returns the list of landmarks fetched by this request. + \since 1.1 */ QList<QLandmark> QLandmarkFetchByIdRequest::landmarks() const { @@ -127,6 +131,7 @@ QList<QLandmark> QLandmarkFetchByIdRequest::landmarks() const /*! Returns the mapping of input landmark ID list indices to the errors which occurred. + \since 1.1 */ QMap<int, QLandmarkManager::Error> QLandmarkFetchByIdRequest::errorMap() const { @@ -137,4 +142,4 @@ QMap<int, QLandmarkManager::Error> QLandmarkFetchByIdRequest::errorMap() const #include "moc_qlandmarkfetchbyidrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkfetchbyidrequest.h b/src/location/landmarks/qlandmarkfetchbyidrequest.h index 1e700ca9..aa28ecbd 100644 --- a/src/location/landmarks/qlandmarkfetchbyidrequest.h +++ b/src/location/landmarks/qlandmarkfetchbyidrequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkFetchByIdRequestPrivate; class Q_LOCATION_EXPORT QLandmarkFetchByIdRequest : public QLandmarkAbstractRequest @@ -66,6 +66,6 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkfetchrequest.cpp b/src/location/landmarks/qlandmarkfetchrequest.cpp index 04509284..9732db69 100644 --- a/src/location/landmarks/qlandmarkfetchrequest.cpp +++ b/src/location/landmarks/qlandmarkfetchrequest.cpp @@ -46,7 +46,7 @@ #include "qlandmarksortorder.h" #include "qlandmark.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkFetchRequest @@ -86,6 +86,7 @@ QLandmarkFetchRequest::~QLandmarkFetchRequest() By default, the filter's type will be a QLandmarkFilter::DefaultFilter and thus match all landmarks. + \since 1.1 */ QLandmarkFilter QLandmarkFetchRequest::filter() const { @@ -96,6 +97,7 @@ QLandmarkFilter QLandmarkFetchRequest::filter() const /*! Sets the \a filter which will be used to select landmarks. + \since 1.1 */ void QLandmarkFetchRequest::setFilter(const QLandmarkFilter &filter) { @@ -107,6 +109,7 @@ void QLandmarkFetchRequest::setFilter(const QLandmarkFilter &filter) /*! Returns the sort ordering which is used to sort the result. By default the sort order list is empty, thus no sorting will take place. + \since 1.1 */ QList<QLandmarkSortOrder> QLandmarkFetchRequest::sorting() const { @@ -119,6 +122,7 @@ QList<QLandmarkSortOrder> QLandmarkFetchRequest::sorting() const Sets the sort ordering of the request to \a sorting. This function will only have an effect on the results if invoked prior to calling \l QLandmarkAbstractRequest::start(). + \since 1.1 */ void QLandmarkFetchRequest::setSorting(const QList<QLandmarkSortOrder> &sorting) { @@ -131,6 +135,7 @@ void QLandmarkFetchRequest::setSorting(const QList<QLandmarkSortOrder> &sorting) Convenience function which sets the sort ordering of the request to a single \a sorting. This function will only have an effect on results if invoked prior to calling \l QLandmarkAbstractRequest::start(). + \since 1.1 */ void QLandmarkFetchRequest::setSorting(const QLandmarkSortOrder &sorting) { @@ -143,6 +148,7 @@ void QLandmarkFetchRequest::setSorting(const QLandmarkSortOrder &sorting) /*! Returns the maximum number of landmarks to be returned. By default the limit is -1 indicating that all landmarks matching the filter sould be retrieved. + \since 1.1 */ int QLandmarkFetchRequest::limit() const { @@ -157,6 +163,7 @@ int QLandmarkFetchRequest::limit() const A limit of -1 will retrieve all landmarks that match the filter. (A limit of 0 will retrieve no landmarks.) + \since 1.1 */ void QLandmarkFetchRequest::setLimit(int limit) { @@ -173,6 +180,7 @@ void QLandmarkFetchRequest::setLimit(int limit) For example, if there are 10 landmarks in the landmark store, setting the offset to 2 and limit to 5 will retrieve the 3rd to 7th landmarks inclusively. (The order of the landmarks is specified by the sorting field). + \since 1.1 */ int QLandmarkFetchRequest::offset() const { @@ -183,6 +191,7 @@ int QLandmarkFetchRequest::offset() const /*! Sets the index \a offset for the request. + \since 1.1 */ void QLandmarkFetchRequest::setOffset(int offset) { Q_D(QLandmarkFetchRequest); @@ -193,6 +202,7 @@ void QLandmarkFetchRequest::setOffset(int offset) { /*! Returns the list of landmarks which matched the filter. + \since 1.1 */ QList<QLandmark> QLandmarkFetchRequest::landmarks() const { @@ -203,4 +213,4 @@ QList<QLandmark> QLandmarkFetchRequest::landmarks() const #include "moc_qlandmarkfetchrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkfetchrequest.h b/src/location/landmarks/qlandmarkfetchrequest.h index 64c630b2..b7b253ad 100644 --- a/src/location/landmarks/qlandmarkfetchrequest.h +++ b/src/location/landmarks/qlandmarkfetchrequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkFetchRequestPrivate; class Q_LOCATION_EXPORT QLandmarkFetchRequest : public QLandmarkAbstractRequest @@ -74,6 +74,6 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkfilter.cpp b/src/location/landmarks/qlandmarkfilter.cpp index d25fc7a0..ce2f7816 100644 --- a/src/location/landmarks/qlandmarkfilter.cpp +++ b/src/location/landmarks/qlandmarkfilter.cpp @@ -50,13 +50,13 @@ #include "qgeocoordinate.h" #if !defined(Q_CC_MWERKS) -template<> QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone() +template<> QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone() { return d->clone(); } #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QLandmarkFilterPrivate::QLandmarkFilterPrivate() : QSharedData(), @@ -140,6 +140,7 @@ QLandmarkFilter::QLandmarkFilter(QLandmarkFilterPrivate *dd) /*! Constructs a copy of \a other. + \since 1.1 */ QLandmarkFilter::QLandmarkFilter(const QLandmarkFilter &other) : d_ptr(other.d_ptr) @@ -148,6 +149,7 @@ QLandmarkFilter::QLandmarkFilter(const QLandmarkFilter &other) /*! Assigns \a other to this filter and returns a reference to this filter. + \since 1.1 */ QLandmarkFilter &QLandmarkFilter::operator=(const QLandmarkFilter & other) { @@ -166,6 +168,7 @@ QLandmarkFilter::~QLandmarkFilter() /*! Returns the type of the filter. + \since 1.1 */ QLandmarkFilter::FilterType QLandmarkFilter::type() const { @@ -176,11 +179,13 @@ QLandmarkFilter::FilterType QLandmarkFilter::type() const \fn QLandmarkFilter::operator!=(const QLandmarkFilter &other) const Returns true if this filter is not identical to \a other. + \since 1.1 \sa operator==() */ /*! Returns true if the filter has the same type and criteria as \a other. + \since 1.1 \sa operator!=() */ bool QLandmarkFilter::operator==(const QLandmarkFilter& other) const @@ -196,6 +201,7 @@ bool QLandmarkFilter::operator==(const QLandmarkFilter& other) const /*! \relates QLandmarkFilter Returns a filter which is the intersection of the \a left and \a right filters + \since 1.1 \sa QLandmarkIntersectionFilter */ const QLandmarkFilter operator&(const QLandmarkFilter &left, const QLandmarkFilter &right) @@ -212,6 +218,7 @@ const QLandmarkFilter operator&(const QLandmarkFilter &left, const QLandmarkFilt /*! \relates QLandmarkFilter Returns a filter which is the union of the \a left and \a right filters + \since 1.1 \sa QLandmarkUnionFilter */ const QLandmarkFilter operator|(const QLandmarkFilter &left, const QLandmarkFilter &right) @@ -224,4 +231,4 @@ const QLandmarkFilter operator|(const QLandmarkFilter &left, const QLandmarkFilt return nuf; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkfilter.h b/src/location/landmarks/qlandmarkfilter.h index d2ab2922..94ecdf56 100644 --- a/src/location/landmarks/qlandmarkfilter.h +++ b/src/location/landmarks/qlandmarkfilter.h @@ -46,7 +46,7 @@ #include <QSharedData> #include <Qt> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #define Q_DECLARE_LANDMARKFILTER_PRIVATE(Class) \ inline Class##Private* d_func(); \ @@ -100,9 +100,10 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QLandmarkFilter::MatchFlags); const Q_LOCATION_EXPORT QLandmarkFilter operator&(const QLandmarkFilter &left, const QLandmarkFilter &right); const Q_LOCATION_EXPORT QLandmarkFilter operator|(const QLandmarkFilter &left, const QLandmarkFilter &right); -QTM_END_NAMESPACE +Q_DECLARE_TYPEINFO(QLandmarkFilter, Q_MOVABLE_TYPE); + +QT_END_NAMESPACE -Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkFilter), Q_MOVABLE_TYPE); #endif diff --git a/src/location/landmarks/qlandmarkfilter_p.h b/src/location/landmarks/qlandmarkfilter_p.h index ad9b8949..a47711f3 100644 --- a/src/location/landmarks/qlandmarkfilter_p.h +++ b/src/location/landmarks/qlandmarkfilter_p.h @@ -71,7 +71,7 @@ d_ptr = new Class##Private(); \ } -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkFilterPrivate : public QSharedData { public: @@ -91,19 +91,19 @@ public: QLandmarkFilter::FilterType type; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_BEGIN_NAMESPACE #if defined(Q_CC_MWERKS) // This results in multiple symbol definition errors on all other compilers // but not having a definition here results in an attempt to use the unspecialized // clone (which fails because of the pure virtuals above) -template<> QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone() +template<> QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone() { return d->clone(); } #else -template<> QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone(); +template<> QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone(); #endif QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkid.cpp b/src/location/landmarks/qlandmarkid.cpp index 7ff3c8e5..f9efcd98 100644 --- a/src/location/landmarks/qlandmarkid.cpp +++ b/src/location/landmarks/qlandmarkid.cpp @@ -43,7 +43,8 @@ #include "qlandmarkid_p.h" #include <QString> -QTM_USE_NAMESPACE + +QT_BEGIN_NAMESPACE /*! \class QLandmarkId @@ -73,6 +74,7 @@ QLandmarkId::QLandmarkId() /*! Constructs a copy of \a other. + \since 1.1 */ QLandmarkId::QLandmarkId(const QLandmarkId &other) : d(other.d) @@ -89,6 +91,7 @@ QLandmarkId::~QLandmarkId() /*! Returns true if the identifier is valid, meaning that both a manager URI and local id have been set. + \since 1.1 */ bool QLandmarkId::isValid() const { @@ -99,6 +102,7 @@ bool QLandmarkId::isValid() const Returns the local id of the landmark identifier. This id is specific to a particular landmark manager. + \since 1.1 */ QString QLandmarkId::localId() const { @@ -107,6 +111,7 @@ QString QLandmarkId::localId() const /*! Sets the local \a id of the landmark identifier. + \since 1.1 */ void QLandmarkId::setLocalId(const QString &id) { @@ -116,6 +121,7 @@ void QLandmarkId::setLocalId(const QString &id) /*! Returns the URI of the manager which this landmark identifer belongs to. + \since 1.1 */ QString QLandmarkId::managerUri() const { @@ -125,6 +131,7 @@ QString QLandmarkId::managerUri() const /*! Sets the manager \a uri which this landmark identifier belongs to. + \since 1.1 */ void QLandmarkId::setManagerUri(const QString &uri) { @@ -134,6 +141,7 @@ void QLandmarkId::setManagerUri(const QString &uri) /*! Assigns \a other to this landmark identifier and returns a reference to this landmark identifier. + \since 1.1 */ QLandmarkId &QLandmarkId::operator=(const QLandmarkId & other) { @@ -149,6 +157,7 @@ QLandmarkId &QLandmarkId::operator=(const QLandmarkId & other) Two QLandmarkIds are considered equal if both have the same manager URI and local id. + \since 1.1 \sa operator!=() */ bool QLandmarkId::operator==(const QLandmarkId &other) const @@ -164,6 +173,7 @@ bool QLandmarkId::operator==(const QLandmarkId &other) const If either the manager URIs or local ids differ, then the QLandmarkIds are not considered equal. + \since 1.1 \sa operator==() */ bool QLandmarkId::operator!=(const QLandmarkId &other) const @@ -172,3 +182,4 @@ bool QLandmarkId::operator!=(const QLandmarkId &other) const } +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkid.h b/src/location/landmarks/qlandmarkid.h index 75aba4f8..a42e3e85 100644 --- a/src/location/landmarks/qlandmarkid.h +++ b/src/location/landmarks/qlandmarkid.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIdPrivate; class Q_LOCATION_EXPORT QLandmarkId @@ -72,12 +72,12 @@ private: QSharedDataPointer<QLandmarkIdPrivate> d; }; -QTM_END_NAMESPACE +Q_DECLARE_TYPEINFO(QLandmarkId, Q_MOVABLE_TYPE); -QT_END_HEADER +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkId)) +Q_DECLARE_METATYPE(QLandmarkId) -Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkId), Q_MOVABLE_TYPE); +QT_END_HEADER #endif diff --git a/src/location/landmarks/qlandmarkid_p.h b/src/location/landmarks/qlandmarkid_p.h index 7f5c1fff..4baa5240 100644 --- a/src/location/landmarks/qlandmarkid_p.h +++ b/src/location/landmarks/qlandmarkid_p.h @@ -56,7 +56,7 @@ #include "qmobilityglobal.h" #include <QSharedData> #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIdPrivate : public QSharedData { @@ -81,6 +81,6 @@ public: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkidfetchrequest.cpp b/src/location/landmarks/qlandmarkidfetchrequest.cpp index bfbf0c77..0a1040d4 100644 --- a/src/location/landmarks/qlandmarkidfetchrequest.cpp +++ b/src/location/landmarks/qlandmarkidfetchrequest.cpp @@ -45,7 +45,7 @@ #include "qlandmarkrequests_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkIdFetchRequest @@ -86,6 +86,7 @@ QLandmarkIdFetchRequest::~QLandmarkIdFetchRequest() By default, the filter's type will be a QLandmarkFilter::DefaultFilter and thus match all landmarks. + \since 1.1 */ QLandmarkFilter QLandmarkIdFetchRequest::filter() const { @@ -97,6 +98,7 @@ QLandmarkFilter QLandmarkIdFetchRequest::filter() const /*! Sets the \a filter which will be used to select landmark identifiers. + \since 1.1 */ void QLandmarkIdFetchRequest::setFilter(const QLandmarkFilter &filter) { @@ -108,6 +110,7 @@ void QLandmarkIdFetchRequest::setFilter(const QLandmarkFilter &filter) /*! Returns the sort ordering which is used to sort the result. By default the sort order list is empty, thus no sorting will take place. + \since 1.1 */ QList<QLandmarkSortOrder> QLandmarkIdFetchRequest::sorting() const { @@ -120,6 +123,7 @@ QList<QLandmarkSortOrder> QLandmarkIdFetchRequest::sorting() const Sets the sort ordering of the request to \a sorting. This function will only have an effect on the results if invoked prior to calling QLandmarkAbstractRequest::start(). + \since 1.1 */ void QLandmarkIdFetchRequest::setSorting(const QList<QLandmarkSortOrder> &sorting) { @@ -132,6 +136,7 @@ void QLandmarkIdFetchRequest::setSorting(const QList<QLandmarkSortOrder> &sortin Convenience function to set the sort ordering of the request to a single \a sorting. This function will only have an effect on the results if invoked prior to calling QLandmarkAbstractRequest::start(). + \since 1.1 */ void QLandmarkIdFetchRequest::setSorting(const QLandmarkSortOrder &sorting) { @@ -144,6 +149,7 @@ void QLandmarkIdFetchRequest::setSorting(const QLandmarkSortOrder &sorting) /*! Returns the maximum number of landmark IDs to be returned. By default the limit is set to -1 indicating that IDs of all landmarks are to be retrieved. + \since 1.1 */ int QLandmarkIdFetchRequest::limit() const { @@ -158,6 +164,7 @@ int QLandmarkIdFetchRequest::limit() const A limit of -1 indicates that IDs of all landmarks are to be retrieved. (A limit of 0 will retrieve no landmark IDs.) + \since 1.1 */ void QLandmarkIdFetchRequest::setLimit(int limit) { @@ -174,6 +181,7 @@ void QLandmarkIdFetchRequest::setLimit(int limit) For example, if there are 10 landmarks in the landmark store, setting the offset to 2 and limit to 5 will retrieve the 3rd and 7th landmark ids inclusively. (The order of the landmark ids is sepecified by the sorting field). + \since 1.1 */ int QLandmarkIdFetchRequest::offset() const { @@ -184,6 +192,7 @@ int QLandmarkIdFetchRequest::offset() const /*! Sets the index \a offset for the request. + \since 1.1 */ void QLandmarkIdFetchRequest::setOffset(int offset) { Q_D(QLandmarkIdFetchRequest); @@ -194,6 +203,7 @@ void QLandmarkIdFetchRequest::setOffset(int offset) { /*! Returns the list of identifiers of landmarks which matched the filter. + \since 1.1 */ QList<QLandmarkId> QLandmarkIdFetchRequest::landmarkIds() const { @@ -204,7 +214,7 @@ QList<QLandmarkId> QLandmarkIdFetchRequest::landmarkIds() const #include "moc_qlandmarkidfetchrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkidfetchrequest.h b/src/location/landmarks/qlandmarkidfetchrequest.h index 91f380ac..d76b66c0 100644 --- a/src/location/landmarks/qlandmarkidfetchrequest.h +++ b/src/location/landmarks/qlandmarkidfetchrequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIdFetchRequestPrivate; class Q_LOCATION_EXPORT QLandmarkIdFetchRequest : public QLandmarkAbstractRequest @@ -75,6 +75,6 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkidfilter.cpp b/src/location/landmarks/qlandmarkidfilter.cpp index 6e4760f1..b93c0cc7 100644 --- a/src/location/landmarks/qlandmarkidfilter.cpp +++ b/src/location/landmarks/qlandmarkidfilter.cpp @@ -42,7 +42,7 @@ #include "qlandmarkidfilter.h" #include "qlandmarkidfilter_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkIdFilter @@ -59,6 +59,7 @@ Q_IMPLEMENT_LANDMARKFILTER_PRIVATE(QLandmarkIdFilter) /*! Creates a filter that selects landmarks using a list of landmark \a ids. + \since 1.1 */ QLandmarkIdFilter::QLandmarkIdFilter(const QList<QLandmarkId> &ids) : QLandmarkFilter(new QLandmarkIdFilterPrivate(ids)) {} @@ -66,6 +67,7 @@ QLandmarkIdFilter::QLandmarkIdFilter(const QList<QLandmarkId> &ids) /*! \fn QLandmarkIdFilter::QLandmarkIdFilter(const QLandmarkFilter &other) Constructs a copy of \a other if possible, otherwise constructs a new id filter. + \since 1.1 */ /*! @@ -78,6 +80,7 @@ QLandmarkIdFilter::~QLandmarkIdFilter() /*! Returns the list of landmark identifiers that the filter will use to determine matches. + \since 1.1 */ QList<QLandmarkId> QLandmarkIdFilter::landmarkIds() const { @@ -87,6 +90,7 @@ QList<QLandmarkId> QLandmarkIdFilter::landmarkIds() const /*! Sets the \a ids that the filter will use to determine matches. + \since 1.1 */ void QLandmarkIdFilter::setLandmarkIds(const QList<QLandmarkId> &ids) { @@ -96,6 +100,7 @@ void QLandmarkIdFilter::setLandmarkIds(const QList<QLandmarkId> &ids) /*! Adds \a id to the list of landmark ids this filter searches for. + \since 1.1 */ void QLandmarkIdFilter::append(const QLandmarkId &id) { @@ -105,6 +110,7 @@ void QLandmarkIdFilter::append(const QLandmarkId &id) /*! Removes \a id to the list of landmark ids this filter searches for. + \since 1.1 */ void QLandmarkIdFilter::remove(const QLandmarkId &id) { @@ -114,6 +120,7 @@ void QLandmarkIdFilter::remove(const QLandmarkId &id) /*! Removes all identifiers from the filter. + \since 1.1 */ void QLandmarkIdFilter::clear() { @@ -124,6 +131,7 @@ void QLandmarkIdFilter::clear() /*! Appends the given \a id to the list of landmark identifiers this filter searches for. + \since 1.1 */ QLandmarkIdFilter &QLandmarkIdFilter::operator<<(const QLandmarkId &id) { @@ -150,4 +158,4 @@ QLandmarkIdFilterPrivate::QLandmarkIdFilterPrivate(const QLandmarkIdFilterPrivat QLandmarkIdFilterPrivate::~QLandmarkIdFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkidfilter.h b/src/location/landmarks/qlandmarkidfilter.h index 9e1ab8fa..c7f8e978 100644 --- a/src/location/landmarks/qlandmarkidfilter.h +++ b/src/location/landmarks/qlandmarkidfilter.h @@ -46,7 +46,7 @@ #include "qlandmarkfilter.h" #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIdFilterPrivate; class Q_LOCATION_EXPORT QLandmarkIdFilter : public QLandmarkFilter @@ -68,6 +68,6 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkIdFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkidfilter_p.h b/src/location/landmarks/qlandmarkidfilter_p.h index c96c2d0c..190e366a 100644 --- a/src/location/landmarks/qlandmarkidfilter_p.h +++ b/src/location/landmarks/qlandmarkidfilter_p.h @@ -57,7 +57,7 @@ #include "qlandmarkid.h" #include "qlandmarkidfilter.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIdFilterPrivate : public QLandmarkFilterPrivate { @@ -77,6 +77,6 @@ public: QList<QLandmarkId> landmarkIds; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkimportrequest.cpp b/src/location/landmarks/qlandmarkimportrequest.cpp index 83a5e056..6dd51b0c 100644 --- a/src/location/landmarks/qlandmarkimportrequest.cpp +++ b/src/location/landmarks/qlandmarkimportrequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include <QFile> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkImportRequest @@ -84,6 +84,7 @@ QLandmarkImportRequest::~QLandmarkImportRequest() /*! Returns the device from which landmarks are read. + \since 1.1 */ QIODevice *QLandmarkImportRequest::device() const { @@ -94,6 +95,7 @@ QIODevice *QLandmarkImportRequest::device() const /*! Sets the \a device from which landmarks are read. + \since 1.1 */ void QLandmarkImportRequest::setDevice(QIODevice *device) { @@ -107,6 +109,7 @@ void QLandmarkImportRequest::setDevice(QIODevice *device) been called, this function returns the name of the file to be read from. In all other cases, it returns an empty string. + \since 1.1 \sa setFileName(), setDevice() */ QString QLandmarkImportRequest::fileName() const @@ -122,6 +125,7 @@ QString QLandmarkImportRequest::fileName() const QLandmarkImportRequest will create a QFile and use this as the device to import from. + \since 1.1 \sa fileName(), setDevice() */ void QLandmarkImportRequest::setFileName(const QString &fileName) @@ -135,6 +139,7 @@ void QLandmarkImportRequest::setFileName(const QString &fileName) Returns the expected data format for the import operation. By default no format is set, indicating that the manager will try to automatically detect the format of the import file. + \since 1.1 */ QString QLandmarkImportRequest::format() const { @@ -147,6 +152,7 @@ QString QLandmarkImportRequest::format() const Sets the expected data \a format for the import operation. If an empty string is set, then during the import, an attempt is made to auto detect the format. + \since 1.1 */ void QLandmarkImportRequest::setFormat(const QString &format) { @@ -161,6 +167,7 @@ void QLandmarkImportRequest::setFormat(const QString &format) during the import operation. The default option is QLandmarkManager::IncludeCategoryData. + \since 1.1 */ QLandmarkManager::TransferOption QLandmarkImportRequest::transferOption() const { @@ -173,6 +180,7 @@ QLandmarkManager::TransferOption QLandmarkImportRequest::transferOption() const Sets the transfer \a option of the import request. The transfer \a option defines how categories are treated during the import operation. + \since 1.1 */ void QLandmarkImportRequest::setTransferOption(QLandmarkManager::TransferOption option) { @@ -185,6 +193,7 @@ void QLandmarkImportRequest::setTransferOption(QLandmarkManager::TransferOption Returns identifier of the category which all landmarks are assigned to if QLandmarkManager::AttachSingleCategory is used as the import option. + \since 1.1 */ QLandmarkCategoryId QLandmarkImportRequest::categoryId() const { @@ -197,6 +206,7 @@ QLandmarkCategoryId QLandmarkImportRequest::categoryId() const Sets the identifier of the category to which all landmarks are assigned to, if QLandmarkManager::AttachSingleCategory is used as the import option, to \a categoryId. + \since 1.1 */ void QLandmarkImportRequest::setCategoryId(const QLandmarkCategoryId &categoryId) { @@ -207,6 +217,7 @@ void QLandmarkImportRequest::setCategoryId(const QLandmarkCategoryId &categoryId /*! Returns a list of identifiers of landmarks that have been imported. + \since 1.1 */ QList<QLandmarkId> QLandmarkImportRequest::landmarkIds() const { @@ -217,6 +228,6 @@ QList<QLandmarkId> QLandmarkImportRequest::landmarkIds() const #include "moc_qlandmarkimportrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkimportrequest.h b/src/location/landmarks/qlandmarkimportrequest.h index a2efd704..b4cb7058 100644 --- a/src/location/landmarks/qlandmarkimportrequest.h +++ b/src/location/landmarks/qlandmarkimportrequest.h @@ -43,9 +43,9 @@ #define QLANDMARKIMPORTREQUEST_H #include "qlandmarkabstractrequest.h" -class QIODevice; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QIODevice; class QLandmarkImportRequestPrivate; class Q_LOCATION_EXPORT QLandmarkImportRequest : public QLandmarkAbstractRequest { @@ -76,7 +76,7 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkintersectionfilter.cpp b/src/location/landmarks/qlandmarkintersectionfilter.cpp index 579a9139..7e03790d 100644 --- a/src/location/landmarks/qlandmarkintersectionfilter.cpp +++ b/src/location/landmarks/qlandmarkintersectionfilter.cpp @@ -42,7 +42,7 @@ #include "qlandmarkintersectionfilter.h" #include "qlandmarkintersectionfilter_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkIntersectionFilter @@ -79,6 +79,7 @@ QLandmarkIntersectionFilter::QLandmarkIntersectionFilter() /*! \fn QLandmarkIntersectionFilter::QLandmarkIntersectionFilter(const QLandmarkFilter &other) Constructs a copy of \a other if possible, otherwise constructs a new intersection filter. + \since 1.1 */ /*! @@ -91,6 +92,7 @@ QLandmarkIntersectionFilter::~QLandmarkIntersectionFilter() /*! Sets the \a filters whose criteria will be intersected. + \since 1.1 \sa filters() */ void QLandmarkIntersectionFilter::setFilters(const QList<QLandmarkFilter> &filters) @@ -101,6 +103,7 @@ void QLandmarkIntersectionFilter::setFilters(const QList<QLandmarkFilter> &filte /*! Prepends the given \a filter to the list of intersected filters + \since 1.1 \sa append(), filters() */ void QLandmarkIntersectionFilter::prepend(const QLandmarkFilter &filter) @@ -111,6 +114,7 @@ void QLandmarkIntersectionFilter::prepend(const QLandmarkFilter &filter) /*! Appends the given \a filter to the list of intersected filters + \since 1.1 \sa operator<<(), prepend(), filters() */ void QLandmarkIntersectionFilter::append(const QLandmarkFilter &filter) @@ -121,6 +125,7 @@ void QLandmarkIntersectionFilter::append(const QLandmarkFilter &filter) /*! Removes the given \a filter from the list of intersected filters. + \since 1.1 \sa filters(), append(), prepend() */ void QLandmarkIntersectionFilter::remove(const QLandmarkFilter &filter) @@ -131,6 +136,7 @@ void QLandmarkIntersectionFilter::remove(const QLandmarkFilter &filter) /*! Removes all filters from the list of intersected filters. + \since 1.1 */ void QLandmarkIntersectionFilter::clear() { @@ -140,6 +146,7 @@ void QLandmarkIntersectionFilter::clear() /*! Appends the given \a filter to the list of intersected filters + \since 1.1 \sa append() */ QLandmarkIntersectionFilter& QLandmarkIntersectionFilter::operator<<(const QLandmarkFilter &filter) @@ -151,6 +158,7 @@ QLandmarkIntersectionFilter& QLandmarkIntersectionFilter::operator<<(const QLand /*! Returns the list of filters which form the intersection filter + \since 1.1 \sa setFilters(), prepend(), append(), remove() */ QList<QLandmarkFilter> QLandmarkIntersectionFilter::filters() const @@ -173,4 +181,4 @@ QLandmarkIntersectionFilterPrivate::QLandmarkIntersectionFilterPrivate(const QLa QLandmarkIntersectionFilterPrivate::~QLandmarkIntersectionFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkintersectionfilter.h b/src/location/landmarks/qlandmarkintersectionfilter.h index bdb3b288..f57fb7af 100644 --- a/src/location/landmarks/qlandmarkintersectionfilter.h +++ b/src/location/landmarks/qlandmarkintersectionfilter.h @@ -45,7 +45,7 @@ #include "qlandmarkfilter.h" #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIntersectionFilterPrivate; class Q_LOCATION_EXPORT QLandmarkIntersectionFilter : public QLandmarkFilter @@ -69,6 +69,6 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkIntersectionFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkintersectionfilter_p.h b/src/location/landmarks/qlandmarkintersectionfilter_p.h index 95a6690d..f6659921 100644 --- a/src/location/landmarks/qlandmarkintersectionfilter_p.h +++ b/src/location/landmarks/qlandmarkintersectionfilter_p.h @@ -57,7 +57,7 @@ #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIntersectionFilterPrivate : public QLandmarkFilterPrivate { @@ -77,6 +77,6 @@ public: QList<QLandmarkFilter> filters; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkmanager.cpp b/src/location/landmarks/qlandmarkmanager.cpp index 45e8796c..11499a92 100644 --- a/src/location/landmarks/qlandmarkmanager.cpp +++ b/src/location/landmarks/qlandmarkmanager.cpp @@ -56,7 +56,8 @@ #include "qlandmarkmanagerenginefactory.h" #include "qlandmarkidfilter.h" -QTM_USE_NAMESPACE + +QT_BEGIN_NAMESPACE /*! \variable QLandmarkManager::Gpx @@ -90,6 +91,7 @@ Q_DEFINE_LATIN1_CONSTANT(QLandmarkManager::Kmz, "Kmz"); \class QLandmarkManager \brief The QLandmarkManager class provides an interface for storage and retrieval of landmarks from a landmark store. + \since 1.1 \inmodule QtLocation @@ -228,11 +230,11 @@ QLandmarkManager::QLandmarkManager(QObject *parent) QString managerName; #ifdef Q_OS_SYMBIAN - managerName = "com.nokia.qt.landmarks.engines.symbian"; + managerName = QLatin1String("com.nokia.qt.landmarks.engines.symbian"); #elif defined(Q_WS_MAEMO_6) || defined(Q_WS_MEEGO) - managerName = "com.nokia.qt.landmarks.engines.qsparql"; + managerName = QLatin1String("com.nokia.qt.landmarks.engines.qsparql"); #else - managerName = "com.nokia.qt.landmarks.engines.sqlite"; + managerName = QLatin1String("com.nokia.qt.landmarks.engines.sqlite"); #endif d->createEngine(managerName); @@ -286,6 +288,7 @@ QLandmarkManager::~QLandmarkManager() Returns false on failure or true on success. On successful save of a landmark with an empty id, it will be assigned a valid id and have its manager URI set to the URI of this manager. + \since 1.1 */ bool QLandmarkManager::saveLandmark(QLandmark *landmark) { @@ -296,7 +299,7 @@ bool QLandmarkManager::saveLandmark(QLandmark *landmark) } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->saveLandmark(landmark, @@ -316,6 +319,7 @@ bool QLandmarkManager::saveLandmark(QLandmark *landmark) For each new landmark that was successfully saved, a landmark identifier is assigned to that landmark. + \since 1.1 */ bool QLandmarkManager::saveLandmarks(QList<QLandmark> *landmarks) { @@ -326,7 +330,7 @@ bool QLandmarkManager::saveLandmarks(QList<QLandmark> *landmarks) } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->saveLandmarks(landmarks, @@ -340,6 +344,7 @@ bool QLandmarkManager::saveLandmarks(QList<QLandmark> *landmarks) Returns true if the landmark was removed successfully, otherwise returnse false. + \since 1.1 */ bool QLandmarkManager::removeLandmark(const QLandmarkId &landmarkId) { @@ -350,7 +355,7 @@ bool QLandmarkManager::removeLandmark(const QLandmarkId &landmarkId) } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->removeLandmark(landmarkId, @@ -364,6 +369,7 @@ bool QLandmarkManager::removeLandmark(const QLandmarkId &landmarkId) Returns true if the landmark was removed successfully, otherwise returns false. + \since 1.1 */ bool QLandmarkManager::removeLandmark(const QLandmark &landmark) { @@ -374,7 +380,7 @@ bool QLandmarkManager::removeLandmark(const QLandmark &landmark) } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->removeLandmark(landmark.landmarkId(), @@ -393,6 +399,7 @@ bool QLandmarkManager::removeLandmark(const QLandmark &landmark) The QLandmarkManager::error() function will only return \c QLandmarkManager::NoError if all landmarks were removed successfully. + \since 1.1 \sa QLandmarkManager::removeLandmark() */ bool QLandmarkManager::removeLandmarks(const QList<QLandmarkId> &landmarkIds) @@ -404,7 +411,7 @@ bool QLandmarkManager::removeLandmarks(const QList<QLandmarkId> &landmarkIds) } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); @@ -426,6 +433,7 @@ bool QLandmarkManager::removeLandmarks(const QList<QLandmarkId> &landmarkIds) + \since 1.1 \sa QLandmarkManager::removeLandmark() */ bool QLandmarkManager::removeLandmarks(const QList<QLandmark> &landmarks) @@ -437,7 +445,7 @@ bool QLandmarkManager::removeLandmarks(const QList<QLandmark> &landmarks) } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); QList<QLandmarkId> landmarkIds; @@ -471,6 +479,7 @@ bool QLandmarkManager::removeLandmarks(const QList<QLandmark> &landmarks) Returns false on failure or true on success. On successful save of a category with an invalid id, it will be assigned a valid id and have its manager URI set to the URI of this manager. + \since 1.1 */ bool QLandmarkManager::saveCategory(QLandmarkCategory *category) { @@ -481,7 +490,7 @@ bool QLandmarkManager::saveCategory(QLandmarkCategory *category) } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->saveCategory(category, @@ -493,7 +502,8 @@ bool QLandmarkManager::saveCategory(QLandmarkCategory *category) Remove the category identified by \a categoryId from the database. Returns true if the category was removed successfully, otherwise - returnse false. + returns false. + \since 1.1 */ bool QLandmarkManager::removeCategory(const QLandmarkCategoryId &categoryId) { @@ -504,7 +514,7 @@ bool QLandmarkManager::removeCategory(const QLandmarkCategoryId &categoryId) } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->removeCategory(categoryId, @@ -516,7 +526,8 @@ bool QLandmarkManager::removeCategory(const QLandmarkCategoryId &categoryId) Remove the given \a category from the database Returns true if the category was removed successfully, otherwise - returnse false. + returns false. + \since 1.1 */ bool QLandmarkManager::removeCategory(const QLandmarkCategory &category) { @@ -527,7 +538,7 @@ bool QLandmarkManager::removeCategory(const QLandmarkCategory &category) } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->removeCategory(category.categoryId(), @@ -537,6 +548,7 @@ bool QLandmarkManager::removeCategory(const QLandmarkCategory &category) /*! Returns the cateory in the database identified by \a categoryId. + \since 1.1 */ QLandmarkCategory QLandmarkManager::category(const QLandmarkCategoryId &categoryId) const { @@ -547,7 +559,7 @@ QLandmarkCategory QLandmarkManager::category(const QLandmarkCategoryId &category } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); QLandmarkCategory cat = d->engine->category(categoryId, @@ -567,6 +579,7 @@ QLandmarkCategory QLandmarkManager::category(const QLandmarkCategoryId &category The QLandmarkManager::error() function will only return \c QLandmarkManager::NoError if all categories were successfully retrieved. + \since 1.1 */ QList<QLandmarkCategory> QLandmarkManager::categories(const QList<QLandmarkCategoryId> &categoryIds) const { @@ -577,7 +590,7 @@ QList<QLandmarkCategory> QLandmarkManager::categories(const QList<QLandmarkCateg } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); QList<QLandmarkCategory> cats = d->engine->categories(categoryIds, @@ -594,6 +607,7 @@ QList<QLandmarkCategory> QLandmarkManager::categories(const QList<QLandmarkCateg A \a limit of -1 means all categories should be returned(a limit of 0 means zero categories are returned). The categories are returned in the order as designated by \a nameSort. + \since 1.1 */ QList<QLandmarkCategory> QLandmarkManager::categories(int limit, int offset, const QLandmarkNameSort &nameSort) const { @@ -604,7 +618,7 @@ QList<QLandmarkCategory> QLandmarkManager::categories(int limit, int offset, con } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); QList<QLandmarkCategory> cats = d->engine->categories(limit, offset, nameSort, @@ -623,6 +637,7 @@ QList<QLandmarkCategory> QLandmarkManager::categories(int limit, int offset, con of the first id. A \a limit of -1 means ids for all categories should be returned. The identifiers are returned in order as designed by \a nameSort. Note that a limit of 0 will return zero category ids. + \since 1.1 */ QList<QLandmarkCategoryId> QLandmarkManager::categoryIds(int limit, int offset, const QLandmarkNameSort &nameSort) const { @@ -633,7 +648,7 @@ QList<QLandmarkCategoryId> QLandmarkManager::categoryIds(int limit, int offset, } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); QList<QLandmarkCategoryId> ids = d->engine->categoryIds(limit, offset, nameSort, @@ -648,6 +663,7 @@ QList<QLandmarkCategoryId> QLandmarkManager::categoryIds(int limit, int offset, /*! Returns the landmark in the database identified by \a landmarkId + \since 1.1 */ QLandmark QLandmarkManager::landmark(const QLandmarkId &landmarkId) const { @@ -658,7 +674,7 @@ QLandmark QLandmarkManager::landmark(const QLandmarkId &landmarkId) const } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); QLandmark lm = d->engine->landmark(landmarkId, @@ -675,6 +691,7 @@ QLandmark QLandmarkManager::landmark(const QLandmarkId &landmarkId) const Returns a list of landmarks which match the given \a filter and are sorted according to the \a sortOrders. The \a limit defines the maximum number of landmarks to return and the \a offset defines the index offset of the first landmark. A \a limit of -1 means all matching landmarks should be returned. + \since 1.1 */ QList<QLandmark> QLandmarkManager::landmarks(const QLandmarkFilter &filter, int limit, int offset, const QList<QLandmarkSortOrder> &sortOrders) const @@ -686,7 +703,7 @@ QList<QLandmark> QLandmarkManager::landmarks(const QLandmarkFilter &filter, int } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); QList<QLandmark> lms = d->engine->landmarks(filter, @@ -707,6 +724,7 @@ QList<QLandmark> QLandmarkManager::landmarks(const QLandmarkFilter &filter, int The \a limit defines the maximum number of landmarks to return and the \a offset defines the index offset of the first landmark. A \a limit of -1 means all matching landmarks should be returned and that a limit of 0 will return zero landmarks. + \since 1.1 */ QList<QLandmark> QLandmarkManager::landmarks(const QLandmarkFilter &filter, int limit, int offset, const QLandmarkSortOrder &sortOrder) const @@ -718,7 +736,7 @@ QList<QLandmark> QLandmarkManager::landmarks(const QLandmarkFilter &filter, int } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); QList<QLandmarkSortOrder> sortOrders; @@ -746,6 +764,7 @@ QList<QLandmark> QLandmarkManager::landmarks(const QLandmarkFilter &filter, int The QLandmarkManager::error() function will only return \c QLandmarkManager::NoError if all landmarks were successfully retrieved. + \since 1.1 */ QList<QLandmark> QLandmarkManager::landmarks(const QList<QLandmarkId> &landmarkIds) const { @@ -756,7 +775,7 @@ QList<QLandmark> QLandmarkManager::landmarks(const QList<QLandmarkId> &landmarkI } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); QList<QLandmark> lms = d->engine->landmarks(landmarkIds, @@ -772,6 +791,7 @@ QList<QLandmark> QLandmarkManager::landmarks(const QList<QLandmarkId> &landmarkI \a offset defines the index offset of the first landmark id. A \a limit of -1 means that ids of all matching landmarks should be returned. Note that a limit of 0 will return zero landmark ids. + \since 1.1 */ QList<QLandmarkId> QLandmarkManager::landmarkIds(const QLandmarkFilter &filter, int limit, int offset, @@ -784,7 +804,7 @@ QList<QLandmarkId> QLandmarkManager::landmarkIds(const QLandmarkFilter &filter, } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); QList<QLandmarkId> ids = d->engine->landmarkIds(filter, @@ -808,6 +828,7 @@ QList<QLandmarkId> QLandmarkManager::landmarkIds(const QLandmarkFilter &filter, that a limit of 0 will return zero landmark ids. + \since 1.1 */ QList<QLandmarkId> QLandmarkManager::landmarkIds(const QLandmarkFilter &filter, int limit, int offset, @@ -820,7 +841,7 @@ QList<QLandmarkId> QLandmarkManager::landmarkIds(const QLandmarkFilter &filter, } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); QList<QLandmarkSortOrder> sortOrders; @@ -854,6 +875,7 @@ QList<QLandmarkId> QLandmarkManager::landmarkIds(const QLandmarkFilter &filter, Returns true if all landmarks could be imported, otherwise returns false. + \since 1.1 */ bool QLandmarkManager::importLandmarks(QIODevice *device, const QString &format, QLandmarkManager::TransferOption option, const QLandmarkCategoryId &categoryId) { @@ -864,7 +886,7 @@ bool QLandmarkManager::importLandmarks(QIODevice *device, const QString &format, } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->importLandmarks(device, @@ -890,6 +912,7 @@ bool QLandmarkManager::importLandmarks(QIODevice *device, const QString &format, Returns true if all landmarks could be imported, otherwise returns false. + \since 1.1 */ bool QLandmarkManager::importLandmarks(const QString &fileName, const QString &format, QLandmarkManager::TransferOption option, const QLandmarkCategoryId &categoryId) { @@ -912,6 +935,7 @@ bool QLandmarkManager::importLandmarks(const QString &fileName, const QString &f Returns true if all specified landmarks were successfully exported, otherwise returns false. It may be possible that only a subset of landmarks are exported. + \since 1.1 */ bool QLandmarkManager::exportLandmarks(QIODevice *device, const QString &format, const QList<QLandmarkId> &landmarkIds, QLandmarkManager::TransferOption option) const { @@ -922,7 +946,7 @@ bool QLandmarkManager::exportLandmarks(QIODevice *device, const QString &format, } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->exportLandmarks(device, @@ -948,6 +972,7 @@ bool QLandmarkManager::exportLandmarks(QIODevice *device, const QString &format, Returns true if all specified landmarks were successfully exported, otherwise returns false. It may be possible that only a subset of landmarks are exported. + \since 1.1 */ bool QLandmarkManager::exportLandmarks(const QString &fileName, const QString &format, const QList<QLandmarkId> &landmarkIds, QLandmarkManager::TransferOption option) const { @@ -958,6 +983,7 @@ bool QLandmarkManager::exportLandmarks(const QString &fileName, const QString &f /*! Returns the file formats supported for the given transfer \a operation. ie import or export. + \since 1.1 */ QStringList QLandmarkManager::supportedFormats(QLandmarkManager::TransferOperation operation) const { @@ -968,7 +994,7 @@ QStringList QLandmarkManager::supportedFormats(QLandmarkManager::TransferOperati } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->supportedFormats(operation, &(d->errorCode), &(d->errorString)); @@ -977,6 +1003,7 @@ QStringList QLandmarkManager::supportedFormats(QLandmarkManager::TransferOperati /*! Returns the error code of the most recent operation. All functions will modify the error based on whether the operation successfully or not. + \since 1.1 */ QLandmarkManager::Error QLandmarkManager::error() const { @@ -988,6 +1015,7 @@ QLandmarkManager::Error QLandmarkManager::error() const Returns a short human-readable description of the error that occurred in the most recent operation. The error string is intended to be used by developers and is not suitable for showing to end users. + \since 1.1 */ QString QLandmarkManager::errorString() const { @@ -1003,6 +1031,7 @@ The error map is only populated for indexes at which an error occurred. Eg If we saved 5 landmarks and an error occurred at index 3, the error map will have only a single key for index 3. +\since 1.1 \sa error(), categories(), landmarks(), saveLandmarks(), removeCategory(), removeLandmarks() */ QMap<int, QLandmarkManager::Error> QLandmarkManager::errorMap() const @@ -1013,6 +1042,7 @@ QMap<int, QLandmarkManager::Error> QLandmarkManager::errorMap() const /*! Returns whether the manager supports the given \a feature. + \since 1.1 */ bool QLandmarkManager::isFeatureSupported(QLandmarkManager::ManagerFeature feature) const { @@ -1023,7 +1053,7 @@ bool QLandmarkManager::isFeatureSupported(QLandmarkManager::ManagerFeature featu } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->isFeatureSupported(feature, &(d->errorCode), &(d->errorString)); @@ -1033,6 +1063,7 @@ bool QLandmarkManager::isFeatureSupported(QLandmarkManager::ManagerFeature featu Returns the support level the manager provides for the given \a filter. For the case of intersection and union filters, whether the elements will be individually processed is dependent on the particular manager implementation. + \since 1.1 */ QLandmarkManager::SupportLevel QLandmarkManager::filterSupportLevel(const QLandmarkFilter &filter) const { @@ -1043,7 +1074,7 @@ QLandmarkManager::SupportLevel QLandmarkManager::filterSupportLevel(const QLandm } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->filterSupportLevel(filter, &(d->errorCode), &(d->errorString)); @@ -1051,6 +1082,7 @@ QLandmarkManager::SupportLevel QLandmarkManager::filterSupportLevel(const QLandm /*! Returns the support level the manager provides for the given \a sortOrder. + \since 1.1 */ QLandmarkManager::SupportLevel QLandmarkManager::sortOrderSupportLevel(const QLandmarkSortOrder &sortOrder) const { @@ -1061,7 +1093,7 @@ QLandmarkManager::SupportLevel QLandmarkManager::sortOrderSupportLevel(const QLa } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->sortOrderSupportLevel(sortOrder, &(d->errorCode), &(d->errorString)); @@ -1070,6 +1102,7 @@ QLandmarkManager::SupportLevel QLandmarkManager::sortOrderSupportLevel(const QLa /*! Returns true if the manager is entirely read-only. Meaning landmarks and categories cannot be added, modified or removed. + \since 1.1 */ bool QLandmarkManager::isReadOnly() const { @@ -1079,7 +1112,7 @@ bool QLandmarkManager::isReadOnly() const } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->isReadOnly(&(d->errorCode), &(d->errorString)); @@ -1091,6 +1124,7 @@ bool QLandmarkManager::isReadOnly() const If the \a landmarkId does not refer to an existing landmark, it is considered writable unless the manager is exclusively read-only. + \since 1.1 */ bool QLandmarkManager::isReadOnly(const QLandmarkId &landmarkId) const { @@ -1100,7 +1134,7 @@ bool QLandmarkManager::isReadOnly(const QLandmarkId &landmarkId) const } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->isReadOnly(landmarkId, &(d->errorCode), &(d->errorString)); @@ -1112,6 +1146,7 @@ bool QLandmarkManager::isReadOnly(const QLandmarkId &landmarkId) const If \a categoryId does not refer to an existing category, it is considered writable unless the manager is exclusively read-only. + \since 1.1 */ bool QLandmarkManager::isReadOnly(const QLandmarkCategoryId &categoryId) const { @@ -1121,7 +1156,7 @@ bool QLandmarkManager::isReadOnly(const QLandmarkCategoryId &categoryId) const } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->isReadOnly(categoryId, &(d->errorCode), &(d->errorString)); @@ -1130,6 +1165,7 @@ bool QLandmarkManager::isReadOnly(const QLandmarkCategoryId &categoryId) const /*! Returns a list of landmark attribute keys that may be used in a QLandmarkAttributeFilter. + \since 1.1 */ QStringList QLandmarkManager::searchableLandmarkAttributeKeys() const { @@ -1139,7 +1175,7 @@ QStringList QLandmarkManager::searchableLandmarkAttributeKeys() const } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->searchableLandmarkAttributeKeys(&(d->errorCode), &(d->errorString)); @@ -1150,6 +1186,7 @@ QStringList QLandmarkManager::searchableLandmarkAttributeKeys() const The manager name usually takes the format of a reverse domain string. An example of a manager name is \c com.nokia.qt.landmarks.engines.sqlite + \since 1.1 */ QString QLandmarkManager::managerName() const { @@ -1160,7 +1197,7 @@ QString QLandmarkManager::managerName() const } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->managerName(); } @@ -1170,6 +1207,7 @@ QString QLandmarkManager::managerName() const The parameters may be viewed as a set of key-value pairs. Each manager may have a different set of parameters depending upon its backend implementation. + \since 1.1 */ QMap<QString, QString> QLandmarkManager::managerParameters() const { @@ -1180,13 +1218,14 @@ QMap<QString, QString> QLandmarkManager::managerParameters() const } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->managerParameters(); } /*! Return the uri describing this QLandmarkManager, consisting of the manager name and any parameters. + \since 1.1 */ QString QLandmarkManager::managerUri() const { @@ -1197,13 +1236,14 @@ QString QLandmarkManager::managerUri() const } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->managerUri(); } /*! Returns the engine backend implementation version number. + \since 1.1 */ int QLandmarkManager::managerVersion() const { @@ -1214,7 +1254,7 @@ int QLandmarkManager::managerVersion() const } d->errorCode = QLandmarkManager::NoError; - d->errorString = ""; + d->errorString = QLatin1String(""); d->errorMap.clear(); return d->engine->managerVersion(); } @@ -1222,6 +1262,7 @@ int QLandmarkManager::managerVersion() const /*! Returns a list of available manager names that can be used when constructing a QLandmarkManager + \since 1.1 */ QStringList QLandmarkManager::availableManagers() { @@ -1230,7 +1271,9 @@ QStringList QLandmarkManager::availableManagers() /*! Returns a URI that completely describes a manager implementation/datastore, and the parameters with which to instantiate the manager, - from the given \a managerName, \a params and an optional \a implementationVersion */ + from the given \a managerName, \a params and an optional \a implementationVersion + \since 1.1 +*/ QString QLandmarkManager::buildUri(const QString& managerName, const QMap<QString, QString>& params, int implementationVersion) { QString ret(QLatin1String("qtlandmarks:%1:%2")); @@ -1261,6 +1304,7 @@ QString QLandmarkManager::buildUri(const QString& managerName, const QMap<QStrin /*! Constructs a QLandmarkManager whose implementation, store and parameters are specified in the given \a storeUri, and whose parent object is \a parent. + \since 1.1 */ QLandmarkManager* QLandmarkManager::fromUri(const QString& storeUri, QObject* parent) { @@ -1282,6 +1326,7 @@ QLandmarkManager* QLandmarkManager::fromUri(const QString& storeUri, QObject* pa Splits the given \a uri into the manager name and parameters that it describes, and places the information into the memory addressed by \a pManagerName and \a pParams respectively. Returns true if \a uri could be split successfully, otherwise returns false + \since 1.1 */ bool QLandmarkManager::parseUri(const QString& uri, QString* pManagerName, QMap<QString, QString>* pParams) { @@ -1338,20 +1383,21 @@ bool QLandmarkManager::parseUri(const QString& uri, QString* pManagerName, QMap< /*! \internal + \since 1.1 */ void QLandmarkManager::connectNotify(const char *signal) { if (!d_ptr->isConnected) { if (d_ptr->engine) { - if (QLatin1String(signal) == SIGNAL(landmarksAdded(QList<QLandmarkId>)) - || (QLatin1String(signal) == SIGNAL(landmarksChanged(QList<QLandmarkId>))) - || (QLatin1String(signal) == SIGNAL(landmarksRemoved(QList<QLandmarkId>))) - || (QLatin1String(signal) == SIGNAL(landmarksChanged(QList<QLandmarkId>))) - || (QLatin1String(signal) == SIGNAL(categoriesAdded(QList<QLandmarkCategoryId>))) - || (QLatin1String(signal) == SIGNAL(categoriesChanged(QList<QLandmarkCategoryId>))) - || (QLatin1String(signal) == SIGNAL(categoriesRemoved(QList<QLandmarkCategoryId>))) - || (QLatin1String(signal) == SIGNAL(dataChanged()))) { + if (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksAdded(QList<QLandmarkId>))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksChanged(QList<QLandmarkId>)))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksRemoved(QList<QLandmarkId>)))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksChanged(QList<QLandmarkId>)))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesAdded(QList<QLandmarkCategoryId>)))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesChanged(QList<QLandmarkCategoryId>)))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesRemoved(QList<QLandmarkCategoryId>)))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(dataChanged())))) { connect(d_ptr->engine,SIGNAL(landmarksAdded(QList<QLandmarkId>)), this, SIGNAL(landmarksAdded(QList<QLandmarkId>))); connect(d_ptr->engine,SIGNAL(landmarksChanged(QList<QLandmarkId>)), @@ -1375,18 +1421,19 @@ void QLandmarkManager::connectNotify(const char *signal) /*! \internal + \since 1.1 */ void QLandmarkManager::disconnectNotify(const char *signal) { if (d_ptr->isConnected) { if (d_ptr->engine) { - if ((QLatin1String(signal) == SIGNAL(landmarksAdded(QList<QLandmarkId>))) - || (QLatin1String(signal) == SIGNAL(landmarksChanged(QList<QLandmarkId>))) - || (QLatin1String(signal) == SIGNAL(landmarksRemoved(QList<QLandmarkId>))) - || (QLatin1String(signal) == SIGNAL(categoriesAdded(QList<QLandmarkCategoryId>))) - || (QLatin1String(signal) == SIGNAL(categoriesChanged(QList<QLandmarkCategoryId>))) - || (QLatin1String(signal) == SIGNAL(categoriesRemoved(QList<QLandmarkCategoryId>))) - || (QLatin1String(signal) == SIGNAL(dataChanged()))) { + if ((QLatin1String(signal) == QLatin1String(SIGNAL(landmarksAdded(QList<QLandmarkId>)))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksChanged(QList<QLandmarkId>)))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksRemoved(QList<QLandmarkId>)))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesAdded(QList<QLandmarkCategoryId>)))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesChanged(QList<QLandmarkCategoryId>)))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesRemoved(QList<QLandmarkCategoryId>)))) + || (QLatin1String(signal) == QLatin1String(SIGNAL(dataChanged())))) { disconnect(d_ptr->engine,SIGNAL(landmarksAdded(QList<QLandmarkId>)), this, SIGNAL(landmarksAdded(QList<QLandmarkId>))); disconnect(d_ptr->engine,SIGNAL(landmarksChanged(QList<QLandmarkId>)), @@ -1418,6 +1465,7 @@ QLandmarkManagerEngine *QLandmarkManager::engine() This signal is emitted by the manager if its internal state changes and it is unable to precisely determine the changes which occurred, or if the manager considers the changes to be radical enough to require clients to reload all data. If the signal is emitted, no other signals will be emitted for the associated changes. + \since 1.1 */ /*! @@ -1425,6 +1473,7 @@ QLandmarkManagerEngine *QLandmarkManager::engine() This signal is emitted when landmarks (identified by \a landmarkIds) have been added to the datastore managed by this manager. This signal is not emitted if the dataChanged() signal was previously emitted for these changes. + \since 1.1 \sa landmarksChanged(), landmarksRemoved() */ @@ -1435,6 +1484,7 @@ QLandmarkManagerEngine *QLandmarkManager::engine() This signal is not emitted if the dataChanged() signal was previously emitted for these changes. Note that removal of a category will not trigger a \c landmarksChanged signal for landmarks belonging to that category. + \since 1.1 \sa landmarksAdded(), landmarksRemoved() */ @@ -1443,6 +1493,7 @@ QLandmarkManagerEngine *QLandmarkManager::engine() This signal is emitted when landmarks (identified by \a landmarkIds) have been removed from the datastore managed by this manager. This signal is not emitted if the dataChanged() signal was previously emitted for these changes. + \since 1.1 \sa landmarksAdded(), landmarksChanged() */ @@ -1451,6 +1502,7 @@ QLandmarkManagerEngine *QLandmarkManager::engine() This signal is emitted when categories (identified by \a categoryIds) have been added to the datastore managed by this manager. This signal is not emitted if the dataChanged() signal was previously emitted for these changes. + \since 1.1 \sa categoriesChanged(), categoriesRemoved() */ @@ -1459,6 +1511,7 @@ QLandmarkManagerEngine *QLandmarkManager::engine() This signal is emitted when categories (identified by \a categoryIds) have been modified in the datastore managed by this manager. This signal is not emitted if the dataChanged() signal was previously emitted for these changes. + \since 1.1 \sa categoriesAdded(), categoriesRemoved() */ @@ -1467,7 +1520,10 @@ QLandmarkManagerEngine *QLandmarkManager::engine() This signal is emitted when categories (identified by \a categoryIds) have been removed from the datastore managed by this manager. This signal is not emitted if the dataChanged() signal was previously emitted for these changes. + \since 1.1 \sa categoriesAdded(), categoriesChanged() */ #include "moc_qlandmarkmanager.cpp" + +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkmanager.h b/src/location/landmarks/qlandmarkmanager.h index 2df37b27..6668546c 100644 --- a/src/location/landmarks/qlandmarkmanager.h +++ b/src/location/landmarks/qlandmarkmanager.h @@ -55,10 +55,10 @@ #include <qlatin1constant.h> #include <QObject> #include <QMap> + +QT_BEGIN_NAMESPACE class QIODevice; class QStringList; - -QTM_BEGIN_NAMESPACE class QLandmarkManagerPrivate; class QLandmarkManagerEngine; @@ -215,6 +215,6 @@ private: QLandmarkManagerEngine *engine(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkmanager_p.cpp b/src/location/landmarks/qlandmarkmanager_p.cpp index 343b88da..37ce5f06 100644 --- a/src/location/landmarks/qlandmarkmanager_p.cpp +++ b/src/location/landmarks/qlandmarkmanager_p.cpp @@ -52,7 +52,7 @@ #include "qmobilitypluginsearch.h" -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE QLandmarkManagerPrivate::QLandmarkManagerPrivate() : engine(0), @@ -68,7 +68,7 @@ void QLandmarkManagerPrivate::createEngine(const QString &managerName, const QMa if (!q->availableManagers().contains(managerName)) { errorCode = QLandmarkManager::InvalidManagerError; - errorString = QString("The landmark manager, %1, was not found").arg(managerName); + errorString = QString::fromLatin1("The landmark manager, %1, was not found").arg(managerName); qWarning() << errorString; engine = 0; return; @@ -77,7 +77,7 @@ void QLandmarkManagerPrivate::createEngine(const QString &managerName, const QMa QList<QLandmarkManagerEngineFactory *> factories = QLandmarkManagerPrivate::factories().values(managerName); bool ok; - int implementationVersion = parameters.value(QTLANDMARKS_IMPLEMENTATION_VERSION_NAME).toInt(&ok); + int implementationVersion = parameters.value(QLatin1String(QTLANDMARKS_IMPLEMENTATION_VERSION_NAME)).toInt(&ok); if (!ok) implementationVersion = -1; @@ -95,7 +95,7 @@ void QLandmarkManagerPrivate::createEngine(const QString &managerName, const QMa if (!engine) { if (errorCode == QLandmarkManager::NoError) { errorCode = QLandmarkManager::InvalidManagerError; - errorString = "The landmark manager could not return the requested engine instance"; + errorString = QLatin1String("The landmark manager could not return the requested engine instance"); } } } @@ -169,3 +169,5 @@ void QLandmarkManagerPrivate::loadStaticFactories(QHash<QString, QLandmarkManage } } + +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkmanager_p.h b/src/location/landmarks/qlandmarkmanager_p.h index fbdf4042..e6feb7ab 100644 --- a/src/location/landmarks/qlandmarkmanager_p.h +++ b/src/location/landmarks/qlandmarkmanager_p.h @@ -61,7 +61,7 @@ #define QTLANDMARKS_IMPLEMENTATION_VERSION_NAME "com.nokia.qtmobility.landmarks.implementation.version" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkManagerEngine; class QLandmarkManagerEngineFactory; @@ -87,6 +87,6 @@ public: Q_DECLARE_PUBLIC(QLandmarkManager) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QLANDMARKMANAGER_P_H diff --git a/src/location/landmarks/qlandmarkmanagerengine.cpp b/src/location/landmarks/qlandmarkmanagerengine.cpp index e12ac420..bc8d4de2 100644 --- a/src/location/landmarks/qlandmarkmanagerengine.cpp +++ b/src/location/landmarks/qlandmarkmanagerengine.cpp @@ -78,7 +78,7 @@ #include <QWeakPointer> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE bool matchString(const QString &sourceString, const QString &matchString, QLandmarkFilter::MatchFlags matchFlags ) { @@ -102,44 +102,44 @@ bool matchString(const QString &sourceString, const QString &matchString, QLandm QVariant getLandmarkAttribute(const QString key, const QLandmark &landmark) { - if (key == "name") { + if (key == QLatin1String("name")) { return landmark.name(); - } else if (key == "description") { + } else if (key == QLatin1String("description")) { return landmark.description(); - } else if (key == "countryCode") { + } else if (key == QLatin1String("countryCode")) { return landmark.address().countryCode(); - } else if (key == "country") { + } else if (key == QLatin1String("country")) { return landmark.address().country(); - } else if (key == "state") { + } else if (key == QLatin1String("state")) { return landmark.address().state(); - } else if (key == "city") { + } else if (key == QLatin1String("city")) { return landmark.address().city(); - } else if (key == "district") { + } else if (key == QLatin1String("district")) { return landmark.address().district(); - } else if (key == "district") { + } else if (key == QLatin1String("district")) { return landmark.address().district(); - } else if (key == "street") { + } else if (key == QLatin1String("street")) { return landmark.address().street(); - } else if (key == "postcode") { + } else if (key == QLatin1String("postcode")) { return landmark.address().postcode(); - } else if (key == "phoneNumber") { + } else if (key == QLatin1String("phoneNumber")) { return landmark.phoneNumber(); } else { return QVariant(); // shouldn't be possible } } -QStringList commonLandmarkKeys = QStringList() << "name" - << "description" - << "countryCode" - << "country" - << "state" - << "county" - << "city" - << "district" - << "street" - << "postcode" - << "phoneNumber"; +QStringList commonLandmarkKeys = QStringList() << QLatin1String("name") + << QLatin1String("description") + << QLatin1String("countryCode") + << QLatin1String("country") + << QLatin1String("state") + << QLatin1String("county") + << QLatin1String("city") + << QLatin1String("district") + << QLatin1String("street") + << QLatin1String("postcode") + << QLatin1String("phoneNumber"); /*! \class QLandmarkManagerEngine @@ -169,7 +169,10 @@ QLandmarkManagerEngine::~QLandmarkManagerEngine() { } -/*! Returns the manager name for this QLandmarkManagerEngine */ +/*! + Returns the manager name for this QLandmarkManagerEngine + \since 1.1 +*/ QString QLandmarkManagerEngine::managerName() const { return QString(QLatin1String("base")); @@ -179,6 +182,7 @@ QString QLandmarkManagerEngine::managerName() const Returns the parameters with which this engine was constructed. Note that the engine may have discarded unused or invalid parameters at the time of construction, and these will not be returned. + \since 1.1 */ QMap<QString, QString> QLandmarkManagerEngine::managerParameters() const { @@ -188,6 +192,7 @@ QMap<QString, QString> QLandmarkManagerEngine::managerParameters() const /*! Returns the unique URI of this manager, which is built from the manager name and the parameters used to construct it. + \since 1.1 */ QString QLandmarkManagerEngine::managerUri() const { @@ -196,6 +201,7 @@ QString QLandmarkManagerEngine::managerUri() const /*! Returns the engine backend implementation version number + \since 1.1 */ int QLandmarkManagerEngine::managerVersion() const { @@ -209,6 +215,7 @@ int QLandmarkManagerEngine::managerVersion() const A \a limit of -1 means that IDs of all matching landmarks should be returned. Any error which occurs will be saved in \a error and \a errorString. + \since 1.1 */ QList<QLandmarkId> QLandmarkManagerEngine::landmarkIds(const QLandmarkFilter& /*filter*/, int /*limit*/, int /*offset*/, const QList<QLandmarkSortOrder>& /*sortOrders*/, QLandmarkManager::Error* /*error*/, @@ -223,6 +230,7 @@ QList<QLandmarkId> QLandmarkManagerEngine::landmarkIds(const QLandmarkFilter& /* of the first ID. A \a limit of -1 means IDs for all categories should be returned. Any error which occurs will be saved in \a error and \a errorString. The identifiers are returned in order according to the given \a nameSort. + \since 1.1 */ QList<QLandmarkCategoryId> QLandmarkManagerEngine::categoryIds(int /*limit*/, int /*offset*/, const QLandmarkNameSort& /*nameSort*/, QLandmarkManager::Error* /*error*/, QString* /*errorString*/) const @@ -235,6 +243,7 @@ QList<QLandmarkCategoryId> QLandmarkManagerEngine::categoryIds(int /*limit*/, in Any errors encountered are:stored in \a error and \a errorString. The \a error is set to QLandmarkManager::LandmarkDoesNotExistError if the landmark could not be found. + \since 1.1 */ QLandmark QLandmarkManagerEngine::landmark(const QLandmarkId &/*landmarkId*/, QLandmarkManager::Error * /*error*/, QString* /*errorString*/) const @@ -250,6 +259,7 @@ QLandmark QLandmarkManagerEngine::landmark(const QLandmarkId &/*landmarkId*/, QL Overall operation errors are stored in \a error and \a errorString. \a error is set to QLandmarkManager::NoError, all landmarks were successfully retrieved. + \since 1.1 */ QList<QLandmark> QLandmarkManagerEngine::landmarks(const QList<QLandmarkId>& /*landmarkIds*/, QMap<int, QLandmarkManager::Error>* /*errorMap*/, QLandmarkManager::Error* /*error*/, QString* /*errorString*/) const @@ -263,6 +273,7 @@ QList<QLandmark> QLandmarkManagerEngine::landmarks(const QList<QLandmarkId>& /*l of the first landmark. A \a limit of -1 means all matching landmarks should be returned. Overall operation errors are stored in \a error and \a errorString. + \since 1.1 */ QList<QLandmark> QLandmarkManagerEngine::landmarks(const QLandmarkFilter& /*filter*/, int /*limit*/, int /*offset*/, const QList<QLandmarkSortOrder>& /*sortOrders*/, QLandmarkManager::Error* /*error*/, QString* /*errorString*/) const @@ -275,6 +286,7 @@ QList<QLandmark> QLandmarkManagerEngine::landmarks(const QLandmarkFilter& /*filt Any errors encountered are stored in \a error and \a errorString. A QLandmarkManager::CategoryDoesNotExist error is set if the category could not be found. + \since 1.1 */ QLandmarkCategory QLandmarkManagerEngine::category(const QLandmarkCategoryId& /*categoryId*/, QLandmarkManager::Error* /*error*/, QString* /*errorString*/) const @@ -290,6 +302,7 @@ QLandmarkCategory QLandmarkManagerEngine::category(const QLandmarkCategoryId& /* Overall operation errors are stored in \a error and \a errorString. \a error is set to QLandmarkManager::NoError, if all categories were successfully retrieved. + \since 1.1 */ QList<QLandmarkCategory> QLandmarkManagerEngine::categories(const QList<QLandmarkCategoryId>& /*categoryIds*/, QMap<int, QLandmarkManager::Error>* /*errorMap*/, @@ -302,7 +315,8 @@ QList<QLandmarkCategory> QLandmarkManagerEngine::categories(const QList<QLandmar Returns a list of categories. The \a limit defines the maximum number of categories to return and the \a offset defines the index offset of the first category. A \a limit of -1 means all categories should be returned. - The returned categories ordered according to the gien \a nameSort. + The returned categories ordered according to the given \a nameSort. + \since 1.1 */ QList<QLandmarkCategory> QLandmarkManagerEngine::categories(int /*limit*/, int /*offset*/, const QLandmarkNameSort& /*nameSort*/, QLandmarkManager::Error* /*error*/, QString* /*errorString*/) const @@ -334,6 +348,7 @@ QList<QLandmarkCategory> QLandmarkManagerEngine::categories(int /*limit*/, int / Any errors encountered during this operation should be stored in \a error and \a errorString. + \since 1.1 */ bool QLandmarkManagerEngine::saveLandmark(QLandmark* /*landmark*/, QLandmarkManager::Error* /*error*/, QString* /*errorString*/) @@ -361,6 +376,7 @@ bool QLandmarkManagerEngine::saveLandmark(QLandmark* /*landmark*/, \a errorString. \a error is set to QLandmarkManager::NoError, if all \a landmarks were successfully saved. + \since 1.1 \sa QLandmarkManagerEngine::saveLandmark() */ bool QLandmarkManagerEngine::saveLandmarks(QList<QLandmark> * /*landmarks*/, QMap<int, QLandmarkManager::Error>* /*errorMap*/, @@ -380,6 +396,7 @@ bool QLandmarkManagerEngine::saveLandmarks(QList<QLandmark> * /*landmarks*/, QMa Any errors encountered during this operation should be stored to \a error and \a errorString. + \since 1.1 */ bool QLandmarkManagerEngine::removeLandmark(const QLandmarkId& /*landmarkId*/, QLandmarkManager::Error* /*error*/, QString* /*errorString*/) { @@ -402,6 +419,7 @@ bool QLandmarkManagerEngine::removeLandmark(const QLandmarkId& /*landmarkId*/, Q \a errorString. \a error is set to QLandmarkManager::NoError, if all landmarks were successfully removed. + \since 1.1 \sa QLandmarkManagerEngine::removeLandmark() */ bool QLandmarkManagerEngine::removeLandmarks(const QList<QLandmarkId>& /*landmarkIds*/, QMap<int, QLandmarkManager::Error>* /*errorMap*/, @@ -434,6 +452,7 @@ bool QLandmarkManagerEngine::removeLandmarks(const QList<QLandmarkId>& /*landmar Overall operations errors should be stored in \a error and \a errorString. + \since 1.1 */ bool QLandmarkManagerEngine::saveCategory(QLandmarkCategory* /*category*/, QLandmarkManager::Error* /*error*/, QString* /*errorString*/) @@ -452,6 +471,7 @@ bool QLandmarkManagerEngine::saveCategory(QLandmarkCategory* /*category*/, Overall operational errors are stored in \a error and \a errorString. + \since 1.1 */ bool QLandmarkManagerEngine::removeCategory(const QLandmarkCategoryId& /*categoryId*/, QLandmarkManager::Error* /*error*/, QString* /*errorString*/) @@ -475,6 +495,7 @@ bool QLandmarkManagerEngine::removeCategory(const QLandmarkCategoryId& /*categor Overall operational errors are stored in \a error and \a errorString. + \since 1.1 */ bool QLandmarkManagerEngine::importLandmarks(QIODevice* /*device*/, const QString& /*format*/, QLandmarkManager::TransferOption /*option*/, const QLandmarkCategoryId& /*categoryId*/, QLandmarkManager::Error *error, QString *errorString) @@ -482,7 +503,7 @@ bool QLandmarkManagerEngine::importLandmarks(QIODevice* /*device*/, const QStrin Q_ASSERT(error); Q_ASSERT(errorString); *error = QLandmarkManager::NotSupportedError; - *errorString ="Not supported"; + *errorString = QLatin1String("Not supported"); return false; } @@ -503,6 +524,7 @@ bool QLandmarkManagerEngine::importLandmarks(QIODevice* /*device*/, const QStrin Overall operation errors are stored in \a error and \a errorString. + \since 1.1 */ bool QLandmarkManagerEngine::exportLandmarks(QIODevice * /*device*/, const QString& /*format*/, const QList<QLandmarkId> &/*landmarkIds*/, QLandmarkManager::TransferOption /*option*/, QLandmarkManager::Error *error, QString *errorString) const @@ -510,20 +532,21 @@ bool QLandmarkManagerEngine::exportLandmarks(QIODevice * /*device*/, const QStri Q_ASSERT(error); Q_ASSERT(errorString); *error = QLandmarkManager::NotSupportedError; - *errorString = "Not supported"; + *errorString = QLatin1String("Not supported"); return false; } /*! Returns the supported file formats for the given transfer \a operation, i.e. import or export. Errors are stored in \a error and \a errorString. + \since 1.1 */ QStringList QLandmarkManagerEngine::supportedFormats(QLandmarkManager::TransferOperation /*operation*/ , QLandmarkManager::Error *error, QString *errorString) const { Q_ASSERT(error); Q_ASSERT(errorString); *error = QLandmarkManager::NoError; - *errorString = ""; + *errorString = QLatin1String(""); return QStringList(); } @@ -533,6 +556,7 @@ QStringList QLandmarkManagerEngine::supportedFormats(QLandmarkManager::TransferO Returns the support level the manager engine provides for the given \a filter. Errors are stored in \a error and \a errorString. + \since 1.1 */ /*! @@ -541,6 +565,7 @@ QStringList QLandmarkManagerEngine::supportedFormats(QLandmarkManager::TransferO Returns the support level the manager engine provides for the given \a sortOrder. Errors are stored in \a error and \a errorString. + \since 1.1 */ /*! @@ -548,6 +573,7 @@ QStringList QLandmarkManagerEngine::supportedFormats(QLandmarkManager::TransferO Returns true if the manager engine supports the given \a feature, otherwise returns false; Errors are stored in \a error and \a errorString. + \since 1.1 */ /*! @@ -555,6 +581,7 @@ QStringList QLandmarkManagerEngine::supportedFormats(QLandmarkManager::TransferO Returns true if the manager engine is exclusively read only. Meaning landmarks and categories cannot be added, modified or removed. Errors are stored in \a error and \a errorString. + \since 1.1 */ /*! @@ -567,6 +594,7 @@ QStringList QLandmarkManagerEngine::supportedFormats(QLandmarkManager::TransferO If the \a landmarkId does not refer to an existing landmark, it is considered writable unless the manager engine is exclusively read-only. Errors are stored in \a error and \a errorString. + \since 1.1 */ /*! @@ -579,16 +607,19 @@ QStringList QLandmarkManagerEngine::supportedFormats(QLandmarkManager::TransferO If \a categoryId does not refer to an existing category, it is considered writable unless the manager engine is exclusively read-only. Errors are stored in \a error and \a errorString. + \since 1.1 */ /*! \fn QStringList QLandmarkManagerEngine::searchableLandmarkAttributeKeys(QLandmarkManager::Error *error, QString *errorString) const Returns the list of landmark attribute keys that may be used in a QLandmarkAttributeFilter. Errors are stored in \a error and \a errorString. + \since 1.1 */ /*! Notifies the manager engine that the given \a request has been destroyed. + \since 1.1 */ void QLandmarkManagerEngine::requestDestroyed(QLandmarkAbstractRequest* request) { @@ -602,6 +633,7 @@ void QLandmarkManagerEngine::requestDestroyed(QLandmarkAbstractRequest* request) Returns true if the request was started successfully, else returns false. + \since 1.1 \sa QLandmarkAbstractRequest::start() */ bool QLandmarkManagerEngine::startRequest(QLandmarkAbstractRequest* request) @@ -616,7 +648,8 @@ bool QLandmarkManagerEngine::startRequest(QLandmarkAbstractRequest* request) Returns true if cancelation of the request was started successfully, otherwise returns false. - \sa startRequest(), QLandmarkAbstractRequest::cancel() + \since 1.1 + \sa startRequest(), QLandmarkAbstractRequest::cancel() */ bool QLandmarkManagerEngine::cancelRequest(QLandmarkAbstractRequest* request) { @@ -631,6 +664,7 @@ bool QLandmarkManagerEngine::cancelRequest(QLandmarkAbstractRequest* request) \c QLandmarkAbstractRequest::Active state, no progress could be reported or if the engine does not support waitForFinished functionality. + \since 1.1 \sa startRequest() */ bool QLandmarkManagerEngine::waitForRequestFinished(QLandmarkAbstractRequest* request, int msecs) @@ -652,6 +686,7 @@ bool QLandmarkManagerEngine::waitForRequestFinished(QLandmarkAbstractRequest* re As it is possible that other processes (or other devices) may have caused the changes, the timing can not be determined. + \since 1.1 \sa landmarksAdded(), landmarksChanged(), landmarksRemoved(), categoriesAdded(), categoriesChanged(), categoriesRemoved() */ @@ -666,6 +701,7 @@ bool QLandmarkManagerEngine::waitForRequestFinished(QLandmarkAbstractRequest* re There may be one or more landmark identifiers in the \a landmarkIds list. + \since 1.1 \sa dataChanged(), landmarksChanged(), landmarksRemoved() */ @@ -680,6 +716,7 @@ bool QLandmarkManagerEngine::waitForRequestFinished(QLandmarkAbstractRequest* re Note that removal of a category will not trigger a \c landmarksChanged signal for landmarks belonging to that category. There may be one ore more landmark identifiers in the \a landmarkIds list. + \since 1.1 \sa dataChanged(), landmarksAdded(), landmarksRemoved() */ @@ -693,6 +730,7 @@ bool QLandmarkManagerEngine::waitForRequestFinished(QLandmarkAbstractRequest* re the timing cannot be determined. There may be one ore more landmark identifiers in the \a landmarkIds list. + \since 1.1 \sa dataChanged(), landmarksAdded(), landmarksChanged() */ @@ -706,6 +744,7 @@ bool QLandmarkManagerEngine::waitForRequestFinished(QLandmarkAbstractRequest* re There may be one or more category identifiers in the \a categoryIds list. + \since 1.1 \sa dataChanged(), categoriesChanged(), categoriesRemoved() */ @@ -719,6 +758,7 @@ bool QLandmarkManagerEngine::waitForRequestFinished(QLandmarkAbstractRequest* re There may be one ore more category identifiers in the \a categoryIds list. + \since 1.1 \sa dataChanged(), categoriesAdded(), categoriesRemoved() */ @@ -732,6 +772,7 @@ bool QLandmarkManagerEngine::waitForRequestFinished(QLandmarkAbstractRequest* re There may be one ore more category identifiers in the \a categoryIds list. + \since 1.1 \sa dataChanged(), categoriesAdded(), categoriesChanged() */ @@ -740,6 +781,7 @@ bool QLandmarkManagerEngine::waitForRequestFinished(QLandmarkAbstractRequest* re of the request. If the new state is different, the stateChanged() signal will be emitted by the request. + \since 1.1 */ void QLandmarkManagerEngine::updateRequestState(QLandmarkAbstractRequest *req, QLandmarkAbstractRequest::State state) { @@ -763,6 +805,7 @@ void QLandmarkManagerEngine::updateRequestState(QLandmarkAbstractRequest *req, Q If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request. + \since 1.1 */ void QLandmarkManagerEngine::updateLandmarkIdFetchRequest(QLandmarkIdFetchRequest* req, const QList<QLandmarkId>& result, QLandmarkManager::Error error, const QString &errorString, @@ -794,6 +837,7 @@ void QLandmarkManagerEngine::updateLandmarkIdFetchRequest(QLandmarkIdFetchReques If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request. + \since 1.1 */ void QLandmarkManagerEngine::updateLandmarkFetchRequest(QLandmarkFetchRequest* req, const QList<QLandmark>& result, QLandmarkManager::Error error, const QString &errorString, @@ -827,6 +871,7 @@ void QLandmarkManagerEngine::updateLandmarkFetchRequest(QLandmarkFetchRequest* r If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request. + \since 1.1 */ void QLandmarkManagerEngine::updateLandmarkFetchByIdRequest(QLandmarkFetchByIdRequest* req, const QList<QLandmark>& result, QLandmarkManager::Error error, const QString &errorString, const QMap<int, QLandmarkManager::Error>& errorMap, QLandmarkAbstractRequest::State newState) @@ -858,6 +903,7 @@ void QLandmarkManagerEngine::updateLandmarkFetchByIdRequest(QLandmarkFetchByIdRe If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request. + \since 1.1 */ void QLandmarkManagerEngine::updateLandmarkRemoveRequest(QLandmarkRemoveRequest* req, QLandmarkManager::Error error, const QString &errorString, const QMap<int, QLandmarkManager::Error>& errorMap, QLandmarkAbstractRequest::State newState) @@ -889,6 +935,7 @@ void QLandmarkManagerEngine::updateLandmarkRemoveRequest(QLandmarkRemoveRequest* If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request. + \since 1.1 */ void QLandmarkManagerEngine::updateLandmarkSaveRequest(QLandmarkSaveRequest* req, const QList<QLandmark>& result, QLandmarkManager::Error error, const QString &errorString, const QMap<int, QLandmarkManager::Error>& errorMap, QLandmarkAbstractRequest::State newState) @@ -920,6 +967,7 @@ void QLandmarkManagerEngine::updateLandmarkSaveRequest(QLandmarkSaveRequest* req If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request. + \since 1.1 */ void QLandmarkManagerEngine::updateLandmarkCategoryIdFetchRequest(QLandmarkCategoryIdFetchRequest* req, const QList<QLandmarkCategoryId>& result, QLandmarkManager::Error error, const QString &errorString, @@ -952,6 +1000,7 @@ void QLandmarkManagerEngine::updateLandmarkCategoryIdFetchRequest(QLandmarkCateg If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request. + \since 1.1 */ void QLandmarkManagerEngine::updateLandmarkCategoryFetchRequest(QLandmarkCategoryFetchRequest* req, const QList<QLandmarkCategory>& result, QLandmarkManager::Error error, const QString &errorString, @@ -984,6 +1033,7 @@ void QLandmarkManagerEngine::updateLandmarkCategoryFetchRequest(QLandmarkCategor If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request. + \since 1.1 */ void QLandmarkManagerEngine::updateLandmarkCategoryFetchByIdRequest(QLandmarkCategoryFetchByIdRequest* req, const QList<QLandmarkCategory>& result, QLandmarkManager::Error error, const QString &errorString, const QMap<int, QLandmarkManager::Error>& errorMap, QLandmarkAbstractRequest::State newState) @@ -1015,6 +1065,7 @@ void QLandmarkManagerEngine::updateLandmarkCategoryFetchByIdRequest(QLandmarkCat If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request. + \since 1.1 */ void QLandmarkManagerEngine::updateLandmarkCategoryRemoveRequest(QLandmarkCategoryRemoveRequest* req, QLandmarkManager::Error error, const QString &errorString, const QMap<int, QLandmarkManager::Error>& errorMap, QLandmarkAbstractRequest::State newState) @@ -1045,6 +1096,7 @@ void QLandmarkManagerEngine::updateLandmarkCategoryRemoveRequest(QLandmarkCatego If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request. + \since 1.1 */ void QLandmarkManagerEngine::updateLandmarkCategorySaveRequest(QLandmarkCategorySaveRequest* req, const QList<QLandmarkCategory>& result, QLandmarkManager::Error error, const QString &errorString, const QMap<int, QLandmarkManager::Error>& errorMap, QLandmarkAbstractRequest::State newState) @@ -1076,6 +1128,7 @@ void QLandmarkManagerEngine::updateLandmarkCategorySaveRequest(QLandmarkCategory If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request. + \since 1.1 */ void QLandmarkManagerEngine::updateLandmarkImportRequest(QLandmarkImportRequest *req, const QList<QLandmarkId> &ids, QLandmarkManager::Error error, const QString &errorString, QLandmarkAbstractRequest::State newState) @@ -1105,6 +1158,7 @@ void QLandmarkManagerEngine::updateLandmarkImportRequest(QLandmarkImportRequest If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request. + \since 1.1 */ void QLandmarkManagerEngine::updateLandmarkExportRequest(QLandmarkExportRequest *req, QLandmarkManager::Error error, const QString &errorString, QLandmarkAbstractRequest::State newState) @@ -1128,6 +1182,7 @@ void QLandmarkManagerEngine::updateLandmarkExportRequest(QLandmarkExportRequest Compares two landmarks (\a a and \a b) using the given list of \a sortOrders. Returns a negative number if \a a should appear before \a b according to the sort order, a positive number if \a a should appear after \a b according to the sort order, and zero if the two are unable to be sorted. + \since 1.1 */ int QLandmarkManagerEngine::compareLandmark(const QLandmark& a, const QLandmark& b, const QList<QLandmarkSortOrder>& sortOrders) { @@ -1165,6 +1220,7 @@ int QLandmarkManagerEngine::compareLandmark(const QLandmark& a, const QLandmark& \a nameSort specifies whether an ascending or descending order is used and whether the sort is case sensitive or not. + \since 1.1 */ int QLandmarkManagerEngine::compareName(const QLandmark &a, const QLandmark &b, const QLandmarkNameSort &nameSort) { @@ -1181,6 +1237,7 @@ int QLandmarkManagerEngine::compareName(const QLandmark &a, const QLandmark &b, The first QLandmarkSortOrder in the list has the highest priority; if the \a landmark is deemed equal to another in the \a sorted list, the second QLandmarkSortOrder in the list is used (and so on until either the landmark is inserted or there are no more sort order objects in the list). + \since 1.1 */ void QLandmarkManagerEngine::addSorted(QList<QLandmark>* sorted, const QLandmark& landmark, const QList<QLandmarkSortOrder>& sortOrders) { @@ -1201,6 +1258,7 @@ void QLandmarkManagerEngine::addSorted(QList<QLandmark>* sorted, const QLandmark /*! Returns true if the supplied \a landmark matches the supplied \a filter. + \since 1.1 */ bool QLandmarkManagerEngine::testFilter(const QLandmarkFilter& filter, const QLandmark& landmark) { @@ -1363,7 +1421,9 @@ bool QLandmarkManagerEngine::testFilter(const QLandmarkFilter& filter, const QLa return false; } -/*! Sorts the given list of \a landmarks according to the provided \a sortOrders */ +/*! Sorts the given list of \a landmarks according to the provided \a sortOrders + \since 1.1 +*/ QList<QLandmarkId> QLandmarkManagerEngine::sortLandmarks(const QList<QLandmark>& landmarks, const QList<QLandmarkSortOrder>& sortOrders) { QList<QLandmarkId> landmarkIds; @@ -1386,4 +1446,4 @@ QList<QLandmarkId> QLandmarkManagerEngine::sortLandmarks(const QList<QLandmark>& #include "moc_qlandmarkmanagerengine.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkmanagerengine.h b/src/location/landmarks/qlandmarkmanagerengine.h index 36501cbc..fd856ccb 100644 --- a/src/location/landmarks/qlandmarkmanagerengine.h +++ b/src/location/landmarks/qlandmarkmanagerengine.h @@ -49,9 +49,9 @@ #include "qlandmarkabstractrequest.h" -class QIODevice; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QIODevice; class QLandmarkCategory; class QLandmarkCategoryId; class QLandmark; @@ -194,6 +194,6 @@ public: static QList<QLandmarkId> sortLandmarks(const QList<QLandmark>& landmarks, const QList<QLandmarkSortOrder>& sortOrders); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkmanagerenginefactory.cpp b/src/location/landmarks/qlandmarkmanagerenginefactory.cpp index a5d4f8e2..da183b7e 100644 --- a/src/location/landmarks/qlandmarkmanagerenginefactory.cpp +++ b/src/location/landmarks/qlandmarkmanagerenginefactory.cpp @@ -42,7 +42,7 @@ #include "qlandmarkmanagerenginefactory.h" #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkManagerEngineFactory @@ -50,7 +50,7 @@ QTM_BEGIN_NAMESPACE plugins that implement QLandmarkManagerEngine functionality. \inmodule QtLocation - + \ingroup landmarks-backend This class provides a simple interface for the creation of @@ -58,7 +58,8 @@ QTM_BEGIN_NAMESPACE associated with it, which forms the \c managerName parameter when creating \l QLandmarkManager objects. - \sa QLandmarkManager, QLandmarkManagerEngine + \since 1.1 + \sa QLandmarkManager, QLandmarkManagerEngine */ /*! @@ -84,7 +85,8 @@ QList<int> QLandmarkManagerEngineFactory::supportedImplementationVersions() cons Typically this would be of the form "com.nokia.qt.landmarks.engines.sqlite", with the appropriate domain and engine name substituted. - */ + \since 1.1 +*/ /*! \fn QLandmarkManagerEngineFactory::engine(const QMap<QString, QString>& parameters, QLandmarkManager::Error *error, @@ -98,8 +100,9 @@ QList<int> QLandmarkManagerEngineFactory::supportedImplementationVersions() cons If a supplied parameter results in an unfulfillable request, or some other error occurs, this function may return a null pointer, and the client developer will get an invalid QLandmarkManager in return. Errors are stored in \a error and \a errorString. + \since 1.1 */ -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkmanagerenginefactory.h b/src/location/landmarks/qlandmarkmanagerenginefactory.h index 861ec78e..c8be6381 100644 --- a/src/location/landmarks/qlandmarkmanagerenginefactory.h +++ b/src/location/landmarks/qlandmarkmanagerenginefactory.h @@ -46,7 +46,7 @@ #include "qlandmarkmanager.h" #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkManagerEngine; class Q_LOCATION_EXPORT QLandmarkManagerEngineFactory @@ -60,7 +60,7 @@ public: virtual QString managerName() const = 0; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_BEGIN_NAMESPACE #define QT_LANDMARKS_BACKEND_INTERFACE "com.nokia.qt.mobility.landmarks.enginefactory/1.0" diff --git a/src/location/landmarks/qlandmarknamefilter.cpp b/src/location/landmarks/qlandmarknamefilter.cpp index 9ab37ab7..44fce816 100644 --- a/src/location/landmarks/qlandmarknamefilter.cpp +++ b/src/location/landmarks/qlandmarknamefilter.cpp @@ -42,7 +42,7 @@ #include "qlandmarknamefilter.h" #include "qlandmarknamefilter_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkNameFilter @@ -65,6 +65,7 @@ Q_IMPLEMENT_LANDMARKFILTER_PRIVATE(QLandmarkNameFilter) /*! Creates a filter that selects landmarks by \a name. + \since 1.1 */ QLandmarkNameFilter::QLandmarkNameFilter(const QString &name) : QLandmarkFilter(new QLandmarkNameFilterPrivate(name)) {} @@ -84,6 +85,7 @@ QLandmarkNameFilter::~QLandmarkNameFilter() /*! Returns the name that the filter will use to determine matches. + \since 1.1 */ QString QLandmarkNameFilter::name() const { @@ -93,6 +95,7 @@ QString QLandmarkNameFilter::name() const /*! Sets the \a name that the filter will use to determine matches. + \since 1.1 */ void QLandmarkNameFilter::setName(const QString &name) { @@ -102,6 +105,7 @@ void QLandmarkNameFilter::setName(const QString &name) /*! Returns the matching criteria of the filter. + \since 1.1 */ QLandmarkFilter::MatchFlags QLandmarkNameFilter::matchFlags() const { @@ -111,6 +115,7 @@ QLandmarkFilter::MatchFlags QLandmarkNameFilter::matchFlags() const /*! Sets the matching criteria to those defined in \a flags. + \since 1.1 */ void QLandmarkNameFilter::setMatchFlags(QLandmarkFilter::MatchFlags flags) { @@ -135,4 +140,4 @@ QLandmarkNameFilterPrivate::QLandmarkNameFilterPrivate(const QLandmarkNameFilter QLandmarkNameFilterPrivate::~QLandmarkNameFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarknamefilter.h b/src/location/landmarks/qlandmarknamefilter.h index bbe81c36..3b4e5662 100644 --- a/src/location/landmarks/qlandmarknamefilter.h +++ b/src/location/landmarks/qlandmarknamefilter.h @@ -47,7 +47,7 @@ #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkNameFilterPrivate; class Q_LOCATION_EXPORT QLandmarkNameFilter : public QLandmarkFilter @@ -67,6 +67,6 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkNameFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarknamefilter_p.h b/src/location/landmarks/qlandmarknamefilter_p.h index 3ec8d2d8..a8ecb114 100644 --- a/src/location/landmarks/qlandmarknamefilter_p.h +++ b/src/location/landmarks/qlandmarknamefilter_p.h @@ -58,7 +58,7 @@ #include "qnamespace.h" #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkNameFilterPrivate : public QLandmarkFilterPrivate { @@ -80,6 +80,6 @@ public: QLandmarkFilter::MatchFlags flags; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarknamesort.cpp b/src/location/landmarks/qlandmarknamesort.cpp index 4fc995d9..c6f57663 100644 --- a/src/location/landmarks/qlandmarknamesort.cpp +++ b/src/location/landmarks/qlandmarknamesort.cpp @@ -42,7 +42,7 @@ #include "qlandmarknamesort.h" #include "qlandmarknamesort_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkNameSort @@ -61,6 +61,7 @@ Q_IMPLEMENT_LANDMARKSORTORDER_PRIVATE(QLandmarkNameSort) /*! Creates a sort order that sorts by name according to the given \a direction and case \a sensitivity. + \since 1.1 */ QLandmarkNameSort::QLandmarkNameSort(Qt::SortOrder direction, Qt::CaseSensitivity sensitivity) : QLandmarkSortOrder(new QLandmarkNameSortPrivate()) @@ -73,6 +74,7 @@ QLandmarkNameSort::QLandmarkNameSort(Qt::SortOrder direction, Qt::CaseSensitivit /*! \fn QLandmarkNameSort::QLandmarkNameSort(const QLandmarkSortOrder &other) Constructs a copy of \a other if possible, otherwise constructs a new name sort order. + \since 1.1 */ /*! @@ -84,6 +86,7 @@ QLandmarkNameSort::~QLandmarkNameSort() /*! Returns the case sensitivity of the sort order. + \since 1.1 */ Qt::CaseSensitivity QLandmarkNameSort::caseSensitivity() const { @@ -93,6 +96,7 @@ Qt::CaseSensitivity QLandmarkNameSort::caseSensitivity() const /*! Sets the the \a caseSensitivity of the sort order. + \since 1.1 */ void QLandmarkNameSort::setCaseSensitivity(Qt::CaseSensitivity caseSensitivity) { @@ -116,4 +120,4 @@ QLandmarkNameSortPrivate::QLandmarkNameSortPrivate(const QLandmarkNameSortPrivat QLandmarkNameSortPrivate::~QLandmarkNameSortPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarknamesort.h b/src/location/landmarks/qlandmarknamesort.h index 4f40c03d..55ab535a 100644 --- a/src/location/landmarks/qlandmarknamesort.h +++ b/src/location/landmarks/qlandmarknamesort.h @@ -46,7 +46,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkNameSortPrivate; class Q_LOCATION_EXPORT QLandmarkNameSort : public QLandmarkSortOrder @@ -62,7 +62,7 @@ private: Q_DECLARE_LANDMARKSORTORDER_PRIVATE(QLandmarkNameSort) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/landmarks/qlandmarknamesort_p.h b/src/location/landmarks/qlandmarknamesort_p.h index e61b6a55..e3bed470 100644 --- a/src/location/landmarks/qlandmarknamesort_p.h +++ b/src/location/landmarks/qlandmarknamesort_p.h @@ -55,7 +55,7 @@ #include "qlandmarksortorder_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkNameSortPrivate : public QLandmarkSortOrderPrivate { @@ -76,6 +76,6 @@ public: Qt::CaseSensitivity sensitivity; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkproximityfilter.cpp b/src/location/landmarks/qlandmarkproximityfilter.cpp index 07b72598..d6672078 100644 --- a/src/location/landmarks/qlandmarkproximityfilter.cpp +++ b/src/location/landmarks/qlandmarkproximityfilter.cpp @@ -43,7 +43,7 @@ #include "qlandmarkproximityfilter_p.h" #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkProximityFilter @@ -68,6 +68,7 @@ Q_IMPLEMENT_LANDMARKFILTER_PRIVATE(QLandmarkProximityFilter) /*! Creates a filter that will select landmarks within a given \a radius around a \a center coordinate. + \since 1.1 */ QLandmarkProximityFilter::QLandmarkProximityFilter(const QGeoCoordinate ¢er, qreal radius) : QLandmarkFilter(new QLandmarkProximityFilterPrivate(QGeoBoundingCircle(center, radius))) @@ -76,6 +77,7 @@ QLandmarkProximityFilter::QLandmarkProximityFilter(const QGeoCoordinate ¢er, /*! Creates a filter that will select landmarks withiin a given bounding \a circle. + \since 1.1 */ QLandmarkProximityFilter::QLandmarkProximityFilter(const QGeoBoundingCircle &circle) : QLandmarkFilter(new QLandmarkProximityFilterPrivate(circle)) @@ -85,6 +87,7 @@ QLandmarkProximityFilter::QLandmarkProximityFilter(const QGeoBoundingCircle &cir /*! \fn QLandmarkProximityFilter::QLandmarkProximityFilter(const QLandmarkFilter &other) Constructs a copy of \a other if possible, otherwise constructs a new proximity filter. + \since 1.1 */ /*! @@ -97,6 +100,7 @@ QLandmarkProximityFilter::~QLandmarkProximityFilter() /*! Returns the center coordinate of the filter. + \since 1.1 */ QGeoCoordinate QLandmarkProximityFilter::center() const { @@ -106,6 +110,7 @@ QGeoCoordinate QLandmarkProximityFilter::center() const /*! Sets the \a center coordinate of the filter. + \since 1.1 */ void QLandmarkProximityFilter::setCenter(const QGeoCoordinate ¢er) { @@ -115,6 +120,7 @@ void QLandmarkProximityFilter::setCenter(const QGeoCoordinate ¢er) /*! Returns the radius of the filter. The unit of the radius is meters. + \since 1.1 */ qreal QLandmarkProximityFilter::radius() const { @@ -124,6 +130,7 @@ qreal QLandmarkProximityFilter::radius() const /*! Sets the \a radius of the filter. The unit of the radius is meters. + \since 1.1 */ void QLandmarkProximityFilter::setRadius(qreal radius) { @@ -133,6 +140,7 @@ void QLandmarkProximityFilter::setRadius(qreal radius) /*! Sets the bounding circle for the proximity filter. + \since 1.1 */ QGeoBoundingCircle QLandmarkProximityFilter::boundingCircle() { @@ -142,6 +150,7 @@ QGeoBoundingCircle QLandmarkProximityFilter::boundingCircle() /*! Sets the bounding \a circle for the proximity filter + \since 1.1 */ void QLandmarkProximityFilter::setBoundingCircle(const QGeoBoundingCircle &circle) { @@ -168,4 +177,4 @@ QLandmarkProximityFilterPrivate::QLandmarkProximityFilterPrivate(const QLandmark QLandmarkProximityFilterPrivate::~QLandmarkProximityFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkproximityfilter.h b/src/location/landmarks/qlandmarkproximityfilter.h index 0f480730..f937df1b 100644 --- a/src/location/landmarks/qlandmarkproximityfilter.h +++ b/src/location/landmarks/qlandmarkproximityfilter.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkProximityFilterPrivate; class Q_LOCATION_EXPORT QLandmarkProximityFilter : public QLandmarkFilter @@ -72,7 +72,7 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkProximityFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/landmarks/qlandmarkproximityfilter_p.h b/src/location/landmarks/qlandmarkproximityfilter_p.h index 8024b899..6c1f1586 100644 --- a/src/location/landmarks/qlandmarkproximityfilter_p.h +++ b/src/location/landmarks/qlandmarkproximityfilter_p.h @@ -56,7 +56,7 @@ #include "qlandmarkfilter_p.h" #include "qlandmarkproximityfilter.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -79,6 +79,6 @@ public: QGeoBoundingCircle circle; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkremoverequest.cpp b/src/location/landmarks/qlandmarkremoverequest.cpp index 4f9f43c9..8606c211 100644 --- a/src/location/landmarks/qlandmarkremoverequest.cpp +++ b/src/location/landmarks/qlandmarkremoverequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include <QMap> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkRemoveRequest @@ -81,6 +81,7 @@ QLandmarkRemoveRequest::~QLandmarkRemoveRequest() /*! Returns the list of identifiers of landmarks which will be removed. + \since 1.1 */ QList<QLandmarkId> QLandmarkRemoveRequest::landmarkIds() const { @@ -92,6 +93,7 @@ QList<QLandmarkId> QLandmarkRemoveRequest::landmarkIds() const /*! Sets the list of \a landmarkIds of landmarks which will be removed. + \since 1.1 \sa setLandmarkId() */ void QLandmarkRemoveRequest::setLandmarkIds(const QList<QLandmarkId> &landmarkIds) @@ -106,6 +108,7 @@ void QLandmarkRemoveRequest::setLandmarkIds(const QList<QLandmarkId> &landmarkId It is the equivalent of calling setLandmarkIds() with a single \a landmarkId in the ID list. + \since 1.1 \sa setLandmarkIds() */ void QLandmarkRemoveRequest::setLandmarkId(const QLandmarkId &landmarkId) @@ -121,6 +124,7 @@ void QLandmarkRemoveRequest::setLandmarkId(const QLandmarkId &landmarkId) This function is the equivalent of calling setLandmarkIds() with the IDs of the \a landmarks. + \since 1.1 \sa setLandmarkIds() */ void QLandmarkRemoveRequest::setLandmarks(const QList<QLandmark> &landmarks) @@ -136,6 +140,7 @@ void QLandmarkRemoveRequest::setLandmarks(const QList<QLandmark> &landmarks) Convenience function that sets a single \a landmark to be removed. This function is the equivalent of calling setLandmarkIds() with the ID of \a landmark. + \since 1.1 */ void QLandmarkRemoveRequest::setLandmark(const QLandmark &landmark) { @@ -148,6 +153,7 @@ void QLandmarkRemoveRequest::setLandmark(const QLandmark &landmark) /*! Returns the mapping of input landmark ID list indices to the errors which occurred. + \since 1.1 */ QMap<int, QLandmarkManager::Error> QLandmarkRemoveRequest::errorMap() const { @@ -158,6 +164,6 @@ QMap<int, QLandmarkManager::Error> QLandmarkRemoveRequest::errorMap() const #include "moc_qlandmarkremoverequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkremoverequest.h b/src/location/landmarks/qlandmarkremoverequest.h index f24ae8b5..c31a3915 100644 --- a/src/location/landmarks/qlandmarkremoverequest.h +++ b/src/location/landmarks/qlandmarkremoverequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkRemoveRequestPrivate; class Q_LOCATION_EXPORT QLandmarkRemoveRequest : public QLandmarkAbstractRequest @@ -68,7 +68,7 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkrequests_p.h b/src/location/landmarks/qlandmarkrequests_p.h index f2022953..354cbd4d 100644 --- a/src/location/landmarks/qlandmarkrequests_p.h +++ b/src/location/landmarks/qlandmarkrequests_p.h @@ -59,7 +59,7 @@ #include "qlandmarkcategoryfetchrequest.h" #include "qlandmarknamesort.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIdFetchRequestPrivate : public QLandmarkAbstractRequestPrivate { @@ -252,6 +252,6 @@ public: QList<QLandmarkId> landmarkIds; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarksaverequest.cpp b/src/location/landmarks/qlandmarksaverequest.cpp index e5d4545b..0e61da46 100644 --- a/src/location/landmarks/qlandmarksaverequest.cpp +++ b/src/location/landmarks/qlandmarksaverequest.cpp @@ -44,7 +44,7 @@ #include "qlandmark.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkSaveRequest @@ -85,6 +85,7 @@ QLandmarkSaveRequest::~QLandmarkSaveRequest() finished, any new landmarks will have had their QLandmarkId set. (Landmarks which were updated or failed to save will remain unchanged, use the errorMap() function to determine which particular landmarks failed to save.) + \since 1.1 */ QList<QLandmark> QLandmarkSaveRequest::landmarks() const { @@ -96,6 +97,7 @@ QList<QLandmark> QLandmarkSaveRequest::landmarks() const /*! Sets the list of \a landmarks to be saved. + \since 1.1 \sa setLandmark() */ void QLandmarkSaveRequest::setLandmarks(const QList<QLandmark> &landmarks) @@ -110,6 +112,7 @@ void QLandmarkSaveRequest::setLandmarks(const QList<QLandmark> &landmarks) function is the equivalent of calling setLandmarks() with a single \a landmark. + \since 1.1 \sa setLandmarks() */ void QLandmarkSaveRequest::setLandmark(const QLandmark &landmark) @@ -122,6 +125,7 @@ void QLandmarkSaveRequest::setLandmark(const QLandmark &landmark) /*! Returns the mapping of input landmark list indices to errors which occurred. + \since 1.1 */ QMap<int, QLandmarkManager::Error> QLandmarkSaveRequest::errorMap() const { @@ -132,6 +136,6 @@ QMap<int, QLandmarkManager::Error> QLandmarkSaveRequest::errorMap() const #include "moc_qlandmarksaverequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarksaverequest.h b/src/location/landmarks/qlandmarksaverequest.h index 73f45d8a..556590c4 100644 --- a/src/location/landmarks/qlandmarksaverequest.h +++ b/src/location/landmarks/qlandmarksaverequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkSaveRequestPrivate; class Q_LOCATION_EXPORT QLandmarkSaveRequest : public QLandmarkAbstractRequest @@ -65,7 +65,7 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarksortorder.cpp b/src/location/landmarks/qlandmarksortorder.cpp index 050db7ec..ac297875 100644 --- a/src/location/landmarks/qlandmarksortorder.cpp +++ b/src/location/landmarks/qlandmarksortorder.cpp @@ -44,13 +44,13 @@ #include "qlandmarkid.h" #if !defined(Q_CC_MWERKS) -template<> QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate)>::clone() +template<> QT_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate)>::clone() { return d->clone(); } #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkSortOrder @@ -105,6 +105,7 @@ QLandmarkSortOrder::QLandmarkSortOrder(const QLandmarkSortOrder &other) /*! Assigns \a other to this sort order and returns a reference to this sort order. + \since 1.1 */ QLandmarkSortOrder &QLandmarkSortOrder::operator=(const QLandmarkSortOrder & other) { @@ -121,6 +122,7 @@ QLandmarkSortOrder::~QLandmarkSortOrder() /*! Returns the type of sort. + \since 1.1 */ QLandmarkSortOrder::SortType QLandmarkSortOrder::type() const { @@ -129,6 +131,7 @@ QLandmarkSortOrder::SortType QLandmarkSortOrder::type() const /*! Returns the direction of the sort order. + \since 1.1 */ Qt::SortOrder QLandmarkSortOrder::direction() const { @@ -137,6 +140,7 @@ Qt::SortOrder QLandmarkSortOrder::direction() const /*! Sets the \a direction of the sort order. + \since 1.1 */ void QLandmarkSortOrder::setDirection(Qt::SortOrder direction) { @@ -147,6 +151,7 @@ void QLandmarkSortOrder::setDirection(Qt::SortOrder direction) \fn QLandmarkSortOrder::operator==(const QLandmarkSortOrder& other) const Returns true if this sort order is identical to \a other. \sa operator!=() + \since 1.1 */ bool QLandmarkSortOrder::operator==(const QLandmarkSortOrder& other) const { @@ -166,6 +171,7 @@ bool QLandmarkSortOrder::operator==(const QLandmarkSortOrder& other) const \fn QLandmarkSortOrder::operator!=(const QLandmarkSortOrder &other) const Returns true if this sort order is not identical to \a other. + \since 1.1 \sa operator==() */ @@ -190,4 +196,4 @@ QLandmarkSortOrderPrivate::~QLandmarkSortOrderPrivate() { } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarksortorder.h b/src/location/landmarks/qlandmarksortorder.h index 0e26f022..48bd6f83 100644 --- a/src/location/landmarks/qlandmarksortorder.h +++ b/src/location/landmarks/qlandmarksortorder.h @@ -50,7 +50,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #define Q_DECLARE_LANDMARKSORTORDER_PRIVATE(Class) \ inline Class##Private* d_func(); \ @@ -87,7 +87,7 @@ protected: QSharedDataPointer<QLandmarkSortOrderPrivate> d_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/landmarks/qlandmarksortorder_p.h b/src/location/landmarks/qlandmarksortorder_p.h index 2b441b6e..68dd8bd7 100644 --- a/src/location/landmarks/qlandmarksortorder_p.h +++ b/src/location/landmarks/qlandmarksortorder_p.h @@ -56,7 +56,7 @@ #include "qlandmarksortorder.h" #include <QSharedData> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #define Q_IMPLEMENT_LANDMARKSORTORDER_PRIVATE(Class) \ Class##Private* Class::d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \ @@ -93,18 +93,17 @@ public: Qt::SortOrder order; }; -QTM_END_NAMESPACE #if defined(Q_CC_MWERKS) // This results in multiple symbol definition errors on all other compilers // but not having a definition here results in an attempt to use the unspecialized // clone (which fails because of the pure virtuals above) -template<> QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate)>::clone() +template<> QLandmarkSortOrderPrivate *QSharedDataPointer<QLandmarkSortOrderPrivate>::clone() { return d->clone(); } #else -template<> QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate)>::clone(); +template<> QLandmarkSortOrderPrivate *QSharedDataPointer<QLandmarkSortOrderPrivate>::clone(); #endif QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkunionfilter.cpp b/src/location/landmarks/qlandmarkunionfilter.cpp index 3fdccf4f..63deb357 100644 --- a/src/location/landmarks/qlandmarkunionfilter.cpp +++ b/src/location/landmarks/qlandmarkunionfilter.cpp @@ -42,7 +42,7 @@ #include "qlandmarkunionfilter.h" #include "qlandmarkunionfilter_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkUnionFilter @@ -75,6 +75,7 @@ QLandmarkUnionFilter::QLandmarkUnionFilter() /*! \fn QLandmarkUnionFilter::QLandmarkUnionFilter(const QLandmarkFilter &other) Constructs a copy of \a other if possible, otherwise constructs a new union filter. + \since 1.1 */ /*! @@ -87,6 +88,7 @@ QLandmarkUnionFilter::~QLandmarkUnionFilter() /*! Sets the \a filters whose criteria will be unioned. + \since 1.1 \sa filters() */ void QLandmarkUnionFilter::setFilters(const QList<QLandmarkFilter>& filters) @@ -98,6 +100,7 @@ void QLandmarkUnionFilter::setFilters(const QList<QLandmarkFilter>& filters) /*! Prepends the given \a filter to the list of unioned filters. + \since 1.1 \sa append(), filters() */ void QLandmarkUnionFilter::prepend(const QLandmarkFilter &filter) @@ -109,6 +112,7 @@ void QLandmarkUnionFilter::prepend(const QLandmarkFilter &filter) /*! Appends the given \a filter to the list of unioned filters. + \since 1.1 \sa operator<<(), prepend(), filters() */ void QLandmarkUnionFilter::append(const QLandmarkFilter &filter) @@ -119,6 +123,7 @@ void QLandmarkUnionFilter::append(const QLandmarkFilter &filter) /*! Removes the given \a filter from the union list. + \since 1.1 \sa filters(), append(), prepend() */ void QLandmarkUnionFilter::remove(const QLandmarkFilter &filter) @@ -129,6 +134,7 @@ void QLandmarkUnionFilter::remove(const QLandmarkFilter &filter) /*! Removes all filters from the union list. + \since 1.1 \sa remove() */ void QLandmarkUnionFilter::clear() @@ -140,6 +146,7 @@ void QLandmarkUnionFilter::clear() /*! Appends the given \a filter to the list of unioned filters. + \since 1.1 \sa append() */ QLandmarkUnionFilter& QLandmarkUnionFilter::operator<<(const QLandmarkFilter &filter) @@ -152,6 +159,7 @@ QLandmarkUnionFilter& QLandmarkUnionFilter::operator<<(const QLandmarkFilter &fi /*! Returns the list of filters which form the union filter. + \since 1.1 \sa setFilters(), prepend(), append(), remove() */ QList<QLandmarkFilter> QLandmarkUnionFilter::filters() const @@ -175,4 +183,4 @@ QLandmarkUnionFilterPrivate::QLandmarkUnionFilterPrivate(const QLandmarkUnionFil QLandmarkUnionFilterPrivate::~QLandmarkUnionFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkunionfilter.h b/src/location/landmarks/qlandmarkunionfilter.h index 3ecf29cd..a0e17753 100644 --- a/src/location/landmarks/qlandmarkunionfilter.h +++ b/src/location/landmarks/qlandmarkunionfilter.h @@ -45,7 +45,7 @@ #include "qlandmarkfilter.h" #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkUnionFilterPrivate; class Q_LOCATION_EXPORT QLandmarkUnionFilter : public QLandmarkFilter @@ -69,7 +69,7 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkUnionFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkunionfilter_p.h b/src/location/landmarks/qlandmarkunionfilter_p.h index e9419d56..32b8705d 100644 --- a/src/location/landmarks/qlandmarkunionfilter_p.h +++ b/src/location/landmarks/qlandmarkunionfilter_p.h @@ -57,7 +57,7 @@ #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkUnionFilterPrivate : public QLandmarkFilterPrivate { @@ -78,6 +78,6 @@ public: QList<QLandmarkFilter> filters; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/location.pro b/src/location/location.pro index 16e2e4ab..c4add6d2 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -10,7 +10,9 @@ QT = core gui network DEFINES += QT_BUILD_LOCATION_LIB QT_MAKEDLL -include($$QT_SOURCE_TREE/src/qbase.pri) +INCLUDEPATH += $$QT.location.private_includes/QtLocation + +load(qt_module_config) HEADERS += qtlocationversion.h diff --git a/src/location/maps/qgeomaneuver.cpp b/src/location/maps/qgeomaneuver.cpp index 1a1767ca..94b44873 100644 --- a/src/location/maps/qgeomaneuver.cpp +++ b/src/location/maps/qgeomaneuver.cpp @@ -44,7 +44,7 @@ #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoManeuver @@ -318,4 +318,4 @@ bool QGeoManeuverPrivate::operator ==(const QGeoManeuverPrivate &other) const && (waypoint == other.waypoint)); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h index a50af961..83245ede 100644 --- a/src/location/maps/qgeomaneuver.h +++ b/src/location/maps/qgeomaneuver.h @@ -46,11 +46,11 @@ #include <QExplicitlySharedDataPointer> -class QString; QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QString; class QGeoCoordinate; class QGeoManeuverPrivate; @@ -107,7 +107,7 @@ private: QExplicitlySharedDataPointer<QGeoManeuverPrivate> d_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/maps/qgeomaneuver_p.h b/src/location/maps/qgeomaneuver_p.h index ae8bc043..2e176e0c 100644 --- a/src/location/maps/qgeomaneuver_p.h +++ b/src/location/maps/qgeomaneuver_p.h @@ -59,7 +59,7 @@ #include <QSharedData> #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoManeuverPrivate : public QSharedData { @@ -80,6 +80,6 @@ public: QGeoCoordinate waypoint; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapcircleobject.cpp b/src/location/maps/qgeomapcircleobject.cpp index c8767cab..9da75184 100644 --- a/src/location/maps/qgeomapcircleobject.cpp +++ b/src/location/maps/qgeomapcircleobject.cpp @@ -46,7 +46,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapCircleObject @@ -336,5 +336,5 @@ QGeoMapCircleObjectPrivate::~QGeoMapCircleObjectPrivate() #include "moc_qgeomapcircleobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapcircleobject.h b/src/location/maps/qgeomapcircleobject.h index b253ed8b..5fce4504 100644 --- a/src/location/maps/qgeomapcircleobject.h +++ b/src/location/maps/qgeomapcircleobject.h @@ -48,7 +48,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingCircle; @@ -103,7 +103,7 @@ private: Q_DISABLE_COPY(QGeoMapCircleObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE Q_DECLARE_METATYPE(qreal) diff --git a/src/location/maps/qgeomapcircleobject_p.h b/src/location/maps/qgeomapcircleobject_p.h index 66ba98f5..565f6b3c 100644 --- a/src/location/maps/qgeomapcircleobject_p.h +++ b/src/location/maps/qgeomapcircleobject_p.h @@ -47,7 +47,7 @@ #include "qgeoboundingcircle.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapCircleObjectPrivate { @@ -61,6 +61,6 @@ public: quint32 pointCount; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapcustomobject.cpp b/src/location/maps/qgeomapcustomobject.cpp index 26e63978..77203818 100644 --- a/src/location/maps/qgeomapcustomobject.cpp +++ b/src/location/maps/qgeomapcustomobject.cpp @@ -45,12 +45,12 @@ #include <QGraphicsItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapCustomObject \brief The QGeoMapCustomObject class is a QGeoMapObject used to draw - a pixmap on a map. + a QGraphicsItem on a map. \inmodule QtLocation @@ -160,6 +160,11 @@ QGeoMapObject::Type QGeoMapCustomObject::type() const } /*! + If the graphics item is modified this + method should be called immediately afterwards to inform + the map that an update is required. . + + This method causes the triggerUpdate() signal to be emitted. */ void QGeoMapCustomObject::update() { @@ -168,6 +173,9 @@ void QGeoMapCustomObject::update() /*! \fn void QGeoMapCustomObject::triggerUpdate() + + This signal indicates that the graphics item has + changed and that the map needs to be updated. */ /*! @@ -282,5 +290,5 @@ QGeoMapCustomObjectPrivate::~QGeoMapCustomObjectPrivate() #include "moc_qgeomapcustomobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapcustomobject.h b/src/location/maps/qgeomapcustomobject.h index 66ae0a9a..a79e5b89 100644 --- a/src/location/maps/qgeomapcustomobject.h +++ b/src/location/maps/qgeomapcustomobject.h @@ -49,7 +49,7 @@ #include <QGraphicsItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapCustomObjectPrivate; @@ -89,6 +89,6 @@ private: Q_DISABLE_COPY(QGeoMapCustomObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapcustomobject_p.h b/src/location/maps/qgeomapcustomobject_p.h index fe292066..5387f193 100644 --- a/src/location/maps/qgeomapcustomobject_p.h +++ b/src/location/maps/qgeomapcustomobject_p.h @@ -46,10 +46,10 @@ #include <QPoint> -class QGraphicsItem; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QGraphicsItem; class QGeoMapCustomObjectPrivate { public: @@ -60,6 +60,6 @@ public: QPoint offset; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapdata.cpp b/src/location/maps/qgeomapdata.cpp index c4e0fdf1..6f7a2be3 100644 --- a/src/location/maps/qgeomapdata.cpp +++ b/src/location/maps/qgeomapdata.cpp @@ -63,7 +63,7 @@ #include "qgeomapobject_p.h" #include <private/projwrapper_p.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapData @@ -785,9 +785,9 @@ QGeoMapDataPrivate::QGeoMapDataPrivate(QGeoMapData *parent, QGeoMappingManagerEn containerObject(0), zoomLevel(-1.0), shiftSinceLastInval(0, 0), - windowSize(0, 0), bearing(0.0), tilt(0.0), + windowSize(0, 0), blockPropertyChangeSignals(false), q_ptr(parent) {} @@ -833,4 +833,4 @@ void QGeoMapDataPrivate::emitUpdateMapDisplay(const QRectF &target) #include "moc_qgeomapdata.cpp" #include "moc_qgeomapdata_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapdata.h b/src/location/maps/qgeomapdata.h index 5747fc57..20a22a24 100644 --- a/src/location/maps/qgeomapdata.h +++ b/src/location/maps/qgeomapdata.h @@ -50,7 +50,7 @@ #include <QPainter> #include <QStyleOptionGraphicsItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBox; @@ -166,6 +166,6 @@ private: friend class QGeoMapGroupObject; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapdata_p.h b/src/location/maps/qgeomapdata_p.h index 3189799d..1bd1ccc5 100644 --- a/src/location/maps/qgeomapdata_p.h +++ b/src/location/maps/qgeomapdata_p.h @@ -62,7 +62,7 @@ #include <private/projwrapper_p.h> #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMappingManagerEngine; class QGeoMapObjectEngine; @@ -105,6 +105,6 @@ private: Q_DISABLE_COPY(QGeoMapDataPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapgroupobject.cpp b/src/location/maps/qgeomapgroupobject.cpp index 68aebd87..07b19441 100644 --- a/src/location/maps/qgeomapgroupobject.cpp +++ b/src/location/maps/qgeomapgroupobject.cpp @@ -51,7 +51,7 @@ #include "qgeomapdata.h" #include "qgeomapdata_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapGroupObject @@ -260,8 +260,15 @@ void QGeoMapGroupObject::setMapData(QGeoMapData *mapData) /*! \fn void QGeoMapGroupObject::childUpdated(QGeoMapObject *childObject) - This signal will be emitted when the map object \a childObject - belonging to the group is updated. + This signal will be emitted if the map object \a childObject has + changed such that the corresponding QGeoMapObjectInfo class that handles + the map-specific behaviours of the object needs to be informed of + the change. + + The map object \a childObject must belong to this group. + + At the moment this is only emitted when the z-value of the + child-objects are changed. */ /*! @@ -305,5 +312,5 @@ void QGeoMapGroupObjectPrivate::childChangedZValue(int zValue) #include "moc_qgeomapgroupobject.cpp" #include "moc_qgeomapgroupobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapgroupobject.h b/src/location/maps/qgeomapgroupobject.h index 5329deec..364e01fd 100644 --- a/src/location/maps/qgeomapgroupobject.h +++ b/src/location/maps/qgeomapgroupobject.h @@ -44,7 +44,7 @@ #include "qgeomapobject.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBox; @@ -82,6 +82,6 @@ private: Q_DISABLE_COPY(QGeoMapGroupObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapgroupobject_p.h b/src/location/maps/qgeomapgroupobject_p.h index 40d67fa6..9971b533 100644 --- a/src/location/maps/qgeomapgroupobject_p.h +++ b/src/location/maps/qgeomapgroupobject_p.h @@ -47,7 +47,7 @@ #include <QObject> #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapGroupObject; @@ -68,6 +68,6 @@ private: QGeoMapGroupObject *q_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapobject.cpp b/src/location/maps/qgeomapobject.cpp index 257dbc07..3f0b3993 100644 --- a/src/location/maps/qgeomapobject.cpp +++ b/src/location/maps/qgeomapobject.cpp @@ -51,7 +51,7 @@ #include <QtAlgorithms> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapObject @@ -531,4 +531,4 @@ QGeoMapObjectPrivate::~QGeoMapObjectPrivate() #include "moc_qgeomapobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapobject.h b/src/location/maps/qgeomapobject.h index a8b76969..11e40b25 100644 --- a/src/location/maps/qgeomapobject.h +++ b/src/location/maps/qgeomapobject.h @@ -47,11 +47,11 @@ #include <QList> #include <QObject> +QT_BEGIN_NAMESPACE class QPainter; class QRectF; class QGraphicsItem; -QTM_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBox; @@ -149,6 +149,6 @@ private: friend class QGeoMapGroupObject; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapobject_p.h b/src/location/maps/qgeomapobject_p.h index b67931c3..0d0c160a 100644 --- a/src/location/maps/qgeomapobject_p.h +++ b/src/location/maps/qgeomapobject_p.h @@ -57,10 +57,10 @@ #include "qgeomapobjectinfo.h" #include "qgeocoordinate.h" -class QGraphicsItem; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QGraphicsItem; class QGeoMapObject; class QGeoMapData; @@ -85,6 +85,6 @@ public: Q_DISABLE_COPY(QGeoMapObjectPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapobjectengine_p.cpp b/src/location/maps/qgeomapobjectengine_p.cpp index 987651e0..7579b829 100644 --- a/src/location/maps/qgeomapobjectengine_p.cpp +++ b/src/location/maps/qgeomapobjectengine_p.cpp @@ -58,7 +58,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /* A quick note about how the transforms are set up: @@ -171,6 +171,9 @@ void QGeoMapObjectEngine::removeObject(QGeoMapObject *object) foreach (QRectF rect, rectsToUpdate) mdp->emitUpdateMapDisplay(rect); + + objectsForLatLonUpdate.removeAll(object); + objectsForPixelUpdate.removeAll(object); } } @@ -285,12 +288,12 @@ bool QGeoMapObjectEngine::exactMetersToSeconds(const QGeoCoordinate &origin, QGraphicsItem *item, QList<QPolygonF> &polys) { - QString projStr = "+proj=tmerc +lat_0=%1 +lon_0=%2 +k=1.0 +x_0=0 +y_0=0 +ellps=WGS84"; + QString projStr = QLatin1String("+proj=tmerc +lat_0=%1 +lon_0=%2 +k=1.0 +x_0=0 +y_0=0 +ellps=WGS84"); projStr = projStr.arg(origin.latitude(), 0, 'f', 12) .arg(origin.longitude(), 0, 'f', 12); ProjCoordinateSystem localSys(projStr, false); - ProjCoordinateSystem wgs84("+proj=latlon +ellps=WGS84"); + ProjCoordinateSystem wgs84(QLatin1String("+proj=latlon +ellps=WGS84")); QTransform west; west.translate(360.0 * 3600.0, 0.0); @@ -491,12 +494,12 @@ void QGeoMapObjectEngine::bilinearMetersToSeconds(const QGeoCoordinate &origin, QPolygonF &local, QTransform &latLon) { - QString projStr = "+proj=tmerc +lat_0=%1 +lon_0=%2 +k=1.0 +x_0=0 +y_0=0 +ellps=WGS84"; + QString projStr = QLatin1String("+proj=tmerc +lat_0=%1 +lon_0=%2 +k=1.0 +x_0=0 +y_0=0 +ellps=WGS84"); projStr = projStr.arg(origin.latitude(), 0, 'f', 12) .arg(origin.longitude(), 0, 'f', 12); ProjCoordinateSystem localSys(projStr, false); - ProjCoordinateSystem wgs84("+proj=latlon +ellps=WGS84"); + ProjCoordinateSystem wgs84(QLatin1String("+proj=latlon +ellps=WGS84")); ProjPolygon p(local, localSys); if (!p.convert(wgs84)) { @@ -1134,7 +1137,7 @@ QPolygonF QGeoMapObjectEngine::latLonViewport() c = viewport.bottomLeft(); view << QPointF(c.longitude() * 3600.0, c.latitude() * 3600.0); c2 = viewport.bottomRight(); - if (c2.longitude() < c.longitude()) + if (c2.longitude() <= c.longitude()) offset = 360.0 * 3600.0; view << QPointF(c2.longitude() * 3600.0 + offset, c2.latitude() * 3600.0); c = viewport.topRight(); @@ -1176,4 +1179,4 @@ QGraphicsItem* QGeoMapObjectEngine::graphicsItemFromMapObject(QGeoMapObject *obj #include "moc_qgeomapobjectengine_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapobjectengine_p.h b/src/location/maps/qgeomapobjectengine_p.h index 6b60081a..91d0bc97 100644 --- a/src/location/maps/qgeomapobjectengine_p.h +++ b/src/location/maps/qgeomapobjectengine_p.h @@ -62,11 +62,11 @@ #include <QHash> #include <QList> +QT_BEGIN_NAMESPACE class QTransform; class QGraphicsItem; class QGraphicsScene; -QTM_BEGIN_NAMESPACE class QGeoMapObjectEngine : public QObject { @@ -170,6 +170,6 @@ private: Q_DISABLE_COPY(QGeoMapObjectEngine) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOMAPOBJECTENGINE_P_H diff --git a/src/location/maps/qgeomapobjectinfo.cpp b/src/location/maps/qgeomapobjectinfo.cpp index 26484e3c..eeefcb8a 100644 --- a/src/location/maps/qgeomapobjectinfo.cpp +++ b/src/location/maps/qgeomapobjectinfo.cpp @@ -48,7 +48,7 @@ #include "qgeomapobject_p.h" #include "qgeoboundingbox.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapObjectInfo @@ -261,4 +261,4 @@ QGeoMapObjectInfoPrivate::~QGeoMapObjectInfoPrivate() {} #include "moc_qgeomapobjectinfo.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapobjectinfo.h b/src/location/maps/qgeomapobjectinfo.h index 7e034923..f9fafa7c 100644 --- a/src/location/maps/qgeomapobjectinfo.h +++ b/src/location/maps/qgeomapobjectinfo.h @@ -48,7 +48,7 @@ #include <QObject> #include <QSizeF> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBox; @@ -92,6 +92,6 @@ private: Q_DISABLE_COPY(QGeoMapObjectInfo) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapobjectinfo_p.h b/src/location/maps/qgeomapobjectinfo_p.h index 88272495..646f6355 100644 --- a/src/location/maps/qgeomapobjectinfo_p.h +++ b/src/location/maps/qgeomapobjectinfo_p.h @@ -55,7 +55,7 @@ #include "qmobilityglobal.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapObject; class QGeoMapData; @@ -73,6 +73,6 @@ private: Q_DISABLE_COPY(QGeoMapObjectInfoPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapoverlay.cpp b/src/location/maps/qgeomapoverlay.cpp index 6d3f5a04..8ee2e80d 100644 --- a/src/location/maps/qgeomapoverlay.cpp +++ b/src/location/maps/qgeomapoverlay.cpp @@ -44,7 +44,7 @@ #include "qgeomapdata.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapOverlay @@ -111,4 +111,4 @@ QGeoMapOverlayPrivate::~QGeoMapOverlayPrivate() {} /******************************************************************************* *******************************************************************************/ -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapoverlay.h b/src/location/maps/qgeomapoverlay.h index 0d807ad6..2e887282 100644 --- a/src/location/maps/qgeomapoverlay.h +++ b/src/location/maps/qgeomapoverlay.h @@ -47,11 +47,11 @@ #include <QList> #include <QObject> +QT_BEGIN_NAMESPACE + class QPainter; class QStyleOptionGraphicsItem; -QTM_BEGIN_NAMESPACE - class QGeoMapData; class QGeoMapOverlayPrivate; @@ -76,6 +76,6 @@ private: friend class QGeoMapData; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapoverlay_p.h b/src/location/maps/qgeomapoverlay_p.h index 585a4b81..491006b1 100644 --- a/src/location/maps/qgeomapoverlay_p.h +++ b/src/location/maps/qgeomapoverlay_p.h @@ -55,7 +55,7 @@ #include "qmobilityglobal.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapData; @@ -71,6 +71,6 @@ private: Q_DISABLE_COPY(QGeoMapOverlayPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp index 874095bf..23027fa8 100644 --- a/src/location/maps/qgeomappingmanager.cpp +++ b/src/location/maps/qgeomappingmanager.cpp @@ -46,7 +46,7 @@ #include <QNetworkProxy> #include <QLocale> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMappingManager @@ -261,4 +261,4 @@ QGeoMappingManagerPrivate::~QGeoMappingManagerPrivate() #include "moc_qgeomappingmanager.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomappingmanager.h b/src/location/maps/qgeomappingmanager.h index 9baae007..d2e51b32 100644 --- a/src/location/maps/qgeomappingmanager.h +++ b/src/location/maps/qgeomappingmanager.h @@ -48,9 +48,9 @@ #include <QSize> #include <QPair> -class QLocale; +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QLocale; class QGeoBoundingBox; class QGeoCoordinate; @@ -98,6 +98,6 @@ private: friend class QGeoServiceProvider; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappingmanager_p.h b/src/location/maps/qgeomappingmanager_p.h index a542f255..fa0cbbca 100644 --- a/src/location/maps/qgeomappingmanager_p.h +++ b/src/location/maps/qgeomappingmanager_p.h @@ -58,7 +58,7 @@ #include <QSize> #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMappingManagerEngine; @@ -74,6 +74,6 @@ private: Q_DISABLE_COPY(QGeoMappingManagerPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp index d063205e..fd6c8c47 100644 --- a/src/location/maps/qgeomappingmanagerengine.cpp +++ b/src/location/maps/qgeomappingmanagerengine.cpp @@ -44,7 +44,7 @@ #include <QNetworkProxy> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMappingManagerEngine @@ -428,4 +428,4 @@ QGeoMappingManagerEnginePrivate::~QGeoMappingManagerEnginePrivate() {} #include "moc_qgeomappingmanagerengine.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomappingmanagerengine.h b/src/location/maps/qgeomappingmanagerengine.h index faba70be..f8dd9872 100644 --- a/src/location/maps/qgeomappingmanagerengine.h +++ b/src/location/maps/qgeomappingmanagerengine.h @@ -48,9 +48,9 @@ #include <QSize> #include <QPair> -class QLocale; +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QLocale; class QGeoBoundingBox; class QGeoCoordinate; @@ -119,6 +119,6 @@ private: friend class QGeoServiceProvider; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappingmanagerengine_p.h b/src/location/maps/qgeomappingmanagerengine_p.h index 0129a565..95decae5 100644 --- a/src/location/maps/qgeomappingmanagerengine_p.h +++ b/src/location/maps/qgeomappingmanagerengine_p.h @@ -59,7 +59,7 @@ #include <QList> #include <QLocale> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMappingManagerEnginePrivate { @@ -86,6 +86,6 @@ private: Q_DISABLE_COPY(QGeoMappingManagerEnginePrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappixmapobject.cpp b/src/location/maps/qgeomappixmapobject.cpp index 80577752..3b5a6a74 100644 --- a/src/location/maps/qgeomappixmapobject.cpp +++ b/src/location/maps/qgeomappixmapobject.cpp @@ -43,7 +43,7 @@ #include "qgeomappixmapobject_p.h" #include "qgeoboundingbox.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapPixmapObject @@ -218,5 +218,5 @@ QGeoMapPixmapObjectPrivate::~QGeoMapPixmapObjectPrivate() {} #include "moc_qgeomappixmapobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomappixmapobject.h b/src/location/maps/qgeomappixmapobject.h index 5d2562a8..6a3ac825 100644 --- a/src/location/maps/qgeomappixmapobject.h +++ b/src/location/maps/qgeomappixmapobject.h @@ -48,7 +48,7 @@ #include <QPixmap> #include <QPoint> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapPixmapObjectPrivate; @@ -86,6 +86,6 @@ private: Q_DISABLE_COPY(QGeoMapPixmapObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappixmapobject_p.h b/src/location/maps/qgeomappixmapobject_p.h index d1b90cc1..9f6166fd 100644 --- a/src/location/maps/qgeomappixmapobject_p.h +++ b/src/location/maps/qgeomappixmapobject_p.h @@ -47,7 +47,7 @@ #include <QPixmap> #include <QPoint> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapPixmapObjectPrivate { @@ -59,6 +59,6 @@ public: QPoint offset; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappolygonobject.cpp b/src/location/maps/qgeomappolygonobject.cpp index bec8a6a2..d82aba18 100644 --- a/src/location/maps/qgeomappolygonobject.cpp +++ b/src/location/maps/qgeomappolygonobject.cpp @@ -44,7 +44,7 @@ #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapPolygonObject @@ -106,7 +106,10 @@ void QGeoMapPolygonObject::setPath(const QList<QGeoCoordinate> &path) { if (d_ptr->path != path) { d_ptr->path = path; - setOrigin(path.at(0)); + if (path.size() != 0) + setOrigin(path.at(0)); + else + setOrigin(QGeoCoordinate()); emit pathChanged(emit d_ptr->path); } } @@ -205,5 +208,5 @@ QGeoMapPolygonObjectPrivate::~QGeoMapPolygonObjectPrivate() {} #include "moc_qgeomappolygonobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomappolygonobject.h b/src/location/maps/qgeomappolygonobject.h index 23ef5d62..a293f0af 100644 --- a/src/location/maps/qgeomappolygonobject.h +++ b/src/location/maps/qgeomappolygonobject.h @@ -48,7 +48,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapPolygonObjectPrivate; @@ -85,6 +85,6 @@ private: Q_DISABLE_COPY(QGeoMapPolygonObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappolygonobject_p.h b/src/location/maps/qgeomappolygonobject_p.h index 48f6273a..c8bf4509 100644 --- a/src/location/maps/qgeomappolygonobject_p.h +++ b/src/location/maps/qgeomappolygonobject_p.h @@ -48,7 +48,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapPolygonObjectPrivate { @@ -61,6 +61,6 @@ public: QBrush brush; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappolylineobject.cpp b/src/location/maps/qgeomappolylineobject.cpp index 6464797c..bb3c501c 100644 --- a/src/location/maps/qgeomappolylineobject.cpp +++ b/src/location/maps/qgeomappolylineobject.cpp @@ -44,7 +44,7 @@ #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapPolylineObject @@ -105,7 +105,10 @@ void QGeoMapPolylineObject::setPath(const QList<QGeoCoordinate> &path) { if (d_ptr->path != path) { d_ptr->path = path; - setOrigin(path.at(0)); + if (path.size() != 0) + setOrigin(path.at(0)); + else + setOrigin(QGeoCoordinate()); emit pathChanged(d_ptr->path); } } @@ -171,5 +174,5 @@ QGeoMapPolylineObjectPrivate::~QGeoMapPolylineObjectPrivate() {} #include "moc_qgeomappolylineobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomappolylineobject.h b/src/location/maps/qgeomappolylineobject.h index bfaef47c..ec343841 100644 --- a/src/location/maps/qgeomappolylineobject.h +++ b/src/location/maps/qgeomappolylineobject.h @@ -47,7 +47,7 @@ #include <QList> #include <QPen> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -81,6 +81,6 @@ private: Q_DISABLE_COPY(QGeoMapPolylineObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappolylineobject_p.h b/src/location/maps/qgeomappolylineobject_p.h index c27afbfd..845b7953 100644 --- a/src/location/maps/qgeomappolylineobject_p.h +++ b/src/location/maps/qgeomappolylineobject_p.h @@ -47,7 +47,7 @@ #include <QList> #include <QPen> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapPolylineObjectPrivate { @@ -59,6 +59,6 @@ public: QPen pen; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomaprectangleobject.cpp b/src/location/maps/qgeomaprectangleobject.cpp index ef336f57..4712ce8b 100644 --- a/src/location/maps/qgeomaprectangleobject.cpp +++ b/src/location/maps/qgeomaprectangleobject.cpp @@ -45,7 +45,7 @@ #include "qgeocoordinate.h" #include "qgeoboundingbox.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapRectangleObject @@ -295,5 +295,5 @@ QGeoMapRectangleObjectPrivate::~QGeoMapRectangleObjectPrivate() {} #include "moc_qgeomaprectangleobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomaprectangleobject.h b/src/location/maps/qgeomaprectangleobject.h index 7c096a56..6f24450f 100644 --- a/src/location/maps/qgeomaprectangleobject.h +++ b/src/location/maps/qgeomaprectangleobject.h @@ -47,7 +47,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapRectangleObjectPrivate; class QGeoBoundingBox; @@ -96,6 +96,6 @@ private: Q_DISABLE_COPY(QGeoMapRectangleObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomaprectangleobject_p.h b/src/location/maps/qgeomaprectangleobject_p.h index fc30de02..814dc2fb 100644 --- a/src/location/maps/qgeomaprectangleobject_p.h +++ b/src/location/maps/qgeomaprectangleobject_p.h @@ -47,7 +47,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapRectangleObjectPrivate { @@ -60,6 +60,6 @@ public: QBrush brush; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomaprouteobject.cpp b/src/location/maps/qgeomaprouteobject.cpp index 08e038fb..462d98f0 100644 --- a/src/location/maps/qgeomaprouteobject.cpp +++ b/src/location/maps/qgeomaprouteobject.cpp @@ -46,7 +46,7 @@ #define DEFAULT_ROUTE_DETAIL_LEVEL 6 -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapRouteObject @@ -220,5 +220,5 @@ QGeoMapRouteObjectPrivate::~QGeoMapRouteObjectPrivate() {} #include "moc_qgeomaprouteobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomaprouteobject.h b/src/location/maps/qgeomaprouteobject.h index bc649742..7ea74723 100644 --- a/src/location/maps/qgeomaprouteobject.h +++ b/src/location/maps/qgeomaprouteobject.h @@ -47,7 +47,7 @@ #include <QPen> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapRouteObjectPrivate; class QGeoRoute; @@ -87,6 +87,6 @@ private: Q_DISABLE_COPY(QGeoMapRouteObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomaprouteobject_p.h b/src/location/maps/qgeomaprouteobject_p.h index 01fc0047..4d5fca57 100644 --- a/src/location/maps/qgeomaprouteobject_p.h +++ b/src/location/maps/qgeomaprouteobject_p.h @@ -46,7 +46,7 @@ #include <QPen> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapRouteObjectPrivate { @@ -59,6 +59,6 @@ public: quint32 detailLevel; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomaptextobject.cpp b/src/location/maps/qgeomaptextobject.cpp index ca56da9e..68cbc154 100644 --- a/src/location/maps/qgeomaptextobject.cpp +++ b/src/location/maps/qgeomaptextobject.cpp @@ -42,7 +42,7 @@ #include "qgeomaptextobject.h" #include "qgeomaptextobject_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapTextObject @@ -371,5 +371,5 @@ QGeoMapTextObjectPrivate::~QGeoMapTextObjectPrivate() {} #include "moc_qgeomaptextobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomaptextobject.h b/src/location/maps/qgeomaptextobject.h index 3d14bb0e..0447aea4 100644 --- a/src/location/maps/qgeomaptextobject.h +++ b/src/location/maps/qgeomaptextobject.h @@ -48,7 +48,7 @@ #include <QFont> #include <QPoint> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapTextObjectPrivate; @@ -110,6 +110,6 @@ private: Q_DISABLE_COPY(QGeoMapTextObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomaptextobject_p.h b/src/location/maps/qgeomaptextobject_p.h index e312b1a5..4c1a7101 100644 --- a/src/location/maps/qgeomaptextobject_p.h +++ b/src/location/maps/qgeomaptextobject_p.h @@ -49,7 +49,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapTextObjectPrivate { @@ -65,6 +65,6 @@ public: Qt::Alignment alignment; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroute.cpp b/src/location/maps/qgeoroute.cpp index 8fb2e1b9..933a840b 100644 --- a/src/location/maps/qgeoroute.cpp +++ b/src/location/maps/qgeoroute.cpp @@ -47,7 +47,7 @@ #include <QDateTime> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoRoute @@ -320,4 +320,4 @@ bool QGeoRoutePrivate::operator ==(const QGeoRoutePrivate &other) const && (path == other.path)); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h index 151fbc86..eca734dd 100644 --- a/src/location/maps/qgeoroute.h +++ b/src/location/maps/qgeoroute.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoBoundingBox; class QGeoRouteSegment; @@ -98,7 +98,7 @@ private: QExplicitlySharedDataPointer<QGeoRoutePrivate> d_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/maps/qgeoroute_p.h b/src/location/maps/qgeoroute_p.h index 0c382ebd..c039c1d1 100644 --- a/src/location/maps/qgeoroute_p.h +++ b/src/location/maps/qgeoroute_p.h @@ -60,7 +60,7 @@ #include <QSharedData> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -89,6 +89,6 @@ public: QGeoRouteSegment firstSegment; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroutereply.cpp b/src/location/maps/qgeoroutereply.cpp index af3a10d6..a741c6f4 100644 --- a/src/location/maps/qgeoroutereply.cpp +++ b/src/location/maps/qgeoroutereply.cpp @@ -42,7 +42,7 @@ #include "qgeoroutereply.h" #include "qgeoroutereply_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoRouteReply @@ -255,7 +255,7 @@ void QGeoRouteReply::abort() QGeoRouteReplyPrivate::QGeoRouteReplyPrivate(const QGeoRouteRequest &request) : error(QGeoRouteReply::NoError), - errorString(""), + errorString(QLatin1String("")), isFinished(false), request(request) {} @@ -268,4 +268,4 @@ QGeoRouteReplyPrivate::~QGeoRouteReplyPrivate() {} #include "moc_qgeoroutereply.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h index 1dfc3188..f331c766 100644 --- a/src/location/maps/qgeoroutereply.h +++ b/src/location/maps/qgeoroutereply.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRouteRequest; class QGeoRouteReplyPrivate; @@ -96,7 +96,7 @@ private: Q_DISABLE_COPY(QGeoRouteReply) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/maps/qgeoroutereply_p.h b/src/location/maps/qgeoroutereply_p.h index 1eb9dfe8..b489fdd8 100644 --- a/src/location/maps/qgeoroutereply_p.h +++ b/src/location/maps/qgeoroutereply_p.h @@ -58,7 +58,7 @@ #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRoute; @@ -80,6 +80,6 @@ private: Q_DISABLE_COPY(QGeoRouteReplyPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeorouterequest.cpp b/src/location/maps/qgeorouterequest.cpp index 955c54e7..55e454bb 100644 --- a/src/location/maps/qgeorouterequest.cpp +++ b/src/location/maps/qgeorouterequest.cpp @@ -45,7 +45,7 @@ #include "qgeocoordinate.h" #include "qgeoboundingbox.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoRouteRequest @@ -485,4 +485,4 @@ bool QGeoRouteRequestPrivate::operator ==(const QGeoRouteRequestPrivate &other) && (maneuverDetail == other.maneuverDetail)); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h index 8fe9f1bf..cdca8989 100644 --- a/src/location/maps/qgeorouterequest.h +++ b/src/location/maps/qgeorouterequest.h @@ -50,7 +50,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBox; @@ -163,7 +163,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoRouteRequest::RouteOptimizations) Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoRouteRequest::SegmentDetails) Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoRouteRequest::ManeuverDetails) -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/maps/qgeorouterequest_p.h b/src/location/maps/qgeorouterequest_p.h index 4152255d..d06d458e 100644 --- a/src/location/maps/qgeorouterequest_p.h +++ b/src/location/maps/qgeorouterequest_p.h @@ -60,7 +60,7 @@ #include <QDateTime> #include <QMap> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRouteRequestPrivate : public QSharedData { @@ -82,6 +82,6 @@ public: QGeoRouteRequest::ManeuverDetail maneuverDetail; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroutesegment.cpp b/src/location/maps/qgeoroutesegment.cpp index ab24e854..ff6f5257 100644 --- a/src/location/maps/qgeoroutesegment.cpp +++ b/src/location/maps/qgeoroutesegment.cpp @@ -45,7 +45,7 @@ #include "qgeocoordinate.h" #include <QDateTime> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoRouteSegment @@ -273,5 +273,5 @@ bool QGeoRouteSegmentPrivate::operator ==(const QGeoRouteSegmentPrivate &other) /******************************************************************************* *******************************************************************************/ -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h index 6b910d20..2396f28c 100644 --- a/src/location/maps/qgeoroutesegment.h +++ b/src/location/maps/qgeoroutesegment.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoManeuver; @@ -92,7 +92,7 @@ private: QExplicitlySharedDataPointer<QGeoRouteSegmentPrivate> d_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/maps/qgeoroutesegment_p.h b/src/location/maps/qgeoroutesegment_p.h index 4d150e91..c4e45ff4 100644 --- a/src/location/maps/qgeoroutesegment_p.h +++ b/src/location/maps/qgeoroutesegment_p.h @@ -59,7 +59,7 @@ #include <QList> #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -82,6 +82,6 @@ public: QExplicitlySharedDataPointer<QGeoRouteSegmentPrivate> nextSegment; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroutingmanager.cpp b/src/location/maps/qgeoroutingmanager.cpp index a9dcd56d..27ebd904 100644 --- a/src/location/maps/qgeoroutingmanager.cpp +++ b/src/location/maps/qgeoroutingmanager.cpp @@ -45,7 +45,7 @@ #include <QLocale> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoRoutingManager @@ -416,4 +416,4 @@ QGeoRoutingManagerPrivate::~QGeoRoutingManagerPrivate() #include "moc_qgeoroutingmanager.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h index 15d3c762..66bafeaa 100644 --- a/src/location/maps/qgeoroutingmanager.h +++ b/src/location/maps/qgeoroutingmanager.h @@ -48,9 +48,9 @@ #include <QObject> #include <QMap> -class QLocale; +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QLocale; class QGeoRoutingManagerEngine; class QGeoRoutingManagerPrivate; @@ -93,6 +93,6 @@ private: friend class QGeoServiceProvider; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroutingmanager_p.h b/src/location/maps/qgeoroutingmanager_p.h index c35fb440..393b335b 100644 --- a/src/location/maps/qgeoroutingmanager_p.h +++ b/src/location/maps/qgeoroutingmanager_p.h @@ -55,7 +55,7 @@ #include "qmobilityglobal.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRoutingManagerEngine; @@ -71,6 +71,6 @@ private: Q_DISABLE_COPY(QGeoRoutingManagerPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroutingmanagerengine.cpp b/src/location/maps/qgeoroutingmanagerengine.cpp index ac6d0316..0cf1d1e2 100644 --- a/src/location/maps/qgeoroutingmanagerengine.cpp +++ b/src/location/maps/qgeoroutingmanagerengine.cpp @@ -42,7 +42,7 @@ #include "qgeoroutingmanagerengine.h" #include "qgeoroutingmanagerengine_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoRoutingManagerEngine @@ -207,7 +207,7 @@ QGeoRouteReply* QGeoRoutingManagerEngine::updateRoute(const QGeoRoute &route, co Q_UNUSED(route) Q_UNUSED(position) return new QGeoRouteReply(QGeoRouteReply::UnsupportedOptionError, - "The updating of routes is not supported by this service provider.", this); + QLatin1String("The updating of routes is not supported by this service provider."), this); } /*! @@ -465,4 +465,4 @@ QGeoRoutingManagerEnginePrivate::~QGeoRoutingManagerEnginePrivate() {} #include "moc_qgeoroutingmanagerengine.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h index 7ebc77bb..a38d3f08 100644 --- a/src/location/maps/qgeoroutingmanagerengine.h +++ b/src/location/maps/qgeoroutingmanagerengine.h @@ -48,9 +48,9 @@ #include <QObject> #include <QMap> -class QLocale; +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QLocale; class QGeoRoutingManagerEnginePrivate; @@ -105,6 +105,6 @@ private: friend class QGeoServiceProvider; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroutingmanagerengine_p.h b/src/location/maps/qgeoroutingmanagerengine_p.h index 63afc8dc..1b26aa0b 100644 --- a/src/location/maps/qgeoroutingmanagerengine_p.h +++ b/src/location/maps/qgeoroutingmanagerengine_p.h @@ -58,7 +58,7 @@ #include <QMap> #include <QLocale> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRoutingManagerEnginePrivate { @@ -85,6 +85,6 @@ private: Q_DISABLE_COPY(QGeoRoutingManagerEnginePrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeosearchmanager.cpp b/src/location/maps/qgeosearchmanager.cpp index 7f84a476..c9e6f784 100644 --- a/src/location/maps/qgeosearchmanager.cpp +++ b/src/location/maps/qgeosearchmanager.cpp @@ -48,7 +48,7 @@ #include <QLocale> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoSearchManager @@ -367,4 +367,4 @@ QGeoSearchManagerPrivate::~QGeoSearchManagerPrivate() #include "moc_qgeosearchmanager.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeosearchmanager.h b/src/location/maps/qgeosearchmanager.h index 631b9c77..ad53179a 100644 --- a/src/location/maps/qgeosearchmanager.h +++ b/src/location/maps/qgeosearchmanager.h @@ -49,9 +49,10 @@ #include <QList> #include <QMap> +QT_BEGIN_NAMESPACE class QLocale; -QTM_BEGIN_NAMESPACE +class QLandmarkManager; class QGeoSearchManagerEngine; class QGeoSearchManagerPrivate; @@ -94,6 +95,8 @@ private: friend class QGeoServiceProvider; }; -QTM_END_NAMESPACE +Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoSearchManager::SearchTypes) + +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeosearchmanager_p.h b/src/location/maps/qgeosearchmanager_p.h index 1267462d..451b05c7 100644 --- a/src/location/maps/qgeosearchmanager_p.h +++ b/src/location/maps/qgeosearchmanager_p.h @@ -59,7 +59,7 @@ #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSearchManagerEngine; @@ -75,7 +75,7 @@ private: Q_DISABLE_COPY(QGeoSearchManagerPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeosearchmanagerengine.cpp b/src/location/maps/qgeosearchmanagerengine.cpp index 93327901..14bee38b 100644 --- a/src/location/maps/qgeosearchmanagerengine.cpp +++ b/src/location/maps/qgeosearchmanagerengine.cpp @@ -45,7 +45,7 @@ #include "qgeoaddress.h" #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoSearchManagerEngine @@ -182,7 +182,7 @@ QGeoSearchReply* QGeoSearchManagerEngine::geocode(const QGeoAddress &address, Q_UNUSED(address) Q_UNUSED(bounds) return new QGeoSearchReply(QGeoSearchReply::UnsupportedOptionError, - "Geocoding is not supported by this service provider.", this); + QLatin1String("Geocoding is not supported by this service provider."), this); } /*! @@ -227,7 +227,7 @@ QGeoSearchReply* QGeoSearchManagerEngine::reverseGeocode(const QGeoCoordinate &c Q_UNUSED(coordinate) Q_UNUSED(bounds) return new QGeoSearchReply(QGeoSearchReply::UnsupportedOptionError, - "Reverse geocoding is not supported by this service provider.", this); + QLatin1String("Reverse geocoding is not supported by this service provider."), this); } /*! @@ -270,7 +270,7 @@ QGeoSearchReply* QGeoSearchManagerEngine::search(const QString &searchString, Q_UNUSED(bounds) return new QGeoSearchReply(QGeoSearchReply::UnsupportedOptionError, - "Searching is not supported by this service provider.", this); + QLatin1String("Searching is not supported by this service provider."), this); } /*! @@ -379,4 +379,4 @@ QGeoSearchManagerEnginePrivate::~QGeoSearchManagerEnginePrivate() #include "moc_qgeosearchmanagerengine.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeosearchmanagerengine.h b/src/location/maps/qgeosearchmanagerengine.h index 058b7456..48bd7775 100644 --- a/src/location/maps/qgeosearchmanagerengine.h +++ b/src/location/maps/qgeosearchmanagerengine.h @@ -49,7 +49,7 @@ #include <QObject> #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSearchManagerEnginePrivate; @@ -97,6 +97,6 @@ private: friend class QGeoServiceProvider; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeosearchmanagerengine_p.h b/src/location/maps/qgeosearchmanagerengine_p.h index 5d46fd60..44ce49af 100644 --- a/src/location/maps/qgeosearchmanagerengine_p.h +++ b/src/location/maps/qgeosearchmanagerengine_p.h @@ -58,7 +58,7 @@ #include <QList> #include <QLocale> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSearchManagerEnginePrivate { @@ -78,6 +78,6 @@ private: Q_DISABLE_COPY(QGeoSearchManagerEnginePrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeosearchreply.cpp b/src/location/maps/qgeosearchreply.cpp index c2f5146b..dd8ed226 100644 --- a/src/location/maps/qgeosearchreply.cpp +++ b/src/location/maps/qgeosearchreply.cpp @@ -42,7 +42,7 @@ #include "qgeosearchreply.h" #include "qgeosearchreply_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoSearchReply @@ -322,7 +322,7 @@ void QGeoSearchReply::setOffset(int offset) QGeoSearchReplyPrivate::QGeoSearchReplyPrivate() : error(QGeoSearchReply::NoError), - errorString(""), + errorString(QLatin1String("")), isFinished(false), viewport(0), limit(-1), @@ -341,4 +341,4 @@ QGeoSearchReplyPrivate::~QGeoSearchReplyPrivate() {} #include "moc_qgeosearchreply.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeosearchreply.h b/src/location/maps/qgeosearchreply.h index 536f6a4c..fc0c4d4c 100644 --- a/src/location/maps/qgeosearchreply.h +++ b/src/location/maps/qgeosearchreply.h @@ -47,7 +47,7 @@ #include <QObject> #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSearchReplyPrivate; @@ -103,6 +103,6 @@ private: Q_DISABLE_COPY(QGeoSearchReply) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeosearchreply_p.h b/src/location/maps/qgeosearchreply_p.h index fc2072fe..16431a6a 100644 --- a/src/location/maps/qgeosearchreply_p.h +++ b/src/location/maps/qgeosearchreply_p.h @@ -59,7 +59,7 @@ #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoLocation; @@ -83,6 +83,6 @@ private: Q_DISABLE_COPY(QGeoSearchReplyPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index e372a4b4..fd175c22 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -64,7 +64,7 @@ #include "qmobilitypluginsearch.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoServiceProvider @@ -182,7 +182,7 @@ QGeoSearchManager* QGeoServiceProvider::searchManager() const d_ptr->searchManager = new QGeoSearchManager(engine); } else { d_ptr->searchError = QGeoServiceProvider::NotSupportedError; - d_ptr->searchErrorString = "The service provider does not support searchManager()."; + d_ptr->searchErrorString = QLatin1String("The service provider does not support searchManager()."); } if (d_ptr->searchError != QGeoServiceProvider::NoError) { @@ -229,7 +229,7 @@ QGeoMappingManager* QGeoServiceProvider::mappingManager() const d_ptr->mappingManager = new QGeoMappingManager(engine); } else { d_ptr->mappingError = QGeoServiceProvider::NotSupportedError; - d_ptr->mappingErrorString = "The service provider does not support mappingManager()."; + d_ptr->mappingErrorString = QLatin1String("The service provider does not support mappingManager()."); } if (d_ptr->mappingError != QGeoServiceProvider::NoError) { @@ -276,7 +276,7 @@ QGeoRoutingManager* QGeoServiceProvider::routingManager() const d_ptr->routingManager = new QGeoRoutingManager(engine); } else { d_ptr->routingError = QGeoServiceProvider::NotSupportedError; - d_ptr->routingErrorString = "The service provider does not support routingManager()."; + d_ptr->routingErrorString = QLatin1String("The service provider does not support routingManager()."); } if (d_ptr->routingError != QGeoServiceProvider::NoError) { @@ -340,7 +340,7 @@ void QGeoServiceProviderPrivate::loadPlugin(const QString &providerName, const Q if (!QGeoServiceProviderPrivate::plugins().keys().contains(providerName)) { error = QGeoServiceProvider::NotSupportedError; - errorString = QString("The geoservices provider %1 is not supported.").arg(providerName); + errorString = QString(QLatin1String("The geoservices provider %1 is not supported.")).arg(providerName); factory = 0; return; } @@ -348,7 +348,7 @@ void QGeoServiceProviderPrivate::loadPlugin(const QString &providerName, const Q factory = 0; error = QGeoServiceProvider::NoError; - errorString = ""; + errorString = QLatin1String(""); QList<QGeoServiceProviderFactory*> candidates = QGeoServiceProviderPrivate::plugins().values(providerName); @@ -426,5 +426,5 @@ void QGeoServiceProviderPrivate::loadStaticPlugins(QHash<QString, QGeoServicePro } } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h index 825e4c03..8fbe8ee6 100644 --- a/src/location/maps/qgeoserviceprovider.h +++ b/src/location/maps/qgeoserviceprovider.h @@ -48,12 +48,12 @@ #include <QVariant> #include <QString> -class QStringList; QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QStringList; class QGeoSearchManager; class QGeoMappingManager; class QGeoRoutingManager; @@ -89,7 +89,7 @@ private: QGeoServiceProviderPrivate* d_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/maps/qgeoserviceprovider_p.h b/src/location/maps/qgeoserviceprovider_p.h index 5b2038dd..3d564481 100644 --- a/src/location/maps/qgeoserviceprovider_p.h +++ b/src/location/maps/qgeoserviceprovider_p.h @@ -57,7 +57,7 @@ #include <QHash> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSearchManager; class QGeoRoutingManager; @@ -97,6 +97,6 @@ public: static void loadStaticPlugins(QHash<QString, QGeoServiceProviderFactory*> *plugins); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoserviceproviderfactory.cpp b/src/location/maps/qgeoserviceproviderfactory.cpp index a2e7f03b..6c8fe013 100644 --- a/src/location/maps/qgeoserviceproviderfactory.cpp +++ b/src/location/maps/qgeoserviceproviderfactory.cpp @@ -41,7 +41,7 @@ #include "qgeoserviceproviderfactory.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoServiceProviderFactory @@ -160,4 +160,4 @@ QGeoRoutingManagerEngine* QGeoServiceProviderFactory::createRoutingManagerEngine return 0; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h index a6ddc725..1e457d7f 100644 --- a/src/location/maps/qgeoserviceproviderfactory.h +++ b/src/location/maps/qgeoserviceproviderfactory.h @@ -49,7 +49,7 @@ #include <QMap> #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class Q_LOCATION_EXPORT QGeoServiceProviderFactory { @@ -70,7 +70,7 @@ public: QString *errorString) const; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_BEGIN_NAMESPACE #define QT_GEOSERVICE_BACKEND_INTERFACE "com.nokia.qt.mobility.geoservice.serviceproviderfactory/1.0" diff --git a/src/location/maps/qgraphicsgeomap.cpp b/src/location/maps/qgraphicsgeomap.cpp index 0e7fecf5..5ccad8a6 100644 --- a/src/location/maps/qgraphicsgeomap.cpp +++ b/src/location/maps/qgraphicsgeomap.cpp @@ -58,7 +58,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGraphicsGeoMap @@ -304,6 +304,9 @@ bool QGraphicsGeoMap::supportsBearing() const Value in degrees where 0 is equivalent to 90 degrees between view and earth's surface i.e. looking straight down to earth. + + Changes to this property will be ignored if supportsBearing() + returns false. */ void QGraphicsGeoMap::setBearing(qreal bearing) { @@ -374,6 +377,9 @@ qreal QGraphicsGeoMap::maximumTilt() const If \a tilt is less than minimumTilt() then minimumTilt() will be used, and if \a tilt is larger than maximumTilt() then maximumTilt() will be used. + + Changes to this property will be ignored if supportsTilting() + returns false. */ void QGraphicsGeoMap::setTilt(qreal tilt) { @@ -755,6 +761,9 @@ QGeoCoordinate QGraphicsGeoMap::screenPositionToCoordinate(QPointF screenPositio This signal is emitted when the bearing of the map changes. The new value is \a bearing. + + This signal will not be emitted if supportsBearing() + returns false. */ /*! @@ -763,6 +772,9 @@ QGeoCoordinate QGraphicsGeoMap::screenPositionToCoordinate(QPointF screenPositio This signal is emitted when the tilt of the map changes. The new value is \a tilt. + + This signal will not be emitted if supportsTilting() + returns false. */ /*! @@ -806,4 +818,4 @@ QGraphicsGeoMapPrivate::~QGraphicsGeoMapPrivate() #include "moc_qgraphicsgeomap.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgraphicsgeomap.h b/src/location/maps/qgraphicsgeomap.h index 03e013a7..00a47d8c 100644 --- a/src/location/maps/qgraphicsgeomap.h +++ b/src/location/maps/qgraphicsgeomap.h @@ -46,7 +46,7 @@ #include <QGraphicsWidget> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoMappingManager; @@ -167,6 +167,6 @@ private: Q_DISABLE_COPY(QGraphicsGeoMap) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgraphicsgeomap_p.h b/src/location/maps/qgraphicsgeomap_p.h index 614dfb7b..c3818c99 100644 --- a/src/location/maps/qgraphicsgeomap_p.h +++ b/src/location/maps/qgraphicsgeomap_p.h @@ -55,7 +55,7 @@ #include "qmobilityglobal.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoServiceProvider; class QGeoMappingManager; @@ -75,6 +75,6 @@ private: Q_DISABLE_COPY(QGraphicsGeoMapPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/makepoly_p.h b/src/location/maps/tiled/makepoly_p.h index a5389931..d8b3a852 100644 --- a/src/location/maps/tiled/makepoly_p.h +++ b/src/location/maps/tiled/makepoly_p.h @@ -61,7 +61,7 @@ #include <QPolygonF> #include <QGraphicsPolygonItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // TODO: replace boolean parameter by enum static inline void makepoly(QPolygonF &points, const QList<QGeoCoordinate> & path, const QGeoTiledMapDataPrivate * mapData, bool closedPath, qreal ypole = -100) @@ -133,6 +133,6 @@ static inline void makepoly(QPolygonF &points, const QList<QGeoCoordinate> & pat } } -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //MAKEPOLY_P_H diff --git a/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp index 04a5d7df..2d726b2b 100644 --- a/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp @@ -50,7 +50,7 @@ #include <QGraphicsItem> #include <QGraphicsEllipseItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapCircleObjectInfo::QGeoTiledMapCircleObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -103,4 +103,4 @@ void QGeoTiledMapCircleObjectInfo::brushChanged(const QBrush &brush) #include "moc_qgeotiledmapcircleobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h index 7ea9b3c2..c6f07383 100644 --- a/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h @@ -59,10 +59,9 @@ #include <QPen> #include <QBrush> -class QGraphicsEllipseItem; - -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QGraphicsEllipseItem; class QGeoMapCircleObject; class QGeoTiledMapCircleObjectInfo : public QGeoTiledMapObjectInfo @@ -81,6 +80,6 @@ public slots: void brushChanged(const QBrush &brush); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPCIRCLEOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.cpp index fec25ff0..080df3e7 100644 --- a/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.cpp @@ -46,7 +46,7 @@ #include "qgeomapcustomobject.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapCustomObjectInfo::QGeoTiledMapCustomObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -90,11 +90,12 @@ void QGeoTiledMapCustomObjectInfo::graphicsItemChanged(QGraphicsItem * /*graphic void QGeoTiledMapCustomObjectInfo::offsetChanged(const QPoint &/*offset*/) { - graphicsItem->setPos(custom->offset()); + QPoint offset = custom->offset(); + graphicsItem->translate(offset.x(), offset.y()); updateItem(); } #include "moc_qgeotiledmapcustomobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h index 09d56f7f..cdf2c81c 100644 --- a/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h @@ -60,7 +60,7 @@ class QGraphicsPixmapItem; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapCustomObject; @@ -79,7 +79,7 @@ public slots: void offsetChanged(const QPoint &offset); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPCUSTOMOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmapdata.cpp b/src/location/maps/tiled/qgeotiledmapdata.cpp index fbe91b48..207242f1 100644 --- a/src/location/maps/tiled/qgeotiledmapdata.cpp +++ b/src/location/maps/tiled/qgeotiledmapdata.cpp @@ -80,6 +80,8 @@ #include <math.h> +QT_BEGIN_NAMESPACE + uint qHash(const QRectF& key) { uint result = qHash(qRound(key.x())); @@ -89,7 +91,6 @@ uint qHash(const QRectF& key) return result; } -QTM_BEGIN_NAMESPACE /*! \class QGeoTiledMapData @@ -805,76 +806,78 @@ void QGeoTiledMapData::tileError(QGeoTiledMapReply::Error error, QString errorSt */ QList<QGeoMapObject*> QGeoTiledMapData::mapObjectsAtScreenPosition(const QPointF &screenPosition) const { - if (screenPosition.isNull()) - return QList<QGeoMapObject*>(); - - Q_D(const QGeoTiledMapData); - - QList<QGeoMapObject*> results; - QSet<QGeoMapObject*> considered; - - d->oe->updateTransforms(); - - QList<QGraphicsItem*> pixelItems; - pixelItems = d->oe->pixelScene->items(QRectF(screenPosition - QPointF(1,1), - screenPosition + QPointF(1,1)), - Qt::IntersectsItemShape, - Qt::AscendingOrder); - - foreach (QGraphicsItem *item, pixelItems) { - QGeoMapObject *object = d->oe->pixelItems.value(item); - Q_ASSERT(object); - - if (object->isVisible() && !considered.contains(object)) { - bool contains = false; - - if (d->oe->pixelExact.contains(object)) { - foreach (QGraphicsItem *item, d->oe->pixelExact.values(object)) { - if (item->shape().contains(screenPosition)) { - contains = true; - break; - } - } - } else { - QGraphicsItem *item - = d->oe->graphicsItemFromMapObject(object); - - if (item) { - QList<QTransform> trans = d->oe->pixelTrans.values(object); - - foreach (QTransform t, trans) { - bool ok; - QTransform inv = t.inverted(&ok); - if (ok) { - QPointF testPt = screenPosition * inv; - - // we have to special case text objects here - // in order to maintain their old (1.1) behaviour - QGeoMapTextObject *tobj = qobject_cast<QGeoMapTextObject*>(object); - if (tobj) { - if (item->boundingRect().contains(testPt)) { - contains = true; - break; - } - } else { - if (item->shape().contains(testPt)) { - contains = true; - break; - } - } - } - } - } - } - - if (contains) - results << object; - - considered.insert(object); - } - } - - return results; + return mapObjectsInScreenRect(QRectF(screenPosition - QPointF(1,1), + screenPosition + QPointF(1,1))); +// if (screenPosition.isNull()) +// return QList<QGeoMapObject*>(); + +// Q_D(const QGeoTiledMapData); + +// QList<QGeoMapObject*> results; +// QSet<QGeoMapObject*> considered; + +// d->oe->updateTransforms(); + +// QList<QGraphicsItem*> pixelItems; +// pixelItems = d->oe->pixelScene->items(QRectF(screenPosition - QPointF(1,1), +// screenPosition + QPointF(1,1)), +// Qt::IntersectsItemShape, +// Qt::AscendingOrder); + +// foreach (QGraphicsItem *item, pixelItems) { +// QGeoMapObject *object = d->oe->pixelItems.value(item); +// Q_ASSERT(object); + +// if (object->isVisible() && !considered.contains(object)) { +// bool contains = false; + +// if (d->oe->pixelExact.contains(object)) { +// foreach (QGraphicsItem *item, d->oe->pixelExact.values(object)) { +// if (item->shape().contains(screenPosition)) { +// contains = true; +// break; +// } +// } +// } else { +// QGraphicsItem *item +// = d->oe->graphicsItemFromMapObject(object); + +// if (item) { +// QList<QTransform> trans = d->oe->pixelTrans.values(object); + +// foreach (QTransform t, trans) { +// bool ok; +// QTransform inv = t.inverted(&ok); +// if (ok) { +// QPointF testPt = screenPosition * inv; + +// // we have to special case text objects here +// // in order to maintain their old (1.1) behaviour +// QGeoMapTextObject *tobj = qobject_cast<QGeoMapTextObject*>(object); +// if (tobj) { +// if (item->boundingRect().contains(testPt)) { +// contains = true; +// break; +// } +// } else { +// if (item->shape().contains(testPt)) { +// contains = true; +// break; +// } +// } +// } +// } +// } +// } + +// if (contains) +// results << object; + +// considered.insert(object); +// } +// } + +// return results; } /*! @@ -998,8 +1001,8 @@ QGeoTiledMapDataPrivate::QGeoTiledMapDataPrivate(QGeoTiledMapData *parent, QGeoM : QGeoMapDataPrivate(parent, engine), oe(new QGeoMapObjectEngine(parent, this)), zoomFactor(0), - spherical("+proj=latlon +ellps=sphere"), - wgs84("+proj=latlon +ellps=WGS84") {} + spherical(QLatin1String("+proj=latlon +ellps=sphere")), + wgs84(QLatin1String("+proj=latlon +ellps=WGS84")) {} QGeoTiledMapDataPrivate::~QGeoTiledMapDataPrivate() { @@ -1425,4 +1428,4 @@ QGeoTiledMapRequest QGeoTileIterator::next() #include "moc_qgeotiledmapdata.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmapdata.h b/src/location/maps/tiled/qgeotiledmapdata.h index ca454b7e..5926f085 100644 --- a/src/location/maps/tiled/qgeotiledmapdata.h +++ b/src/location/maps/tiled/qgeotiledmapdata.h @@ -47,7 +47,7 @@ #include <QRectF> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMapDataPrivate; @@ -110,6 +110,6 @@ private: friend class QGeoTiledMapObjectInfo; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmapdata_p.h b/src/location/maps/tiled/qgeotiledmapdata_p.h index 3ff60f3a..5df38012 100644 --- a/src/location/maps/tiled/qgeotiledmapdata_p.h +++ b/src/location/maps/tiled/qgeotiledmapdata_p.h @@ -66,7 +66,7 @@ class QGraphicsScene; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMapData; class QGeoTiledMapRequest; @@ -163,6 +163,6 @@ private: QRect tileRect; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp index 9782bb25..0bac17f8 100644 --- a/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp @@ -54,7 +54,7 @@ #include <QGraphicsScene> #include <QGraphicsPathItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapGroupObjectInfo::QGeoTiledMapGroupObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -134,4 +134,4 @@ void QGeoTiledMapGroupObjectInfo::childRemoved(QGeoMapObject *childObject) #include "moc_qgeotiledmapgroupobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h index 447fdba6..7ea3de33 100644 --- a/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h @@ -55,10 +55,9 @@ #include "qgeotiledmapobjectinfo_p.h" +QT_BEGIN_NAMESPACE class QGraphicsPathItem; -QTM_BEGIN_NAMESPACE - class QGeoMapGroupObject; class QGeoTiledMapGroupObjectInfo : public QGeoTiledMapObjectInfo @@ -77,6 +76,6 @@ public slots: void childRemoved(QGeoMapObject *childObject); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPGROUPOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp index d989183f..6b19d571 100644 --- a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp @@ -52,13 +52,13 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapObjectInfo::QGeoTiledMapObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoMapObjectInfo(mapData, mapObject), - graphicsItem(0), inited(false), - updateAfterInit(false) + updateAfterInit(false), + graphicsItem(0) { tiledMapData = mapData; tiledMapDataPrivate = static_cast<QGeoTiledMapDataPrivate*>(mapData->d_ptr); @@ -118,19 +118,19 @@ void QGeoTiledMapObjectInfo::selectedChanged(bool /*selected*/) // } } -void QGeoTiledMapObjectInfo::originChanged(const QGeoCoordinate &origin) +void QGeoTiledMapObjectInfo::originChanged(const QGeoCoordinate &/*origin*/) { if (graphicsItem) updateItem(); } -void QGeoTiledMapObjectInfo::unitsChanged(QGeoMapObject::CoordinateUnit units) +void QGeoTiledMapObjectInfo::unitsChanged(QGeoMapObject::CoordinateUnit /*units*/) { if (graphicsItem) updateItem(); } -void QGeoTiledMapObjectInfo::transformTypeChanged(QGeoMapObject::TransformType transformType) +void QGeoTiledMapObjectInfo::transformTypeChanged(QGeoMapObject::TransformType /*transformType*/) { if (graphicsItem) updateItem(); @@ -255,5 +255,5 @@ void QGeoTiledMapObjectInfo::updateItem(const QRectF& target) #include "moc_qgeotiledmapobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.h index 65fe3792..ea1fb559 100644 --- a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.h @@ -57,12 +57,12 @@ #include <QRectF> +QT_BEGIN_NAMESPACE + class QGraphicsItem; class QRect; class QPolygonF; -QTM_BEGIN_NAMESPACE - class QGeoTiledMapData; class QGeoBoundingBox; class QGeoCoordinate; @@ -103,7 +103,7 @@ protected: QGeoTiledMapDataPrivate *tiledMapDataPrivate; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp b/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp index 03ba0490..aedff2b6 100644 --- a/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp +++ b/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp @@ -42,7 +42,7 @@ #include "qgeotiledmappingmanagerengine.h" #include "qgeotiledmappingmanagerengine_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoTiledMappingManagerEngine @@ -185,4 +185,4 @@ QGeoTiledMappingManagerEnginePrivate::~QGeoTiledMappingManagerEnginePrivate() {} #include "moc_qgeotiledmappingmanagerengine.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmappingmanagerengine.h b/src/location/maps/tiled/qgeotiledmappingmanagerengine.h index aacf2d0c..975fd02a 100644 --- a/src/location/maps/tiled/qgeotiledmappingmanagerengine.h +++ b/src/location/maps/tiled/qgeotiledmappingmanagerengine.h @@ -51,7 +51,7 @@ #include <QMap> #include <QVariant> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMappingManagerEnginePrivate; @@ -76,8 +76,8 @@ private: Q_DISABLE_COPY(QGeoTiledMappingManagerEngine) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QGeoTiledMapReply::Error)) +Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGeoTiledMapReply::Error)) #endif diff --git a/src/location/maps/tiled/qgeotiledmappingmanagerengine_p.h b/src/location/maps/tiled/qgeotiledmappingmanagerengine_p.h index cc76f793..fc0f89b3 100644 --- a/src/location/maps/tiled/qgeotiledmappingmanagerengine_p.h +++ b/src/location/maps/tiled/qgeotiledmappingmanagerengine_p.h @@ -58,7 +58,7 @@ #include <QSize> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMappingManagerEngine; class QGeoTiledMapRequestHandler; @@ -77,6 +77,6 @@ private: Q_DISABLE_COPY(QGeoTiledMappingManagerEnginePrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.cpp index 7e7fd2bb..405af88e 100644 --- a/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.cpp @@ -46,7 +46,7 @@ #include "qgeomappixmapobject.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapPixmapObjectInfo::QGeoTiledMapPixmapObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -81,11 +81,16 @@ void QGeoTiledMapPixmapObjectInfo::pixmapChanged(const QPixmap &/*pixmap*/) void QGeoTiledMapPixmapObjectInfo::offsetChanged(const QPoint &/*offset*/) { - pixmapItem->setOffset(pixmap->offset()); + QPoint offset = pixmap->offset(); + + QTransform trans; + trans.translate(offset.x(), offset.y()); + pixmapItem->setTransform(trans); + updateItem(); } #include "moc_qgeotiledmappixmapobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.h index c71fda03..580346f9 100644 --- a/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.h @@ -58,10 +58,9 @@ #include <QPixmap> -class QGraphicsPixmapItem; - -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QGraphicsPixmapItem; class QGeoMapPixmapObject; class QGeoTiledMapPixmapObjectInfo : public QGeoTiledMapObjectInfo @@ -79,7 +78,7 @@ public slots: void offsetChanged(const QPoint &offset); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPPIXMAPOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp index 76ba710a..02279ade 100644 --- a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp @@ -46,7 +46,7 @@ #include "qgeomappolygonobject.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapPolygonObjectInfo::QGeoTiledMapPolygonObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -134,5 +134,5 @@ void QGeoTiledMapPolygonObjectInfo::genPoly() #include "moc_qgeotiledmappolygonobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.h index 22768064..1dec8a55 100644 --- a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.h @@ -59,10 +59,10 @@ #include <QBrush> #include <QPolygonF> -class QGraphicsPolygonItem; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QGraphicsPolygonItem; class QGeoMapPolygonObject; class QGeoTiledMapPolygonObjectInfo : public QGeoTiledMapObjectInfo @@ -84,7 +84,7 @@ private: void genPoly(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPPOLYGONOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp index b51b340f..3e76ce90 100644 --- a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp @@ -49,7 +49,7 @@ #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapPolylineObjectInfo::QGeoTiledMapPolylineObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -126,5 +126,5 @@ void QGeoTiledMapPolylineObjectInfo::genPath() #include "moc_qgeotiledmappolylineobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.h index 966dfa1d..23e33b76 100644 --- a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.h @@ -58,11 +58,11 @@ #include <QPen> #include <QPolygonF> +QT_BEGIN_NAMESPACE + class QGraphicsPathItem; class QPointF; -QTM_BEGIN_NAMESPACE - class QGeoMapPolylineObject; class QGeoTiledMapPolylineObjectInfo : public QGeoTiledMapObjectInfo @@ -83,6 +83,6 @@ private: void genPath(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPPOLYLINEOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp index 8622a273..7f20bab4 100644 --- a/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp @@ -50,7 +50,7 @@ #include "qgeomaprectangleobject.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapRectangleObjectInfo::QGeoTiledMapRectangleObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -142,6 +142,6 @@ void QGeoTiledMapRectangleObjectInfo::regenPolygon() #include "moc_qgeotiledmaprectangleobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.h index 065dda1f..b55b8479 100644 --- a/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.h @@ -58,9 +58,9 @@ #include <QPen> #include <QBrush> -class QGraphicsPolygonItem; +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QGraphicsPolygonItem; class QGeoMapRectangleObject; @@ -84,7 +84,7 @@ private: void regenPolygon(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPRECTANGLEOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmapreply.cpp b/src/location/maps/tiled/qgeotiledmapreply.cpp index 1fc9b944..622db385 100644 --- a/src/location/maps/tiled/qgeotiledmapreply.cpp +++ b/src/location/maps/tiled/qgeotiledmapreply.cpp @@ -46,7 +46,7 @@ #include <qdebug.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoTiledMapReply @@ -311,7 +311,7 @@ void QGeoTiledMapReply::abort() QGeoTiledMapReplyPrivate::QGeoTiledMapReplyPrivate(const QGeoTiledMapRequest &request) : error(QGeoTiledMapReply::NoError), - errorString(""), + errorString(QLatin1String("")), isFinished(false), isCached(false), request(request) {} @@ -326,4 +326,4 @@ QGeoTiledMapReplyPrivate::~QGeoTiledMapReplyPrivate() {} #include "moc_qgeotiledmapreply.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmapreply.h b/src/location/maps/tiled/qgeotiledmapreply.h index 3064b511..9b3bea4f 100644 --- a/src/location/maps/tiled/qgeotiledmapreply.h +++ b/src/location/maps/tiled/qgeotiledmapreply.h @@ -46,7 +46,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMapRequest; class QGeoTiledMapReplyPrivate; @@ -98,6 +98,6 @@ private: Q_DISABLE_COPY(QGeoTiledMapReply) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmapreply_p.h b/src/location/maps/tiled/qgeotiledmapreply_p.h index 23cf0247..537a23b7 100644 --- a/src/location/maps/tiled/qgeotiledmapreply_p.h +++ b/src/location/maps/tiled/qgeotiledmapreply_p.h @@ -56,7 +56,7 @@ #include "qgeotiledmapreply.h" #include "qgeotiledmaprequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMapReplyPrivate { @@ -75,6 +75,6 @@ public: QString mapImageFormat; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmaprequest.cpp b/src/location/maps/tiled/qgeotiledmaprequest.cpp index 0694dafb..cad5a7f2 100644 --- a/src/location/maps/tiled/qgeotiledmaprequest.cpp +++ b/src/location/maps/tiled/qgeotiledmaprequest.cpp @@ -44,7 +44,7 @@ #include "qgeotiledmapdata.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoTiledMapRequest @@ -262,5 +262,5 @@ QGeoTiledMapRequestPrivate& QGeoTiledMapRequestPrivate::operator= (const QGeoTil return *this; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmaprequest.h b/src/location/maps/tiled/qgeotiledmaprequest.h index 9b048c01..bf00f4fb 100644 --- a/src/location/maps/tiled/qgeotiledmaprequest.h +++ b/src/location/maps/tiled/qgeotiledmaprequest.h @@ -47,7 +47,7 @@ #include <QRect> #include <QExplicitlySharedDataPointer> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMapData; class QGeoTiledMapRequestPrivate; @@ -85,6 +85,6 @@ private: Q_LOCATION_EXPORT uint qHash(const QGeoTiledMapRequest &key); -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmaprequest_p.h b/src/location/maps/tiled/qgeotiledmaprequest_p.h index 4f379ff6..5c0a474a 100644 --- a/src/location/maps/tiled/qgeotiledmaprequest_p.h +++ b/src/location/maps/tiled/qgeotiledmaprequest_p.h @@ -57,7 +57,7 @@ #include <QSharedData> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //class QGeoTiledMapData; @@ -79,6 +79,6 @@ public: QRect tileRect; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp index 3a663dbe..e6ae4553 100644 --- a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp @@ -50,7 +50,7 @@ #include <QPointF> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapRouteObjectInfo::QGeoTiledMapRouteObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -140,5 +140,5 @@ void QGeoTiledMapRouteObjectInfo::regenPath() #include "moc_qgeotiledmaprouteobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.h index 49cada24..e275ab56 100644 --- a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.h @@ -59,10 +59,8 @@ #include <QPen> +QT_BEGIN_NAMESPACE class QGraphicsPathItem; - -QTM_BEGIN_NAMESPACE - class QGeoMapRouteObject; class QGeoTiledMapRouteObjectInfo : public QGeoTiledMapObjectInfo @@ -84,7 +82,7 @@ private: void regenPath(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPROUTEOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp index a51f9127..576eff82 100644 --- a/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp @@ -48,7 +48,7 @@ #include <QFontMetrics> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapTextObjectInfo::QGeoTiledMapTextObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -165,5 +165,5 @@ void QGeoTiledMapTextObjectInfo::doAlignment() #include "moc_qgeotiledmaptextobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.h index e11aa73a..7e4ce9f8 100644 --- a/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.h @@ -60,9 +60,9 @@ #include <QPen> #include <QBrush> -class QGraphicsSimpleTextItem; +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QGraphicsSimpleTextItem; class QGeoMapTextObject; @@ -88,7 +88,7 @@ private: void doAlignment(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPTEXTOBJECT_INFO_P_H diff --git a/src/location/notificationcallback_s60_p.h b/src/location/notificationcallback_s60_p.h index d95c5008..9936d10e 100644 --- a/src/location/notificationcallback_s60_p.h +++ b/src/location/notificationcallback_s60_p.h @@ -58,7 +58,7 @@ #include <lbs.h> #include <lbscommon.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class INotificationCallback { @@ -69,6 +69,6 @@ public: virtual void updatePosition(HPositionGenericInfo *mPosInfo, int error) = 0 ; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // NOTIFICATIONCALLBACK_H diff --git a/src/location/notificationmonitorcallback_s60_p.h b/src/location/notificationmonitorcallback_s60_p.h index a842797b..42dc8b59 100644 --- a/src/location/notificationmonitorcallback_s60_p.h +++ b/src/location/notificationmonitorcallback_s60_p.h @@ -58,7 +58,7 @@ #include <e32base.h> // For CActive, link against: euser.lib #include <lbs.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class INotificationMonitorCallback { @@ -68,6 +68,6 @@ public: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* NOTIFICATIONMONITORCALLBACK_H_ */ diff --git a/src/location/notificationsatellitecallback_s60_p.h b/src/location/notificationsatellitecallback_s60_p.h index 9c76459e..fddd2ba1 100644 --- a/src/location/notificationsatellitecallback_s60_p.h +++ b/src/location/notificationsatellitecallback_s60_p.h @@ -59,7 +59,7 @@ #include <lbscommon.h> #include <lbssatellite.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class INotificationSatelliteCallback { @@ -70,6 +70,6 @@ public: virtual void updatePosition(TPositionSatelliteInfo &aSatInfo, int error, bool isStartUpdate) = 0 ; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* NOTIFICATIONSATELLITECALLBACK_H_ */ diff --git a/src/location/projwrapper_p.cpp b/src/location/projwrapper_p.cpp index 1c615e21..463cc735 100644 --- a/src/location/projwrapper_p.cpp +++ b/src/location/projwrapper_p.cpp @@ -47,7 +47,7 @@ #include <QPointF> #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class ProjCoordinateSystemPrivate : public QSharedData { @@ -264,4 +264,4 @@ QPolygonF ProjPolygon::toPolygonF(double scale) const return poly; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/projwrapper_p.h b/src/location/projwrapper_p.h index 395f3f5f..e0a7040a 100644 --- a/src/location/projwrapper_p.h +++ b/src/location/projwrapper_p.h @@ -60,7 +60,7 @@ #include <QList> #include <QPolygonF> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class ProjCoordinate; class QGeoCoordinate; @@ -69,7 +69,7 @@ class ProjCoordinateSystemPrivate; class ProjCoordinateSystem { public: - ProjCoordinateSystem(const QString &projection = QString("+proj=latlon +ellps=WGS84"), bool latLon=true); + ProjCoordinateSystem(const QString &projection = QString::fromLatin1("+proj=latlon +ellps=WGS84"), bool latLon=true); ProjCoordinateSystem(const ProjCoordinateSystem &other); ~ProjCoordinateSystem(); @@ -124,6 +124,6 @@ private: ProjPolygonPrivate *d; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // PROJWRAPPER_P_H diff --git a/src/location/qgeoaddress.cpp b/src/location/qgeoaddress.cpp index 8044c143..4c73815c 100644 --- a/src/location/qgeoaddress.cpp +++ b/src/location/qgeoaddress.cpp @@ -47,7 +47,7 @@ #include <QDebug> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoAddressPrivate::QGeoAddressPrivate() : QSharedData() @@ -93,6 +93,7 @@ QGeoAddress::QGeoAddress() /*! Constructs a copy of \a other. + \since 1.1 */ QGeoAddress::QGeoAddress(const QGeoAddress &other) : d(other.d) @@ -109,6 +110,7 @@ QGeoAddress::~QGeoAddress() /*! Assigns the given \a address to this address and returns a reference to this address. + \since 1.1 */ QGeoAddress &QGeoAddress::operator=(const QGeoAddress & address) { @@ -119,6 +121,7 @@ QGeoAddress &QGeoAddress::operator=(const QGeoAddress & address) /*! Returns true if this address is equal to \a other, otherwise returns false. + \since 1.1 */ bool QGeoAddress::operator==(const QGeoAddress &other) const { @@ -148,10 +151,12 @@ bool QGeoAddress::operator==(const QGeoAddress &other) const Returns true if this address is not equal to \a other, otherwise returns false. + \since 1.1 */ /*! Returns the country name. + \since 1.1 */ QString QGeoAddress::country() const { @@ -160,6 +165,7 @@ QString QGeoAddress::country() const /*! Sets the \a country name. + \since 1.1 */ void QGeoAddress::setCountry(const QString &country) { @@ -168,6 +174,7 @@ void QGeoAddress::setCountry(const QString &country) /*! Returns the country code according to ISO 3166-1 alpha-3 + \since 1.1 */ QString QGeoAddress::countryCode() const { @@ -176,6 +183,7 @@ QString QGeoAddress::countryCode() const /*! Sets the \a countryCode according to ISO 3166-1 alpha-3 + \since 1.1 */ void QGeoAddress::setCountryCode(const QString &countryCode) { @@ -184,6 +192,7 @@ void QGeoAddress::setCountryCode(const QString &countryCode) /*! Returns the state. The state is considered the first subdivision below country. + \since 1.1 */ QString QGeoAddress::state() const { @@ -192,6 +201,7 @@ QString QGeoAddress::state() const /*! Sets the \a state. + \since 1.1 */ void QGeoAddress::setState(const QString &state) { @@ -200,6 +210,7 @@ void QGeoAddress::setState(const QString &state) /*! Returns the county. The county is considered the second subdivision below country. + \since 1.1 */ QString QGeoAddress::county() const { @@ -208,6 +219,7 @@ QString QGeoAddress::county() const /*! Sets the \a county. + \since 1.1 */ void QGeoAddress::setCounty(const QString &county) { @@ -216,6 +228,7 @@ void QGeoAddress::setCounty(const QString &county) /*! Returns the city. + \since 1.1 */ QString QGeoAddress::city() const { @@ -224,6 +237,7 @@ QString QGeoAddress::city() const /*! Sets the \a city. + \since 1.1 */ void QGeoAddress::setCity(const QString &city) { @@ -232,6 +246,7 @@ void QGeoAddress::setCity(const QString &city) /*! Returns the district. The district is considered the subdivison below city. + \since 1.1 */ QString QGeoAddress::district() const { @@ -240,6 +255,7 @@ QString QGeoAddress::district() const /*! Sets the \a district. + \since 1.1 */ void QGeoAddress::setDistrict(const QString &district) { @@ -253,6 +269,7 @@ void QGeoAddress::setDistrict(const QString &district) but may also contain things like a unit number, a building name, or anything else that might be used to distinguish one address from another. + \since 1.1 */ QString QGeoAddress::street() const { @@ -266,6 +283,7 @@ QString QGeoAddress::street() const but may also contain things like a unit number, a building name, or anything else that might be used to distinguish one address from another. + \since 1.1 */ void QGeoAddress::setStreet(const QString &street) { @@ -274,6 +292,7 @@ void QGeoAddress::setStreet(const QString &street) /*! Returns the post code. + \since 1.1 */ QString QGeoAddress::postcode() const { @@ -282,6 +301,7 @@ QString QGeoAddress::postcode() const /*! Sets the \a postcode. + \since 1.1 */ void QGeoAddress::setPostcode(const QString &postcode) { @@ -291,6 +311,7 @@ void QGeoAddress::setPostcode(const QString &postcode) /*! Returns whether this address is empty. An address is considered empty if \i all of its fields are empty. + \since 1.1 */ bool QGeoAddress::isEmpty() const { @@ -305,6 +326,7 @@ bool QGeoAddress::isEmpty() const } /*! Clears the all the address' data fields. + \since 1.1 */ void QGeoAddress::clear() { @@ -318,5 +340,5 @@ void QGeoAddress::clear() d->sPostCode.clear(); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoaddress.h b/src/location/qgeoaddress.h index 256969d6..0404afac 100644 --- a/src/location/qgeoaddress.h +++ b/src/location/qgeoaddress.h @@ -45,10 +45,10 @@ #include "qmobilityglobal.h" #include <QSharedDataPointer> -class QString; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QString; class QGeoAddressPrivate; class Q_LOCATION_EXPORT QGeoAddress { @@ -104,6 +104,6 @@ private: QSharedDataPointer<QGeoAddressPrivate> d; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeoaddress_p.h b/src/location/qgeoaddress_p.h index c6a0c63a..ca656de9 100644 --- a/src/location/qgeoaddress_p.h +++ b/src/location/qgeoaddress_p.h @@ -58,7 +58,7 @@ #include "qmobilityglobal.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoAddressPrivate : public QSharedData { @@ -77,6 +77,6 @@ public: QString sPostCode; //!< post code field }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeoareamonitor.cpp b/src/location/qgeoareamonitor.cpp index bcadf3b7..cac668b9 100644 --- a/src/location/qgeoareamonitor.cpp +++ b/src/location/qgeoareamonitor.cpp @@ -90,7 +90,7 @@ \endcode */ -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoAreaMonitorPrivate { @@ -130,6 +130,7 @@ QGeoAreaMonitor::~QGeoAreaMonitor() Note: Subclass implementations must call the base implementation of setCenter() so that center() returns the correct value. + \since 1.0 */ void QGeoAreaMonitor::setCenter(const QGeoCoordinate &coordinate) { @@ -156,6 +157,7 @@ QGeoCoordinate QGeoAreaMonitor::center() const Note: Subclass implementations must call the base implementation of setRadius() so that radius() returns the correct value. + \since 1.0 */ void QGeoAreaMonitor::setRadius(qreal radius) { @@ -175,6 +177,7 @@ qreal QGeoAreaMonitor::radius() const Note: Symbian applications will need to have the Location capability otherwise this will return 0. + \since 1.0 */ QGeoAreaMonitor *QGeoAreaMonitor::createDefaultMonitor(QObject *parent) { @@ -200,6 +203,7 @@ QGeoAreaMonitor *QGeoAreaMonitor::createDefaultMonitor(QObject *parent) monitored area to a position within the monitored area. The \a update holds the new position. + \since 1.0 */ /*! @@ -209,6 +213,7 @@ QGeoAreaMonitor *QGeoAreaMonitor::createDefaultMonitor(QObject *parent) monitored area to a position outside the monitored area. The \a update holds the new position. + \since 1.0 */ -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h index 7eb00c84..98bcf486 100644 --- a/src/location/qgeoareamonitor.h +++ b/src/location/qgeoareamonitor.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoPositionInfo; class QGeoAreaMonitorPrivate; @@ -80,7 +80,7 @@ private: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeoareamonitor_polling.cpp b/src/location/qgeoareamonitor_polling.cpp index bea552c8..e3c871ec 100644 --- a/src/location/qgeoareamonitor_polling.cpp +++ b/src/location/qgeoareamonitor_polling.cpp @@ -42,7 +42,7 @@ #include "qgeoareamonitor_polling_p.h" #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #define UPDATE_INTERVAL_5S 5000 @@ -120,4 +120,4 @@ void QGeoAreaMonitorPolling::positionUpdated(const QGeoPositionInfo &info) } #include "moc_qgeoareamonitor_polling_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoareamonitor_polling_p.h b/src/location/qgeoareamonitor_polling_p.h index d0e1fb2f..2ac729d0 100644 --- a/src/location/qgeoareamonitor_polling_p.h +++ b/src/location/qgeoareamonitor_polling_p.h @@ -56,7 +56,7 @@ #include "qgeoareamonitor.h" #include "qgeopositioninfosource.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /** * QGeoAreaMonitorPolling @@ -87,5 +87,5 @@ private: void checkStartStop(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOAREAMONITORPOLLING_H diff --git a/src/location/qgeoareamonitor_s60.cpp b/src/location/qgeoareamonitor_s60.cpp index 76095a5a..e5cbcccf 100644 --- a/src/location/qgeoareamonitor_s60.cpp +++ b/src/location/qgeoareamonitor_s60.cpp @@ -45,7 +45,7 @@ #include "qmlbackendmonitorinfo_s60_p.h" #include "qmlbackendmonitorcreatetriggerao_s60_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE TInt QGeoAreaMonitorS60::refCount = 0; @@ -285,5 +285,5 @@ void QGeoAreaMonitorS60::disconnectNotify(const char* signal) } } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoareamonitor_s60_p.h b/src/location/qgeoareamonitor_s60_p.h index 15a1de34..7cc61ac1 100644 --- a/src/location/qgeoareamonitor_s60_p.h +++ b/src/location/qgeoareamonitor_s60_p.h @@ -64,7 +64,7 @@ #include <lbttriggerconditionarea.h> #include <lbtgeocircle.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /** * QGeoAreaMonitorS60 @@ -114,6 +114,6 @@ private: static TInt refCount; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* QGEOAREAMONITORS60_H_ */ diff --git a/src/location/qgeoboundingarea.cpp b/src/location/qgeoboundingarea.cpp index bcde633c..252f1095 100644 --- a/src/location/qgeoboundingarea.cpp +++ b/src/location/qgeoboundingarea.cpp @@ -41,7 +41,7 @@ #include "qgeoboundingarea.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoBoundingArea @@ -79,6 +79,7 @@ QGeoBoundingArea::~QGeoBoundingArea() {} \fn virtual QGeoBoundingArea::AreaType QGeoBoundingArea::type() const Returns the type of this area. +\since 1.1 */ /*! @@ -89,6 +90,7 @@ Returns whether this bounding area is valid. An area is considered to be invalid if some of the data that is required to unambiguously describe the area has not been set or has been set to an unsuitable value. +\since 1.1 */ /*! @@ -97,6 +99,7 @@ unsuitable value. Returns whether this bounding area is empty. An empty area is a region which has a geometrical area of 0. +\since 1.1 */ /*! @@ -104,6 +107,7 @@ An empty area is a region which has a geometrical area of 0. Returns whether the coordinate \a coordinate is contained within this area. +\since 1.1 */ -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoboundingarea.h b/src/location/qgeoboundingarea.h index 89b7035b..9812359b 100644 --- a/src/location/qgeoboundingarea.h +++ b/src/location/qgeoboundingarea.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class Q_LOCATION_EXPORT QGeoBoundingArea { @@ -68,7 +68,7 @@ public: virtual bool contains(const QGeoCoordinate &coordinate) const = 0; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeoboundingbox.cpp b/src/location/qgeoboundingbox.cpp index 194e329e..637a0bf8 100644 --- a/src/location/qgeoboundingbox.cpp +++ b/src/location/qgeoboundingbox.cpp @@ -45,9 +45,7 @@ #include "qgeocoordinate.h" #include "qnumeric.h" -#include <QDebug> - -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoBoundingBox @@ -93,6 +91,7 @@ QGeoBoundingBox::QGeoBoundingBox() only extends up to the pole. The center of the bounding box will be unchanged, and the height will be adjusted such that the center point is at the center of the truncated bounding box. + \since 1.1 */ QGeoBoundingBox::QGeoBoundingBox(const QGeoCoordinate ¢er, double degreesWidth, double degreesHeight) : d_ptr(new QGeoBoundingBoxPrivate(center, center)) @@ -104,12 +103,14 @@ QGeoBoundingBox::QGeoBoundingBox(const QGeoCoordinate ¢er, double degreesWid /*! Constructs a new bounding box with a top left coordinate \a topLeft and a bottom right coordinate \a bottomRight. + \since 1.1 */ QGeoBoundingBox::QGeoBoundingBox(const QGeoCoordinate &topLeft, const QGeoCoordinate &bottomRight) : d_ptr(new QGeoBoundingBoxPrivate(topLeft, bottomRight)) {} /*! Constructs a bounding box from the contents of \a other. + \since 1.1 */ QGeoBoundingBox::QGeoBoundingBox(const QGeoBoundingBox &other) : QGeoBoundingArea(other), @@ -123,6 +124,7 @@ QGeoBoundingBox::~QGeoBoundingBox() {} /*! Assigns \a other to this bounding box and returns a reference to this bounding box. + \since 1.1 */ QGeoBoundingBox& QGeoBoundingBox::operator = (const QGeoBoundingBox & other) { @@ -133,6 +135,7 @@ QGeoBoundingBox& QGeoBoundingBox::operator = (const QGeoBoundingBox & other) /*! Returns whether this bounding box is equal to \a other. + \since 1.1 */ bool QGeoBoundingBox::operator == (const QGeoBoundingBox &other) const { @@ -141,6 +144,7 @@ bool QGeoBoundingBox::operator == (const QGeoBoundingBox &other) const /*! Returns whether this bounding box is not equal to \a other. + \since 1.1 */ bool QGeoBoundingBox::operator != (const QGeoBoundingBox &other) const { @@ -153,6 +157,7 @@ bool QGeoBoundingBox::operator != (const QGeoBoundingBox &other) const This function is provided to help find the specific type of aQGeoBoundingArea instance. + \since 1.1 */ QGeoBoundingArea::AreaType QGeoBoundingBox::type() const { @@ -165,6 +170,7 @@ QGeoBoundingArea::AreaType QGeoBoundingBox::type() const A valid bounding box has valid top left and bottom right coordinates and has a top left coordinate with latitude greater than or equal to the latitude of the bottom right coordinate. + \since 1.1 */ bool QGeoBoundingBox::isValid() const { @@ -177,6 +183,7 @@ bool QGeoBoundingBox::isValid() const Returns whether this bounding box has a geometrical area of 0. Returns true if this bounding box is invalid. + \since 1.1 */ bool QGeoBoundingBox::isEmpty() const { @@ -187,6 +194,7 @@ bool QGeoBoundingBox::isEmpty() const /*! Sets the top left coordinate of this bounding box to \a topLeft. + \since 1.1 */ void QGeoBoundingBox::setTopLeft(const QGeoCoordinate &topLeft) { @@ -195,6 +203,7 @@ void QGeoBoundingBox::setTopLeft(const QGeoCoordinate &topLeft) /*! Returns the top left coordinate of this bounding box. + \since 1.1 */ QGeoCoordinate QGeoBoundingBox::topLeft() const { @@ -203,6 +212,7 @@ QGeoCoordinate QGeoBoundingBox::topLeft() const /*! Sets the top right coordinate of this bounding box to \a topRight. + \since 1.1 */ void QGeoBoundingBox::setTopRight(const QGeoCoordinate &topRight) { @@ -212,6 +222,7 @@ void QGeoBoundingBox::setTopRight(const QGeoCoordinate &topRight) /*! Returns the top right coordinate of this bounding box. + \since 1.1 */ QGeoCoordinate QGeoBoundingBox::topRight() const { @@ -224,6 +235,7 @@ QGeoCoordinate QGeoBoundingBox::topRight() const /*! Sets the bottom left coordinate of this bounding box to \a bottomLeft. + \since 1.1 */ void QGeoBoundingBox::setBottomLeft(const QGeoCoordinate &bottomLeft) { @@ -233,6 +245,7 @@ void QGeoBoundingBox::setBottomLeft(const QGeoCoordinate &bottomLeft) /*! Returns the bottom left coordinate of this bounding box. + \since 1.1 */ QGeoCoordinate QGeoBoundingBox::bottomLeft() const { @@ -245,6 +258,7 @@ QGeoCoordinate QGeoBoundingBox::bottomLeft() const /*! Sets the bottom right coordinate of this bounding box to \a bottomRight. + \since 1.1 */ void QGeoBoundingBox::setBottomRight(const QGeoCoordinate &bottomRight) { @@ -253,6 +267,7 @@ void QGeoBoundingBox::setBottomRight(const QGeoCoordinate &bottomRight) /*! Returns the bottom right coordinate of this bounding box. + \since 1.1 */ QGeoCoordinate QGeoBoundingBox::bottomRight() const { @@ -267,6 +282,8 @@ QGeoCoordinate QGeoBoundingBox::bottomRight() const to the pole. The center of the bounding box will be unchanged, and the height will be adjusted such that the center point is at the center of the truncated bounding box. + + \since 1.1 */ void QGeoBoundingBox::setCenter(const QGeoCoordinate ¢er) { @@ -319,6 +336,7 @@ void QGeoBoundingBox::setCenter(const QGeoCoordinate ¢er) /*! Returns the center of this bounding box. + \since 1.1 */ QGeoCoordinate QGeoBoundingBox::center() const { @@ -351,6 +369,7 @@ QGeoCoordinate QGeoBoundingBox::center() const If \a degreesWidth is greater than 360.0 then 360.0 is used as the width, the leftmost longitude of the bounding box is set to -180.0 degrees and the rightmost longitude of the bounding box is set to 180.0 degrees. + \since 1.1 */ void QGeoBoundingBox::setWidth(double degreesWidth) { @@ -393,6 +412,7 @@ void QGeoBoundingBox::setWidth(double degreesWidth) Returns the width of this bounding box in degrees. The return value is undefined if this bounding box is invalid. + \since 1.1 */ double QGeoBoundingBox::width() const { @@ -424,6 +444,7 @@ double QGeoBoundingBox::width() const a smaller height than might otherwise be expected. If \a degreesHeight is greater than 180.0 then 180.0 is used as the height. + \since 1.1 */ void QGeoBoundingBox::setHeight(double degreesHeight) { @@ -473,6 +494,7 @@ void QGeoBoundingBox::setHeight(double degreesHeight) Returns the height of this bounding box in degrees. The return value is undefined if this bounding box is invalid. + \since 1.1 */ double QGeoBoundingBox::height() const { @@ -488,6 +510,7 @@ double QGeoBoundingBox::height() const /*! Returns whether the coordinate \a coordinate is contained within this bounding box. + \since 1.1 */ bool QGeoBoundingBox::contains(const QGeoCoordinate &coordinate) const { @@ -528,6 +551,7 @@ bool QGeoBoundingBox::contains(const QGeoCoordinate &coordinate) const /*! Returns whether the bounding box \a boundingBox is contained within this bounding box. + \since 1.1 */ bool QGeoBoundingBox::contains(const QGeoBoundingBox &boundingBox) const { @@ -544,6 +568,7 @@ bool QGeoBoundingBox::contains(const QGeoBoundingBox &boundingBox) const If the top or bottom edges of both bounding boxes are at one of the poles the bounding boxes are considered to be intersecting, since the longitude is irrelevant when the edges are at the pole. + \since 1.1 */ bool QGeoBoundingBox::intersects(const QGeoBoundingBox &boundingBox) const { @@ -599,6 +624,7 @@ bool QGeoBoundingBox::intersects(const QGeoBoundingBox &boundingBox) const If the translation would have caused the bounding box to cross a pole the bounding box will be translated until the top or bottom edge of bounding box touches the pole but not further. + \since 1.1 */ void QGeoBoundingBox::translate(double degreesLatitude, double degreesLongitude) { @@ -652,6 +678,7 @@ void QGeoBoundingBox::translate(double degreesLatitude, double degreesLongitude) Negative values of \a degreesLatitude and \a degreesLongitude correspond to southward and westward translation respectively. + \since 1.1 \sa translate() */ QGeoBoundingBox QGeoBoundingBox::translated(double degreesLatitude, double degreesLongitude) const @@ -663,6 +690,13 @@ QGeoBoundingBox QGeoBoundingBox::translated(double degreesLatitude, double degre /*! Returns the smallest bounding box which contains both this bounding box and \a boundingBox. + + If the centers of the two bounding boxes are separated by exactly 180.0 degrees then the + width is set to 360.0 degrees with the leftmost longitude set to -180.0 degrees and the + rightmost longitude set to 180.0 degrees. This is done to ensure that the result is + independent of the order of the operands. + + \since 1.1 */ QGeoBoundingBox QGeoBoundingBox::united(const QGeoBoundingBox &boundingBox) const { @@ -675,10 +709,24 @@ QGeoBoundingBox QGeoBoundingBox::united(const QGeoBoundingBox &boundingBox) cons \fn QGeoBoundingBox QGeoBoundingBox::operator | (const QGeoBoundingBox &boundingBox) const Returns the smallest bounding box which contains both this bounding box and \a boundingBox. + + If the centers of the two bounding boxes are separated by exactly 180.0 degrees then the + width is set to 360.0 degrees with the leftmost longitude set to -180.0 degrees and the + rightmost longitude set to 180.0 degrees. This is done to ensure that the result is + independent of the order of the operands. + + \since 1.1 */ /*! Returns the smallest bounding box which contains both this bounding box and \a boundingBox. + + If the centers of the two bounding boxes are separated by exactly 180.0 degrees then the + width is set to 360.0 degrees with the leftmost longitude set to -180.0 degrees and the + rightmost longitude set to 180.0 degrees. This is done to ensure that the result is + independent of the order of the operands. + + \since 1.1 */ QGeoBoundingBox& QGeoBoundingBox::operator |= (const QGeoBoundingBox & boundingBox) { @@ -704,8 +752,20 @@ QGeoBoundingBox& QGeoBoundingBox::operator |= (const QGeoBoundingBox & boundingB bool wrap2 = (left2 > right2); if ((wrap1 && wrap2) || (!wrap1 && !wrap2)) { - left = qMin(left1, left2); - right = qMax(right1, right2); + + double w = qAbs((left1 + right1 - left2 - right2) / 2.0); + + if (w < 180.0) { + left = qMin(left1, left2); + right = qMax(right1, right2); + } else if (w > 180.0) { + left = qMax(left1, left2); + right = qMin(right1, right2); + } else { + left = -180.0; + right = 180.0; + } + } else { double wrapLeft = 0.0; double wrapRight = 0.0; @@ -800,5 +860,5 @@ bool QGeoBoundingBoxPrivate::operator== (const QGeoBoundingBoxPrivate &other) co return ((topLeft == other.topLeft) && (bottomRight == other.bottomRight)); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoboundingbox.h b/src/location/qgeoboundingbox.h index 941010af..fc1547df 100644 --- a/src/location/qgeoboundingbox.h +++ b/src/location/qgeoboundingbox.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBoxPrivate; @@ -114,7 +114,7 @@ inline QGeoBoundingBox QGeoBoundingBox::operator | (const QGeoBoundingBox &bound return united(boundingBox); } -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeoboundingbox_p.h b/src/location/qgeoboundingbox_p.h index 154abdb2..7c1553b5 100644 --- a/src/location/qgeoboundingbox_p.h +++ b/src/location/qgeoboundingbox_p.h @@ -57,7 +57,7 @@ #include <QSharedData> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoBoundingBoxPrivate : public QSharedData { @@ -75,6 +75,6 @@ public: QGeoCoordinate bottomRight; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeoboundingcircle.cpp b/src/location/qgeoboundingcircle.cpp index 23bcf71b..ec5d158c 100644 --- a/src/location/qgeoboundingcircle.cpp +++ b/src/location/qgeoboundingcircle.cpp @@ -47,7 +47,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoBoundingCircle @@ -75,12 +75,14 @@ QGeoBoundingCircle::QGeoBoundingCircle() /*! Constructs a new bounding circle centered at \a center and with a radius of \a radius metres. + \since 1.1 */ QGeoBoundingCircle::QGeoBoundingCircle(const QGeoCoordinate ¢er, qreal radius) : d_ptr(new QGeoBoundingCirclePrivate(center, radius)) {} /*! Constructs a new bounding circle from the contents of \a other. + \since 1.1 */ QGeoBoundingCircle::QGeoBoundingCircle(const QGeoBoundingCircle &other) : QGeoBoundingArea(other), @@ -94,6 +96,7 @@ QGeoBoundingCircle::~QGeoBoundingCircle() {} /*! Assigns \a other to this bounding circle and returns a reference to this bounding circle. + \since 1.1 */ QGeoBoundingCircle& QGeoBoundingCircle::operator = (const QGeoBoundingCircle & other) { @@ -104,6 +107,7 @@ QGeoBoundingCircle& QGeoBoundingCircle::operator = (const QGeoBoundingCircle & o /*! Returns whether this bounding circle is equal to \a other. + \since 1.1 */ bool QGeoBoundingCircle::operator == (const QGeoBoundingCircle &other) const { @@ -112,6 +116,7 @@ bool QGeoBoundingCircle::operator == (const QGeoBoundingCircle &other) const /*! Returns whether this bounding circle is not equal to \a other. + \since 1.1 */ bool QGeoBoundingCircle::operator != (const QGeoBoundingCircle &other) const { @@ -124,6 +129,7 @@ bool QGeoBoundingCircle::operator != (const QGeoBoundingCircle &other) const This function is provided to help find the specific type of aQGeoBoundingArea instance. + \since 1.1 */ QGeoBoundingArea::AreaType QGeoBoundingCircle::type() const { @@ -135,6 +141,7 @@ QGeoBoundingArea::AreaType QGeoBoundingCircle::type() const A valid bounding circle has a valid center coordinate and a radius greater than or equal to zero. + \since 1.1 */ bool QGeoBoundingCircle::isValid() const { @@ -147,6 +154,7 @@ bool QGeoBoundingCircle::isValid() const Returns whether this bounding circle has a geometrical area of zero. Returns true if this bounding circle is invalid. + \since 1.1 */ bool QGeoBoundingCircle::isEmpty() const { @@ -155,6 +163,7 @@ bool QGeoBoundingCircle::isEmpty() const /*! Sets the center coordinate of this bounding circle to \a center. + \since 1.1 */ void QGeoBoundingCircle::setCenter(const QGeoCoordinate ¢er) { @@ -163,6 +172,7 @@ void QGeoBoundingCircle::setCenter(const QGeoCoordinate ¢er) /*! Returns the center coordinate of this bounding circle. + \since 1.1 */ QGeoCoordinate QGeoBoundingCircle::center() const { @@ -170,7 +180,8 @@ QGeoCoordinate QGeoBoundingCircle::center() const } /*! - Sets the radius in metres of this bounding circle to \a radius. + Sets the radius in meters of this bounding circle to \a radius. + \since 1.1 */ void QGeoBoundingCircle::setRadius(qreal radius) { @@ -179,6 +190,7 @@ void QGeoBoundingCircle::setRadius(qreal radius) /*! Returns the radius in meters of this bounding circle. + \since 1.1 */ qreal QGeoBoundingCircle::radius() const { @@ -188,6 +200,7 @@ qreal QGeoBoundingCircle::radius() const /*! Returns whether the coordinate \a coordinate is contained within this bounding circle. + \since 1.1 */ bool QGeoBoundingCircle::contains(const QGeoCoordinate &coordinate) const { @@ -207,6 +220,7 @@ bool QGeoBoundingCircle::contains(const QGeoCoordinate &coordinate) const Negative values of \a degreesLatitude and \a degreesLongitude correspond to southward and westward translation respectively. + \since 1.1 */ void QGeoBoundingCircle::translate(double degreesLatitude, double degreesLongitude) { @@ -249,6 +263,7 @@ void QGeoBoundingCircle::translate(double degreesLatitude, double degreesLongitu Negative values of \a degreesLatitude and \a degreesLongitude correspond to southward and westward translation respectively. + \since 1.1 \sa translate() */ QGeoBoundingCircle QGeoBoundingCircle::translated(double degreesLatitude, double degreesLongitude) const @@ -290,5 +305,5 @@ bool QGeoBoundingCirclePrivate::operator== (const QGeoBoundingCirclePrivate &oth return ((center == other.center) && (radius == other.radius)); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoboundingcircle.h b/src/location/qgeoboundingcircle.h index a1fcaa1b..4eb57151 100644 --- a/src/location/qgeoboundingcircle.h +++ b/src/location/qgeoboundingcircle.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingCirclePrivate; @@ -86,7 +86,7 @@ private: QSharedDataPointer<QGeoBoundingCirclePrivate> d_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeoboundingcircle_p.h b/src/location/qgeoboundingcircle_p.h index 13fb235e..826a5601 100644 --- a/src/location/qgeoboundingcircle_p.h +++ b/src/location/qgeoboundingcircle_p.h @@ -57,7 +57,7 @@ #include <QSharedData> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoBoundingCirclePrivate : public QSharedData { @@ -75,6 +75,6 @@ public: qreal radius; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeocoordinate.cpp b/src/location/qgeocoordinate.cpp index 26e4f434..fcf9a39d 100644 --- a/src/location/qgeocoordinate.cpp +++ b/src/location/qgeocoordinate.cpp @@ -56,7 +56,7 @@ #define M_PI 3.14159265358979323846 #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE static const double qgeocoordinate_EARTH_MEAN_RADIUS = 6371.0072; @@ -137,6 +137,7 @@ QGeoCoordinate::QGeoCoordinate() the type() will be QGeoCoordinate::InvalidCoordinate. \sa isValid() + \since 1.0 */ QGeoCoordinate::QGeoCoordinate(double latitude, double longitude) : d(new QGeoCoordinatePrivate) @@ -158,6 +159,7 @@ QGeoCoordinate::QGeoCoordinate(double latitude, double longitude) Note that \a altitude specifies the metres above sea level. \sa isValid() + \since 1.0 */ QGeoCoordinate::QGeoCoordinate(double latitude, double longitude, double altitude) : d(new QGeoCoordinatePrivate) @@ -171,6 +173,7 @@ QGeoCoordinate::QGeoCoordinate(double latitude, double longitude, double altitud /*! Constructs a coordinate from the contents of \a other. + \since 1.0 */ QGeoCoordinate::QGeoCoordinate(const QGeoCoordinate &other) : d(new QGeoCoordinatePrivate) @@ -189,6 +192,7 @@ QGeoCoordinate::~QGeoCoordinate() /*! Assigns \a other to this coordinate and returns a reference to this coordinate. + \since 1.0 */ QGeoCoordinate &QGeoCoordinate::operator=(const QGeoCoordinate & other) { @@ -207,6 +211,7 @@ QGeoCoordinate &QGeoCoordinate::operator=(const QGeoCoordinate & other) coordinate are the same as those of \a other. The longitude will be ignored if the latitude is +/- 90 degrees. + \since 1.0 */ bool QGeoCoordinate::operator==(const QGeoCoordinate &other) const { @@ -228,10 +233,12 @@ bool QGeoCoordinate::operator==(const QGeoCoordinate &other) const Returns true if the latitude, longitude or altitude of this coordinate are not the same as those of \a other. + \since 1.0 */ /*! Returns true if the type() is Coordinate2D or Coordinate3D. + \since 1.0 */ bool QGeoCoordinate::isValid() const { @@ -241,6 +248,7 @@ bool QGeoCoordinate::isValid() const /*! Returns the type of this coordinate. + \since 1.0 */ QGeoCoordinate::CoordinateType QGeoCoordinate::type() const { @@ -262,6 +270,7 @@ QGeoCoordinate::CoordinateType QGeoCoordinate::type() const latitude indicates the Southern Hemisphere. \sa setLatitude(), type() + \since 1.0 */ double QGeoCoordinate::latitude() const { @@ -275,6 +284,7 @@ double QGeoCoordinate::latitude() const To be valid, the latitude must be between -90 to 90 inclusive. \sa latitude() + \since 1.0 */ void QGeoCoordinate::setLatitude(double latitude) { @@ -289,6 +299,7 @@ void QGeoCoordinate::setLatitude(double latitude) longitude indicates the Western Hemisphere. \sa setLongitude(), type() + \since 1.0 */ double QGeoCoordinate::longitude() const { @@ -302,6 +313,7 @@ double QGeoCoordinate::longitude() const To be valid, the longitude must be between -180 to 180 inclusive. \sa longitude() + \since 1.0 */ void QGeoCoordinate::setLongitude(double longitude) { @@ -313,6 +325,7 @@ void QGeoCoordinate::setLongitude(double longitude) The return value is undefined if the altitude has not been set. + \since 1.0 \sa setAltitude(), type() */ double QGeoCoordinate::altitude() const @@ -323,6 +336,7 @@ double QGeoCoordinate::altitude() const /*! Sets the altitude (meters above sea level) to \a altitude. + \since 1.0 \sa altitude() */ void QGeoCoordinate::setAltitude(double altitude) @@ -340,6 +354,7 @@ void QGeoCoordinate::setAltitude(double altitude) Returns 0 if the type of this coordinate or the type of \a other is QGeoCoordinate::InvalidCoordinate. + \since 1.0 */ qreal QGeoCoordinate::distanceTo(const QGeoCoordinate &other) const { @@ -373,6 +388,7 @@ qreal QGeoCoordinate::distanceTo(const QGeoCoordinate &other) const Returns 0 if the type of this coordinate or the type of \a other is QGeoCoordinate::InvalidCoordinate. + \since 1.0 */ qreal QGeoCoordinate::azimuthTo(const QGeoCoordinate &other) const { @@ -480,6 +496,7 @@ QGeoCoordinate QGeoCoordinate::atDistanceAndAzimuth(qreal distance, qreal azimut The altitude field is omitted if no altitude is set. If the coordinate is invalid, an empty string is returned. + \since 1.0 */ QString QGeoCoordinate::toString(CoordinateFormat format) const { @@ -504,11 +521,11 @@ QString QGeoCoordinate::toString(CoordinateFormat format) const case DegreesMinutesWithHemisphere: { double latMin = (absLat - int(absLat)) * 60; double lngMin = (absLng - int(absLng)) * 60; - latStr = QString("%1%2 %3'") + latStr = QString::fromLatin1("%1%2 %3'") .arg(QString::number(int(absLat))) .arg(symbol) .arg(QString::number(latMin, 'f', 3)); - longStr = QString("%1%2 %3'") + longStr = QString::fromLatin1("%1%2 %3'") .arg(QString::number(int(absLng))) .arg(symbol) .arg(QString::number(lngMin, 'f', 3)); @@ -521,12 +538,12 @@ QString QGeoCoordinate::toString(CoordinateFormat format) const double latSec = (latMin - int(latMin)) * 60; double lngSec = (lngMin - int(lngMin)) * 60; - latStr = QString("%1%2 %3' %4\"") + latStr = QString::fromLatin1("%1%2 %3' %4\"") .arg(QString::number(int(absLat))) .arg(symbol) .arg(QString::number(int(latMin))) .arg(QString::number(latSec, 'f', 1)); - longStr = QString("%1%2 %3' %4\"") + longStr = QString::fromLatin1("%1%2 %3' %4\"") .arg(QString::number(int(absLng))) .arg(symbol) .arg(QString::number(int(lngMin))) @@ -541,29 +558,29 @@ QString QGeoCoordinate::toString(CoordinateFormat format) const case DegreesMinutes: case DegreesMinutesSeconds: { if (d->lat < 0) - latStr.insert(0, "-"); + latStr.insert(0, QLatin1String("-")); if (d->lng < 0) - longStr.insert(0, "-"); + longStr.insert(0, QLatin1String("-")); break; } case DegreesWithHemisphere: case DegreesMinutesWithHemisphere: case DegreesMinutesSecondsWithHemisphere: { if (d->lat < 0) - latStr.append(" S"); + latStr.append(QString::fromLatin1(" S")); else if (d->lat > 0) - latStr.append(" N"); + latStr.append(QString::fromLatin1(" N")); if (d->lng < 0) - longStr.append(" W"); + longStr.append(QString::fromLatin1(" W")); else if (d->lng > 0) - longStr.append(" E"); + longStr.append(QString::fromLatin1(" E")); break; } } if (qIsNaN(d->alt)) - return QString("%1, %2").arg(latStr, longStr); - return QString("%1, %2, %3m").arg(latStr, longStr, QString::number(d->alt)); + return QString::fromLatin1("%1, %2").arg(latStr, longStr); + return QString::fromLatin1("%1, %2, %3m").arg(latStr, longStr, QString::number(d->alt)); } #ifndef QT_NO_DEBUG_STREAM @@ -599,6 +616,7 @@ QDebug operator<<(QDebug dbg, const QGeoCoordinate &coord) Writes the given \a coordinate to the specified \a stream. + \since 1.0 \sa {Serializing Qt Data Types} */ @@ -619,6 +637,7 @@ QDataStream &operator<<(QDataStream &stream, const QGeoCoordinate &coordinate) Reads a coordinate from the specified \a stream into the given \a coordinate. + \since 1.0 \sa {Serializing Qt Data Types} */ @@ -635,4 +654,4 @@ QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate) } #endif -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeocoordinate.h b/src/location/qgeocoordinate.h index 67848cb5..ac530e2e 100644 --- a/src/location/qgeocoordinate.h +++ b/src/location/qgeocoordinate.h @@ -45,14 +45,11 @@ #include <QString> +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE + class QDebug; class QDataStream; -QT_END_NAMESPACE - -QT_BEGIN_HEADER - -QTM_BEGIN_NAMESPACE class QGeoCoordinatePrivate; class Q_LOCATION_EXPORT QGeoCoordinate @@ -120,7 +117,7 @@ Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoCoordin Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate); #endif -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeocoordinate_p.h b/src/location/qgeocoordinate_p.h index 70baf777..7a859c82 100644 --- a/src/location/qgeocoordinate_p.h +++ b/src/location/qgeocoordinate_p.h @@ -56,7 +56,7 @@ #include "qmobilityglobal.h" #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinatePrivate { @@ -72,6 +72,6 @@ public: double *lon, double *lat); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOCOORDINATE_P_H diff --git a/src/location/qgeoplace.cpp b/src/location/qgeoplace.cpp index 7fbd01ee..c786f677 100644 --- a/src/location/qgeoplace.cpp +++ b/src/location/qgeoplace.cpp @@ -48,13 +48,13 @@ #endif #if !defined(Q_CC_MWERKS) -template<> QTM_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone() +template<> QT_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone() { return d->clone(); } #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoPlace @@ -100,6 +100,7 @@ QGeoPlace::QGeoPlace(QGeoPlacePrivate *dd) /*! Constructs a copy of \a other. + \since 1.1 */ QGeoPlace::QGeoPlace(const QGeoPlace &other) : d_ptr(other.d_ptr) @@ -116,6 +117,7 @@ QGeoPlace::~QGeoPlace() /*! Assigns \a other to this place and returns a reference to this place. + \since 1.1 */ QGeoPlace &QGeoPlace::operator= (const QGeoPlace & other) { @@ -136,6 +138,7 @@ inline const QGeoPlacePrivate* QGeoPlace::d_func() const /*! Returns true if \a other is equal to this place, otherwise returns false. + \since 1.1 */ bool QGeoPlace::operator== (const QGeoPlace &other) const { @@ -145,6 +148,7 @@ bool QGeoPlace::operator== (const QGeoPlace &other) const /*! Returns true if \a other is not equal to this place, otherwise returns false. + \since 1.1 */ bool QGeoPlace::operator!= (const QGeoPlace &other) const { @@ -157,6 +161,7 @@ bool QGeoPlace::operator!= (const QGeoPlace &other) const If so, the QLandmark(const QGeoPlace &place) constructor can be used to restore access to the landmark data. + \since 1.1 */ bool QGeoPlace::isLandmark() const { @@ -168,6 +173,7 @@ bool QGeoPlace::isLandmark() const The viewport is a suggestion for a size and position of a map window which aims to view this palce. + \since 1.1 */ QGeoBoundingBox QGeoPlace::viewport() const { @@ -180,6 +186,7 @@ QGeoBoundingBox QGeoPlace::viewport() const The viewport is a suggestion for a size and position of a map window which aims to view this palce. + \since 1.1 */ void QGeoPlace::setViewport(const QGeoBoundingBox &viewport) { @@ -189,6 +196,7 @@ void QGeoPlace::setViewport(const QGeoBoundingBox &viewport) /*! Returns the coordinate that this place is located at. + \since 1.1 */ QGeoCoordinate QGeoPlace::coordinate() const { @@ -198,6 +206,7 @@ QGeoCoordinate QGeoPlace::coordinate() const /*! Sets the \a coordinate that this place is located at. + \since 1.1 */ void QGeoPlace::setCoordinate(const QGeoCoordinate &coordinate) { @@ -207,6 +216,7 @@ void QGeoPlace::setCoordinate(const QGeoCoordinate &coordinate) /*! Returns the address of this place. + \since 1.1 */ QGeoAddress QGeoPlace::address() const { @@ -216,6 +226,7 @@ QGeoAddress QGeoPlace::address() const /*! Sets the \a address of this place. + \since 1.1 */ void QGeoPlace::setAddress(const QGeoAddress &address) { @@ -639,7 +650,7 @@ bool QGeoPlacePrivate::operator== (const QGeoPlacePrivate &other) const { #ifdef QGEOPLACE_DEBUG - qDebug() << "typoe" << (type == other.type); + qDebug() << "type" << (type == other.type); qDebug() << "viewport" << (viewport == other.viewport); qDebug() << "coordinate:" << (coordinate == other.coordinate); qDebug() << "address:" << (address == other.address); @@ -691,5 +702,5 @@ bool QGeoPlacePrivate::operator== (const QGeoPlacePrivate &other) const ); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoplace.h b/src/location/qgeoplace.h index ad0d02dc..d6635b02 100644 --- a/src/location/qgeoplace.h +++ b/src/location/qgeoplace.h @@ -60,10 +60,10 @@ #include "qplacemediaobject.h" #include "qplacereview.h" -class QString; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QString; class QLandmark; class QGeoPlacePrivate; @@ -142,6 +142,6 @@ private: friend class QLandmark; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeoplace_p.h b/src/location/qgeoplace_p.h index 1e3a7cd7..4911ed83 100644 --- a/src/location/qgeoplace_p.h +++ b/src/location/qgeoplace_p.h @@ -61,7 +61,7 @@ #include "qgeoboundingbox.h" #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoPlacePrivate : public QSharedData { @@ -107,19 +107,19 @@ public: QStringList tags; }; -QTM_END_NAMESPACE #if defined(Q_CC_MWERKS) // This results in multiple symbol definition errors on all other compilers // but not having a definition here results in an attempt to use the unspecialized // clone (which fails because of the pure virtuals above) -template<> QTM_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone() +template<> QGeoPlacePrivate *QSharedDataPointer<QGeoPlacePrivate>::clone() { return d->clone(); } #else -template<> QTM_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone(); +template<> QGeoPlacePrivate *QSharedDataPointer<QGeoPlacePrivate>::clone(); #endif +QT_END_NAMESPACE #endif diff --git a/src/location/qgeopositioninfo.cpp b/src/location/qgeopositioninfo.cpp index 7a291d25..25584b11 100644 --- a/src/location/qgeopositioninfo.cpp +++ b/src/location/qgeopositioninfo.cpp @@ -44,7 +44,7 @@ #include <QDebug> #include <QDataStream> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoPositionInfoPrivate { @@ -94,6 +94,7 @@ QGeoPositionInfo::QGeoPositionInfo() /*! Creates a QGeoPositionInfo for the given \a coordinate and \a timestamp. + \since 1.0 */ QGeoPositionInfo::QGeoPositionInfo(const QGeoCoordinate &coordinate, const QDateTime ×tamp) : d(new QGeoPositionInfoPrivate) @@ -104,6 +105,7 @@ QGeoPositionInfo::QGeoPositionInfo(const QGeoCoordinate &coordinate, const QDate /*! Creates a QGeoPositionInfo with the values of \a other. + \since 1.0 */ QGeoPositionInfo::QGeoPositionInfo(const QGeoPositionInfo &other) : d(new QGeoPositionInfoPrivate) @@ -121,6 +123,7 @@ QGeoPositionInfo::~QGeoPositionInfo() /*! Assigns the values from \a other to this QGeoPositionInfo. + \since 1.0 */ QGeoPositionInfo &QGeoPositionInfo::operator=(const QGeoPositionInfo & other) { @@ -137,6 +140,7 @@ QGeoPositionInfo &QGeoPositionInfo::operator=(const QGeoPositionInfo & other) /*! Returns true if all of this object's values are the same as those of \a other. + \since 1.0 */ bool QGeoPositionInfo::operator==(const QGeoPositionInfo &other) const { @@ -150,11 +154,13 @@ bool QGeoPositionInfo::operator==(const QGeoPositionInfo &other) const Returns true if any of this object's values are not the same as those of \a other. + \since 1.0 */ /*! Returns true if the timestamp() and coordinate() values are both valid. + \since 1.0 \sa QGeoCoordinate::isValid(), QDateTime::isValid() */ bool QGeoPositionInfo::isValid() const @@ -167,6 +173,7 @@ bool QGeoPositionInfo::isValid() const The \a timestamp must be in UTC time. + \since 1.0 \sa timestamp() */ void QGeoPositionInfo::setTimestamp(const QDateTime ×tamp) @@ -179,6 +186,7 @@ void QGeoPositionInfo::setTimestamp(const QDateTime ×tamp) Returns an invalid QDateTime if no date/time value has been set. + \since 1.0 \sa setTimestamp() */ QDateTime QGeoPositionInfo::timestamp() const @@ -189,6 +197,7 @@ QDateTime QGeoPositionInfo::timestamp() const /*! Sets the coordinate for this position to \a coordinate. + \since 1.0 \sa coordinate() */ void QGeoPositionInfo::setCoordinate(const QGeoCoordinate &coordinate) @@ -201,6 +210,7 @@ void QGeoPositionInfo::setCoordinate(const QGeoCoordinate &coordinate) Returns an invalid coordinate if no coordinate has been set. + \since 1.0 \sa setCoordinate() */ QGeoCoordinate QGeoPositionInfo::coordinate() const @@ -211,6 +221,7 @@ QGeoCoordinate QGeoPositionInfo::coordinate() const /*! Sets the value for \a attribute to \a value. + \since 1.0 \sa attribute() */ void QGeoPositionInfo::setAttribute(Attribute attribute, qreal value) @@ -227,6 +238,7 @@ void QGeoPositionInfo::setAttribute(Attribute attribute, qreal value) The function hasAttribute() should be used to determine whether or not a value has been set for an attribute. + \since 1.0 \sa hasAttribute(), setAttribute() */ qreal QGeoPositionInfo::attribute(Attribute attribute) const @@ -238,6 +250,7 @@ qreal QGeoPositionInfo::attribute(Attribute attribute) const /*! Removes the specified \a attribute and its value. + \since 1.0 */ void QGeoPositionInfo::removeAttribute(Attribute attribute) { @@ -247,6 +260,7 @@ void QGeoPositionInfo::removeAttribute(Attribute attribute) /*! Returns true if the specified \a attribute is present for this QGeoPositionInfo object. + \since 1.0 */ bool QGeoPositionInfo::hasAttribute(Attribute attribute) const { @@ -297,6 +311,7 @@ QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info) Writes the given \a info to the specified \a stream. + \since 1.0 \sa {Serializing Qt Data Types} */ @@ -317,6 +332,7 @@ QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info) Reads a coordinate from the specified \a stream into the given \a info. + \since 1.0 \sa {Serializing Qt Data Types} */ @@ -329,4 +345,4 @@ QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info) } #endif -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h index c71646cd..37840755 100644 --- a/src/location/qgeopositioninfo.h +++ b/src/location/qgeopositioninfo.h @@ -46,14 +46,11 @@ #include <QDateTime> +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE + class QDebug; class QDataStream; -QT_END_NAMESPACE - -QT_BEGIN_HEADER - -QTM_BEGIN_NAMESPACE class QGeoPositionInfoPrivate; class Q_LOCATION_EXPORT QGeoPositionInfo @@ -113,7 +110,7 @@ Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoPositio Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info); #endif -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeopositioninfosource.cpp b/src/location/qgeopositioninfosource.cpp index c1992d13..45c2aff0 100644 --- a/src/location/qgeopositioninfosource.cpp +++ b/src/location/qgeopositioninfosource.cpp @@ -66,7 +66,7 @@ #endif #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoPositionInfoSource @@ -172,9 +172,9 @@ void QGeoPositionInfoSourcePrivate::loadDynamicPlugins(QHash<QString, QGeoPositi QString blockName; QSettings settings(QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSat")); - QVariant value = settings.value("position.plugin.operator.whitelist"); + QVariant value = settings.value(QLatin1String("position.plugin.operator.whitelist")); if (value.isValid()) { - QStringList parts = value.toString().split(","); + QStringList parts = value.toString().split(QLatin1String(",")); if (parts.size() == 4) { QFile file(parts.at(1)); file.open(QIODevice::ReadOnly); @@ -314,6 +314,7 @@ QGeoPositionInfoSource::~QGeoPositionInfoSource() Note: Subclass implementations must call the base implementation of setUpdateInterval() so that updateInterval() returns the correct value. + \since 1.0 */ void QGeoPositionInfoSource::setUpdateInterval(int msec) { @@ -337,6 +338,7 @@ int QGeoPositionInfoSource::updateInterval() const \bold {Note:} When reimplementing this method, subclasses must call the base method implementation to ensure preferredPositioningMethods() returns the correct value. + \since 1.0 \sa supportedPositioningMethods() */ void QGeoPositionInfoSource::setPreferredPositioningMethods(PositioningMethods methods) @@ -349,6 +351,7 @@ void QGeoPositionInfoSource::setPreferredPositioningMethods(PositioningMethods m /*! Returns the positioning methods set by setPreferredPositioningMethods(). + \since 1.0 */ QGeoPositionInfoSource::PositioningMethods QGeoPositionInfoSource::preferredPositioningMethods() const { @@ -365,14 +368,15 @@ QGeoPositionInfoSource::PositioningMethods QGeoPositionInfoSource::preferredPosi Note: Symbian applications will need to have the Location capability otherwise this will return 0. + \since 1.0 */ QGeoPositionInfoSource *QGeoPositionInfoSource::createDefaultSource(QObject *parent) { QSettings pluginSettings(QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSat")); - QVariant value = pluginSettings.value("position.plugin.operator.whitelist"); + QVariant value = pluginSettings.value(QLatin1String("position.plugin.operator.whitelist")); if (value.isValid()) { - QStringList parts = value.toString().split(","); + QStringList parts = value.toString().split(QLatin1String(",")); if (parts.size() == 4) { QGeoPositionInfoSource *source = createSource(parts.at(0), parent); if (source) @@ -399,7 +403,7 @@ QGeoPositionInfoSource *QGeoPositionInfoSource::createDefaultSource(QObject *par #elif defined(Q_WS_MEEGO) // Use Maemo6 backend if its available, otherwise use Geoclue backend QSettings maemo6Settings(QSettings::UserScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSatMaemo6")); - if (!maemo6Settings.value("maemo6positioningavailable").isValid()) { + if (!maemo6Settings.value(QLatin1String("maemo6positioningavailable")).isValid()) { QGeoPositionInfoSourceMaemo* maemo6Source = new QGeoPositionInfoSourceMaemo(parent); int status = maemo6Source->init(); if (status == -1) { @@ -465,6 +469,7 @@ QStringList QGeoPositionInfoSource::availableSources() If \a fromSatellitePositioningMethodsOnly is true, this returns the last known position received from a satellite positioning method; if none is available, a null update is returned. + \since 1.0 */ /*! @@ -472,6 +477,7 @@ QStringList QGeoPositionInfoSource::availableSources() Returns the positioning methods available to this source. + \since 1.0 \sa setPreferredPositioningMethods() */ @@ -482,6 +488,7 @@ QStringList QGeoPositionInfoSource::availableSources() This is the minimum value accepted by setUpdateInterval() and requestUpdate(). + \since 1.0 */ @@ -498,12 +505,14 @@ QStringList QGeoPositionInfoSource::availableSources() lost or if a hardware error is detected. Position updates will recommence if the data becomes available later on. The updateTimout() signal will not be emitted again until after the periodic updates resume. + \since 1.0 */ /*! \fn virtual void QGeoPositionInfoSource::stopUpdates() = 0; Stops emitting updates at regular intervals. + \since 1.0 */ /*! @@ -524,6 +533,7 @@ QStringList QGeoPositionInfoSource::availableSources() If the source uses multiple positioning methods, it tries to gets the current position from the most accurate positioning method within the given timeout. + \since 1.0 */ /*! @@ -533,6 +543,7 @@ QStringList QGeoPositionInfoSource::availableSources() when an update becomes available. The \a update value holds the value of the new update. + \since 1.0 */ /*! @@ -544,8 +555,9 @@ QStringList QGeoPositionInfoSource::availableSources() If startUpdates() has been called, this signal will be emitted if this QGeoPositionInfoSource subclass determines that it will not be able to provide further regular updates. This signal will not be emitted again until after the regular updates resume. + \since 1.0 */ #include "moc_qgeopositioninfosource.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosource.h b/src/location/qgeopositioninfosource.h index b11124d0..3d4eacd9 100644 --- a/src/location/qgeopositioninfosource.h +++ b/src/location/qgeopositioninfosource.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoPositionInfoSourcePrivate; class Q_LOCATION_EXPORT QGeoPositionInfoSource : public QObject @@ -100,7 +100,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoPositionInfoSource::PositioningMethods) -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeopositioninfosource_geocluemaster.cpp b/src/location/qgeopositioninfosource_geocluemaster.cpp index 334a4fcd..a3331e58 100644 --- a/src/location/qgeopositioninfosource_geocluemaster.cpp +++ b/src/location/qgeopositioninfosource_geocluemaster.cpp @@ -48,7 +48,7 @@ #include "qgeopositioninfosource_geocluemaster_p.h" #include <gconf/gconf-client.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #define MINIMUM_UPDATE_INTERVAL 1000 #define UPDATE_TIMEOUT_COLD_START 120000 @@ -553,4 +553,4 @@ QGeoPositionInfo QGeoPositionInfoSourceGeoclueMaster::geoclueToPositionInfo( } #include "moc_qgeopositioninfosource_geocluemaster_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosource_geocluemaster_p.h b/src/location/qgeopositioninfosource_geocluemaster_p.h index fba906a4..bac50355 100644 --- a/src/location/qgeopositioninfosource_geocluemaster_p.h +++ b/src/location/qgeopositioninfosource_geocluemaster_p.h @@ -60,7 +60,7 @@ //#define Q_LOCATION_GEOCLUE_DEBUG -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoPositionInfoSourceGeoclueMaster : public QGeoPositionInfoSource { @@ -136,6 +136,6 @@ private: PositioningMethods m_methods; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOPOSITIONINFOSOURCE_GEOCLUEMASTER_H diff --git a/src/location/qgeopositioninfosource_maemo.cpp b/src/location/qgeopositioninfosource_maemo.cpp index e0461ad0..e8b6ea91 100644 --- a/src/location/qgeopositioninfosource_maemo.cpp +++ b/src/location/qgeopositioninfosource_maemo.cpp @@ -45,7 +45,7 @@ using namespace std; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoPositionInfoSourceMaemo::QGeoPositionInfoSourceMaemo(QObject *parent): QGeoPositionInfoSource(parent) { @@ -202,5 +202,5 @@ void QGeoPositionInfoSourceMaemo::shutdownRequestSession() } #include "moc_qgeopositioninfosource_maemo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosource_maemo_p.h b/src/location/qgeopositioninfosource_maemo_p.h index 8493cbf4..95bf1186 100644 --- a/src/location/qgeopositioninfosource_maemo_p.h +++ b/src/location/qgeopositioninfosource_maemo_p.h @@ -69,7 +69,7 @@ extern "C" } #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class DBusComm; class QGeoPositionInfoSourceMaemo : public QGeoPositionInfoSource @@ -105,6 +105,6 @@ private Q_SLOTS: void requestTimerExpired(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeopositioninfosource_s60.cpp b/src/location/qgeopositioninfosource_s60.cpp index 26a87c0e..179953fd 100644 --- a/src/location/qgeopositioninfosource_s60.cpp +++ b/src/location/qgeopositioninfosource_s60.cpp @@ -49,7 +49,7 @@ -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // constructor CQGeoPositionInfoSourceS60::CQGeoPositionInfoSourceS60(QObject* aParent) : QGeoPositionInfoSource(aParent), @@ -64,6 +64,7 @@ CQGeoPositionInfoSourceS60::CQGeoPositionInfoSourceS60(QObject* aParent) : QGeoP mMinUpdateInterval(100), mStartUpdates(FALSE), mRegularUpdateTimedOut(FALSE), + mUpdateIntervalSet(FALSE), mModuleFlags(0) { memset(mList, 0 , MAX_SIZE * sizeof(CPosMethodInfo)); @@ -107,10 +108,12 @@ CQGeoPositionInfoSourceS60* CQGeoPositionInfoSourceS60::NewL(QObject * aParent) CleanupStack::Pop(); //check if the second phase construction is successful - if (!self->isValid()) { - delete self; - self = NULL; - } + // commented to return the pointer and the application can check if it + //is valid or not + /* if (!self->isValid()) { + delete self; + self = NULL; + }*/ return self; } @@ -823,6 +826,10 @@ void CQGeoPositionInfoSourceS60::requestUpdate(int aTimeout) // starts the regular updates void CQGeoPositionInfoSourceS60::startUpdates() { + //SetUpdateInterval if it is not already set from application + if (!mUpdateIntervalSet) + setUpdateInterval(1000); + if (mRegUpdateAO == NULL || mCurrentModuleId == TUid::Null()) { emit updateTimeout(); return; @@ -931,6 +938,8 @@ void CQGeoPositionInfoSourceS60::setUpdateInterval(int aMilliSec) // as the above set value can be minimum value so // assigning to the base class data member QGeoPositionInfoSource::setUpdateInterval(interval); + + mUpdateIntervalSet = true; } } @@ -951,4 +960,4 @@ void CQGeoPositionInfoSourceS60::disconnectNotify(const char *aSignal) } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosource_s60_p.h b/src/location/qgeopositioninfosource_s60_p.h index 9fc446c6..4b595804 100644 --- a/src/location/qgeopositioninfosource_s60_p.h +++ b/src/location/qgeopositioninfosource_s60_p.h @@ -64,7 +64,7 @@ #define MAX_SIZE 25 -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // CLASS DECLARATION //forward declaration @@ -299,12 +299,15 @@ private: TBool mRegularUpdateTimedOut; + // To check if update interval is already set from application + TBool mUpdateIntervalSet; + /* * flags for the modules */ TUint8 mModuleFlags; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // CQGEOPOSITIONINFOSOURCES60_H diff --git a/src/location/qgeopositioninfosource_simulator.cpp b/src/location/qgeopositioninfosource_simulator.cpp index 9a9ea92c..82e4cd3d 100644 --- a/src/location/qgeopositioninfosource_simulator.cpp +++ b/src/location/qgeopositioninfosource_simulator.cpp @@ -52,7 +52,7 @@ #include <QtNetwork/QLocalSocket> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE using namespace QtSimulatorPrivate; @@ -163,4 +163,4 @@ void QGeoPositionInfoSourceSimulator::updatePosition() #include "moc_qgeopositioninfosource_simulator_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosource_simulator_p.h b/src/location/qgeopositioninfosource_simulator_p.h index 774887d8..a208bf99 100644 --- a/src/location/qgeopositioninfosource_simulator_p.h +++ b/src/location/qgeopositioninfosource_simulator_p.h @@ -48,10 +48,9 @@ QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE class QTimer; -QTM_BEGIN_NAMESPACE - class QGeoPositionInfoSourceSimulator : public QGeoPositionInfoSource { Q_OBJECT @@ -80,6 +79,6 @@ private: QGeoPositionInfo lastPosition; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOPOSITIONINFOSOURCESIMULATOR_H diff --git a/src/location/qgeopositioninfosourcefactory.cpp b/src/location/qgeopositioninfosourcefactory.cpp index 92f005ed..317ea473 100644 --- a/src/location/qgeopositioninfosourcefactory.cpp +++ b/src/location/qgeopositioninfosourcefactory.cpp @@ -41,7 +41,7 @@ #include "qgeopositioninfosourcefactory.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoPositionInfoSourceFactory @@ -128,4 +128,4 @@ int QGeoPositionInfoSourceFactory::sourcePriority() const QGeoPositionInfoSourceFactory::~QGeoPositionInfoSourceFactory() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosourcefactory.h b/src/location/qgeopositioninfosourcefactory.h index ca1b53ca..fb01e9c5 100644 --- a/src/location/qgeopositioninfosourcefactory.h +++ b/src/location/qgeopositioninfosourcefactory.h @@ -47,7 +47,7 @@ #include "qgeosatelliteinfosource.h" #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class Q_LOCATION_EXPORT QGeoPositionInfoSourceFactory { @@ -62,7 +62,7 @@ public: virtual QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent) = 0; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_BEGIN_NAMESPACE #define QT_POSITION_SOURCE_INTERFACE "com.nokia.qt.mobility.position.sourcefactory/1.0" diff --git a/src/location/qgeosatelliteinfo.cpp b/src/location/qgeosatelliteinfo.cpp index cab00d77..a9a594a0 100644 --- a/src/location/qgeosatelliteinfo.cpp +++ b/src/location/qgeosatelliteinfo.cpp @@ -44,7 +44,7 @@ #include <QDebug> #include <QDataStream> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSatelliteInfoPrivate { @@ -88,6 +88,7 @@ QGeoSatelliteInfo::QGeoSatelliteInfo() /*! Creates a satellite information object with the values of \a other. + \since 1.0 */ QGeoSatelliteInfo::QGeoSatelliteInfo(const QGeoSatelliteInfo &other) @@ -106,6 +107,7 @@ QGeoSatelliteInfo::~QGeoSatelliteInfo() /*! Assigns the values from \a other to this object. + \since 1.0 */ QGeoSatelliteInfo &QGeoSatelliteInfo::operator=(const QGeoSatelliteInfo & other) { @@ -121,6 +123,7 @@ QGeoSatelliteInfo &QGeoSatelliteInfo::operator=(const QGeoSatelliteInfo & other) /*! Returns true if all the information for this satellite are the same as those of \a other. + \since 1.0 */ bool QGeoSatelliteInfo::operator==(const QGeoSatelliteInfo &other) const { @@ -134,12 +137,14 @@ bool QGeoSatelliteInfo::operator==(const QGeoSatelliteInfo &other) const Returns true if any of the information for this satellite are not the same as those of \a other. + \since 1.0 */ /*! Sets the PRN (Pseudo-random noise) number to \a prn. The PRN number can be used to identify a satellite. + \since 1.0 */ void QGeoSatelliteInfo::setPrnNumber(int prn) { @@ -148,6 +153,7 @@ void QGeoSatelliteInfo::setPrnNumber(int prn) /*! Returns the PRN (Pseudo-random noise) number, or -1 if the value has not been set. + \since 1.0 */ int QGeoSatelliteInfo::prnNumber() const @@ -157,6 +163,7 @@ int QGeoSatelliteInfo::prnNumber() const /*! Sets the signal strength to \a signalStrength, in decibels. + \since 1.0 */ void QGeoSatelliteInfo::setSignalStrength(int signalStrength) { @@ -165,6 +172,7 @@ void QGeoSatelliteInfo::setSignalStrength(int signalStrength) /*! Returns the signal strength, or -1 if the value has not been set. + \since 1.0 */ int QGeoSatelliteInfo::signalStrength() const { @@ -173,6 +181,7 @@ int QGeoSatelliteInfo::signalStrength() const /*! Sets the value for \a attribute to \a value. + \since 1.0 */ void QGeoSatelliteInfo::setAttribute(Attribute attribute, qreal value) { @@ -184,6 +193,7 @@ void QGeoSatelliteInfo::setAttribute(Attribute attribute, qreal value) Returns -1 if the value has not been set. + \since 1.0 \sa hasAttribute(), setAttribute() */ qreal QGeoSatelliteInfo::attribute(Attribute attribute) const @@ -195,6 +205,7 @@ qreal QGeoSatelliteInfo::attribute(Attribute attribute) const /*! Removes the specified \a attribute and its value. + \since 1.0 */ void QGeoSatelliteInfo::removeAttribute(Attribute attribute) { @@ -203,6 +214,7 @@ void QGeoSatelliteInfo::removeAttribute(Attribute attribute) /*! Returns true if the specified \a attribute is present in this update. + \since 1.0 */ bool QGeoSatelliteInfo::hasAttribute(Attribute attribute) const { @@ -241,6 +253,7 @@ QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info) Writes the given \a info to the specified \a stream. + \since 1.0 \sa \link datastreamformat.html Format of the QDataStream operators \endlink */ @@ -262,6 +275,7 @@ QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info) Reads satellite information from the specified \a stream into the given \a info. + \since 1.0 \sa \link datastreamformat.html Format of the QDataStream operators \endlink */ @@ -274,4 +288,4 @@ QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info) } #endif -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfo.h b/src/location/qgeosatelliteinfo.h index bfa6d641..61047fc6 100644 --- a/src/location/qgeosatelliteinfo.h +++ b/src/location/qgeosatelliteinfo.h @@ -44,13 +44,10 @@ #include "qmobilityglobal.h" QT_BEGIN_NAMESPACE +QT_BEGIN_HEADER class QDebug; class QDataStream; -QT_END_NAMESPACE -QT_BEGIN_HEADER - -QTM_BEGIN_NAMESPACE class QGeoSatelliteInfoPrivate; class Q_LOCATION_EXPORT QGeoSatelliteInfo @@ -104,7 +101,7 @@ Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoSatelli Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info); #endif -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeosatelliteinfosource.cpp b/src/location/qgeosatelliteinfosource.cpp index 163fe3fd..716f04be 100644 --- a/src/location/qgeosatelliteinfosource.cpp +++ b/src/location/qgeosatelliteinfosource.cpp @@ -65,7 +65,7 @@ #endif #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSatelliteInfoSourcePrivate { @@ -113,9 +113,9 @@ void QGeoSatelliteInfoSourcePrivate::loadDynamicPlugins(QHash<QString, QGeoPosit QString blockName; QSettings settings(QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSat")); - QVariant value = settings.value("position.plugin.operator.whitelist"); + QVariant value = settings.value(QLatin1String("position.plugin.operator.whitelist")); if (value.isValid()) { - QStringList parts = value.toString().split(","); + QStringList parts = value.toString().split(QLatin1String(",")); if (parts.size() == 4) { QFile file(parts.at(1)); file.open(QIODevice::ReadOnly); @@ -258,13 +258,14 @@ QGeoSatelliteInfoSource::QGeoSatelliteInfoSource(QObject *parent) Note: Symbian applications will need to have the Location capability otherwise this will return 0. + \since 1.0 */ QGeoSatelliteInfoSource *QGeoSatelliteInfoSource::createDefaultSource(QObject *parent) { QSettings pluginSettings(QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSat")); - QVariant value = pluginSettings.value("position.plugin.operator.whitelist"); + QVariant value = pluginSettings.value(QLatin1String("position.plugin.operator.whitelist")); if (value.isValid()) { - QStringList parts = value.toString().split(","); + QStringList parts = value.toString().split(QLatin1String(",")); if (parts.size() == 4) { QGeoSatelliteInfoSource *source = createSource(parts.at(0), parent); if (source) @@ -354,6 +355,7 @@ QStringList QGeoSatelliteInfoSource::availableSources() currently in view. The \a satellites parameter holds the satellites currently in view. + \since 1.0 */ /*! @@ -367,6 +369,7 @@ QStringList QGeoSatelliteInfoSource::availableSources() is, those used to determine the current position. The \a satellites parameter holds the satellites currently in use. + \since 1.0 */ /*! @@ -375,6 +378,7 @@ QStringList QGeoSatelliteInfoSource::availableSources() Starts emitting updates at regular intervals. The updates will be provided whenever new satellite information becomes available. + \since 1.0 \sa satellitesInViewUpdated(), satellitesInUseUpdated() */ @@ -382,6 +386,7 @@ QStringList QGeoSatelliteInfoSource::availableSources() \fn virtual void QGeoSatelliteInfoSource::stopUpdates() = 0; Stops emitting updates at regular intervals. + \since 1.0 */ /*! @@ -399,6 +404,7 @@ QStringList QGeoSatelliteInfoSource::availableSources() This does nothing if another update request is in progress. However it can be called even if startUpdates() has already been called and regular updates are in progress. + \since 1.0 */ /*! @@ -406,8 +412,9 @@ QStringList QGeoSatelliteInfoSource::availableSources() Emitted if requestUpdate() was called and the current satellite information could not be retrieved within the specified timeout. + \since 1.0 */ #include "moc_qgeosatelliteinfosource.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource.h b/src/location/qgeosatelliteinfosource.h index f7b007dc..9b9a4cc3 100644 --- a/src/location/qgeosatelliteinfosource.h +++ b/src/location/qgeosatelliteinfosource.h @@ -50,7 +50,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSatelliteInfoSourcePrivate; class Q_LOCATION_EXPORT QGeoSatelliteInfoSource : public QObject @@ -79,7 +79,7 @@ private: QGeoSatelliteInfoSourcePrivate *d; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeosatelliteinfosource_gypsy.cpp b/src/location/qgeosatelliteinfosource_gypsy.cpp index 8b91688f..4f6de5d4 100644 --- a/src/location/qgeosatelliteinfosource_gypsy.cpp +++ b/src/location/qgeosatelliteinfosource_gypsy.cpp @@ -46,7 +46,7 @@ #endif #include <QFile> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #define UPDATE_TIMEOUT_COLD_START 120000 @@ -366,4 +366,4 @@ void QGeoSatelliteInfoSourceGypsy::requestUpdateTimeout() } #include "moc_qgeosatelliteinfosource_gypsy_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource_gypsy_p.h b/src/location/qgeosatelliteinfosource_gypsy_p.h index 631d0cf7..e7165882 100644 --- a/src/location/qgeosatelliteinfosource_gypsy_p.h +++ b/src/location/qgeosatelliteinfosource_gypsy_p.h @@ -63,7 +63,7 @@ // #define Q_LOCATION_GYPSY_DEBUG -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // An engine that encapsulates all symbols we want // to be able to mock (for unit/autotest purposes). @@ -135,6 +135,6 @@ private: bool m_requestOngoing; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOSATELLITEINFOSOURCE_GYPSY_H diff --git a/src/location/qgeosatelliteinfosource_maemo.cpp b/src/location/qgeosatelliteinfosource_maemo.cpp index 7a3c7dad..f9d205ff 100644 --- a/src/location/qgeosatelliteinfosource_maemo.cpp +++ b/src/location/qgeosatelliteinfosource_maemo.cpp @@ -41,7 +41,7 @@ #include "qgeosatelliteinfosource_maemo_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoSatelliteInfoSourceMaemo::QGeoSatelliteInfoSourceMaemo(QObject *parent) : QGeoSatelliteInfoSource(parent), running(false), satInViewSeen(false) @@ -149,5 +149,5 @@ void QGeoSatelliteInfoSourceMaemo::onServiceConnect() #include "moc_qgeosatelliteinfosource_maemo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource_maemo_p.h b/src/location/qgeosatelliteinfosource_maemo_p.h index 8ac7898b..a0376782 100644 --- a/src/location/qgeosatelliteinfosource_maemo_p.h +++ b/src/location/qgeosatelliteinfosource_maemo_p.h @@ -57,7 +57,7 @@ #include "qgeosatelliteinfo.h" #include "dbuscomm_maemo_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSatelliteInfoSourceMaemo : public QGeoSatelliteInfoSource { @@ -91,7 +91,7 @@ private: Q_DISABLE_COPY(QGeoSatelliteInfoSourceMaemo) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeosatelliteinfosource_s60.cpp b/src/location/qgeosatelliteinfosource_s60.cpp index 5d383016..6d57d458 100644 --- a/src/location/qgeosatelliteinfosource_s60.cpp +++ b/src/location/qgeosatelliteinfosource_s60.cpp @@ -51,7 +51,7 @@ #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // constructor CQGeoSatelliteInfoSourceS60::CQGeoSatelliteInfoSourceS60(QObject* aParent) : QGeoSatelliteInfoSource(aParent), @@ -704,5 +704,5 @@ void CQGeoSatelliteInfoSourceS60::disconnectNotify(const char *aSignal) } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource_s60_p.h b/src/location/qgeosatelliteinfosource_s60_p.h index 7c02c5ea..bf0efee3 100644 --- a/src/location/qgeosatelliteinfosource_s60_p.h +++ b/src/location/qgeosatelliteinfosource_s60_p.h @@ -63,7 +63,7 @@ #define MAX_SIZE 25 -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // CLASS DECLARATION //forward declaration @@ -275,6 +275,6 @@ private: TUint8 mModuleFlags; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* QGEOSATELLITEINFOSOURCE60_H_ */ diff --git a/src/location/qgeosatelliteinfosource_simulator.cpp b/src/location/qgeosatelliteinfosource_simulator.cpp index 0b35190d..86a38447 100644 --- a/src/location/qgeosatelliteinfosource_simulator.cpp +++ b/src/location/qgeosatelliteinfosource_simulator.cpp @@ -43,7 +43,7 @@ #include "qlocationconnection_simulator_p.h" #include "qlocationdata_simulator_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoSatelliteInfoSourceSimulator::QGeoSatelliteInfoSourceSimulator(QObject *parent) : QGeoSatelliteInfoSource(parent) @@ -102,5 +102,5 @@ void QGeoSatelliteInfoSourceSimulator::updateData() } #include "moc_qgeosatelliteinfosource_simulator_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource_simulator_p.h b/src/location/qgeosatelliteinfosource_simulator_p.h index 7d4d934c..18bcab01 100644 --- a/src/location/qgeosatelliteinfosource_simulator_p.h +++ b/src/location/qgeosatelliteinfosource_simulator_p.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSatelliteInfoSourceSimulator : public QGeoSatelliteInfoSource { @@ -74,7 +74,7 @@ private: QTimer *requestTimer; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOSATELLITEINFOSOURCE_SIMULATOR_H diff --git a/src/location/qlatin1constant.h b/src/location/qlatin1constant.h index d5485507..a8746498 100644 --- a/src/location/qlatin1constant.h +++ b/src/location/qlatin1constant.h @@ -45,7 +45,7 @@ #include <QString> #include <QVariant> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /* * QLatin1Constant @@ -158,6 +158,6 @@ template<int N> bool operator!=(const QString& b, const QLatin1Constant<N>& a) #define Q_DECLARE_LATIN1_CONSTANT(varname, str) static const QLatin1Constant<sizeof(str)> varname #define Q_DEFINE_LATIN1_CONSTANT(varname, str) const QLatin1Constant<sizeof(str)> varname = {str} -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qlocationconnection_simulator.cpp b/src/location/qlocationconnection_simulator.cpp index 50f47ccd..f147bce6 100644 --- a/src/location/qlocationconnection_simulator.cpp +++ b/src/location/qlocationconnection_simulator.cpp @@ -51,7 +51,7 @@ #include <QtNetwork/QLocalSocket> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE using namespace QtSimulatorPrivate; @@ -132,4 +132,4 @@ QGeoSatelliteInfoData *qtSatelliteInfo() } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qlocationconnection_simulator_p.h b/src/location/qlocationconnection_simulator_p.h index e9d5121a..029cc6f0 100644 --- a/src/location/qlocationconnection_simulator_p.h +++ b/src/location/qlocationconnection_simulator_p.h @@ -47,7 +47,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE namespace Simulator { @@ -75,6 +75,6 @@ void ensureSimulatorConnection(); QGeoPositionInfoData *qtPositionInfo(); QGeoSatelliteInfoData *qtSatelliteInfo(); -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QLOCATIONCONNECTION_H diff --git a/src/location/qlocationdata_simulator.cpp b/src/location/qlocationdata_simulator.cpp index f68a835f..49e04a06 100644 --- a/src/location/qlocationdata_simulator.cpp +++ b/src/location/qlocationdata_simulator.cpp @@ -43,7 +43,7 @@ #include <QtCore/QDataStream> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE void qt_registerLocationTypes() { @@ -94,4 +94,4 @@ QDataStream &operator>>(QDataStream &in, QGeoSatelliteInfoData::SatelliteInfo &s return in; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qlocationdata_simulator_p.h b/src/location/qlocationdata_simulator_p.h index 420acba9..4bfe4885 100644 --- a/src/location/qlocationdata_simulator_p.h +++ b/src/location/qlocationdata_simulator_p.h @@ -59,7 +59,7 @@ #include <QtCore/QList> QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE struct QGeoPositionInfoData { @@ -100,7 +100,7 @@ struct QGeoSatelliteInfoData void qt_registerLocationTypes(); -QTM_END_NAMESPACE +QT_END_NAMESPACE Q_DECLARE_METATYPE(QtMobility::QGeoPositionInfoData) Q_DECLARE_METATYPE(QtMobility::QGeoSatelliteInfoData) diff --git a/src/location/qlocationutils.cpp b/src/location/qlocationutils.cpp index 97d604f7..c210ed59 100644 --- a/src/location/qlocationutils.cpp +++ b/src/location/qlocationutils.cpp @@ -48,7 +48,7 @@ #include <math.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // converts e.g. 15306.0235 from NMEA sentence to 153.100392 static double qlocationutils_nmeaDegreesToDecimal(double nmeaDegrees) @@ -133,7 +133,7 @@ static void qlocationutils_readRmc(const char *data, int size, QGeoPositionInfo *hasFix = (parts[2][0] == 'A'); if (parts.count() > 9 && parts[9].count() == 6) { - date = QDate::fromString(parts[9], "ddMMyy"); + date = QDate::fromString(parts[9], QLatin1String("ddMMyy")); if (date.isValid()) date = date.addYears(100); // otherwise starts from 1900 else @@ -305,9 +305,9 @@ bool QLocationUtils::getNmeaTime(const QByteArray &bytes, QTime *time) QTime tempTime; if (dotIndex < 0) { - tempTime = QTime::fromString(bytes, "hhmmss"); + tempTime = QTime::fromString(bytes, QLatin1String("hhmmss")); } else { - tempTime = QTime::fromString(bytes.mid(0, dotIndex), "hhmmss"); + tempTime = QTime::fromString(bytes.mid(0, dotIndex), QLatin1String("hhmmss")); bool hasMsecs = false; int midLen = qMin(3, bytes.size() - dotIndex - 1); int msecs = bytes.mid(dotIndex + 1, midLen).toUInt(&hasMsecs); @@ -350,5 +350,5 @@ bool QLocationUtils::getNmeaLatLong(const QByteArray &latString, char latDirecti return false; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qlocationutils_p.h b/src/location/qlocationutils_p.h index 2ceb3d9e..73e52de7 100644 --- a/src/location/qlocationutils_p.h +++ b/src/location/qlocationutils_p.h @@ -57,9 +57,6 @@ QT_BEGIN_NAMESPACE class QTime; class QByteArray; -QT_END_NAMESPACE - -QTM_BEGIN_NAMESPACE class QGeoPositionInfo; class QLocationUtils @@ -100,6 +97,6 @@ public: Q_AUTOTEST_EXPORT static bool getNmeaLatLong(const QByteArray &latString, char latDirection, const QByteArray &lngString, char lngDirection, double *lat, double *lon); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qmlbackendao_s60.cpp b/src/location/qmlbackendao_s60.cpp index 876e5465..e948fea4 100644 --- a/src/location/qmlbackendao_s60.cpp +++ b/src/location/qmlbackendao_s60.cpp @@ -43,7 +43,7 @@ #include "qgeosatelliteinfosource_s60_p.h" #include "qmlbackendao_s60_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //The name of the requestor //Added by PM //_LIT(KRequestor,"QTMobility Location"); @@ -475,4 +475,4 @@ void CQMLBackendAO::startUpdates() } } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qmlbackendao_s60_p.h b/src/location/qmlbackendao_s60_p.h index 6152f7b2..e3aa591a 100644 --- a/src/location/qmlbackendao_s60_p.h +++ b/src/location/qmlbackendao_s60_p.h @@ -61,7 +61,7 @@ #include "qgeopositioninfosource.h" //#include "qgeopositioninfosources60.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class CQGeoPositionInfoSourceS60 ; class CQGeoSatelliteInfoSourceS60; @@ -158,6 +158,6 @@ private: TPositionSatelliteInfo mPosSatInfo; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QMLBACKENDAO_H diff --git a/src/location/qmlbackendmonitorao_s60.cpp b/src/location/qmlbackendmonitorao_s60.cpp index f5c763fc..91075f4c 100644 --- a/src/location/qmlbackendmonitorao_s60.cpp +++ b/src/location/qmlbackendmonitorao_s60.cpp @@ -48,7 +48,7 @@ #include <lbttriggerconditionarea.h> #include <lbttriggerentry.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //static member of the QMLBackendMonitorAO object holding the address of the object @@ -153,5 +153,5 @@ QMLBackendMonitorAO::QMLBackendMonitorAO() CActiveScheduler::Add(this); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qmlbackendmonitorao_s60_p.h b/src/location/qmlbackendmonitorao_s60_p.h index b42c248f..80ca6c82 100644 --- a/src/location/qmlbackendmonitorao_s60_p.h +++ b/src/location/qmlbackendmonitorao_s60_p.h @@ -61,7 +61,7 @@ #include "qgeoareamonitor.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class CBackendMonitorInfo; @@ -114,6 +114,6 @@ private: RLbt iLbt; //subsession }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* QMLBACKENDMONITORAO_H_ */ diff --git a/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp b/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp index 2b8d42d6..c4029db0 100644 --- a/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp +++ b/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp @@ -44,7 +44,7 @@ #include "qmlbackendmonitorinfo_s60_p.h" #include "qmlbackendmonitorcreatetriggerao_s60_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //Sets the radius of the monitoring area, to aRadius.If the Radius is less than the MinimumTriggerAreaSize(), //then aRadius will be set to MinimumTriggerAreaSize() supported by the LBT implementation.If the aRadius is @@ -401,4 +401,4 @@ bool QMLBackendMonitorCreateTriggerAO::isTriggerInitialized(QGeoAreaMonitorS60* return (triggerInfo != NULL) ? TRUE : FALSE; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h b/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h index b6c7e90f..7b61635a 100644 --- a/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h +++ b/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h @@ -62,7 +62,7 @@ #include <lbttriggerconditionarea.h> #include <lbttriggerentry.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoAreaMonitorS60; @@ -108,6 +108,6 @@ private: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* QMLBACKENDMONITORCREATETRIGGER_H_ */ diff --git a/src/location/qmlbackendmonitorinfo_s60.cpp b/src/location/qmlbackendmonitorinfo_s60.cpp index 4c42b135..13fc8c55 100644 --- a/src/location/qmlbackendmonitorinfo_s60.cpp +++ b/src/location/qmlbackendmonitorinfo_s60.cpp @@ -42,7 +42,7 @@ #include "qmlbackendmonitorinfo_s60_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //singleton class object CBackendMonitorInfo* CBackendMonitorInfo::iBackendMonitorInfo = NULL; @@ -154,4 +154,4 @@ CBackendMonitorInfo::~CBackendMonitorInfo() iBackendMonitorInfo = NULL; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qmlbackendmonitorinfo_s60_p.h b/src/location/qmlbackendmonitorinfo_s60_p.h index 118ddc81..831108b3 100644 --- a/src/location/qmlbackendmonitorinfo_s60_p.h +++ b/src/location/qmlbackendmonitorinfo_s60_p.h @@ -55,7 +55,7 @@ #include "qmlbackendmonitorao_s60_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //linked list information structure struct CMonitorTriggerInfo { @@ -103,6 +103,6 @@ private : static CBackendMonitorInfo* iBackendMonitorInfo; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* QMLBACKENDMONITORINFO_H_ */ diff --git a/src/location/qmlbackendtriggerchangeao_s60.cpp b/src/location/qmlbackendtriggerchangeao_s60.cpp index 60f8ccbf..9d990682 100644 --- a/src/location/qmlbackendtriggerchangeao_s60.cpp +++ b/src/location/qmlbackendtriggerchangeao_s60.cpp @@ -47,7 +47,7 @@ #include <lbtsessiontrigger.h> #include <lbttriggerentry.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //Design chnages @@ -346,4 +346,4 @@ void QMLBackendTriggerChangeAO::ConstructL(RLbtServer& aLbtServ) } } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qmlbackendtriggerchangeao_s60_p.h b/src/location/qmlbackendtriggerchangeao_s60_p.h index 4aaa396c..26dd1d40 100644 --- a/src/location/qmlbackendtriggerchangeao_s60_p.h +++ b/src/location/qmlbackendtriggerchangeao_s60_p.h @@ -62,7 +62,7 @@ #include <lbt.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QMLBackendTriggerChangeAO : public CActive { @@ -91,6 +91,6 @@ private : }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* QMLBACKENDMONITORAO_H_ */ diff --git a/src/location/qmobilityglobal.h b/src/location/qmobilityglobal.h index 19701476..b2311120 100644 --- a/src/location/qmobilityglobal.h +++ b/src/location/qmobilityglobal.h @@ -48,20 +48,20 @@ //#define QTM_NAMESPACE QtMobility //#define QTM_NAMESPACE -#ifdef QTM_NAMESPACE +/*#ifdef QTM_NAMESPACE # define QTM_PREPEND_NAMESPACE(name) ::QTM_NAMESPACE::name -# define QTM_BEGIN_NAMESPACE namespace QTM_NAMESPACE { -# define QTM_END_NAMESPACE } +# define QT_BEGIN_NAMESPACE namespace QTM_NAMESPACE { +# define QT_END_NAMESPACE } # define QTM_USE_NAMESPACE using namespace QTM_NAMESPACE; #else # define QTM_PREPEND_NAMESPACE(name) ::name -# define QTM_BEGIN_NAMESPACE -# define QTM_END_NAMESPACE +# define QT_BEGIN_NAMESPACE +# define QT_END_NAMESPACE # define QTM_USE_NAMESPACE -#endif +#endif*/ //in case Qt is in namespace -QT_USE_NAMESPACE +//QT_USE_NAMESPACE #endif // QMOBILITYGLOBAL_H diff --git a/src/location/qmobilitypluginsearch.h b/src/location/qmobilitypluginsearch.h index ee5a56e6..9c14751d 100644 --- a/src/location/qmobilitypluginsearch.h +++ b/src/location/qmobilitypluginsearch.h @@ -50,7 +50,7 @@ # include <f32file.h> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #if defined(Q_OS_SYMBIAN) static inline bool qSymbian_CheckDir(const QDir& dir, RFs& rfs) @@ -167,6 +167,6 @@ inline QStringList mobilityPlugins(const QString& plugintype) return plugins; } -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qnmeapositioninfosource.cpp b/src/location/qnmeapositioninfosource.cpp index df4a8233..55ec396c 100644 --- a/src/location/qnmeapositioninfosource.cpp +++ b/src/location/qnmeapositioninfosource.cpp @@ -47,7 +47,7 @@ #include <QTimer> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QNmeaRealTimeReader::QNmeaRealTimeReader(QNmeaPositionInfoSourcePrivate *sourcePrivate) : QNmeaReader(sourcePrivate) @@ -466,6 +466,7 @@ void QNmeaPositionInfoSourcePrivate::emitUpdated(const QGeoPositionInfo &update) /*! Constructs a QNmeaPositionInfoSource instance with the given \a parent and \a updateMode. + \since 1.0 */ QNmeaPositionInfoSource::QNmeaPositionInfoSource(UpdateMode updateMode, QObject *parent) : QGeoPositionInfoSource(parent), @@ -496,6 +497,7 @@ QNmeaPositionInfoSource::~QNmeaPositionInfoSource() Returns true if the sentence was succsesfully parsed, otherwise returns false and should not modifiy \a posInfo or \a hasFix. + \since 1.0 */ bool QNmeaPositionInfoSource::parsePosInfoFromNmeaData(const char *data, int size, QGeoPositionInfo *posInfo, bool *hasFix) @@ -505,6 +507,7 @@ bool QNmeaPositionInfoSource::parsePosInfoFromNmeaData(const char *data, int siz /*! Returns the update mode. + \since 1.0 */ QNmeaPositionInfoSource::UpdateMode QNmeaPositionInfoSource::updateMode() const { @@ -522,6 +525,7 @@ QNmeaPositionInfoSource::UpdateMode QNmeaPositionInfoSource::updateMode() const source to be notified when data is available for reading. QNmeaPositionInfoSource does not assume the ownership of the device, and hence does not deallocate it upon destruction. + \since 1.0 */ void QNmeaPositionInfoSource::setDevice(QIODevice *device) { @@ -535,6 +539,7 @@ void QNmeaPositionInfoSource::setDevice(QIODevice *device) /*! Returns the NMEA data source. + \since 1.0 */ QIODevice *QNmeaPositionInfoSource::device() const { @@ -543,6 +548,7 @@ QIODevice *QNmeaPositionInfoSource::device() const /*! \reimp + \since 1.0 */ void QNmeaPositionInfoSource::setUpdateInterval(int msec) { @@ -558,6 +564,7 @@ void QNmeaPositionInfoSource::setUpdateInterval(int msec) /*! \reimp + \since 1.0 */ void QNmeaPositionInfoSource::startUpdates() { @@ -566,6 +573,7 @@ void QNmeaPositionInfoSource::startUpdates() /*! \reimp + \since 1.0 */ void QNmeaPositionInfoSource::stopUpdates() { @@ -574,6 +582,7 @@ void QNmeaPositionInfoSource::stopUpdates() /*! \reimp + \since 1.0 */ void QNmeaPositionInfoSource::requestUpdate(int msec) { @@ -582,6 +591,7 @@ void QNmeaPositionInfoSource::requestUpdate(int msec) /*! \reimp + \since 1.0 */ QGeoPositionInfo QNmeaPositionInfoSource::lastKnownPosition(bool) const { @@ -591,6 +601,7 @@ QGeoPositionInfo QNmeaPositionInfoSource::lastKnownPosition(bool) const /*! \reimp + \since 1.0 */ QGeoPositionInfoSource::PositioningMethods QNmeaPositionInfoSource::supportedPositioningMethods() const { @@ -599,6 +610,7 @@ QGeoPositionInfoSource::PositioningMethods QNmeaPositionInfoSource::supportedPos /*! \reimp + \since 1.0 */ int QNmeaPositionInfoSource::minimumUpdateInterval() const { @@ -608,4 +620,4 @@ int QNmeaPositionInfoSource::minimumUpdateInterval() const #include "moc_qnmeapositioninfosource.cpp" #include "moc_qnmeapositioninfosource_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h index 5c315dc9..7d7966b3 100644 --- a/src/location/qnmeapositioninfosource.h +++ b/src/location/qnmeapositioninfosource.h @@ -44,13 +44,10 @@ #include "qmobilityglobal.h" #include "qgeopositioninfosource.h" -QT_BEGIN_NAMESPACE -class QIODevice; -QT_END_NAMESPACE - QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QIODevice; class QNmeaPositionInfoSourcePrivate; class Q_LOCATION_EXPORT QNmeaPositionInfoSource : public QGeoPositionInfoSource @@ -93,7 +90,7 @@ private: QNmeaPositionInfoSourcePrivate *d; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qnmeapositioninfosource_p.h b/src/location/qnmeapositioninfosource_p.h index b1360db9..b37682ac 100644 --- a/src/location/qnmeapositioninfosource_p.h +++ b/src/location/qnmeapositioninfosource_p.h @@ -59,15 +59,12 @@ #include <QQueue> #include <QPointer> +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE + class QBasicTimer; class QTimerEvent; class QTimer; -QT_END_NAMESPACE - -QT_BEGIN_HEADER - -QTM_BEGIN_NAMESPACE class QNmeaReader; struct QPendingGeoPositionInfo { @@ -173,7 +170,7 @@ private: bool m_hasValidDateTime; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/plugins/geoservices/nokia/OVI_SERVICES_TERMS_AND_CONDITIONS.txt b/src/plugins/geoservices/nokia/OVI_SERVICES_TERMS_AND_CONDITIONS.txt index 14cf2b35..b9b709df 100644 --- a/src/plugins/geoservices/nokia/OVI_SERVICES_TERMS_AND_CONDITIONS.txt +++ b/src/plugins/geoservices/nokia/OVI_SERVICES_TERMS_AND_CONDITIONS.txt @@ -1,202 +1,315 @@ -THE OVI MAPS API SERVICE IS GOVERNED BY THE TERMS SET FORTH BELOW. PLEASE NOTE THAT THERE ARE TERMS AND CONDITIONS FOLLOWING THE NOKIA CORPORATION DEVELOPER SOFTWARE AGREEMENT V. 1.0 THAT ARE SPECIFIC TO THE USE OF THE OVI MAPS API SERVICE. IF YOU DO NOT ACCEPT THE BELOW TERMS AND CONDITIONS, YOU MAY NOT USE THE OVI MAPS API SERVICE. +NOKIA DEVELOPER SOFTWARE AGREEMENT 2.1 +FOR THE NOKIA MAPS PLUG-IN TO Qt MOBILITY -NOKIA CORPORATION DEVELOPER SOFTWARE AGREEMENT -Version 1.0 -This Nokia Corporation Developer Software Agreement ("Agreement") is between You (either an individual or an entity), the developer, and Nokia Corporation ("Nokia"). The Agreement authorizes You to use the Software specified in Clause 1 below, which may be stored on a CD-ROM, sent to You by electronic mail, or downloaded from Nokia's web pages or servers or from other sources under the terms and conditions set forth below. +Please read this Nokia Developer Software Agreement carefully before accessing, downloading or using any part ofthe Nokia Maps Plug-In to Qt Mobility. By accessing, downloading, installing, using or clicking on the "Accept" button while downloading, installing and/or using the Software, You agree to the terms and conditions of this Agreement. -This is an agreement on end-user rights and not an agreement for sale. Nokia continues to own the copy of the Software and the physical media contained in the sales package and any other copy that You are authorized to make pursuant to this Agreement. +Please note that this Agreement is structured in two sections: (i) general terms that apply to most Nokia developer software distributions; and (ii) additional terms and conditions applicable to certain parts of the Software or related content, services, additions and extensions that are specific to the particular Software provided. Please ensure to review the entirety of the terms provided as important restrictions relevant to your use of the Software are often included as additional terms. -Read this Agreement carefully before accessing, downloading, installing or using the Software or any part of it. By accessing, downloading, installing or using the Software, You agree to the terms and conditions of this Agreement. If You do not agree to all of the terms and conditions of this Agreement, promptly cancel the installation or downloading, or destroy or return the Software and accompanying documentation to Nokia. +GENERAL TERMS -1. SOFTWARE +1. Acceptance -As used in this Agreement, the term "Software" means, collectively: (i) the Nokia Qt SDK software product with the exception of Open Source Software (as defined below), (ii) all the contents of the disk(s), CD-ROM(s), electronic mail and its file attachments, or other media with which this Agreement is provided, including the object code form of the software delivered via a CD-ROM, electronic mail, or web page (iii) related explanatory written materials and any other possible documentation related thereto ("Documentation"); (v) fonts, and (vi) upgrades, modified versions, updates, additions, and copies of the Software (collectively "Updates"), if any, provided to You by Nokia under this Agreement. +This Nokia Developer Software Agreement (the “Agreement”) governs Your use of the Software (ase defined below) and these terms and conditions constitute an agreement between You (either an individual or an entity) and Nokia Corporation including its affiliates and suppliers (collectively “Nokia”) defining the rights and responsibilities of You and Nokia with respect to the Software. -"Open Source Software" means any software, which is, as included in the Nokia Qt SDK, subject to a license terms and conditions currently listed at http://opensource.org/licenses/ or meeting the criteria listed at http://www.opensource.org/docs/definition.php or which is subject to any similar free or open source license terms. Open Source Software contained in the Nokia Qt SDK is licensed under the license terms accompanying such Open Source Software and not the terms of this Agreement. +There may be additional terms and conditions specific to the particular Software provided or applicable to certain parts of the Software or related content, services, additions and extensions. -2. USE OF THE SOFTWARE +You are not allowed to use the Software if You do not agree to these terms and conditions. -The Software is made accessible to You for the sole purpose of developing and testing Applications by installing a reasonable number of copies of the Software on computers owned or controlled by You to be used by You or Your authorized users. "Application" means one or more software programs developed by or for You in compliance with the Documentation, including any bug fixes, updates, upgrades, modifications, enhancements, supplements to, revisions, new releases and new versions of such software programs. - -You acknowledge that the use of the Software may require licenses to third party patents and that Nokia does not grant any licenses to such third party patents under this Agreement to the You. Also, any and all standards related licenses with respect to Essential Patents (as defined below) are specifically excluded from the scope of this Agreement, and those licenses need to be acquired separately from Nokia or the respective right holders, as the case may be. "Essential Patent" means any patent claiming a feature necessarily and unavoidably required for compliance with industry standards (usually GSM, WCDMA or other similar mobile communications standard), to the limited extent only that infringement or use of such claims of a patent cannot be avoided in remaining compliant with industry standard either for technological reasons or for lack of commercially viable technical alternatives. +2. Definitions -No patent licenses to any patents of Nokia and/ or its Affiliates are granted under this Agreement. +“Application” means one or more software programs developed by You in compliance with the requirements set forth in this Agreement and documentation provided by Nokia, under Your own trademark or brand, including bug fixes, updates, upgrades and new versions of such software programs. -3. LIMITATIONS ON END USER RIGHTS +“Authorized Users” means You and Your employees and contractors or, if You are an educational institution, Your faculty and staff, as applicable, who (a) each have a valid Forum Nokia account with Nokia, (b) have a demonstrable need to know or use the Software in order to develop and test Applications, and (c) to the extent such individuals will have access to Confidential Information, each have written and binding agreements with You to protect the unauthorized use and disclosure of such Confidential Information. -You may not copy, distribute, or make derivative works of the Software except as follows: +“Software” means (i) the Nokia Maps Plug-In to the Qt Mobility software product (source code and/or object code as applicable), with the exception of Open Source Software (as defined below), documentation, sample code, simulators, tools, libraries, application programming interfaces (APIs), data, files, and materials hereby provided or made available by Nokia for use by You in connection with Your Application development, and includes any updates that may be provided or made available by Nokia. -(a) You may not use, modify, translate, reproduce, or transfer the right to use the Software or copy the Software except as expressly provided in this Agreement. +"Open Source Software" means any software, which is, as included in the Software, subject to a license terms and conditions currently listed at http://opensource.org/licenses/ or meeting the criteria listed at http://www.opensource.org/docs/definition.php or which is subject to any similar free or open source license terms. Open Source Software contained in the Software is licensed under the license terms accompanying such Open Source Software and not the terms of this Agreement. -(b) You may not resell, sublicense, rent, lease, or lend the Software. + “You” or “Your” means the person(s) or entity using the Software or otherwise exercising rights under these Terms. If you are accepting these Terms on behalf of your company. organization or other entity, “You” or “Your” refers to your company, organization or other entity as well. -(c) You may not reverse engineer, reverse compile, disassemble, or otherwise attempt to discover the source code of the Software (except to the extent that this restriction is expressly prohibited by law) or create derivative works based on the Software. +3. Eligibility -(d) You agree that You shall only use the Software in a manner that complies with all applicable laws in the jurisdiction in which You use the Software, including, but not limited to, applicable restrictions concerning copyright and other intellectual property rights. +You must be legally competent to execute this Agreement. Thereby You must be of the legal age of majority in the jurisdiction in which You reside (at least 18 years of age in most countries) and have the right and authority to enter into this Agreement on Your own behalf, or if You are entering into this Agreement on behalf of Your company, organization or other entity, that You have the right and authority to legally bind Your company, organization or other entity to the terms and obligations of this Agreement. -4. INTELLECTUAL PROPERTY RIGHTS +4. Registration and termination -The Software and all rights, without limitation including title and intellectual property rights therein, are owned by Nokia and/or its licensors and affiliates and are protected by international treaty provisions and all other applicable national laws of the country in which it is being used. The structure, organization, and code of the Software are the valuable trade secrets and confidential information of Nokia and/or its licensors and affiliates. You must not copy the Software, except as set forth in clause 3 (Limitations On End-User Rights). Any copies which You are permitted to make pursuant to this Agreement must contain the same copyright and other proprietary notices that appear on the Software. +If registration is required, You agree to provide truthful and complete information when registering for the Software and to keep that information updated. Providing misleading information about Your identity is forbidden. -5. FEEDBACK +You may terminate Your registration(s) if You no longer wish to use the Software. After termination, You may not access the Software. Nokia may terminate Your registration(s) or restrict Your access to certain parts of the Software or related services if there is an indication that You have breached this Agreement. -By submitting feedback ("Feedback") to Nokia related to the Software, including but not limited to information on bug fixes or error corrections, you acknowledge and agree that (1) Nokia may have similar development ideas to the Feedback; (2) your Feedback does not contain confidential or proprietary information related to your own activities or those of any third party; (3) Nokia is not under any obligation of confidentiality with respect to the Feedback; and (4) you are not entitled to any compensation of any kind from Nokia. You hereby grant Nokia a worldwide non-exclusive, assignable, fully paid, royalty-free, perpetual and irrevocable license to use, exploit, copy, publicly perform, display, distribute, further develop and modify for any purpose such Feedback, and to prepare derivative works thereof, or incorporate such Feedback into other works as well as sublicense products and services resulting from such works. +You may terminate this Agreement at any time by permanently uninstalling and/or deleting, at Your own costs, the Software and any backup copies, and all related materials provided by Nokia and by ceasing to use the Software. All Your rights automatically and immediately terminate without notice from Nokia if You fail to comply with any provision of these Terms. In such an event, You must immediately uninstall and/or delete, at Your own cost, the Software, all backup copies, and all other related material provided by Nokia as well as stop using the Software. -6. SUPPORT AND MAINTENANCE +Nokia may, in its sole discretion, provide with updates to the Software from time to time. Nokia may also provide with updates that are considered as important or critical by Nokia, and in such case You may not continue using the previous version of the Software and the use of the previous version of the Software may be prevented without installation of the update. Any related services or features of the Software may not be available during maintenance breaks and other times. Nokia may also decide to discontinue the Software, related service or any part thereof in its sole discretion. In such case You will be provided a prior notification and Nokia may terminate the Agreement accordingly. -Nokia has no obligation to furnish You with technical or other support unless separately agreed in writing between You and Nokia. In case of such support given by Nokia You understand and agree that the support has been given on "as is" and "as available" basis and Nokia will have no obligations or liabilities related to such support. +5. Updates to the Terms -Nokia, may, from time to time, make Updates available to You. You may use the previous version for ninety (90) days after You receive the Update in order to assist You in the transition to the Update. After such time You no longer have a right to use the previous version, except for the sole purpose of enabling You to install the Update. However, Nokia may provide You with Updates that are considered as important or critical by Nokia, and in such case You may not continue using the previous version of the Software and the use of the previous version of the Software may be prevented without installation of the Update. +Nokia reserves the right to modify or amend the terms and conditions of this Agreement at any time without prior notice. If the terms are changed in a material, adverse way, Nokia will provide a separate notice advising of such change. In order to continue using the Software, You must accept and agree to the new terms of this Agreement. If You do not agree to new terms, Your use of the Software will be suspended or terminated by Nokia. -7. COMMENCEMENT & TERMINATION +6. Use of the Software -This Agreement is effective from the first date You install the Software. You may terminate this Agreement at any time by permanently deleting, destroying, and returning, at Your own costs, the Software, all backup copies, and all related materials provided by Nokia. Your end-user rights automatically and immediately terminate without notice from Nokia if You fail to comply with any provision of this Agreement. In such an event, You must immediately delete, destroy, or return at Your own cost, the Software, all backup copies, and all related material to Nokia. +You hereby certify and agree that You will comply with the terms of this Agreement and You agree to monitor and be responsible for Your Authorized Users’ use of the Software and their compliance with the terms of this Agreement. You may not grant access to the Software for any other than Authorized Users. -8. NO WARRANTIES +The Software is made accessible to You for the sole purpose of developing and testing Your Application(s). You may install, as applicable, a reasonable number of copies of the Software on computers owned or controlled by You to be used by You or Your Authorized Users during the term of this Agreement. -YOU ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, AND TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW NEITHER NOKIA, ITS LICENSORS OR AFFILIATES, NOR THE COPYRIGHT HOLDERS MAKE ANY REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE OR THAT THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS, OR OTHER RIGHTS. THERE IS NO WARRANTY BY NOKIA OR BY ANY OTHER PARTY THAT THE FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET YOUR REQUIREMENTS OR THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE. YOU ASSUME ALL RESPONSIBILITY AND RISK FOR THE SELECTION OF THE SOFTWARE TO ACHIEVE YOUR INTENDED RESULTS AND FOR THE INSTALLATION, USE, AND RESULTS OBTAINED FROM IT. +As a condition to using the Software, You hereby agree that: -9. NO OTHER OBLIGATIONS +(i) You will not use the Software in any manner or for any purpose that violates these Terms or any applicable law or regulation, including without limitation, any intellectual property or other proprietary rights, any right of any person, rights of privacy, or rights of personality; -This Agreement creates no obligations on the part of Nokia other than as specifically set forth herein. +(ii) You will not distribute or post spam, unreasonably large files, chain letters, pyramid schemes, any malicious code, viruses or any other technologies or content that may harm the Software, other users, servers or network; -10. LIMITATION OF LIABILITY +(iii) You will not use the Software in connection with any unlawful, offensive, abusive, obscene, pornographic, harassing, libelous or otherwise inappropriate content or material; -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL NOKIA, ITS EMPLOYEES OR LICENSORS OR AFFILIATES BE LIABLE FOR ANY LOST PROFITS, REVENUE, SALES, DATA, OR COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, PROPERTY DAMAGE, PERSONAL INJURY, INTERRUPTION OF BUSINESS, LOSS OF BUSINESS INFORMATION, OR FOR ANY SPECIAL, DIRECT, INDIRECT, INCIDENTAL, ECONOMIC, COVER, PUNITIVE, SPECIAL, OR CONSEQUENTIAL DAMAGES, HOWEVER CAUSED AND WHETHER ARISING UNDER CONTRACT, TORT, NEGLIGENCE, OR OTHER THEORY OF LIABILITY ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF NOKIA OR ITS LICENSORS OR AFFILIATES ARE ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. BECAUSE SOME COUNTRIES/STATES/JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF LIABILITY, BUT MAY ALLOW LIABILITY TO BE LIMITED, IN SUCH CASES, NOKIA, ITS EMPLOYEES OR LICENSORS OR AFFILIATES' LIABILITY SHALL BE LIMITED TO U.S. $50. Nothing contained in this Agreement shall prejudice the statutory rights of any party dealing as a consumer. Nothing contained in this Agreement limits Nokia's liability to You in the event of death or personal injury resulting from Nokia's negligence. Nokia is acting on behalf of its employees and licensors or affiliates for the purpose of disclaiming, excluding, and/or restricting obligations, warranties, and liability as provided in this clause 9, but in no other respects and for no other purpose. +(iv) You will be solely responsible for all costs, expenses, losses and liabilities incurred, and activities undertaken by You and Authorized Users in connection with the Software, Your Applications and Your related development efforts; and -11. INDEMNITY +(v) You will not remove or obscure any copyright or trademark notices or other similar notices or markings or legends from the Software; -You shall defend, indemnify and hold Nokia and its licensors harmless against any claims, damages, liabilities, losses, costs, suits or expenditures incurred by Nokia, its Affiliates, or licensors as a result of any infringement or alleged infringement of intellectual property rights of a third party caused by Your development or exploitation of the Software. +Notwithstanding anything to the contrary contained herein, You may not (a) reverse engineer, decompile, disassemble or otherwise attempt to discover the source code of the Software, except and only to the extent permitted by applicable mandatory law; (b) modify or create derivative works of the Software, except and only to the extent permitted by Nokia; or (c) distribute, communicate to the public, export, re-export, sublicense, rent, loan, lease, disclose, sell, market, commercialise, re-license, host, or otherwise transfer or make available to any third party (including without limitation any affiliates and subcontractors) the Software (or any portions thereof). -12. EXPORT CONTROL +Nothing in this Agreement or otherwise prevents Nokia from developing, distributing and/or making use of any application that is directly or indirectly competing with Your Application. -You acknowledge that the Software may be subject to export control restrictions of various countries. You shall fully comply with all applicable export license restrictions and requirements as well as with all laws and regulations relating to the importation of the Software and/or Applications and shall procure all necessary governmental authorizations, including without limitation, all necessary licenses, approvals, permissions or consents, where necessary for the re-exportation of the Software or Applications. +7. Requirements for Your Applications +Your Application developed using the Software, or any part thereof, must comply with the following criteria and requirements, as may be modified by Nokia from time to time: -13. GOVERNMENT END USERS +(i) Your Application will be developed and used in compliance with the these Terms or any applicable law or regulation, including without limitation, any intellectual property or other proprietary rights, any right of any person, rights of privacy, or rights of personality; + +(ii) Your Application will be developed in compliance with the documentation, technical guidelines and other requirements as Nokia may provide from time to time; + +(iii) Your Application does not and will not, to the best of Your knowledge, violate, misappropriate, or infringe any copyright, patent, trademark, trade secret, rights of privacy or other proprietary or legal right of any third party or of Nokia; + +(iv) Your Application must not contain nor transfer any viruses, files, code malware or any other malicious software programs that may harm or disrupt the normal operation of the device or network; + +(v) Your Application must identify the nature and provider (including contact details) of the application, function as promoted and not contain any false, fraudulent or misleading information or representations; + +(vi) You will clearly communicate to the users of Your Application(s) (e.g. in the Application UI) that the use of the Application(s) creates data traffic; + +(vii) You will provide users of the Application(s) with easy settings to disable notifications; + +(viii) You will not design or market the Application, or any part thereof, in connection with any internal business application the purpose of which is directly related to the operation of Your core business and where the users of such application are Your employees or contractors (e.g. fleet or asset management and tracking); + +(ix) You will not design or market the Application, or any part thereof, for use in or with systems, devices or products that are critical to health and/or security of other people and property (e.g. intended for surgical implant into the body or other applications intended to support or sustain life or for any aviation or nuclear reactor application) or any other application in which the software or its failure, malfunction or inadequacy could directly or indirectly cause or contribute to personal injury or death or significant property damage; + +(x) Your Application must not enable push notifications routed from other notification systems and servers provided by third parties; + +(xi) Your Application shall not send any push notifications without first obtaining user consent, (e.g. unsolicited messages, advertising, promotions, or direct marketing of any kind or for the purposes of phishing and spamming); and + +(xii) Your Application shall not send any messages for the purpose of phishing or spamming, or enable anonymous or prank phone calls or SMS/MMS messaging. + +8. Ownership and Intellectual Property Rights + +The Software and all rights, without limitation including title and intellectual property rights therein, are owned by Nokia and/or its licensors and affiliates and are protected by international treaty provisions and all other applicable national laws of the country in which it is being used. The structure, organization, and code of the Software are the valuable trade secrets and confidential information of Nokia and/or its licensors and affiliates. + +No right or license, express or implied, is granted to any part of the Software except as expressly set forth above. In addition, no licenses or immunities are granted to the combination of the Software with any other software or hardware not delivered by Nokia under this Agreement. Also, any and all licenses with respect to Nokia or third party patents (including essential patents) are specifically excluded from the scope of this Agreement, and those licenses need to be acquired separately from Nokia or the respective right holders, as the case may be. + +You and Your affiliates, as the case may be, covenant and agree not to bring suit before any court or administrative agency or otherwise assert any claim against Nokia or any of its affiliates, suppliers, licensees or customers based on any of Your patent or Your affiliate’s due to reproduction, development, use, manufacturing, marketing, selling, distribution, licensing, importing, sub-licensing or other disposal of the Software or implementations thereof. + +You and Your affiliates shall impose the obligation stated in clause above on any third party to whom You or Your affiliates may assign or transfer Your patents. This obligation is restricted to suits or other assertions based on such assigned or transferred patents. + +You shall be released from Your covenant and agreement not to sue under this section in relation to a particular beneficiary (but not in relation to any other beneficiary) in the following event: (i) You are first sued for patent infringement related to the Software by such other beneficiary who benefits from Your covenant and agreement as set forth herein; and (ii) the suit is based on Your infringement of such other beneficiary’s patent rights which if held by You would be subject to the covenant and agreement not to sue provided for above in this section. + +For the purposes of this section, patent means any patent, utility model and any divisional, re-exam, re-issue, continuation and continuation-in-part thereof as well as any corresponding application globally. + +9. Fees + +Your use of the Software may be or may become subject to charges. Nokia reserves the right to charge for the Software and to change its fees from time to time, at its discretion. + +10. Availability + +The Software may not be available in all countries and may be provided only in selected languages. The Software or some features may be network dependent, contact Your network service provider for more information. + +11. Support and maintenance + +Nokia has no obligation to furnish You with technical or other support unless separately agreed in writing between You and Nokia. In case of such support given by Nokia, You understand and agree that the support has been given on “as is” and “as available” basis and Nokia will have no obligations or liabilities related to such support. + +12. Feedback + +By submitting feedback (“Feedback”) to Nokia related to the Software, You acknowledge and agree that (1) Nokia may have similar development ideas to the Feedback; (2) Your Feedback does not contain confidential or proprietary information related to Your own activities or those of any third party; (3) Nokia is not under any obligation of confidentiality with respect to the Feedback; and (4) You are not entitled to any compensation of any kind from Nokia. You hereby grant Nokia a worldwide non-exclusive, sublicensable, assignable, fully paid up, royalty-free, perpetual and irrevocable license to use, reproduce, adapt, translate, exploit, copy, publicly perform, display, distribute, further develop and modify for any purpose such Feedback, and to prepare derivative works thereof, or incorporate such Feedback into other works as well as sublicense products and Software resulting from such works. + +13. Links to Third Party Sites and Services + +For Your easy accessibility Nokia may include links to sites and services on the Internet that are owned or operated by third parties and that are not part of the Software. Upon following a link to such a third-party site, You shall review and agree to that site's rules of use before using such site or service. + +You agree that Nokia has no control over the content of third-party sites and cannot assume any responsibility for services provided or material created or published by such sites. A link to a third-party site does not imply that Nokia endorses the site or the products or services referenced in the site. + +You agree that Nokia is neither responsible nor liable for any such links or any third party Internet site. + +14. Confidentiality + +You agree that all material and information in any form received from Nokia, including, but not limited to Software and its copies, as well as all translations of computer programs contained in the Software, Nokia's products, designs, business plans, business opportunities, finances, research, development, know-how, personnel, or third-party confidential information, will be considered and referred to collectively as "Confidential Information". Confidential Information, however, does not include: (a) information that Nokia makes generally available to the public; (b) information that You can demonstrate to have had rightfully in Your possession prior to disclosure to You by Nokia; (c) information that is independently developed by You without the use of any Confidential Information; or (d) information that You rightfully obtain from a third party who has been given the right to transfer or disclose it by Nokia. You agree to keep confidential and not to disclose, publish, or disseminate any Confidential Information to any third party. You further agree to take reasonable precautions to prevent any unauthorized use, disclosure, publication, or dissemination of Confidential Information. You agree not to use Confidential Information otherwise for Your own or any third party's benefit without the prior written approval of an authorized representative of Nokia in each instance. + +You further agree that despite of any other confidentiality agreements You may have between You and Nokia, Nokia will not be responsible for keeping confidential any information You provide to Nokia through the use of the Software or any related services. Neither Nokia nor any of its employees accept or consider unsolicited ideas, including but not limited to ideas for new advertising campaigns, new promotions, new products or technologies, processes, materials, marketing plans or new product names. If, despite the request that You not send us Your ideas and materials, You still send them, please understand that Nokia makes no assurances that Your ideas and materials will be treated as confidential or proprietary. + +The rights and obligations of this section 14 shall remain in force for five (5) years from the date of the disclosure of Confidential Information. + +15. No warranties + +YOU ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, AND TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW NEITHER NOKIA, ITS LICENSORS OR AFFILIATES, NOR THE COPYRIGHT HOLDERS MAKE ANY REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ACCURACY OF DOCUMENTATION AND SUPPORT MATERIAL, OR FITNESS FOR A PARTICULAR PURPOSE OR THAT SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS, OR OTHER RIGHTS. THERE IS NO WARRANTY BY NOKIA OR BY ANY OTHER PARTY THAT THE FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET YOUR REQUIREMENTS OR THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE. YOU ASSUME ALL RESPONSIBILITY AND RISK FOR THE SELECTION OF THE SOFTWARE TO ACHIEVE YOUR INTENDED RESULTS AND FOR THE INSTALLATION, USE, AND RESULTS OBTAINED FROM IT. + +16. Indemnity + +You agree to defend and indemnify Nokia from and against all third party claims and all liabilities, assessments, losses, costs or damages resulting from or arising out of (i) Your breach of this Agreement, (ii) Your infringement or violation of any intellectual property, other rights or privacy of a third party, and (iii) misuse of the Software by a third party where such misuse was made available by Your failure to take reasonable measures to protect Your username and password against misuse. + +17. Limitation of liability + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL NOKIA, ITS EMPLOYEES,LICENSORS OR AFFILIATES BE LIABLE FOR ANY LOST PROFITS, REVENUE, SALES, DATA, OR COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SOFTWARE, PROPERTY DAMAGE, PERSONAL INJURY, INTERRUPTION OF BUSINESS, LOSS OF BUSINESS INFORMATION, OR FOR ANY SPECIAL, DIRECT, INDIRECT, INCIDENTAL, ECONOMIC, COVER, PUNITIVE, SPECIAL, OR CONSEQUENTIAL DAMAGES, HOWEVER CAUSED AND WHETHER ARISING UNDER CONTRACT, TORT, NEGLIGENCE, OR OTHER THEORY OF LIABILITY ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE OR THE SOFTWARE, EVEN IF NOKIA OR ITS LICENSORS OR AFFILIATES ARE ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. BECAUSE SOME COUNTRIES/STATES/JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF LIABILITY, BUT MAY ALLOW LIABILITY TO BE LIMITED, IN SUCH CASES, NOKIA, ITS EMPLOYEES OR LICENSORS OR AFFILIATES' LIABILITY SHALL BE LIMITED TO U.S. $50. Nothing contained in this Agreement shall prejudice the statutory rights of any party dealing as a consumer. Nothing contained in this Agreement limits Nokia's liability to you in the event of death or personal injury resulting from Nokia's negligence. Nokia is acting on behalf of its employees and licensors or affiliates for the purpose of disclaiming, excluding, and/or restricting obligations, warranties, and liability as provided in this Agreement, but in no other respects and for no other purpose. + +18. Export control + +You acknowledge that the Software may be subject to export control restrictions of various countries. You shall fully comply with all applicable export license restrictions and requirements as well as with all laws and regulations relating to the importation of the Software and/or Applications and shall procure all necessary governmental authorizations, including without limitation, all necessary licenses, approvals, permissions or consents, where necessary for the re-exportation of the Software or Applications. + +19. Government End Users A "U.S. Government End User" shall mean any agency or entity of the government of the United States. The following shall apply if You are a U.S. Government End User. The Software is a "commercial item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial computer software documentation," as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire the Software with only those rights set forth herein. The Software (including related documentation) is provided to U.S. Government End Users: (a) only as a commercial end item; and (b) only pursuant to this Agreement. +20. Miscellaneous + +20.1 Notices -14. NOTICES +All notices of the Software should be delivered to: -All notices and return of the Software and Documentation should be delivered to: +Nokia Corporation +P.O. Box 100 +FIN-00045 Nokia Group +Finland -NOKIA CORPORATION -P.O. Box 100 -FIN-00045 NOKIA GROUP -FINLAND +20.2 Assignment -15. APPLICABLE LAW AND GENERAL PROVISIONS +You shall not be entitled to assign or transfer all or any of Your rights, benefits and obligations under this Agreement without the prior written consent of Nokia, which shall not be unreasonably withheld. Nokia shall be entitled to assign or transfer any of its rights, benefits or obligations under this Agreement on an unrestricted basis. -This Agreement is governed by the laws of Finland. All disputes arising from or relating to this Agreement shall be settled by a single arbitrator appointed by the Central Chamber of Commerce of Finland. The arbitration procedure shall take place in Helsinki, Finland in the English language. If any part of this Agreement is found void and unenforceable, it will not affect the validity of the balance of the Agreement, which shall remain valid and enforceable according to its terms. This Agreement may only be modified by a writing signed by an authorized officer of Nokia, although Nokia may vary the terms of this Agreement. +20.3 Severability -This is the entire agreement between Nokia and You relating to the Software, and it supersedes any prior representations, discussions, undertakings, end-user agreements, communications, or advertising relating to the Software. +If any part of this Agreement is found void and unenforceable, it will not affect the validity of the balance of the Agreement, which shall remain valid and enforceable according to its terms. -There are no implied licenses or other implied rights granted under this Agreement, and all rights, save for those expressly granted hereunder, shall remain with Nokia and its licensors. In addition, no licenses or immunities are granted to the combination of the Software with any other software or hardware not delivered by Nokia under this Agreement. +20.4 Privacy +The Nokia Privacy Policy and any additional privacy supplements govern the use of Your personal data. -OVI MAPS API ADDITIONAL TERMS +20.5 Governing law and dispute resolution -In addition to the terms set forth above, the Nokia Privacy Policy and following additional terms shall apply to Your use of the Ovi Maps and related services ("Service"): +This Agreement is governed by the laws of Finland. All disputes arising from or relating to these Terms shall be settled by a single arbitrator appointed by the Central Chamber of Commerce of Finland. The arbitration procedure shall take place in Helsinki, Finland in the English language. +20.6 Entire Agreement -1. DEFINITIONS +This is the entire agreement between Nokia and You relating to the Software, and it supersedes any prior representations, discussions, undertakings, end-user agreements, communications, or advertising relating to the Software. -"Ovi Maps Content" means the maps content available from Nokia from time to time for the purpose of being rendered on the Ovi Maps, including data provided by Nokia that originates from third parties. +ADDITIONAL TERMS -"Ovi Maps API Service" means the service offered by Nokia that enables You to incorporate the Ovi Maps For Developers and the Ovi Maps Content, as made available by Nokia from time to time, into Your Applications and to have end-users access and use it on such Applications +Location API Additional Terms -"Ovi Maps For Developers" means the software, as made available by Nokia from time to time that allows the rendering of Ovi Maps Content within Applications. For clarity, the Ovi Maps For Developers may include software components that are downloaded and installed on the users' mobile device(s) and/or JavaScript libraries that are invoked and downloaded by the Ovi Maps API. +In addition to the terms set forth in Nokia Software Development Agreement version 2.1, the Nokia Privacy Policy and following additional terms shall apply to Your use of the Nokia Maps Plug-In (“Plug-In”) that is delivered in conjunction with the Qt Mobility software package and Nokia’s related location-based services (“Service”). Please note that these terms and conditions do no apply to Your use of the location APIs included in Qt Mobility as such and only apply to the use of the Plug-In and Service -"Ovi Maps API Developer Package" means the Ovi Maps API, documentation and any and all other material made accessible to You by Nokia from time to time that enables You to incorporate the Ovi Maps For Developers into Your Applications and is designated by Nokia as being a part of the Ovi Maps API Developer Package. + +1. Definitions + +“Nokia Maps Content” means the maps content available from Nokia from time to time for the purpose of being rendered on the Nokia Maps, including data provided by Nokia that originates from third parties. + +“Location API Service” means the service offered by Nokia that enables You to incorporate the Location API s For Developers, the Nokia Maps Content and the Places Content, as made available by Nokia from time to time, into Your Applications and to have end-users access and use it on such Applications. + +“Location API For Developers” means the software, as made available by Nokia from time to time that allows the rendering of Nokia Maps Content and Places Content within Applications. For clarity, the Location API For Developers may include software components that are downloaded and installed on the users’ mobile device(s) and/or JavaScript libraries that are invoked and downloaded by the Location API(s) and/or data retrieved from server based APIs, including but not limited to the Ovi Maps Rendering API. “Location API Developer Package” means the Location API(s), documentation and any and all other material made accessible to You by Nokia from time to time that enables You to incorporate the Location API For Developers into Your Applications and is designated by Nokia as being a part of the Location API Developer Package. -"Ovi Maps API(s)" means the interface information made accessible to You by Nokia from time to time that enables You to incorporate the Ovi Maps For Developers into Your Applications. +“Location API(s)” means the interface information made accessible to You by Nokia from time to time that enables You to incorporate the Location API For Developers into Your Applications. + +Places Content” means the geo-location content, including rich content (e.g. descriptions, opening hours, reviews) available from Nokia, including data provided by Nokia that originates from third parties + +2. Service Offering, Registration and Termination + +The Service is made available under a variety of business models to suit Your needs which will form an integral part of your agreement with Nokia for the use of the Software. For information about the Service, please visit www.forumnokia.com/Maps/. -2. REGISTRATION AND TERMINATION +If you do not register for the Service Your use of the Location API For Developers is limited to internal testing of your Application(s) that use the Location API(s) and the Service will automatically disable itself once the access quota for the Service has been exceeded. -If registration is required, You agree to provide truthful and complete information when registering for the Service and to keep that information updated. Providing misleading information about Your identity is forbidden. Depending on the use of the Ovi Maps API(s), You may receive an identifier code or developer key in order to use the Service. You are personally responsible for any use of the Ovi Maps API Service. You agree to take due care in protecting Your Application using Ovi Maps API, Your identifier code and/or developer key against misuse by others and promptly notify Nokia about any misuse. Where requested by Nokia, You agree to include and use the identifier code and/or developer key, as applicable, in each request You make to access to the Ovi Maps API(s). +If you elect to register for the Service (https://api.forum.nokia.com/ovi-api), You will be provided with a token and/or developer key that will enable You to create Application(s) that use the Location API(s) and distribute such Application(s) under the terms of this Agreement. The number of requests submitted by your Application(s) to the Service may be subject to certain quota limitations as updated from time to time by Nokia. + +If You elect to register for the Service, You agree to provide truthful and complete information when registering for the Service and to keep that information updated. Providing misleading information about Your identity is forbidden. You are personally responsible for any use of the Location API Service. You agree to take due care in protecting Your Application using Location API, Your token and/or developer key against misuse by others and promptly notify Nokia about any misuse. Where requested by Nokia, You agree to include and use the token and/or developer key, as applicable, in each request You make to access to the Location API(s). You may terminate Your registration if You no longer wish to use the Service. After termination, You may not access the Service. Nokia may terminate Your registration or restrict Your access to certain parts of the Service if there is an indication that You have breached these terms or with a prior notice if You have not signed into the Service with Your identifier code in the past three (3) months. -3. SERVICE CHANGES +3. Changes Nokia may, in its sole discretion, change, improve and correct the Service from time to time. Nokia may also provide with updates to the Service that are considered as important or critical by Nokia, and in such case You may not continue using the previous version of the Service and the use of the previous version of the Service may be prevented without installation of the update. The Service may not be available during maintenance breaks and other times. Nokia may also decide to discontinue the Service or any part thereof in its sole discretion. In such case You will be provided a prior notification and Nokia may terminate the Agreement accordingly. -Except as set forth in Privacy Policy, Nokia shall not be responsible for any removal or loss of the information or content You have submitted ("Material") to the Service when Your registration is terminated. After the Material is removed from the Service by either You or Nokia, traces and copies of the Material may still remain. +Except as set forth in Privacy Policy, Nokia shall not be responsible for any removal or loss of the information or content You have submitted (“Material”) to the Service when Your registration is terminated. After the Material is removed from the Service by either You or Nokia, traces and copies of the Material may still remain. +Nokia reserves the right to modify or amend these terms and conditions at any time without prior notice. If the terms are changed in a material, adverse way, Nokia will provide a separate notice advising of such change. In order to continue using the Service, You must accept and agree to the new terms and conditions. If You do not agree to new terms, Your use of the Service will be suspended or terminated by Nokia. -4. USE OF OVI MAPS API DEVELOPER PACKAGE +4. Use of Location API Developer Package -The Ovi Maps API Developer Package is made accessible to You for the purposes of incorporating the Ovi Maps Service into Your Application and for the limited purposes of evaluating, testing, and controlling the Ovi Maps For Developers during the term of this Agreement. +The Location API Developer Package is made accessible to You for the purposes of incorporating the Service into Your Application and for the limited purposes of evaluating, testing, and controlling the Location API For Developers during the term of this Agreement, subject to the limitations set forth in Section 2 of these additional terms set forth above. If you have not registered for the Service, You may not distribute your Applications incorporating the Service. -When using the Ovi Maps API Developer Package and/or the Ovi Maps Service, You hereby agree that You will not: +When using the Location API Developer Package and/or the Service, unless otherwise agreed in writing with Nokia, You hereby agree that You will not: -(i) use or incorporate the Ovi Maps Service, Ovi Maps API Developer Package or any part thereof, in connection with any Application or other service (a) which has the primary functionality of providing turn-by-turn navigation services, real time navigation or route guidance; or (b) where such Application's functionality is substantially similar to the Ovi Maps or navigation/location-based products distributed by Nokia or its affiliates; or (c) which has the primary purpose of capturing or collecting end user data; +(i) use or incorporate, without Nokia’s prior written permission, the Service, Location API Developer Package or any part thereof, in connection with any Application or other service (a) which has the primary functionality of providing turn-by-turn navigation services, real time navigation or route guidance; or (b) where such Application’s functionality is substantially similar to the Nokia Maps or navigation/location-based products distributed by Nokia or its affiliates; or (c) which has the primary purpose of capturing or collecting end user data; -(ii) use, without Nokia's prior written permission, the Ovi Maps Service or Ovi Maps For Developers, or any part thereof, in connection with any internal business Application the purpose of which is directly related to the operation of Your core business and where the users of such Application are Your employees or contractors (e.g. fleet or asset management and tracking); +(ii) use, without Nokia’s prior written permission, the Service or Location API For Developers, or any part thereof, in connection with any internal business Application the purpose of which is directly related to the operation of Your core business and where the users of such Application are Your employees or contractors (e.g. fleet or asset management and tracking); -(iii)remove or obscure any copyright or trademark notices or other similar notices or markings or legends or branding requirements from the Ovi Maps API Developer Package, Ovi Maps For Developers or the Ovi Maps Content whether such notices, markings or legends or other branding requirements originate from Nokia or a third party; +(iii) remove, obscure, modify or omit, any copyright or trademark notices or other similar notices or markings or legends or branding requirements from the Location API Developer Package, Location API For Developers, Nokia Maps Content, or the Places Content whether such notices, markings or legends or other branding requirements originate from Nokia or a third party; -(iv) alter the order of search, geo-coding and/or reverse geo-coding results delivered by or through any Ovi Maps API to or as part of the Application (where applicable); +(iv) alter or manipulate the order of search, geo-coding and/or reverse geo-coding results delivered by or through any Location API to or as part of the Application (where applicable); -(v) alter, delete or otherwise change any Ovi Maps Content, including third party content contained in the Ovi Maps Content, that is displayed through the use of the Ovi Maps Service or Ovi Maps For Developers; +(v) alter, delete or otherwise change any Nokia Maps Content or Places Content, including third party content contained in the Nokia Maps Content or Places Content, branding or sponsorship information, that is displayed through the use of the Service or Location API For Developers; -(vi) use the Ovi Maps API(s) or Ovi Maps Service to exceed any transaction volume limits (if any) set by Nokia for Applications, Ovi Maps APIs and/or Ovi Maps Services. The amount of the possible transaction volume limit is as set forth in the documentation included in the Ovi Maps API. Nokia may change the limit from time to time in its sole discretion, but will provide You with ninety (90) days' advance notice of a change in the volume limit. Any programmatic methods or other actions intended to circumvent the transaction volume limits shall be considered a material breach of this Agreement; +(vi) create an Application which obsures or alters the visibility of Places Content and/or Nokia Maps Content or any other content; or -(vii) access or use the Ovi Maps Service or any Ovi Maps Content through any technology or means other than those provided by the Ovi Maps Service or Ovi Maps API, or through other explicitly authorized means Nokia may designate; +(v) use the Location API(s) or Service to exceed any transaction volume limits (if any) set by Nokia for Applications, Location APIs and/or Services. The amount of the possible transaction volume limit is as set forth in the documentation included in the Location API. Nokia may change the limit from time to time in its sole discretion, but will provide You with sixty (60) days’ advance notice of a change in the volume limit. Any programmatic methods or other actions intended to circumvent the transaction volume limits shall be considered a material breach of this Agreement; -(viii) use the Ovi Maps Service, Ovi Maps API or Ovi Maps For Developers in a manner that gives You or any other person access to mass downloads or bulk fees of any Ovi Maps Content, including but not limited to numerical latitude or longitude coordinates; +(vii) access, or use the Service any Nokia Maps Content or Places Content through any technology or means other than those provided by the Service or Location API(s), or through other explicitly authorized means Nokia may designate; -(ix) pre-fetch, cache, or store any Ovi Maps Content except that You may store limited amounts of Ovi Maps Content for the purpose of testing your Application, if You do so temporarily, securely, and in a manner that does not permit use of the Ovi Maps Content outside of the Ovi Maps Service; or +(viii) use the Service, Location API or Location API For Developers in a manner that gives You or any other person access to mass downloads or bulk feeds of any Nokia Maps Content or Places Content, including but not limited to numerical latitude or longitude coordinates; -(x) use the Ovi Maps API Developer Package, including the Ovi Maps For Developers, or the Ovi Maps Service in any manner or for any purpose that violates this Agreement or any law or regulation, including without limitation, any intellectual property or other proprietary rights, any right of any person, rights of privacy, or rights of personality. +(ix) pre-fetch, cache, or store any Nokia Maps Content or Places Content except that You may store (i) references and IDs; and (ii) limited amounts of Nokia Maps Content or Places Conent solely for the purpose of testing your Application, if You do so temporarily, securely, and in a manner that does not permit use of the Nokia Maps Content or Places Content outside of the Service; or -You also agree (i) to comply with these terms, applicable laws and good manners; (ii) not to distribute or post spam, unreasonably large files, chain letters, pyramid schemes, viruses or any other technologies that may harm the Ovi Maps Service, or the interest or property of the Ovi Maps Service users; (iii) not to use the Service in connection with any unlawful, offensive, abusive, pornographic, harassing, libelous or otherwise inappropriate Material and comply with Nokia Content Guidelines as may be provided by Nokia from time to time; and (iv) to respect the privacy of others. You agree to comply with Nokia Technical Guidelines and other guidelines as Nokia may provide from time to time. +(x) use the Location API Developer Package, including the Location API For Developers, or the Service in any manner or for any purpose that violates this Agreement or any law or regulation, including without limitation, any intellectual property or other proprietary rights, any right of any person, rights of privacy, or rights of personality; or -5. OVI MAPS CONTENT AND PUBLICATION +(xi) use the Location API(s) to issue queries that are not in response to end user actions; or -Ovi Maps Content is provided to You and Your end users for planning purposes only and Nokia does not guarantee the accuracy or availability of any Ovi Maps Content. You may find that weather conditions, construction projects, closures or other events may cause road conditions, directions, positioning coordinates or other location information to differ from the results depicted in the Ovi Maps Content. All use of Ovi Maps Content is at Your own risk. +(xii) create Application(s) which do not display the results of every such search made by such Application(s) using the Location API(s) to the end user; or -6. PRIVACY AND OVI STORE PUBLICATION +(xiii) distribute in any manner, such as through the Location API(s), Nokia Maps Content or Places Content collected using the Location API(s), or data derived from the Nokia Maps Content or Places Content, including, but not limited to location corrections. -You agree that Your use of the Ovi Maps Services and Ovi Maps API will comply with the Nokia Privacy Policy (http://www.nokia.com/privacy-policy). +If screen size constraints prevent Nokia Maps Content or Places Content from being displayed with search or detail results, You shall display a notice informing the end user that the Nokia Maps Content or Places Content cannot be displayed. -If your Application enables You or any party to gain access to information about users, including but not limited to personally identifiable information, non-personally identifiable usage information or location information ("Information"), You must provide users with notice about what Information is accessible and how such Information will be used or disclosed so that users may make informed decisions about whether or not to use Your Application. Furthermore, you must make Your privacy policy regarding the use of Information publicly available. +You also agree (i) to comply with these terms, applicable laws and good manners; (ii) not to distribute or post spam, unreasonably large files, chain letters, pyramid schemes, viruses or any other technologies that may harm the Service, or the interest or property of the Service users; (iii) not to use the Service in connection with any unlawful, offensive, abusive, pornographic, harassing, libelous or otherwise inappropriate Material and comply with Nokia Content Guidelines as may be provided by Nokia from time to time; and (iv) to respect the privacy of others. You agree to comply with Nokia Technical Guidelines and other guidelines as Nokia may provide from time to time. -If You intend to publish your Application on Nokia's Ovi Store, please note that Your Application must comply with the Ovi Store Publication Requirements (https://publish.ovi.com/info/). +5. Nokia Maps Content and Publication -7. FEES +Nokia Maps Content and Places Content are provided to You and Your end users for planning purposes only and Nokia does not guarantee the accuracy or availability of any Nokia Maps Content or Places Content. You may find that weather conditions, construction projects, closures or other events may cause road conditions, directions, positioning coordinates or other location information to differ from the results depicted in the Nokia Maps Content or Places Content. All use of Nokia Maps Content and/or Places Content is at Your own risk. -Your use of the Ovi Maps Service may be or may become subject to charges. Nokia reserves the right to charge for the Ovi Maps Service and to change its fees from time to time, at its discretion, but Nokia will provide You with ninety (90) days' advance notice if charges will be implemented for use of the Ovi Maps Service. +6. Privacy and Ovi store publication -8. AVAILABILITY +You agree that Your use of the Services and Location API will comply with the Nokia Privacy Policy (http://www.nokia.com/privacy-policy). -The Ovi Maps Service may not be available in all countries and may be provided only in selected languages. The Ovi Maps Service may be network dependent, contact Your network service provider for more information. +If your Application enables You or any party to gain access to information about users, including but not limited to personally identifiable information, non-personally identifiable usage information or location information (“Information”), You must provide users with notice about what Information is accessible and how such Information will be used or disclosed so that users may make informed decisions about whether or not to use Your Application. Furthermore, you must make Your privacy policy regarding the use of Information publicly available. -9. YOUR SERVICES +If You intend to publish your Application on Nokia’s Ovi Store, please note that Your Application must comply with the Ovi Store Publication Requirements (https://publish.ovi.com/info/). -You may interact with users, including consumers, on or through the Ovi Maps Service. You agree that any such interactions by You do not involve Nokia and are solely between You and the other user(s). +7. Fees -10. LINKS TO THIRD PARTY SITES, CONTENT AND ADVERTISING +Your use of the Service may be or may become subject to charges. Nokia reserves the right to charge for the Service and to change its fees from time to time, at its discretion, but Nokia will provide You with sixty (60) days’ advance notice if charges will be implemented for use of the Service. -Nokia may include links to sites on the Internet that are owned or operated by third parties and that are not part of the Ovi Maps Service. Upon following a link to such a third-party site, You shall review and agree to that site's rules of use before using such site. +8. Availability -You agree that Nokia has no control over the content of third-party sites and cannot assume any responsibility for services provided or material created or published by such sites. A link to a third-party site does not imply that Nokia endorses the site or the products or services referenced in the site. +The Service may not be available in all countries and may be provided only in selected languages. The Service may be network dependent, contact Your network service provider for more information. + +9. Your Services + +You may interact with users, including consumers, on or through the Service. You agree that any such interactions by You do not involve Nokia and are solely between You and the other user(s). -In addition, users may create links within the Ovi Maps Service to content that has not otherwise been submitted to the Ovi Maps Service. You agree that Nokia is neither responsible nor liable for any such links. Moreover, Ovi Maps Content made available to You by Nokia, may include content and data that originates from third parties. +10. Links to Third Party Sites, Content and Advertising + +Nokia may include links to sites on the Internet that are owned or operated by third parties and that are not part of the Service. Upon following a link to such a third-party site, You shall review and agree to that site's rules of use before using such site. + +You agree that Nokia has no control over the content of third-party sites and cannot assume any responsibility for services provided or material created or published by such sites. A link to a third-party site does not imply that Nokia endorses the site or the products or services referenced in the site. -Nokia reserves the right, in its sole discretion, to implement advertising in the Ovi Maps For Developers. If Nokia implements advertising, You agree not to remove or otherwise alter or tamper with such advertising. Nokia will provide You with ninety (90) days' advance written notice prior to implementing advertising in the Ovi Maps For Developers. +In addition, users may create links within the Service to content that has not otherwise been submitted to the Service. You agree that Nokia is neither responsible nor liable for any such links. Moreover, Nokia Maps Content and Places Content made available to You by Nokia, may include content and data that originates from third parties. -11. REPORTING +Nokia reserves the right, in its sole discretion, to implement advertising in the Location API For Developers. Unless otherwise agreed in writing between You and Nokia, and if Nokia implements advertising, You agree not to remove, otherwise alter, tamper with; or obsure such advertising. Nokia will provide You with sixty (60) days’ advance written notice prior to implementing advertising in the Location API For Developers. -You agree to implement those reporting mechanisms specified by Nokia (if any). For example, if specified by Nokia, You agree to provide Nokia with reports if your Application which utilizes the Ovi Maps API detects its own location through the use of a sensor (including, but not limited to GPS, cell triangulation, WiFi or similar functionality) to display the location of the device on a map or to calculate a route. +11. Reporting -12. ADDITIONAL EXPORT CONTROL RESTRICTIONS +You agree to implement those reporting mechanisms specified by Nokia (if any). For example, if specified by Nokia, You agree to provide Nokia with reports if your Application which utilizes the Location API(s) detects its own location through the use of a sensor (including, but not limited to GPS, cell triangulation, WiFi or similar functionality) to display the location of the device on a map or to calculate a route. -The Ovi Maps Service and Ovi Maps API Developer Package, including technical data, includes cryptographic software subject to export controls under the U.S. Export Administration Regulations ("EAR") and may be subject to import or export controls in other countries. The EAR prohibits the use of the Ovi Maps Service and the Ovi Maps API Developer Package and technical data by a Government End User, as defined hereafter, without a license from the U.S. government. A Government End User is defined in Part 772 of the EAR as "any foreign central, regional, or local government department, agency, or other entity performing governmental functions; including governmental research institutions, governmental corporations, or their separate business units (as defined in part 772 of the EAR) which are engaged in the manufacture or distribution of items or services controlled on the Wassenaar Munitions List, and international governmental organizations. This term does not include: utilities, telecommunications companies and Internet service providers; banks and financial institutions; transportation; broadcast or entertainment; educational organizations; civil health and medical organizations; retail or wholesale firms; and manufacturing or industrial entities not engaged in the manufacture or distribution of items or services controlled on the Wassenaar Munitions List. You agree to strictly comply with all applicable import and export regulations and acknowledge that You have the responsibility to obtain licenses to export, re-export, transfer, or import the Ovi Maps Service and the Ovi Maps API Developer Package. You further represent that You are not a Government End User as defined above, and You will not transfer the Ovi Maps Service and the Ovi Maps API Developer Package to any Government End User without a license. +12. Additional Export Control Restrictions +The Service and Location API Developer Package, including technical data, includes cryptographic software subject to export controls under the U.S. Export Administration Regulations ("EAR") and may be subject to import or export controls in other countries. The EAR prohibits the use of the Service and the Location API Developer Package and technical data by a Government End User, as defined hereafter, without a license from the U.S. government. A Government End User is defined in Part 772 of the EAR as "any foreign central, regional, or local government department, agency, or other entity performing governmental functions; including governmental research institutions, governmental corporations, or their separate business units (as defined in part 772 of the EAR) which are engaged in the manufacture or distribution of items or services controlled on the Wassenaar Munitions List, and international governmental organizations. This term does not include: utilities, telecommunications companies and Internet service providers; banks and financial institutions; transportation; broadcast or entertainment; educational organizations; civil health and medical organizations; retail or wholesale firms; and manufacturing or industrial entities not engaged in the manufacture or distribution of items or services controlled on the Wassenaar Munitions List. You agree to strictly comply with all applicable import and export regulations and acknowledge that You have the responsibility to obtain licenses to export, re-export, transfer, or import the Service and the Location API Developer Package. You further represent that You are not a Government End User as defined above, and You will not transfer the Service and the Location API Developer Package to any Government End User without a license. -Copyright (c) 2010 Nokia Corporation. diff --git a/src/plugins/geoservices/nokia/jsonparser.h b/src/plugins/geoservices/nokia/jsonparser.h index 5ea0a690..d39f4771 100644 --- a/src/plugins/geoservices/nokia/jsonparser.h +++ b/src/plugins/geoservices/nokia/jsonparser.h @@ -53,6 +53,8 @@ #include <QString> #include <QRegExp> +QT_BEGIN_NAMESPACE + class JSONParser { public: @@ -238,4 +240,6 @@ public: } }; +QT_END_NAMESPACE + #endif // JSONPARSER_H diff --git a/src/plugins/geoservices/nokia/marclanguagecodes.h b/src/plugins/geoservices/nokia/marclanguagecodes.h index 5f2accac..57bc57cd 100644 --- a/src/plugins/geoservices/nokia/marclanguagecodes.h +++ b/src/plugins/geoservices/nokia/marclanguagecodes.h @@ -53,6 +53,8 @@ // http://www.loc.gov/marc/languages/language_code.html // Order matches QLocale::Language +QT_BEGIN_NAMESPACE + static const unsigned char marc_language_code_list[] = "\0\0\0" // Unused "\0\0\0" // C @@ -271,5 +273,6 @@ static const unsigned char marc_language_code_list[] = "\0\0\0" // Shambala ; +QT_END_NAMESPACE #endif /* MARCLANGUAGECODES_H_ */ diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro index dc46130a..062f2760 100644 --- a/src/plugins/geoservices/nokia/nokia.pro +++ b/src/plugins/geoservices/nokia/nokia.pro @@ -3,7 +3,7 @@ load(qt_module) TARGET = qtgeoservices_nokia QT += location network -include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) +load(qt_plugin) DESTDIR = $$QT.location.plugins/geoservices #QTDIR_build:REQUIRES += "contains(QT_CONFIG, location)" @@ -37,12 +37,6 @@ RESOURCES += resource.qrc INCLUDEPATH += $$QT.location.includes -message($$QT.location.includes) - -#INCLUDEPATH += $$SOURCE_DIR/src/location \ -# $$SOURCE_DIR/src/location/maps \ -# $$SOURCE_DIR/src/location/maps/tiled - symbian { TARGET.EPOCALLOWDLLDATA = 1 TARGET.CAPABILITY = ALL -TCB diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp index 484d879f..32386948 100644 --- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp @@ -51,6 +51,8 @@ #include <QXmlStreamReader> #include <QIODevice> +QT_BEGIN_NAMESPACE + QGeoCodeXmlParser::QGeoCodeXmlParser() : m_reader(0) { @@ -580,3 +582,4 @@ bool QGeoCodeXmlParser::parseCoordinate(QGeoCoordinate *coordinate, const QStrin return true; } +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.h b/src/plugins/geoservices/nokia/qgeocodexmlparser.h index a8946d9b..2592e69b 100644 --- a/src/plugins/geoservices/nokia/qgeocodexmlparser.h +++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.h @@ -53,15 +53,15 @@ #include <QList> #include <QXmlStreamReader> -class QIODevice; #include <qgeocoordinate.h> #include <qgeoboundingbox.h> #include <qgeolocation.h> #include <qgeoaddress.h> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE +class QIODevice; class QGeoCodeXmlParser { public: @@ -87,4 +87,6 @@ private: QString m_errorString; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp index 80b907c2..3bd6b708 100644 --- a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp @@ -69,8 +69,12 @@ #define DISK_CACHE_ENABLED 1 #endif +QT_BEGIN_NAMESPACE + #if defined(Q_OS_SYMBIAN) #include <f32file.h> + + QChar QGeoMappingManagerEngineNokia::findFirstInternalFlashDrive() { QChar flashDrive; @@ -300,3 +304,4 @@ QString QGeoMappingManagerEngineNokia::mapTypeToStr(QGraphicsGeoMap::MapType typ return "normal.day"; } +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h index 89f145dc..70c6cfe1 100644 --- a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h @@ -54,11 +54,11 @@ #include <qgeoserviceprovider.h> #include <qgeotiledmappingmanagerengine.h> +QT_BEGIN_NAMESPACE + class QNetworkAccessManager; class QNetworkDiskCache; -QTM_USE_NAMESPACE - class QGeoMappingManagerEngineNokia : public QGeoTiledMappingManagerEngine { Q_OBJECT @@ -89,4 +89,6 @@ private: QString m_referer; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp index 30f583e3..1f11d72a 100644 --- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp @@ -51,6 +51,8 @@ #include <QNetworkCacheMetaData> #include <QDateTime> +QT_BEGIN_NAMESPACE + QGeoMapReplyNokia::QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTiledMapRequest &request, QObject *parent) : QGeoTiledMapReply(request, parent), m_reply(reply) @@ -135,3 +137,5 @@ void QGeoMapReplyNokia::networkError(QNetworkReply::NetworkError error) m_reply->deleteLater(); m_reply = 0; } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h index 6bc6e405..ee0195bb 100644 --- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h +++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h @@ -52,7 +52,7 @@ #include <qgeotiledmapreply.h> #include <QNetworkReply> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapReplyNokia : public QGeoTiledMapReply { @@ -75,4 +75,6 @@ private: QNetworkReply *m_reply; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp index 1a61f878..c2ea29c5 100644 --- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp @@ -51,6 +51,8 @@ #include <qgeorouterequest.h> +QT_BEGIN_NAMESPACE + QGeoRouteReplyNokia::QGeoRouteReplyNokia(const QGeoRouteRequest &request, QNetworkReply *reply, QObject *parent) : QGeoRouteReply(request, parent), m_reply(reply) @@ -120,3 +122,5 @@ void QGeoRouteReplyNokia::networkError(QNetworkReply::NetworkError error) m_reply->deleteLater(); m_reply = 0; } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h index 0fcd11a4..38b4e534 100644 --- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h @@ -52,7 +52,7 @@ #include <qgeoroutereply.h> #include <QNetworkReply> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRouteReplyNokia : public QGeoRouteReply { @@ -71,4 +71,6 @@ private: QNetworkReply *m_reply; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp index ba6e5227..e8d2f328 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp @@ -53,6 +53,8 @@ #include <QStringList> #include <QString> +QT_BEGIN_NAMESPACE + QGeoRouteXmlParser::QGeoRouteXmlParser(const QGeoRouteRequest &request) : m_request(request), m_reader(0) @@ -558,3 +560,5 @@ bool QGeoRouteXmlParser::parseBoundingBox(QGeoBoundingBox &bounds) return false; } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h index d6269358..02ef640b 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h @@ -54,8 +54,6 @@ #include <QString> #include <QXmlStreamReader> -class QIODevice; - #include <qgeoroute.h> #include <qgeoroutesegment.h> #include <qgeocoordinate.h> @@ -63,7 +61,9 @@ class QIODevice; #include <qgeorouterequest.h> #include <qgeomaneuver.h> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE +class QIODevice; + class QGeoManeuverContainer { @@ -114,4 +114,5 @@ private: QList<QGeoRouteSegmentContainer> segments; }; +QT_END_NAMESPACE #endif diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp index 74dacac9..f92e20ac 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp @@ -54,6 +54,8 @@ #include <QUrl> #include <qgeoboundingbox.h> +QT_BEGIN_NAMESPACE + QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QGeoRoutingManagerEngine(parameters), m_host("prd.lbsp.navteq.com"), @@ -434,7 +436,7 @@ QString QGeoRoutingManagerEngineNokia::routeRequestString(const QGeoRouteRequest return requestString; } -QString QGeoRoutingManagerEngineNokia::trimDouble(qreal degree, int decimalDigits) +QString QGeoRoutingManagerEngineNokia::trimDouble(double degree, int decimalDigits) { QString sDegree = QString::number(degree, 'g', decimalDigits); @@ -475,3 +477,5 @@ void QGeoRoutingManagerEngineNokia::routeError(QGeoRouteReply::Error error, cons emit this->error(reply, error, errorString); } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h index 9ff8d06f..0dd17b0c 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h @@ -55,7 +55,7 @@ #include <qgeoroutingmanagerengine.h> #include <QNetworkAccessManager> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRoutingManagerEngineNokia : public QGeoRoutingManagerEngine { @@ -81,7 +81,7 @@ private: QGeoRouteRequest::TravelModes travelModes) const; QString modesRequestString(const QGeoRouteRequest &request, QGeoRouteRequest::TravelModes travelModes) const; - static QString trimDouble(qreal degree, int decimalDigits = 10); + static QString trimDouble(double degree, int decimalDigits = 10); QNetworkAccessManager *m_networkManager; QString m_host; @@ -89,4 +89,6 @@ private: QString m_referer; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp index 5e615557..5ddaa480 100644 --- a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp @@ -56,6 +56,8 @@ #include <QUrl> #include <QMap> +QT_BEGIN_NAMESPACE + QGeoSearchManagerEngineNokia::QGeoSearchManagerEngineNokia(const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QGeoSearchManagerEngine(parameters), m_host("loc.desktop.maps.svc.ovi.com"), @@ -242,7 +244,7 @@ QGeoSearchReply* QGeoSearchManagerEngineNokia::search(QString requestString, return reply; } -QString QGeoSearchManagerEngineNokia::trimDouble(qreal degree, int decimalDigits) +QString QGeoSearchManagerEngineNokia::trimDouble(double degree, int decimalDigits) { QString sDegree = QString::number(degree, 'g', decimalDigits); @@ -301,3 +303,5 @@ QString QGeoSearchManagerEngineNokia::languageToMarc(QLocale::Language language) return code; } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h index 7a165679..dbaf94b5 100644 --- a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h @@ -58,7 +58,7 @@ #include <QLocale> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSearchManagerEngineNokia : public QGeoSearchManagerEngine { @@ -84,7 +84,7 @@ private slots: void placesError(QGeoSearchReply::Error error, const QString &errorString); private: - static QString trimDouble(qreal degree, int decimalDigits = 10); + static QString trimDouble(double degree, int decimalDigits = 10); QGeoSearchReply* search(QString requestString, QGeoBoundingArea *bounds, int limit = -1, int offset = 0); QString languageToMarc(QLocale::Language language); @@ -94,4 +94,6 @@ private: QString m_referer; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp index 10a3c2e8..836e00e3 100644 --- a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp @@ -49,6 +49,8 @@ #include "qgeosearchreply_nokia.h" #include "qgeocodexmlparser.h" +QT_BEGIN_NAMESPACE + QGeoSearchReplyNokia::QGeoSearchReplyNokia(QNetworkReply *reply, int limit, int offset, QGeoBoundingArea *viewport, QObject *parent) : QGeoSearchReply(parent), m_reply(reply) @@ -129,3 +131,5 @@ void QGeoSearchReplyNokia::networkError(QNetworkReply::NetworkError error) m_reply->deleteLater(); m_reply = 0; } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h index f97ec55d..9c47dd6b 100644 --- a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h +++ b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h @@ -52,7 +52,7 @@ #include <qgeosearchreply.h> #include <QNetworkReply> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSearchReplyNokia : public QGeoSearchReply { @@ -71,4 +71,6 @@ private: QNetworkReply *m_reply; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp index 5b8e65d3..ae6d9a1a 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp @@ -55,6 +55,8 @@ #include <QtPlugin> #include <QNetworkProxy> +QT_BEGIN_NAMESPACE + QGeoServiceProviderFactoryNokia::QGeoServiceProviderFactoryNokia() {} QGeoServiceProviderFactoryNokia::~QGeoServiceProviderFactoryNokia() {} @@ -94,3 +96,5 @@ const QString QGeoServiceProviderFactoryNokia::defaultToken("152022572f0e44e0748 const QString QGeoServiceProviderFactoryNokia::defaultReferer("qtlocationapi"); Q_EXPORT_PLUGIN2(qtgeoservices_nokia, QGeoServiceProviderFactoryNokia) + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h index c0117302..0013f40d 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h @@ -52,7 +52,7 @@ #include <qgeoserviceproviderfactory.h> #include <QObject> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoServiceProviderFactoryNokia : public QObject, public QGeoServiceProviderFactory { @@ -79,4 +79,6 @@ public: static const QString defaultReferer; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp index 9a3d06be..72918f25 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp @@ -55,7 +55,7 @@ #include <QNetworkAccessManager> #include <QNetworkProxy> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE /*! Constructs a new tiled map data object, which stores the map data required by @@ -185,7 +185,7 @@ QString QGeoTiledMapDataNokia::getViewCopyright() /*! \reimp */ -void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyleOptionGraphicsItem *option) +void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/) { QRect viewport = painter->combinedTransform().inverted().mapRect(painter->viewport()); @@ -234,3 +234,5 @@ void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyle lastCopyright ); } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h index 38d6004f..8fd01c00 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h @@ -52,7 +52,7 @@ #include <QPixmap> #include <QNetworkReply> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMappingManagerEngineNokia; @@ -92,4 +92,6 @@ private slots: void copyrightReplyFinished(QNetworkReply*); }; +QT_END_NAMESPACE + #endif // QGEOMAPDATA_NOKIA_H diff --git a/sync.profile b/sync.profile index db13b435..bd29e380 100644 --- a/sync.profile +++ b/sync.profile @@ -14,17 +14,16 @@ %modulepris = ( "QtLocation" => "$basedir/modules/qt_location.pri", ); -# Modules and programs, and their dependencies. +# Module dependencies. +# Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: # - A specific Git revision. -# - "LATEST_REVISION", to always test against the latest revision. -# - "LATEST_RELEASE", to always test against the latest public release. -# - "THIS_REPOSITORY", to indicate that the module is in this repository. +# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) +# %dependencies = ( - "QtLocation" => { - "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a", - "QtNetwork" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a", - "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a", - "QtDeclarative" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a", - }, + "qtbase" => "refs/heads/master", + "qtscript" => "refs/heads/master", + "qtsvg" => "refs/heads/master", + "qtxmlpatterns" => "refs/heads/master", + "qtdeclarative" => "refs/heads/master", ); diff --git a/tests/auto/declarative/tst_bounding_area.qml b/tests/auto/declarative/tst_bounding_area.qml index e71cb9cd..f8f0264f 100644 --- a/tests/auto/declarative/tst_bounding_area.qml +++ b/tests/auto/declarative/tst_bounding_area.qml @@ -7,29 +7,29 @@ ** This file is part of the test suite of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** diff --git a/tests/auto/declarative/tst_map_geocoding.qml b/tests/auto/declarative/tst_map_geocoding.qml index 939982e0..69e07ae1 100644 --- a/tests/auto/declarative/tst_map_geocoding.qml +++ b/tests/auto/declarative/tst_map_geocoding.qml @@ -7,29 +7,29 @@ ** This file is part of the test suite of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** diff --git a/tests/auto/declarative/tst_map_mouse.qml b/tests/auto/declarative/tst_map_mouse.qml index d0b4aa55..416fd18d 100644 --- a/tests/auto/declarative/tst_map_mouse.qml +++ b/tests/auto/declarative/tst_map_mouse.qml @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** diff --git a/tests/auto/declarative/tst_map_objectview_qml1 b/tests/auto/declarative/tst_map_objectview_qml1 index 370a72b7..4e262c1b 100644 --- a/tests/auto/declarative/tst_map_objectview_qml1 +++ b/tests/auto/declarative/tst_map_objectview_qml1 @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** diff --git a/tests/auto/declarative/tst_map_qml1 b/tests/auto/declarative/tst_map_qml1 index 599e921e..cf235727 100644 --- a/tests/auto/declarative/tst_map_qml1 +++ b/tests/auto/declarative/tst_map_qml1 @@ -7,29 +7,29 @@ ** This file is part of the test suite of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** diff --git a/tests/auto/declarative/tst_map_routing.qml b/tests/auto/declarative/tst_map_routing.qml index 7435349b..b186760d 100644 --- a/tests/auto/declarative/tst_map_routing.qml +++ b/tests/auto/declarative/tst_map_routing.qml @@ -7,29 +7,29 @@ ** This file is part of the test suite of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** diff --git a/tests/auto/declarative/tst_plugin.qml b/tests/auto/declarative/tst_plugin.qml index 7a37b273..cac9d025 100644 --- a/tests/auto/declarative/tst_plugin.qml +++ b/tests/auto/declarative/tst_plugin.qml @@ -7,29 +7,29 @@ ** This file is part of the test suite of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** diff --git a/tests/auto/declarative/tst_qmlmapsandnav.cpp b/tests/auto/declarative/tst_qmlmapsandnav.cpp index cd5e2b2f..3b55a989 100644 --- a/tests/auto/declarative/tst_qmlmapsandnav.cpp +++ b/tests/auto/declarative/tst_qmlmapsandnav.cpp @@ -7,29 +7,29 @@ ** This file is part of the test suite of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** diff --git a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h index 93383adf..a3bb7f44 100644 --- a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h +++ b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** diff --git a/tests/auto/geotestplugin/qgeosearchmanagerengine_test.h b/tests/auto/geotestplugin/qgeosearchmanagerengine_test.h index e5b21757..f7abb36f 100644 --- a/tests/auto/geotestplugin/qgeosearchmanagerengine_test.h +++ b/tests/auto/geotestplugin/qgeosearchmanagerengine_test.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** diff --git a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp index e31bc8f6..41d961d4 100644 --- a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp +++ b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** diff --git a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h index f747f38d..915b20b2 100644 --- a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h +++ b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h @@ -7,29 +7,29 @@ ** This file is part of the Qt Mobility Components. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** diff --git a/tests/systemtests/sys_location.pro b/tests/systemtests/sys_location.pro new file mode 100644 index 00000000..86e87423 --- /dev/null +++ b/tests/systemtests/sys_location.pro @@ -0,0 +1,11 @@ +CONFIG+=systemtest +SOURCES=sys_location.qtt + +unix:!symbian { + maemo5 { + target.path = /opt/usr/bin + } else { + target.path = /usr/local/bin + } + INSTALLS += target +} diff --git a/tests/systemtests/sys_location.qtt b/tests/systemtests/sys_location.qtt new file mode 100644 index 00000000..93c99fa4 --- /dev/null +++ b/tests/systemtests/sys_location.qtt @@ -0,0 +1,848 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//TESTED_COMPONENT=src/location + +testcase = { + + // \groups BAT,1.1,MOBILITY-65 + current_position: function() + { + prompt(twiki('---+++ Position is detected + Note that GPS connection is required for this test case + | *Step* | *Verification* | + | Run the weatherinfo_with_location example | Verify that weather information for your local area is displayed |' + )); + }, + + // \groups BAT,1.1,MOBILITY-65 + location_is_updated: function() + { + prompt(twiki('---+++ Position changes are detected + Note that GPS and internet connection is required for this test case. + | *Step* | *Verification* | + | Run the lightmaps_with_location app (sources are in qtbase/examples/embedded/lightmaps). | Verify that map is displayed and centered with the current position | + | Move to a different location | Verify that map is updated and centered with new location |' + )); + }, + + // \groups BAT,1.2,QTMOBILITY-873 + third_party_position_source: function() + { + prompt(twiki('---+++ Position is detected via cusom plugin + Note that GPS and internet connection is required for this test case + | *Step* | *Verification* | + | Run the testQtLocation application (this is part of BlueWeel project, sources are in git@scm.dev.nokia.troll.no:qtmobility/qtmobility-tests.git | | + | Select the Custom Service | Verify that no "Unable to register location service" and "Not valid interface." messages appear | + | Press the Update Map button | Verify that map was loaded and correct current position is displayed |' + )); + }, + + //Note that significand precision should be taken into account during comparing real numbers, that is why we consider 5.48417e-16 value equal to zero + // \groups BAT,1.2,QTMOBILITY-658 + shift_to_the_given_offset: function() + { + prompt(twiki('---+++ New coordinats are calculated + | *Step* | *Verification* | + | Run the testQtLocation application | | + | Select the MapNavigation | | + | Fill in 0 in to Start Latitude field | | + | Fill in *100* in to Start Longitude field | | + | Select Distance/Bearing from pre-defined dropdown list | | + | Fill *1000000, 90* in to the given field | | + | Press the Ok button | Verify that Destination fields are updated with *5.48417e-16* latitude and *108.9932* longitude | + | Fill in *60* in to Start Latitude field | | + | Fill in *100* in to Start Longitude field | | + | Select Distance/Bearing from pre-defined dropdown list | | + | Fill *1000000, 180* in to the given field | | + | Press the Ok button | Verify that Destination fields are updated with *51.0068* latitude and *100* longitude | + | Fill in *60* in to Start Latitude field | | + | Fill in *100* in to Start Longitude field | | + | Select Distance/Bearing from pre-defined dropdown list | | + | Fill *1000000, 20* in to the given field | | + | Press the Ok button | Verify that Destination fields are updated with *68.2523* latitude and *108.296* longitude |' + )); + }, + + // Landmarks + + store_and_load_a_landmark_data: { + // Valid landmarks are -90~90 latitude, and -180~180 longitude + landmark : ["landmark", "20", "120"] + }, + + // \groups BAT,1.1,MOBILITY-66 + store_and_load_a_landmark: function(name, latitude, longitude) + { + startApplication("landmarkbrowser"); + select("Add Landmark"); + enter("Latitude", latitude); + enter("Longitude", longitude); + enter("Name", name); + select("Ok"); + prompt("Verify that the landmark record is created"); + }, + + negative_store_and_load_a_landmark_data: { + // Landmarks outside the ranges -90~90 latitude, and -180~180 longitude + bad_landmark_lat : ["bad_landmark", "100", "120"], + bad_landmark_long : ["bad_landmark", "80", "300"] + }, + + // \groups BAT,1.1,MOBILITY-66 + negative_store_and_load_a_landmark: function(name, latitude, longitude) + { + startApplication("landmarkbrowser"); + select("Add Landmark"); + enter("Latitude", latitude); + enter("Longitude", longitude); + enter("Name", name); + //expectMessageBox("Invalid"); + prompt("Verify a message box is shown indicating the values are ouside the valid range") + select("Ok"); + select("Cancel"); + }, + + // \groups BAT,1.1,MOBILITY-66 + sorted_search_based_on_category: function() + { + prompt(twiki('---+++ Landmarks for the specified category are displayed + | *Step* | *Verification* | + | Create Accomodation category | | + | Create Businesses category | | + | Run the landmarkbrowser application | | + | Create *A1* landmark in *Accomodation* category | | + | Create *A2* landmark in *Accomodation* category | | + | Create *BB* landmark in *Businesses* category | | + | Press the Set Filter button | | + | Select the Category checkbox | | + | Select Accomodation category | | + | Press Ok button | Verify that *only A1 and A2* landmark is in the list and they are present in alphabetical order | + | Press the Set Filter button | | + | Select Education category | | + | Press Ok button | Verify that no landmarks are in the list |' + )); + }, + + // \groups BAT,1.1,MOBILITY-66 + sort_landmarks_in_alphabetical_and_nearest: function() + { + prompt(twiki('---+++ Nearest landmarks are displayed + | *Step* | *Verification* | + | Run the landmarkbrowser application | | + | Create landmark *A(12;0)* | | + | Create landmark *B(10;0)* | | + | Create landmark *C(8;0)* | | + | Create landmark *D(8;0)* | | + | Press Set Filter button | | + | Select Proximity checkbox | | + | Fill in 0 in to Lat field | | + | Fill in 0 in to Long field | | + | Fill in *10000000* in to *Radius* field | | + | Press Ok button | Verify that *C, D, B, A* landmarks are in the list (not in alphabetical order) | + | Press Set Filter button | | + | Change radius value to *1000000* | | + | Press Ok button | Verify that only *C and D* landmarks are in the list | + | Press Set Filter button | | + | Deselect Proximity checkbox | | + | Press Ok button | Verify that landmarks appear in alphabetical order from A to Z |' + )); + }, + + // \groups BAT,1.1,MOBILITY-66 + landmarks_within_range_of_a_position: function() + { + prompt(twiki('---+++ Landmarks within range are displayed + | *Step* | *Verification* | + | Run the landmarkbrowser application | | + | Create landmark *A(12;0)* | | + | Create landmark *B(10;0)* | | + | Create landmark *C(8;0)* | | + | Create landmark *D(8;0)* | | + | Press Set Filter button | | + | Select Box checkbox | | + | Fill in 9 in to Top Left Lat field | | + | Fill in 0 in to Top Left Long field | | + | Fill in 0 i to Bottom Right Lat filed | | + | Fill in 1 in to Bottom Right Long field | | + | Press Ok button | Verify that only *C and D* landmarks are in the list and landmarks appear in alphabetical order |' + )); + }, + + // \groups BAT,1.1,MOBILITY-66 + create_edit_and_delete_a_landmark: function() + { + //Landmark manager provides notifications whenever landmarks are added, updated or deleted + prompt(twiki('---+++ Landmarks are added, edited and deleted + | *Step* | *Verification* | + | Run the landmarkbrowser application | | + | Press Add Landmark button | | + | Fill in *AAA* in to *Name* field | | + | Fill in *30* into *Latitude* field | | + | Fill in *30* into *Longitude* field | | + | Press Ok button | Verify that message "Landmark(s) have been added" appears on the screen | + | Press Ok button | Verify that *AAA* landmark is in the landmarks list | + | Select *AAA* landmark | | + | Press Edit Landmark button | | + | Change *Latitude* value to *40* | | + | Change *Longitude* value to *40* | | + | Change *Name* value to *BBB* | | + | Press Ok button | Verify that message "Landmark(s) have been edited" appears on the screen | + | Press Ok button | Verify that *BBB* landmark has new latitude and longitude | + | Select *BBB* landmark | | + | Press Delete Landmarks button | Verify that message "Landmark(s) have been removed" appears on the screen | + | Press Ok button | Verify that only BBB landmark has been deleted | + | Create 2 new landmarks *A1* and *A2* | | + | Select both *A1 and A2* landmarks | + | Press Delete Landmarks button | Verify that message "Landmark(s) have been removed" appears on the screen | + | Press Ok button | Verify that only A1 and A2 landmarks have been deleted |' + )); + }, + + // \groups BAT,1.1,MOBILITY-66 + enumerate_categories: function() + { + prompt(twiki('---+++ Categories are displayed + | *Step* | *Verification* | + | Run the landmarkbrowser application | | + | Select Category tab | | + | Create several categories | | + | Swith to the Landmark tab and back to the Category tab | Verify that the created categories are present in the list |' + )); + }, + + // \groups BAT,1.1,MOBILITY-66 + add_and_delete_a_category: function() + { + //Landmark manager provides notifications whenever categories are added, updated or deleted + prompt(twiki('---+++ Categories are added, edited and deleted + | *Step* | *Verification* | + | Run the landmarkbrowser application | | + | Select Category tab | | + | Press Add Category button | | + | Fill in *AAA* in to *Name* field | | + | Press Ok button | Verify that message "Category(ies) have been added" | + | Press Ok button | Verify that AAA is added in list of categories in alphabetical order | + | Press Add Category button | | + | Fill in *AAA* in to Name field | | + | Press Ok button | Verify that message "Add Category Failed: category already Exists" appears on the screen | + | Press Ok button | | + | Press Add Category button | | + | Press Ok button | Verify that message "Category name must not be empty" appears on the screen | + | Press Ok button | | + | Select *AAA* category | | + | Press Delete Categories button | Verify that message "Categoty(ies) have been removed" appears on the screen | + | Press Ok button | Verify that list of categories does not contain AAA category only | + | Add *A1* and *A2* categories | | + | Select *A1 and A2* categories | | + | Press Delete Categories button | Verify that message "Categoty(ies) have been removed" appears on the screen | + | Press Ok button | Verify that list of categories does not contain A1 and A2 categories only | + | Select some of predefined categories | | + | Press Delete Category button | Verify tha message "Cannot delete a global category" appears on the screen | + | Press Ok button | Verify that no categories have been deleted |' + )); + }, + + // Maps and Navigation + // \groups BAT,1.1,MOBILITY-538 + select_service_provider: function() + { + startApplication("geoservicedemo"); + select("Service Providers"); + select("nokia"); + select("Set Service Provider"); + prompt("Verify selected service provider is indicated as current service provider"); + }, + + request_route_from_one_GPS_location_to_another_data: { + route:["-27.575", "153.088", "-27.465", "153.023", "15901", "15987"] + }, + + // \groups BAT,1.1,MOBILITY-538 + request_route_from_one_GPS_location_to_another: function(lat1, long1, lat2, long2, distance1, distance2) + { + startApplication("geoservicedemo"); + select("Service Providers"); + select("nokia"); + select("Set Service Provider"); + select("Route"); + select("Request Route"); + enter(lat1); + enter(long1); + enter(lat2); + enter(long2); + select("Ok"); + prompt(twiki("Wait until the route is calculated (should be less than 10 seconds)")); + prompt(twiki("Verify the there are 8 segments, first and last instructions indicate to 'Head toward Logan rd' and 'Turn right onto Bartley St'")); + select("routes/route"); + compare(getText("distance"), distance1); + select("Request Route"); + enter(lat2); + enter(long2); + enter(lat1); + enter(long1); + select("Ok"); + prompt(twiki('Wait until the route is calculated (should be less than 10 seconds)')); + prompt(twiki('Verify the instructions for segments 1 and 2 indicate to Head towards Sedgebrook st and Turn right onto Sedgebrook st')); + compare(getText("distance"), distance2); + }, + + // \groups BAT,1.1,MOBILITY-538 + geocoding: function() + { + prompt(twiki('---+++ Geocoding + Note that testing via proxy is not recommended, incorrect settings can be a cause of the " Socket operation timed out" error + | *Step* | *Verification* | + | Run the GeoServiceDemo application (sources are /tests/location-testing-tools/geoservicedemo) | | + | Select Search By Adress tab | | + | Select One-box Search checkbox | | + | Fill in *Brandl st, Eight Mile Plains, Australia* in search field | | + | Select Geocoding search | | + | Press Ok button | | + | Wait until data is recieved | | + | Select places | Verify that count = 1 | + | Select place | Verify that latitude is *-27.5798*, longitude is *153.1* | + | Select address | Verify that Country is *AUSTRALIA*, country code is *AUS*, city is *Eight Mile Plains*, street name is *Branl St*, post code is *4113* |' + )); + + }, + + // \groups BAT,1.1,MOBILITY-538 + reverse_geocoding: function() + { + prompt(twiki('---+++ Reverse geocoding + Note that testing via proxy is not recommended, incorrect settings can be a cause of the " Socket operation timed out" error + | *Step* | *Verification* | + | Run the GeoServiceDemo application | | + | Select Reverse Geocoding tab | | + | Press Search By Coordinates button | | + | Fill in *-27.5798* in Latitude field | | + | Fill in *153.1* in Longitude field | | + | Press Ok button | | + | Wait until data is recieved | | + | Select places/place/adress | Verify that Country is *AUSTRALIA*, country code is *AUS*, city is *Eight Mile Plains*, street name is *54 Branl St*, post code is *4113* |' + )); + }, + + // \groups BAT,1.1,MOBILITY-538 + displaying_a_map: function() + { + prompt(twiki('---+++ Different views are displayed + Note that internet connection is required for this test case. + | *Step* | *Verification* | + | Run the mapsdemo application (sources are /examples/mapsdemo) | Map for current location is displayed on the screen |' + )); + }, + + // \groups BAT,1.1,MOBILITY-538 + different_map_types: function() + { + prompt(twiki('---+++ Different views are displayed + Note that internet connection is required for this test case. + Note that Nokia map engine supports only Street, Satellite and Terrain map types + | *Step* | *Verification* | + | Run the MapViewer application (sources are /tests/location-testing-tools/mapviewer) | Map for current location is displayed on the screen | + | Press Option button | | + | Press Street button (if button is enabled) | Map is drawn in Street view | + | Press Option button | | + | Press Satellite button (if button is enabled) | Map is drawn in Satellite view | + | Press Option button | | + | Press Terrain button (if button is enabled) | Map is drawn in Satellite view |' + )); + }, + + // \groups BAT,1.1,MOBILITY-538 + zooming_support:function() + { + prompt(twiki('---+++ Map is zoomed in and out + Note that internet connection is required for this test case. + | *Step* | *Verification* | + | Run the mapsdemo application | Map is displayed on the screen | + | Press - button | Map is zoomed out correctly | + | Press + button | Map is zoomed in correctly |' + )); + }, + + // \groups BAT,1.1,MOBILITY-538 + capturing_coordinates:function() + { + prompt(twiki('---+++ Coordinates are captured + Note that internet connection is required for this test case. + | *Step* | *Verification* | + | Run the MapViewer application | Map is displayed on the screen | + | Navigate and/or zoom in the map to see Brisbane | | + | Right mouse click on the square which represents *Brisbane* | | + | Select Coordinates menu item | | + | Select Capture menu item | Verify that dialog with coordinates appears on the screen. Latitude is *about -27.46*, longitude is *about 153.02* |' + )); + }, + + // \groups BAT,1.2,QTMOBILITY-757,QTMOBILITY-701 + pixmap_object_zooming: function() + { + prompt(twiki('---+++ Pixmap object is not scaled during zooming + Note that GPS and internet connection is required for this test case + | *Step* | *Verification* | + | Run the testQtLocation application | | + | Select the MapNavigation | | + | Go to Map tab | Verify that map is loaded for current position | + | Swith to MapObject mode | | + | Tap on the screen to create pixmap object | Verify that blue square appears on the screen in place of touch | + | Switch to Pan/Zoom mode | | + | Increase zoom level | Verify that the blue square is not scaled | + | Decrease zoom level | Verify that the blue square is not scaled |' + )); + }, + + request_landmarks_for_given_coordinate_with_reverse_geocoding: function() + { + skip( "Nothing tested", SkipAll ); + }, + + //TESTED_COMPONENT=plugins/declarative/location + + // \groups BAT,1.2,QTMOBILITY-796 + qml_display_map: function() + { + prompt(twiki('---+++ QML: Map is displayed + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application (sources are in examples/declarative/mapviewer) | Verify that map is loaded in Street view with the center next to Brisbane | + | Press Settings button | | + | Press Map Type | | + | Select Satelite view | Verify that map is displayed in satellite view | + | Press Settings button | | + | Press Map Type | | + | Select Terrain view | Verify that map is displayed in terrain view |' + )); + }, + + // \groups BAT,1.2,QTMOBILITY-796 + qml_zoom_a_map: function() + { + prompt(twiki('---+++ QML: Zoom in and out the map + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | Verify that map is loaded with the center next to Brisbane | + | Move slider to the right | Verify that map is zoomed in | + | Move slider to the left | Verify that map is zoomed out |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2893,RESEARCH + qml_route_for_two_close_points: function() + { + prompt(twiki('---+++ QML: Route for two close points + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Route menu item | | + | Make sure that coordinates are *(-27.575,153.088)->(-27.465,153.023)* | | + | Press Go button | | + | Wait for message appears on the screen | Verify that distance is *15.901*km | + | Press Ok button | Verify that the route looks correct and does not have strange loops | + | Press Options button | | + | Select Route menu item | | + | Select second option group to enter start and end points as address | | + | Use default addresses and Press Go button | | + | Wait for message appears on the screen | Verify that distance is *18.676km* | + | Press Ok button | Verify that the route looks correct and does not have strange loops |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2893,RESEARCH + qml_route_for_two_distant_points: function() + { + prompt(twiki('---+++ QML: Route for two distant points + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Route menu item | | + | Selec first option group | | + | Fill in *-27.4709* in From Latitude field | | + | Fill in *153.0235* in From Longitude filed | | + | Fill in *-33.8689* in To Latitude field | | + | Fill in *151.2071* in To Longitude filed | | + | Press Go button | | + | Wait for message appears on the screen | Verify that distance is *927.209km* | + | Press Ok button | Verify that the route looks correct and does not have strange loops | + | Press Options button | | + | Select Route menu item | | + | Selec second option group | | + | Press Clear button | | + | Fill in *Moscow* in From City field | | + | Fill in *Russia* in From Country filed | | + | Fill in *Eight Mile Plains* in To City filed | | + | Fill in *Australia* in To Country filed | | + | Press Go button | | + | Wait for message appears on the screen | Verify that route is not found | + | Press Ok button | | + | Press Options button | | + | Select Route menu item | | + | Selec second option group | | + | Press Clear button | | + | Fill in *Eight Mile Plains* in From City field | | + | Fill in *Australia* in From Country filed | | + | Fill in *Byron Bay* in To City filed | | + | Fill in *Australia* in To Country filed | | + | Press Go button | | + | Wait for message appears on the screen | Verify that distance is *151.318km* | + | Press Ok button | Verify that the route looks correct and does not have strange loops |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2893,RESEARCH + qml_route_for_multiple_points: function() + { + prompt(twiki('---+++ QML: Route for multiple waypoints + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Long press on the map | | + | Press Set Marker menu item | | + | Create another Marker via Long Press | | + | Create third Marker | | + | Long Press on the first marker | | + | Select Move To menu item | | + | Fill in *-27.575* in Latitude filed | | + | Fill in *153.088* in Longitude | | + | Press Go! button | | + | Long Press on the second marker | | + | Select Move To menu item | | + | Fill in *-27.465* in Latitude filed | | + | Fill in *153.023* in Longitude | | + | Press Go! button | | + | Long Press on the third marker | | + | Select Move To menu item | | + | Fill in *-27.3614* in Latitude filed | | + | Fill in *153.0043* in Longitude | | + | Press Go! button | | + | Long Press on the first marker | | + | Select Route To The Next Points | | + | Wait for message appears on the screen | Verify that distance is *29.491km* | + | Press Ok button | Verify that the route looks correct, goes through all waypoints and does not have strange loops |' + )); + }, +/* + // \groups BAT,5.0,MOBILITY-2893,RESEARCH + qml_travel_mode: function() + { + prompt(twiki('---+++ QML: Travel mode + Note that internet connection is required for this test case + | *Step* | *Verification* | +1. Travel mode: pedestrian. Use qml_mapviewer to test. (55 Bordeaux Street, Eight Mile Plains QLD)->(53 Brandl St, Eight Mile Plains QLD 4113) or (-27.5784,153.0934)->(-27.5798,153.1003) +2. Travel mode: bicycle +3. Travel mode: public transport +4. Travel mode: by truck' + }, + + // \groups BAT,5.0,MOBILITY-2893,RESEARCH + qml_route_feature_type: function() + { + prompt(twiki('---+++ QML: Route features + Note that internet connection is required for this test case + | *Step* | *Verification* | +1. Feature type: no feature +2. Feature type: toll +3. Feature type: highway +4. Feature type: public transit +5. Feature type: ferry +6. Feature type: tunnel +7. Feature type: dirt road +8. Feature type: parks +9. Feature type: motor pool lane' + }, + + // \groups BAT,5.0,MOBILITY-2893,RESEARCH + qml_route_optimization: function() + { + prompt(twiki('---+++ QML: Route optimization + Note that internet connection is required for this test case + | *Step* | *Verification* | +1. Route optimization: shortest +2. Route optimization: fastest +3. Route optimization: most economic +4. Route optimization: most scenic' + }, +*/ + // \groups BAT,5.0,MOBILITY-2900,RESEARCH + qml_geocode_australian_location: function() + { + prompt(twiki('---+++ QML: Geocode australian location + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Geocode menu item | | + | Press Clear All button | | + | Fill in *Brandl st* in Street filed | | + | Fill in *Eight Mile Plains* in City field | | + | Fill in *Australia* in Country field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that geocode was successful with latitude *-27.5798*, longitude *153.1* |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2900,RESEARCH + qml_geocode_russian_location: function() + { + prompt(twiki('---+++ QML: Geocode russian location + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Geocode menu item | | + | Press Clear All button | | + | Fill in *Minina I Pozharskogo Ploshchad* in Street filed | | + | Fill in *Nizhniy Novgorod* in City field | | + | Fill in *Russia* in Country field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that geocode was successful with latitude *56.3294*, longitude *44.0089* |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2900,RESEARCH + qml_geocode_fictional_location: function() + { + prompt(twiki('---+++ QML: Geocode a fictional location + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Geocode menu item | | + | Press Clear All button | | + | Fill in *The Best City* in City field | | + | Fill in *Australia* in Country field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that location is not found |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2900,RESEARCH + qml_geocode_not_unique_location: function() + { + prompt(twiki('---+++ QML: Geocode not unique location + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Geocode menu item | | + | Press Clear All button | | + | Fill in *Moscow* in City field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that several results were found | + | Press Ok button | + | Press Options button | | + | Select Geocode menu item | | + | Fill in *USA* in Country field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that *19* points were found | + | Press Ok button | + | Press Options button | | + | Select Geocode menu item | | + | Press Clear All button | | + | Fill in *Moscow* in City filed | | + | Fill in *Russia* in Country field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that geocode was successful with latitude *55.7569*, longitude *37.615* |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2900,RESEARCH + qml_geocode_popular_request: function() + { + prompt(twiki('---+++ QML: Geocode a popular request + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Geocode menu item | | + | Press Clear All button | | + | Fill in *53 Brandl st* in Street filed | | + | Fill in *Eight Mile Plains* in City field | | + | Fill in *QLD* in State field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that geocode was successful |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2900,RESEARCH + qml_geocode_request_with_district: function() + { + prompt(twiki('---+++ QML: Geocode district + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Geocode menu item | | + | Press Clear All button | | + | Fill in *Nizhniy Novgorod* in City filed | | + | Fill in *Russia* in Country field | | + | Fill in *Nizhegorodskiy Rayon* in District field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that geocode was successful with latitude *56.3217*, longitude *44.0331* |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2900,RESEARCH + qml_geocode_request_with_county: function() + { + prompt(twiki('---+++ QML: Geocode county + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Geocode menu item | | + | Press Clear All button | | + | Fill in *Norfolk* in County filed | | + | Fill in *United Kingdom* in Country field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that geocode was successful with latitude *52.614*, longitude *0.8864* |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2900,RESEARCH + qml_geocode_request_with_country_code: function() + { + prompt(twiki('---+++ QML: Geocode country code + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Clear All button | | + | Fill in *AUS* in Country code field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that geocode is successful |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2900,RESEARCH + qml_geocode_request_with_post_code: function() + { + prompt(twiki('---+++ QML: Geocode post code + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Geocode menu item | | + | Press Clear All button | | + | Fill in *Brandl st* in Street filed | | + | Fill in *4113* in Post Code field | | + | Fill in *Australia* in Country field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that geocode is successful with latitude *-27.5798*, longitude *153.1* |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2901,RESEARCH + qml_reverse_geocode_australian_place: function() + { + prompt(twiki('---+++ QML: Reverse geocode of an australian place + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Reverse Geocode | | + | Fill in *-27.575* in Latitude filed | | + | Fill in *153.088* in Longitude field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that reverse geocode issuccessful (street: *230 Padstow Rd*, City: *Eight Mile Plains*, State: *AUS-QLD*, Country code: *AUS*, Country: *AUSTRALIA*, Postcode: *4113*) |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2901,RESEARCH + qml_reverse_geocode_russian_place: function() + { + prompt(twiki('---+++ QML: Reverse geocode of a russian place + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Reverse Geocode | | + | Fill in *56.3264* in Latitude filed | | + | Fill in *44.0048* in Longitude field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that reverse geocode issuccessful (street: *Minina I Pozharskogo Ploshchad\'*, district: *Nizhegorodskiy Rayon*, City: *Nizhniy Novgorod*, Country code: *RUS*, Country: *Russian Federation*, Postcode: *603005*) |' + )); + }, + + // \groups BAT,5.0,MOBILITY-2901,RESEARCH + qml_reverse_geocode_uninhabited_place: function() + { + prompt(twiki('---+++ QML: Reverse geocode of uninhabited place + Note that internet connection is required for this test case + | *Step* | *Verification* | + | Run the qml_mapviewer application | | + | Press Options button | | + | Select Reverse Geocode | | + | Fill in *-26.8890* in Latitude filed | | + | Fill in *154.6696* in Longitude field | | + | Press Go! button | | + | Wait for message appears on the screen | Verify that location is not found |' + )); +/* }, + + + // \groups BAT,5.0,MOBILITY-2902,RESEARCH + qml_searching: function() + { +// Seacrh for landmarks +*/ } + +} // end of testcase + + +/* + +----Maps And Navigation use cases + + list_of_way_points: function() { }, + + distinguish_pedestrian_and_car_navigation: function() { }, + + find_matching_landmarks_for_given_search_criteria_with_geocoding: function() { }, + + provide_map_for_given_coordinate: function() { }, + + online_and_offline: function() { } + +*/ diff --git a/tests/tests.pro b/tests/tests.pro new file mode 100644 index 00000000..566e1725 --- /dev/null +++ b/tests/tests.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs + |
