summaryrefslogtreecommitdiff
path: root/src/location/places/qplaceproposedsearchresult.h
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2013-08-29 11:27:50 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-03 09:06:50 +0200
commitfc53ebdbd043642aaab0ce39f48d7c05231d10fd (patch)
treeedb5635f9fb1c9252f31434452e05e75d7b9bcb7 /src/location/places/qplaceproposedsearchresult.h
parent9f98392aff316bff0b89ac20234234e1e3f060e2 (diff)
downloadqtlocation-fc53ebdbd043642aaab0ce39f48d7c05231d10fd.tar.gz
Fix some name inconsistencies in QtLocation
1. Rename QGeocoding* classes to QGeoCoding*. This emphasizes the QGeo prefix rather than the geocing word. The QML interfaces continues to use the Geocoding* as they don't a prefix as such. 2. Rename QProposedSearchResult to QPlaceProposedSearchResult. The class is place related and should carry the QPlace name prefix Change-Id: I428c7e6368774a9f199db5c113de11649e4a665c Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'src/location/places/qplaceproposedsearchresult.h')
-rw-r--r--src/location/places/qplaceproposedsearchresult.h75
1 files changed, 75 insertions, 0 deletions
diff --git a/src/location/places/qplaceproposedsearchresult.h b/src/location/places/qplaceproposedsearchresult.h
new file mode 100644
index 00000000..ff957b86
--- /dev/null
+++ b/src/location/places/qplaceproposedsearchresult.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Aaron McCarthy <mccarthy.aaron@gmail.com>
+** 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 QPROPOSEDSEARCHRESULT_H
+#define QPROPOSEDSEARCHRESULT_H
+
+#include <QtLocation/QPlaceSearchResult>
+
+QT_BEGIN_NAMESPACE
+
+class QPlaceProposedSearchResultPrivate;
+
+class Q_LOCATION_EXPORT QPlaceProposedSearchResult : public QPlaceSearchResult
+{
+public:
+ QPlaceProposedSearchResult();
+
+#ifdef Q_QDOC
+ QPlaceProposedSearchResult(const QPlaceSearchRequest &other);
+#else
+ Q_DECLARE_SEARCHRESULT_COPY_CTOR(QPlaceProposedSearchResult)
+#endif
+
+ ~QPlaceProposedSearchResult();
+
+ QPlaceSearchRequest searchRequest() const;
+ void setSearchRequest(const QPlaceSearchRequest &request);
+
+private:
+ Q_DECLARE_SEARCHRESULT_D_FUNC(QPlaceProposedSearchResult)
+};
+
+Q_DECLARE_TYPEINFO(QPlaceProposedSearchResult, Q_MOVABLE_TYPE);
+
+QT_END_NAMESPACE
+
+#endif // QPROPOSEDSEARCHRESULT_H