summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-30 15:27:58 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-30 15:28:48 (GMT)
commit6aab8e9ddfe7698f685058310c56120005d95f83 (patch)
treed8cfa3ffa9deb262c7542b3b06886e7afca88b2a
parent23fb2b7e1dc8e6285185582abf18d15e9eff25bb (diff)
Remove methods which were deprecated since 2011/2012
-rw-r--r--src/lib/marble/AbstractDataPluginModel.cpp9
-rw-r--r--src/lib/marble/AbstractDataPluginModel.h10
-rw-r--r--src/lib/marble/ViewportParams.cpp6
-rw-r--r--src/lib/marble/ViewportParams.h1
-rw-r--r--src/lib/marble/geodata/data/GeoDataPlacemark.cpp5
-rw-r--r--src/lib/marble/geodata/data/GeoDataPlacemark.h2
6 files changed, 0 insertions, 33 deletions
diff --git a/src/lib/marble/AbstractDataPluginModel.cpp b/src/lib/marble/AbstractDataPluginModel.cpp
index 036d0e0..99f41a5 100644
--- a/src/lib/marble/AbstractDataPluginModel.cpp
+++ b/src/lib/marble/AbstractDataPluginModel.cpp
@@ -374,15 +374,6 @@ void AbstractDataPluginModel::parseFile( const QByteArray& file )
Q_UNUSED( file );
}
-void AbstractDataPluginModel::downloadItemData( const QUrl& url,
- const QString& type,
- AbstractDataPluginItem *item )
-{
- downloadItem( url, type, item );
- connect( item, SIGNAL(destroyed(QObject*)), this, SLOT(removeItem(QObject*)) );
- addItemToList( item );
-}
-
void AbstractDataPluginModel::downloadItem( const QUrl& url,
const QString& type,
AbstractDataPluginItem *item )
diff --git a/src/lib/marble/AbstractDataPluginModel.h b/src/lib/marble/AbstractDataPluginModel.h
index 03b442e..4ac29a0 100644
--- a/src/lib/marble/AbstractDataPluginModel.h
+++ b/src/lib/marble/AbstractDataPluginModel.h
@@ -143,16 +143,6 @@ public Q_SLOTS:
void downloadItem( const QUrl& url, const QString& type, AbstractDataPluginItem *item );
/**
- * Downloads the file from @p url. @p item -> addDownloadedFile() will be called when the
- * download is finished. Additionally initialized() items will be added to the item list
- * after the download. It checks if a item with the same id is already in the list and
- * ignores and deletes the item in this case.
- * @param: The type of the download (to be specified by the subclasser)
- * @deprecated Please use downloadItem() and addItemsToList() for efficiency
- **/
- MARBLE_DEPRECATED( void downloadItemData( const QUrl& url, const QString& type, AbstractDataPluginItem *item ) );
-
- /**
* Download the description file from the @p url.
*/
void downloadDescriptionFile( const QUrl& url );
diff --git a/src/lib/marble/ViewportParams.cpp b/src/lib/marble/ViewportParams.cpp
index 5a8b1d4..8daf8dd 100644
--- a/src/lib/marble/ViewportParams.cpp
+++ b/src/lib/marble/ViewportParams.cpp
@@ -320,12 +320,6 @@ qreal ViewportParams::centerLatitude() const
return d->m_centerLatitude;
}
-void ViewportParams::centerCoordinates( qreal &centerLon, qreal &centerLat ) const
-{
- centerLon = d->m_centerLongitude;
- centerLat = d->m_centerLatitude;
-}
-
const GeoDataLatLonAltBox& ViewportParams::viewLatLonAltBox() const
{
if (d->m_dirtyBox) {
diff --git a/src/lib/marble/ViewportParams.h b/src/lib/marble/ViewportParams.h
index 6ca0d75..1bf3a8d 100644
--- a/src/lib/marble/ViewportParams.h
+++ b/src/lib/marble/ViewportParams.h
@@ -110,7 +110,6 @@ class MARBLE_EXPORT ViewportParams
qreal centerLongitude() const;
qreal centerLatitude() const;
- MARBLE_DEPRECATED( void centerCoordinates( qreal &centerLon, qreal &centerLat ) const );
/**
* @brief Get the screen coordinates corresponding to geographical coordinates in the map.
diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
index f5a087f..5087070 100644
--- a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
+++ b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
@@ -295,11 +295,6 @@ void GeoDataPlacemark::setCoordinate( const GeoDataCoordinates &point )
setGeometry ( new GeoDataPoint( point ) );
}
-void GeoDataPlacemark::setCoordinate( const GeoDataPoint &point )
-{
- setGeometry ( new GeoDataPoint( point ) );
-}
-
void GeoDataPlacemark::setGeometry( GeoDataGeometry *entry )
{
detach();
diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.h b/src/lib/marble/geodata/data/GeoDataPlacemark.h
index 9a49c99..20b0e47 100644
--- a/src/lib/marble/geodata/data/GeoDataPlacemark.h
+++ b/src/lib/marble/geodata/data/GeoDataPlacemark.h
@@ -141,8 +141,6 @@ class GEODATA_EXPORT GeoDataPlacemark: public GeoDataFeature
*/
void setCoordinate( const GeoDataCoordinates &coordinate );
- GEODATA_DEPRECATED( void setCoordinate( const GeoDataPoint &point ) );
-
/**
* Sets the current Geometry of this Placemark. @see geometry() and the class
* overview for description of the geometry concept. The geometry can be set