Renames the new mapping classes.

Also moves them into src/location/maps.

We still need to take a closer look at which classes are
public and which are private, and then do the associated
file renaming and addition of private header warnings.

Change-Id: Ide0225ad5d5dc23834baaa9f6841646e4c92de39
Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>

1 files changed, 218 insertions, 0 deletions

diff --git a/src/location/maps/qgeotilespec.cpp b/src/location/maps/qgeotilespec.cpp
new file mode 100644
index 00000000..13a0b394
--- /dev/null
+++ b/src/location/maps/qgeotilespec.cpp
@@ -0,0 +1,218 @@
+/****************************************************************************
+**
+** 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 QtLocation module of the Qt Toolkit.
+**
+** $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 "qgeotilespec.h"
+#include "qgeotilespec_p.h"
+#include <QDebug>
+
+QT_BEGIN_NAMESPACE
+
+QGeoTileSpec::QGeoTileSpec()
+    : d_ptr(new QGeoTileSpecPrivate()) {}
+
+QGeoTileSpec::QGeoTileSpec(const QString &plugin, int mapId, int zoom, int x, int y)
+        : d_ptr(new QGeoTileSpecPrivate(plugin, mapId, zoom, x, y)) {}
+
+QGeoTileSpec::QGeoTileSpec(const QGeoTileSpec &other)
+    : d_ptr(new QGeoTileSpecPrivate(*(other.d_ptr))) {}
+
+QGeoTileSpec::~QGeoTileSpec() {
+    delete d_ptr;
+}
+
+QGeoTileSpec& QGeoTileSpec::operator = (const QGeoTileSpec &other)
+{
+    d_ptr->operator=(*(other.d_ptr));
+    return *this;
+}
+
+QString QGeoTileSpec::plugin() const
+{
+    Q_D(const QGeoTileSpec);
+    return d->plugin_;
+}
+
+void QGeoTileSpec::setZoom(int zoom)
+{
+    Q_D(QGeoTileSpec);
+    d->zoom_ = zoom;
+}
+
+int QGeoTileSpec::zoom() const
+{
+    Q_D(const QGeoTileSpec);
+    return d->zoom_;
+}
+
+void QGeoTileSpec::setX(int x)
+{
+    Q_D(QGeoTileSpec);
+    d->x_ = x;
+}
+
+int QGeoTileSpec::x() const
+{
+    Q_D(const QGeoTileSpec);
+    return d->x_;
+}
+
+void QGeoTileSpec::setY(int y)
+{
+    Q_D(QGeoTileSpec);
+    d->y_ = y;
+}
+
+int QGeoTileSpec::y() const
+{
+    Q_D(const QGeoTileSpec);
+    return d->y_;
+}
+
+void QGeoTileSpec::setMapId(int mapId)
+{
+    Q_D(QGeoTileSpec);
+    d->mapId_ = mapId;
+}
+
+int QGeoTileSpec::mapId() const
+{
+    Q_D(const QGeoTileSpec);
+    return d->mapId_;
+}
+
+bool QGeoTileSpec::operator == (const QGeoTileSpec &rhs) const
+{
+    return (d_ptr->operator == (*(rhs.d_ptr)));
+}
+
+bool QGeoTileSpec::operator < (const QGeoTileSpec &rhs) const
+{
+    return (d_ptr->operator < (*(rhs.d_ptr)));
+}
+
+unsigned int qHash(const QGeoTileSpec &spec)
+{
+    unsigned int result = (qHash(spec.plugin()) * 13) % 31;
+    result += ((spec.mapId() * 17) % 31) << 5;
+    result += ((spec.zoom() * 19) % 31) << 10;
+    result += ((spec.x() * 23) % 31) << 15;
+    result += ((spec.y() * 29) % 31) << 20;
+    return result;
+}
+
+QDebug operator<< (QDebug dbg, const QGeoTileSpec &spec)
+{
+    dbg << spec.plugin() << spec.mapId() << spec.zoom() << spec.x() << spec.y();
+    return dbg;
+}
+
+QGeoTileSpecPrivate::QGeoTileSpecPrivate()
+    : mapId_(0),
+    zoom_(-1),
+    x_(-1),
+    y_(-1) {}
+
+QGeoTileSpecPrivate::QGeoTileSpecPrivate(const QGeoTileSpecPrivate &other)
+    : plugin_(other.plugin_),
+      mapId_(other.mapId_),
+      zoom_(other.zoom_),
+      x_(other.x_),
+      y_(other.y_) {}
+
+QGeoTileSpecPrivate::QGeoTileSpecPrivate(const QString &plugin, int mapId, int zoom, int x, int y)
+    : plugin_(plugin),
+      mapId_(mapId),
+      zoom_(zoom),
+      x_(x),
+      y_(y) {}
+
+QGeoTileSpecPrivate::~QGeoTileSpecPrivate() {}
+
+QGeoTileSpecPrivate& QGeoTileSpecPrivate::operator = (const QGeoTileSpecPrivate &other)
+{
+    plugin_ = other.plugin_;
+    mapId_ = other.mapId_;
+    zoom_ = other.zoom_;
+    x_ = other.x_;
+    y_ = other.y_;
+    return *this;
+}
+
+bool QGeoTileSpecPrivate::operator == (const QGeoTileSpecPrivate &rhs) const
+{
+    if (plugin_ != rhs.plugin_)
+        return false;
+
+    if (mapId_ != rhs.mapId_)
+        return false;
+
+    if (zoom_ != rhs.zoom_)
+        return false;
+
+    if (x_ != rhs.x_)
+        return false;
+
+    if (y_ != rhs.y_)
+        return false;
+
+    return true;
+}
+
+bool QGeoTileSpecPrivate::operator < (const QGeoTileSpecPrivate &rhs) const
+{
+    if (plugin_ < rhs.plugin_)
+        return true;
+    if (plugin_ > rhs.plugin_)
+        return false;
+
+    if (zoom_ < rhs.zoom_)
+        return true;
+    if (zoom_ > rhs.zoom_)
+        return false;
+
+    if (x_ < rhs.x_)
+        return true;
+    if (x_ > rhs.x_)
+        return false;
+
+    return (y_ < rhs.y_);
+}
+
+QT_END_NAMESPACE