Missing changes from MapMouseArea removal.

MapMouseArea has been removed. Remove MapMouseEvent, it is no longer
required.

Remove some remaining MapMouseArea instances in the tests.

Change-Id: I12c534bb3360f6a19ec9e1dd40ecf7bb0d7b8e21
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

6 files changed, 2 insertions, 374 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 260e60b6..9f68178e 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -42,8 +42,6 @@
 #include "qdeclarativegeoserviceprovider_p.h"
 #include "qdeclarativegeomap_p.h"
 
-#include "qdeclarativegeomapmouseevent_p.h"
-
 #include "qdeclarativegeoroute_p.h"
 #include "qdeclarativegeoroutemodel_p.h"
 #include "qdeclarativegeocodemodel_p.h"
diff --git a/src/imports/location/qdeclarativegeomapmouseevent.cpp b/src/imports/location/qdeclarativegeomapmouseevent.cpp
deleted file mode 100644
index 23e245b9..00000000
--- a/src/imports/location/qdeclarativegeomapmouseevent.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtLocation module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** 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.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia 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.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativegeomapmouseevent_p.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \qmltype MapMouseEvent
-    \instantiates QDeclarativeGeoMapMouseEvent
-    \inqmlmodule QtLocation
-    \ingroup qml-QtLocation5-maps
-    \since Qt Location 5.0
-
-    \brief The MapMouseEvent object provides information about a mouse event.
-
-    The position of the mouse can be found via the \l x and \l y properties
-    or the \l coordinate property. Both \a x and \a y are relative to the
-    \l MapMouseArea that generated the event.
-    The button that caused the event is available via the \l button property.
-
-    \sa MapMouseArea
-*/
-
-QDeclarativeGeoMapMouseEvent::QDeclarativeGeoMapMouseEvent(QObject *parent)
-    : QObject(parent),
-      accepted_(false),
-      button_(Qt::NoButton),
-      modifiers_(Qt::NoModifier),
-      wasHeld_(false),
-      x_(0),
-      y_(0),
-      buttons_(Qt::NoButton)
-{
-}
-
-QDeclarativeGeoMapMouseEvent::~QDeclarativeGeoMapMouseEvent()
-{
-}
-
-/*!
-    \qmlproperty bool QtLocation::MapMouseEvent::accepted
-
-    Setting \a accepted to true prevents the mouse event from being
-    propagated to items below the item currently handling the event.
-
-    Generally, if the item acts on the mouse event then it should be accepted
-    so that items lower in the stacking order do not also respond to the same event.
-*/
-
-void QDeclarativeGeoMapMouseEvent::setAccepted(bool accepted)
-{
-    accepted_ = accepted;
-}
-
-bool QDeclarativeGeoMapMouseEvent::accepted() const
-{
-    return accepted_;
-}
-
-/*!
-    \qmlproperty enumeration QtLocation::MapMouseEvent::button
-
-    This property holds the button that caused the event.  It can be one of:
-
-    \list
-    \li Qt.LeftButton
-    \li Qt.RightButton
-    \li Qt.MiddleButton
-    \endlist
-
-    \sa buttons
-*/
-
-void QDeclarativeGeoMapMouseEvent::setButton(int button)
-{
-    button_ = button;
-}
-
-int QDeclarativeGeoMapMouseEvent::button() const
-{
-    return button_;
-}
-
-/*!
-    \qmlproperty enumeration QtLocation::MapMouseEvent::buttons
-
-    This property holds the mouse buttons pressed when the event was
-    generated. For mouse move events, this is all buttons that are pressed
-    down. For mouse press and double click events this includes the button
-    that caused the event. For mouse release events this excludes the button
-    that caused the event.
-
-    It contains a bitwise combination of:
-
-    \list
-    \li Qt.LeftButton
-    \li Qt.RightButton
-    \li Qt.MiddleButton
-    \endlist
-
-    \sa button
-*/
-
-void QDeclarativeGeoMapMouseEvent::setButtons(int buttons)
-{
-    buttons_ = buttons;
-}
-
-int QDeclarativeGeoMapMouseEvent::buttons() const
-{
-    return buttons_;
-}
-
-/*!
-    \qmlproperty int QtLocation::MapMouseEvent::modifiers
-
-    This property holds the keyboard modifier flags that existed immediately
-    before the event occurred.
-
-    It contains a bitwise combination of:
-    \list
-    \li Qt.NoModifier - No modifier key is pressed.
-    \li Qt.ShiftModifier - A Shift key on the keyboard is pressed.
-    \li Qt.ControlModifier - A Ctrl key on the keyboard is pressed.
-    \li Qt.AltModifier - An Alt key on the keyboard is pressed.
-    \li Qt.MetaModifier - A Meta key on the keyboard is pressed.
-    \li Qt.KeypadModifier - A keypad button is pressed.
-    \endlist
-*/
-
-void QDeclarativeGeoMapMouseEvent::setModifiers(int modifiers)
-{
-    modifiers_ = modifiers;
-}
-
-int QDeclarativeGeoMapMouseEvent::modifiers() const
-{
-    return modifiers_;
-}
-
-/*!
-    \qmlproperty bool QtLocation::MapMouseEvent::wasHeld
-
-     This property is true if the mouse button has been held pressed longer the threshold (800ms).
-*/
-
-void QDeclarativeGeoMapMouseEvent::setWasHeld(bool wasHeld)
-{
-    wasHeld_ = wasHeld;
-}
-
-bool QDeclarativeGeoMapMouseEvent::wasHeld() const
-{
-    return wasHeld_;
-}
-
-/*!
-    \qmlproperty int QtLocation::MapMouseEvent::x
-
-    This property holds the x-screen coordinate of the position supplied
-    by the mouse event.
-*/
-
-void QDeclarativeGeoMapMouseEvent::setX(int x)
-{
-    x_ = x;
-}
-
-int QDeclarativeGeoMapMouseEvent::x() const
-{
-    return x_;
-}
-
-/*!
-    \qmlproperty int QtLocation::MapMouseEvent::y
-
-    This property holds the y-screen coordinate of the position supplied
-    by the mouse event.
-*/
-
-void QDeclarativeGeoMapMouseEvent::setY(int y)
-{
-    y_ = y;
-}
-
-int QDeclarativeGeoMapMouseEvent::y() const
-{
-    return y_;
-}
-
-/*!
-    \qmlproperty coordinate QtLocation::MapMouseEvent::coordinate
-
-    This property holds the coordinate corresponding to the latitude
-    and longitude of the position on the map at which the mouse event
-    occurred.
-*/
-
-void QDeclarativeGeoMapMouseEvent::setCoordinate(const QGeoCoordinate &coordinate)
-{
-    coordinate_ = coordinate;
-}
-
-QGeoCoordinate QDeclarativeGeoMapMouseEvent::coordinate()
-{
-    return coordinate_;
-}
-
-#include "moc_qdeclarativegeomapmouseevent_p.cpp"
-
-QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeomapmouseevent_p.h b/src/imports/location/qdeclarativegeomapmouseevent_p.h
deleted file mode 100644
index 34341d07..00000000
--- a/src/imports/location/qdeclarativegeomapmouseevent_p.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtLocation module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** 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.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia 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.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEGEOMAPMOUSEEVENT_H
-#define QDECLARATIVEGEOMAPMOUSEEVENT_H
-
-#include <QtPositioning/QGeoCoordinate>
-
-#include <QtQml/qqml.h>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeGeoMapMouseEvent : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(bool accepted READ accepted WRITE setAccepted)
-    Q_PROPERTY(int button READ button)
-    Q_PROPERTY(int buttons READ buttons)
-    Q_PROPERTY(int modifiers READ modifiers)
-    Q_PROPERTY(bool wasHeld READ wasHeld)
-    Q_PROPERTY(int x READ x)
-    Q_PROPERTY(int y READ y)
-    Q_PROPERTY(QGeoCoordinate coordinate READ coordinate)
-
-public:
-    explicit QDeclarativeGeoMapMouseEvent(QObject *parent = 0);
-    ~QDeclarativeGeoMapMouseEvent();
-
-    void setAccepted(bool accepted);
-    bool accepted() const;
-
-    void setButton(int button);
-    int button() const;
-
-    void setButtons(int buttons);
-    int buttons() const;
-
-    void setModifiers(int modifiers);
-    int modifiers() const;
-
-    void setWasHeld(bool wasHeld);
-    bool wasHeld() const;
-
-    void setX(int x);
-    int x() const;
-
-    void setY(int y);
-    int y() const;
-
-    void setCoordinate(const QGeoCoordinate &coordinate);
-    QGeoCoordinate coordinate();
-
-private:
-    bool accepted_;
-    int button_;
-    int modifiers_;
-    bool wasHeld_;
-    int x_;
-    int y_;
-    int buttons_;
-    QGeoCoordinate coordinate_;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QDeclarativeGeoMapMouseEvent)
-
-#endif
diff --git a/tests/auto/declarative_ui/tst_map_item.qml b/tests/auto/declarative_ui/tst_map_item.qml
index cfb1c51b..3afae572 100644
--- a/tests/auto/declarative_ui/tst_map_item.qml
+++ b/tests/auto/declarative_ui/tst_map_item.qml
@@ -140,7 +140,7 @@ Item {
                 latitude: 10
                 longitude: 30
             }
-            MapMouseArea {
+            MouseArea {
                 id: preMapRectMa
                 anchors.fill: parent
                 drag.target: parent
diff --git a/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml b/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml
index 26cef4f8..7c32fd65 100644
--- a/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml
+++ b/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml
@@ -135,7 +135,7 @@ Item {
             border.width: 0
             topLeft: preMapRectangleDefaultTopLeft
             bottomRight: preMapRectangleDefaultBottomRight
-            MapMouseArea {
+            MouseArea {
                 id: preMapRectMa
                 anchors.fill: parent
                 drag.target: parent
diff --git a/tests/auto/declarative_ui/tst_map_mouse.qml b/tests/auto/declarative_ui/tst_map_mouse.qml
index d059bcfb..3931b1ca 100644
--- a/tests/auto/declarative_ui/tst_map_mouse.qml
+++ b/tests/auto/declarative_ui/tst_map_mouse.qml
@@ -84,10 +84,6 @@ Item {
     // General-purpose elements for the test:
     Plugin { id: testPlugin; name : "qmlgeo.test.plugin"; allowExperimental: true }
 
-    MapMouseEvent{
-        id: mapMouseEvent
-    }
-
     function setMouseData(ma, me)
     {
         ma.lastX = me.x
@@ -353,15 +349,6 @@ Item {
             compare(mouseUpperClickedSpy.count, 1)
         }
 
-        function test_aab_event_basic_properties() {
-            compare(mapMouseEvent.accepted, false)
-            compare(mapMouseEvent.button, Qt.NoButton)
-            compare(mapMouseEvent.modifiers, Qt.NoModifier)
-            compare(mapMouseEvent.wasHeld, false)
-            compare(mapMouseEvent.x, 0)
-            compare(mapMouseEvent.y, 0)
-        }
-
         function test_basic_position_changed() {
             // tests basic position changed/move when button is being pressed
             clear_data();