summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-20 22:36:34 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-21 05:30:23 (GMT)
commitcae89b95ef6c6f71a978a1db342dc0b525604a6f (patch)
treecf137eae75a0a6fba460a9556ae6aee8664c4082
parent913caa81077781479f6eae0bcd70b00f79c2891b (diff)
Remove dead Q_EXPORT_PLUGIN macros, no longer used in Qt5
-rw-r--r--src/lib/marble/FileViewWidget.cpp1
-rw-r--r--src/lib/marble/FormattedTextWidget.cpp1
-rw-r--r--src/lib/marble/TileId.h2
-rw-r--r--src/lib/marble/TourItemDelegate.cpp1
-rw-r--r--src/lib/marble/TourWidget.cpp1
-rw-r--r--src/lib/marble/cloudsync/RouteSyncManager.h2
-rw-r--r--src/lib/marble/declarative/MarbleDeclarativePlugin.cpp2
-rw-r--r--src/lib/marble/geodata/data/GeoDataLatLonAltBox.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataUpdate.cpp2
-rw-r--r--src/lib/marble/graphicsview/FrameGraphicsItem.h2
-rw-r--r--src/lib/marble/graphicsview/MarbleGraphicsGridLayout.h2
-rw-r--r--src/lib/marble/marble_export.h15
-rw-r--r--src/lib/marble/osm/OsmRelationManagerWidget.cpp1
-rw-r--r--src/lib/marble/routing/instructions/RoutingInstruction.h1
-rw-r--r--src/lib/marble/routing/instructions/RoutingWaypoint.h1
-rw-r--r--src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp2
-rw-r--r--src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp2
-rw-r--r--src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp2
-rw-r--r--src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.cpp2
-rw-r--r--src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp4
-rw-r--r--src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp5
-rw-r--r--src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp2
-rw-r--r--src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp2
-rw-r--r--src/plugins/render/annotate/AnnotatePlugin.cpp2
-rw-r--r--src/plugins/render/annotate/PolylineAnnotation.h1
-rw-r--r--src/plugins/render/aprs/AprsPlugin.cpp2
-rw-r--r--src/plugins/render/atmosphere/AtmospherePlugin.cpp2
-rw-r--r--src/plugins/render/compass/CompassFloatItem.cpp2
-rw-r--r--src/plugins/render/crosshairs/CrosshairsPlugin.cpp2
-rw-r--r--src/plugins/render/earthquake/EarthquakePlugin.cpp2
-rw-r--r--src/plugins/render/eclipses/EclipsesPlugin.cpp2
-rw-r--r--src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp2
-rw-r--r--src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp2
-rw-r--r--src/plugins/render/fileview/FileViewFloatItem.cpp3
-rw-r--r--src/plugins/render/foursquare/FoursquarePlugin.cpp1
-rw-r--r--src/plugins/render/gpsinfo/GpsInfo.cpp2
-rw-r--r--src/plugins/render/graticule/GraticulePlugin.cpp2
-rw-r--r--src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp2
-rw-r--r--src/plugins/render/license/License.cpp2
-rw-r--r--src/plugins/render/mapscale/MapScaleFloatItem.cpp2
-rw-r--r--src/plugins/render/measure/MeasureToolPlugin.cpp2
-rw-r--r--src/plugins/render/navigation/NavigationFloatItem.cpp2
-rw-r--r--src/plugins/render/opencaching/OpenCachingPlugin.cpp2
-rw-r--r--src/plugins/render/opencachingcom/OpenCachingComPlugin.cpp2
-rw-r--r--src/plugins/render/opendesktop/OpenDesktopPlugin.cpp3
-rw-r--r--src/plugins/render/overviewmap/OverviewMap.cpp2
-rw-r--r--src/plugins/render/panoramio/PanoramioPlugin.cpp2
-rw-r--r--src/plugins/render/photo/PhotoPlugin.cpp2
-rw-r--r--src/plugins/render/positionmarker/PositionMarker.cpp2
-rw-r--r--src/plugins/render/postalcode/PostalCodePlugin.cpp2
-rw-r--r--src/plugins/render/progress/ProgressFloatItem.cpp2
-rw-r--r--src/plugins/render/routing/RoutingPlugin.cpp2
-rw-r--r--src/plugins/render/satellites/SatellitesPlugin.cpp2
-rw-r--r--src/plugins/render/speedometer/Speedometer.cpp2
-rw-r--r--src/plugins/render/stars/StarsPlugin.cpp2
-rw-r--r--src/plugins/render/sun/SunPlugin.cpp2
-rw-r--r--src/plugins/render/test/TestPlugin.cpp2
-rw-r--r--src/plugins/render/twitter/twitterPlugin.cpp4
-rw-r--r--src/plugins/render/weather/WeatherPlugin.cpp2
-rw-r--r--src/plugins/render/wikipedia/WikipediaPlugin.cpp2
-rw-r--r--src/plugins/runner/cache/CachePlugin.cpp2
-rw-r--r--src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp2
-rw-r--r--src/plugins/runner/geouri/GeoUriPlugin.cpp2
-rw-r--r--src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp2
-rw-r--r--src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp2
-rw-r--r--src/plugins/runner/gpsbabel/GpsbabelPlugin.cpp2
-rw-r--r--src/plugins/runner/gpx/GpxPlugin.cpp2
-rw-r--r--src/plugins/runner/hostip/HostipPlugin.cpp2
-rw-r--r--src/plugins/runner/json/JsonPlugin.cpp2
-rw-r--r--src/plugins/runner/kml/KmlPlugin.cpp2
-rw-r--r--src/plugins/runner/latlon/LatLonPlugin.cpp2
-rw-r--r--src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp2
-rw-r--r--src/plugins/runner/localdatabase/LocalDatabasePlugin.cpp2
-rw-r--r--src/plugins/runner/log/LogPlugin.cpp2
-rw-r--r--src/plugins/runner/mapquest/MapQuestPlugin.cpp2
-rw-r--r--src/plugins/runner/monav/MonavPlugin.cpp2
-rw-r--r--src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.cpp2
-rw-r--r--src/plugins/runner/nominatim-search/NominatimSearchPlugin.cpp2
-rw-r--r--src/plugins/runner/open-source-routing-machine/OSRMPlugin.cpp2
-rw-r--r--src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.cpp2
-rw-r--r--src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp2
-rw-r--r--src/plugins/runner/osm/OsmPlugin.cpp2
-rw-r--r--src/plugins/runner/pn2/Pn2Plugin.cpp2
-rw-r--r--src/plugins/runner/pnt/PntPlugin.cpp2
-rw-r--r--src/plugins/runner/routino/RoutinoPlugin.cpp2
-rw-r--r--src/plugins/runner/shp/ShpPlugin.cpp2
-rw-r--r--src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.cpp2
-rw-r--r--src/plugins/runner/yours/YoursPlugin.cpp2
-rw-r--r--src/plugins/templates/floatitem/FITemplateFloatItem.cpp2
-rw-r--r--tools/osm-addresses/SqlWriter.h1
90 files changed, 22 insertions, 172 deletions
diff --git a/src/lib/marble/FileViewWidget.cpp b/src/lib/marble/FileViewWidget.cpp
index a4dbc568..ed879fc 100644
--- a/src/lib/marble/FileViewWidget.cpp
+++ b/src/lib/marble/FileViewWidget.cpp
@@ -15,6 +15,7 @@
#include <QFileDialog>
#include <QMenu>
#include <QAction>
+#include <QPointer>
// Marble
#include "GeoDataContainer.h"
diff --git a/src/lib/marble/FormattedTextWidget.cpp b/src/lib/marble/FormattedTextWidget.cpp
index 8b99e19..2885af4 100644
--- a/src/lib/marble/FormattedTextWidget.cpp
+++ b/src/lib/marble/FormattedTextWidget.cpp
@@ -18,6 +18,7 @@
#include <QColorDialog>
#include <QFontComboBox>
#include <QLineEdit>
+#include <QPointer>
//Marble
#include "MarbleWidget.h"
diff --git a/src/lib/marble/TileId.h b/src/lib/marble/TileId.h
index debf925..789474f 100644
--- a/src/lib/marble/TileId.h
+++ b/src/lib/marble/TileId.h
@@ -17,6 +17,8 @@
#include "GeoDataLatLonBox.h"
#include "GeoSceneTextureTileDataset.h"
+#include <QHash>
+
class QString;
namespace Marble
diff --git a/src/lib/marble/TourItemDelegate.cpp b/src/lib/marble/TourItemDelegate.cpp
index 6779ca4..2ab8f67 100644
--- a/src/lib/marble/TourItemDelegate.cpp
+++ b/src/lib/marble/TourItemDelegate.cpp
@@ -15,6 +15,7 @@
#include <QPainter>
#include <QApplication>
#include <QListView>
+#include <QPointer>
#include "TourItemDelegate.h"
#include "MarblePlacemarkModel.h"
diff --git a/src/lib/marble/TourWidget.cpp b/src/lib/marble/TourWidget.cpp
index d3c406e..321906a 100644
--- a/src/lib/marble/TourWidget.cpp
+++ b/src/lib/marble/TourWidget.cpp
@@ -52,6 +52,7 @@
#include <QUrl>
#include <QKeyEvent>
#include <QCloseEvent>
+#include <QPointer>
namespace Marble
{
diff --git a/src/lib/marble/cloudsync/RouteSyncManager.h b/src/lib/marble/cloudsync/RouteSyncManager.h
index 1aca78a..de1897c 100644
--- a/src/lib/marble/cloudsync/RouteSyncManager.h
+++ b/src/lib/marble/cloudsync/RouteSyncManager.h
@@ -13,6 +13,8 @@
#include "marble_export.h"
+#include <QObject>
+
namespace Marble {
class CloudSyncManager;
diff --git a/src/lib/marble/declarative/MarbleDeclarativePlugin.cpp b/src/lib/marble/declarative/MarbleDeclarativePlugin.cpp
index 86ad0da..3a8e614 100644
--- a/src/lib/marble/declarative/MarbleDeclarativePlugin.cpp
+++ b/src/lib/marble/declarative/MarbleDeclarativePlugin.cpp
@@ -82,5 +82,3 @@ void MarbleDeclarativePlugin::initializeEngine( QQmlEngine *engine, const char *
}
#include "moc_MarbleDeclarativePlugin.cpp"
-
-Q_EXPORT_PLUGIN2( MarbleDeclarativePlugin, MarbleDeclarativePlugin )
diff --git a/src/lib/marble/geodata/data/GeoDataLatLonAltBox.h b/src/lib/marble/geodata/data/GeoDataLatLonAltBox.h
index 9834ba4..cee0bbd 100644
--- a/src/lib/marble/geodata/data/GeoDataLatLonAltBox.h
+++ b/src/lib/marble/geodata/data/GeoDataLatLonAltBox.h
@@ -22,6 +22,8 @@
#include "GeoDataLatLonBox.h"
+#include <QHash>
+
namespace Marble
{
@@ -145,7 +147,7 @@ class GEODATA_EXPORT GeoDataLatLonAltBox : public GeoDataLatLonBox
};
inline uint qHash( const GeoDataLatLonAltBox & r ){
- return qHash( QString (r.toString()) );
+ return ::qHash(r.toString());
}
bool GEODATA_EXPORT operator==( GeoDataLatLonAltBox const& lhs, GeoDataLatLonAltBox const& rhs );
diff --git a/src/lib/marble/geodata/data/GeoDataUpdate.cpp b/src/lib/marble/geodata/data/GeoDataUpdate.cpp
index 640caa3..05a5e53 100644
--- a/src/lib/marble/geodata/data/GeoDataUpdate.cpp
+++ b/src/lib/marble/geodata/data/GeoDataUpdate.cpp
@@ -11,6 +11,8 @@
#include "GeoDataUpdate.h"
#include "GeoDataTypes.h"
+#include <QString>
+
namespace Marble
{
diff --git a/src/lib/marble/graphicsview/FrameGraphicsItem.h b/src/lib/marble/graphicsview/FrameGraphicsItem.h
index 8f19a12..a110f4a 100644
--- a/src/lib/marble/graphicsview/FrameGraphicsItem.h
+++ b/src/lib/marble/graphicsview/FrameGraphicsItem.h
@@ -15,6 +15,8 @@
#include "marble_export.h"
#include "ScreenGraphicsItem.h"
+#include <Qt> // for Qt::PenStyle
+
class QBrush;
class QPainterPath;
diff --git a/src/lib/marble/graphicsview/MarbleGraphicsGridLayout.h b/src/lib/marble/graphicsview/MarbleGraphicsGridLayout.h
index 1f2155f..945405b 100644
--- a/src/lib/marble/graphicsview/MarbleGraphicsGridLayout.h
+++ b/src/lib/marble/graphicsview/MarbleGraphicsGridLayout.h
@@ -15,6 +15,8 @@
#include "AbstractMarbleGraphicsLayout.h"
#include "marble_export.h"
+#include <Qt> // for Qt::Alignment
+
namespace Marble
{
diff --git a/src/lib/marble/marble_export.h b/src/lib/marble/marble_export.h
index 9b7fd69..77a769a 100644
--- a/src/lib/marble/marble_export.h
+++ b/src/lib/marble/marble_export.h
@@ -30,19 +30,4 @@
#define MARBLE_DEPRECATED(func) func
#endif
-
-#include <QtPlugin>
-
-#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
- #if defined(Q_EXPORT_PLUGIN)
- #undef Q_EXPORT_PLUGIN
- #undef Q_EXPORT_PLUGIN2
- #endif
-
- #define Q_EXPORT_PLUGIN(a)
- #define Q_EXPORT_PLUGIN2(a, b)
-#else
- # define Q_PLUGIN_METADATA(a)
-#endif
-
#endif // MARBLE_EXPORT_H
diff --git a/src/lib/marble/osm/OsmRelationManagerWidget.cpp b/src/lib/marble/osm/OsmRelationManagerWidget.cpp
index 340f43e..f0f2c5e 100644
--- a/src/lib/marble/osm/OsmRelationManagerWidget.cpp
+++ b/src/lib/marble/osm/OsmRelationManagerWidget.cpp
@@ -17,6 +17,7 @@
#include <QWidget>
#include <QTreeWidget>
#include <QMenu>
+#include <QPointer>
#include <QDebug>
// Marble
diff --git a/src/lib/marble/routing/instructions/RoutingInstruction.h b/src/lib/marble/routing/instructions/RoutingInstruction.h
index c48f675..a99d3f9 100644
--- a/src/lib/marble/routing/instructions/RoutingInstruction.h
+++ b/src/lib/marble/routing/instructions/RoutingInstruction.h
@@ -16,6 +16,7 @@
#include "marble_export.h"
#include <QVector>
+#include <QMetaType>
class QTextStream;
diff --git a/src/lib/marble/routing/instructions/RoutingWaypoint.h b/src/lib/marble/routing/instructions/RoutingWaypoint.h
index da88bd1..708b3d2 100644
--- a/src/lib/marble/routing/instructions/RoutingWaypoint.h
+++ b/src/lib/marble/routing/instructions/RoutingWaypoint.h
@@ -15,6 +15,7 @@
#include "marble_export.h"
#include <QVector>
+#include <QString>
namespace Marble
{
diff --git a/src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp b/src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp
index 2f3ade3..14c8d65 100644
--- a/src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp
+++ b/src/plugins/designer/latloneditwidget/LatLonEditPlugin.cpp
@@ -82,6 +82,4 @@ QWidget *LatLonEditPlugin::createWidget(QWidget *parent)
return new Marble::LatLonEdit(parent);
}
-Q_EXPORT_PLUGIN2(LatLonEditPlugin, LatLonEditPlugin)
-
#include "moc_LatLonEditPlugin.cpp"
diff --git a/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp b/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
index 37917c9..bcc45f0 100644
--- a/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
+++ b/src/plugins/designer/marblewidget/MarbleWidgetPlugin.cpp
@@ -96,6 +96,4 @@ QString MarbleWidgetPlugin::includeFile() const
return "MarbleWidget.h";
}
-Q_EXPORT_PLUGIN2(MarbleWidgetPlugin, MarbleWidgetPlugin)
-
#include "moc_MarbleWidgetPlugin.cpp"
diff --git a/src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp b/src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp
index ebdce03..389b626 100644
--- a/src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp
+++ b/src/plugins/designer/navigator/MarbleNavigatorPlugin.cpp
@@ -92,6 +92,4 @@ QString MarbleNavigatorPlugin::includeFile() const
return "MarbleNavigator.h";
}
-Q_EXPORT_PLUGIN2(MarbleNavigatorPlugin, MarbleNavigatorPlugin)
-
#include "moc_MarbleNavigatorPlugin.cpp"
diff --git a/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.cpp b/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.cpp
index c377bad..55350b0 100644
--- a/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.cpp
@@ -228,6 +228,4 @@ QString FlightGearPositionProviderPlugin::error() const
return QString();
}
-Q_EXPORT_PLUGIN2( FlightGearPositionProviderPlugin, Marble::FlightGearPositionProviderPlugin )
-
#include "moc_FlightGearPositionProviderPlugin.cpp"
diff --git a/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp b/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp
index 772115a..505d84e 100644
--- a/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.cpp
@@ -104,8 +104,4 @@ void GeoCluePositionProviderPlugin::updateStatus(GeoCute::Status newStatus)
emit statusChanged(m_status);
}
-Q_EXPORT_PLUGIN2( GeoCluePositionProviderPlugin, Marble::GeoCluePositionProviderPlugin )
-
-
-
#include "moc_GeoCluePositionProviderPlugin.cpp"
diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
index eb71d21..c32e7d2 100644
--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
@@ -191,9 +191,4 @@ QString GpsdPositionProviderPlugin::error() const
return m_thread->error();
}
-
-Q_EXPORT_PLUGIN2( GpsdPositionProviderPlugin, Marble::GpsdPositionProviderPlugin )
-
-
-
#include "moc_GpsdPositionProviderPlugin.cpp"
diff --git a/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp b/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp
index effec0b..88f99db 100644
--- a/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp
@@ -209,6 +209,4 @@ void QtPositioningPositionProviderPlugin::update()
} // namespace Marble
-Q_EXPORT_PLUGIN2( Marble::QtPositioningPositionProviderPlugin, Marble::QtPositioningPositionProviderPlugin )
-
#include "moc_QtPositioningPositionProviderPlugin.cpp"
diff --git a/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp b/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
index fa4951f..7b8318c 100644
--- a/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
@@ -197,6 +197,4 @@ void WlocatePositionProviderPlugin::handleWlocateResult()
} // namespace Marble
-Q_EXPORT_PLUGIN2( Marble::WlocatePositionProviderPlugin, Marble::WlocatePositionProviderPlugin )
-
#include "moc_WlocatePositionProviderPlugin.cpp"
diff --git a/src/plugins/render/annotate/AnnotatePlugin.cpp b/src/plugins/render/annotate/AnnotatePlugin.cpp
index 26f8273..aaac874 100644
--- a/src/plugins/render/annotate/AnnotatePlugin.cpp
+++ b/src/plugins/render/annotate/AnnotatePlugin.cpp
@@ -1745,6 +1745,4 @@ const GeoDataCoordinates AnnotatePlugin::mouseGeoDataCoordinates( QMouseEvent *m
}
-Q_EXPORT_PLUGIN2( AnnotatePlugin, Marble::AnnotatePlugin )
-
#include "moc_AnnotatePlugin.cpp"
diff --git a/src/plugins/render/annotate/PolylineAnnotation.h b/src/plugins/render/annotate/PolylineAnnotation.h
index 23d4cef..9e134b2 100644
--- a/src/plugins/render/annotate/PolylineAnnotation.h
+++ b/src/plugins/render/annotate/PolylineAnnotation.h
@@ -12,6 +12,7 @@
#define POLYLINEANNOTATION_H
#include <QColor>
+#include <QPointer>
#include "SceneGraphicsItem.h"
#include "GeoDataCoordinates.h"
diff --git a/src/plugins/render/aprs/AprsPlugin.cpp b/src/plugins/render/aprs/AprsPlugin.cpp
index 9044a66..05d1ed9 100644
--- a/src/plugins/render/aprs/AprsPlugin.cpp
+++ b/src/plugins/render/aprs/AprsPlugin.cpp
@@ -446,6 +446,4 @@ QAction* AprsPlugin::action() const
return m_action;
}
-Q_EXPORT_PLUGIN2( AprsPlugin, Marble::AprsPlugin )
-
#include "moc_AprsPlugin.cpp"
diff --git a/src/plugins/render/atmosphere/AtmospherePlugin.cpp b/src/plugins/render/atmosphere/AtmospherePlugin.cpp
index d835e85..5413681 100644
--- a/src/plugins/render/atmosphere/AtmospherePlugin.cpp
+++ b/src/plugins/render/atmosphere/AtmospherePlugin.cpp
@@ -191,6 +191,4 @@ void AtmospherePlugin::repaintPixmap(const ViewportParams *viewParams)
}
-Q_EXPORT_PLUGIN2( AtmospherePlugin, Marble::AtmospherePlugin )
-
#include "moc_AtmospherePlugin.cpp"
diff --git a/src/plugins/render/compass/CompassFloatItem.cpp b/src/plugins/render/compass/CompassFloatItem.cpp
index 7bb7588..8e97e15 100644
--- a/src/plugins/render/compass/CompassFloatItem.cpp
+++ b/src/plugins/render/compass/CompassFloatItem.cpp
@@ -256,6 +256,4 @@ void CompassFloatItem::writeSettings()
}
-Q_EXPORT_PLUGIN2( CompassFloatItem, Marble::CompassFloatItem )
-
#include "moc_CompassFloatItem.cpp"
diff --git a/src/plugins/render/crosshairs/CrosshairsPlugin.cpp b/src/plugins/render/crosshairs/CrosshairsPlugin.cpp
index 277b3f1..d71447a 100644
--- a/src/plugins/render/crosshairs/CrosshairsPlugin.cpp
+++ b/src/plugins/render/crosshairs/CrosshairsPlugin.cpp
@@ -251,6 +251,4 @@ bool CrosshairsPlugin::render( GeoPainter *painter, ViewportParams *viewport,
}
-Q_EXPORT_PLUGIN2( CrosshairsPlugin, Marble::CrosshairsPlugin )
-
#include "moc_CrosshairsPlugin.cpp"
diff --git a/src/plugins/render/earthquake/EarthquakePlugin.cpp b/src/plugins/render/earthquake/EarthquakePlugin.cpp
index 099524c..5c00f67 100644
--- a/src/plugins/render/earthquake/EarthquakePlugin.cpp
+++ b/src/plugins/render/earthquake/EarthquakePlugin.cpp
@@ -218,6 +218,4 @@ void EarthquakePlugin::validateDateRange()
}
-Q_EXPORT_PLUGIN2( EarthquakePlugin, Marble::EarthquakePlugin )
-
#include "moc_EarthquakePlugin.cpp"
diff --git a/src/plugins/render/eclipses/EclipsesPlugin.cpp b/src/plugins/render/eclipses/EclipsesPlugin.cpp
index 6976797..3eb041f 100644
--- a/src/plugins/render/eclipses/EclipsesPlugin.cpp
+++ b/src/plugins/render/eclipses/EclipsesPlugin.cpp
@@ -500,7 +500,5 @@ void EclipsesPlugin::showEclipseFromMenu( QAction *action )
} // namespace Marble
-Q_EXPORT_PLUGIN2( EclipsesPlugin, Marble::EclipsesPlugin )
-
#include "moc_EclipsesPlugin.cpp"
diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
index 4cbd315..d7ce707 100644
--- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
+++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
@@ -725,6 +725,4 @@ void ElevationProfileFloatItem::switchDataSource(ElevationProfileDataSource* sou
}
-Q_EXPORT_PLUGIN2(ElevationProfileFloatItem, Marble::ElevationProfileFloatItem)
-
#include "moc_ElevationProfileFloatItem.cpp"
diff --git a/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp b/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp
index c537fd5..83fe502 100644
--- a/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp
+++ b/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.cpp
@@ -227,6 +227,4 @@ void ElevationProfileMarker::onGeoObjectRemoved( GeoDataObject *object )
}
-Q_EXPORT_PLUGIN2(ElevationProfileMarker, Marble::ElevationProfileMarker)
-
#include "moc_ElevationProfileMarker.cpp"
diff --git a/src/plugins/render/fileview/FileViewFloatItem.cpp b/src/plugins/render/fileview/FileViewFloatItem.cpp
index 6e87510..ecffb28 100644
--- a/src/plugins/render/fileview/FileViewFloatItem.cpp
+++ b/src/plugins/render/fileview/FileViewFloatItem.cpp
@@ -242,8 +242,5 @@ void FileViewFloatItem::removeFile()
// close selected file
reinterpret_cast<FileViewModel*>(m_fileView->model())->closeFile();
}
-
-
-Q_EXPORT_PLUGIN2(FileViewFloatItem, FileViewFloatItem)
#include "moc_FileViewFloatItem.cpp"
diff --git a/src/plugins/render/foursquare/FoursquarePlugin.cpp b/src/plugins/render/foursquare/FoursquarePlugin.cpp
index 656d636..b2abd2b 100644
--- a/src/plugins/render/foursquare/FoursquarePlugin.cpp
+++ b/src/plugins/render/foursquare/FoursquarePlugin.cpp
@@ -99,6 +99,5 @@ bool FoursquarePlugin::storeAccessToken(const QString& tokenUrl)
}
-Q_EXPORT_PLUGIN2(FoursquarePlugin, Marble::FoursquarePlugin)
#include "moc_FoursquarePlugin.cpp"
diff --git a/src/plugins/render/gpsinfo/GpsInfo.cpp b/src/plugins/render/gpsinfo/GpsInfo.cpp
index b08ff9d..2d08fbc 100644
--- a/src/plugins/render/gpsinfo/GpsInfo.cpp
+++ b/src/plugins/render/gpsinfo/GpsInfo.cpp
@@ -172,6 +172,4 @@ void GpsInfo::updateLocation( const GeoDataCoordinates& coordinates, qreal)
}
-Q_EXPORT_PLUGIN2( GpsInfo, Marble::GpsInfo )
-
#include "moc_GpsInfo.cpp"
diff --git a/src/plugins/render/graticule/GraticulePlugin.cpp b/src/plugins/render/graticule/GraticulePlugin.cpp
index a399abf..3b4f9ba 100644
--- a/src/plugins/render/graticule/GraticulePlugin.cpp
+++ b/src/plugins/render/graticule/GraticulePlugin.cpp
@@ -789,6 +789,4 @@ void GraticulePlugin::initLineMaps( GeoDataCoordinates::Notation notation)
}
-Q_EXPORT_PLUGIN2(GraticulePlugin, Marble::GraticulePlugin)
-
#include "moc_GraticulePlugin.cpp"
diff --git a/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp b/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp
index ae6807c..074801d 100644
--- a/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp
+++ b/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.cpp
@@ -173,6 +173,4 @@ QString InhibitScreensaverPlugin::renderPolicy() const
}
-Q_EXPORT_PLUGIN2( InhibitScreensaverPlugin, Marble::InhibitScreensaverPlugin )
-
#include "moc_InhibitScreensaverPlugin.cpp"
diff --git a/src/plugins/render/license/License.cpp b/src/plugins/render/license/License.cpp
index 3120336..d81c7ea 100644
--- a/src/plugins/render/license/License.cpp
+++ b/src/plugins/render/license/License.cpp
@@ -241,6 +241,4 @@ void License::contextMenuEvent( QWidget *w, QContextMenuEvent *e )
}
-Q_EXPORT_PLUGIN2( License, Marble::License )
-
#include "moc_License.cpp"
diff --git a/src/plugins/render/mapscale/MapScaleFloatItem.cpp b/src/plugins/render/mapscale/MapScaleFloatItem.cpp
index 378f14c..8be7e05 100644
--- a/src/plugins/render/mapscale/MapScaleFloatItem.cpp
+++ b/src/plugins/render/mapscale/MapScaleFloatItem.cpp
@@ -456,6 +456,4 @@ void MapScaleFloatItem::toggleMinimized()
}
-Q_EXPORT_PLUGIN2(MapScaleFloatItem, Marble::MapScaleFloatItem)
-
#include "moc_MapScaleFloatItem.cpp"
diff --git a/src/plugins/render/measure/MeasureToolPlugin.cpp b/src/plugins/render/measure/MeasureToolPlugin.cpp
index b18b761..2412247 100644
--- a/src/plugins/render/measure/MeasureToolPlugin.cpp
+++ b/src/plugins/render/measure/MeasureToolPlugin.cpp
@@ -698,7 +698,5 @@ bool MeasureToolPlugin::eventFilter( QObject *object, QEvent *e )
}
-Q_EXPORT_PLUGIN2( MeasureToolPlugin, Marble::MeasureToolPlugin )
-
#include "moc_MeasureToolPlugin.cpp"
diff --git a/src/plugins/render/navigation/NavigationFloatItem.cpp b/src/plugins/render/navigation/NavigationFloatItem.cpp
index 40c26bd..e42c3a2 100644
--- a/src/plugins/render/navigation/NavigationFloatItem.cpp
+++ b/src/plugins/render/navigation/NavigationFloatItem.cpp
@@ -345,6 +345,4 @@ void NavigationFloatItem::setSettings( const QHash<QString, QVariant> &settings
}
}
-Q_EXPORT_PLUGIN2( NavigationFloatItem, Marble::NavigationFloatItem )
-
#include "moc_NavigationFloatItem.cpp"
diff --git a/src/plugins/render/opencaching/OpenCachingPlugin.cpp b/src/plugins/render/opencaching/OpenCachingPlugin.cpp
index 5f817cc..9a75ac9 100644
--- a/src/plugins/render/opencaching/OpenCachingPlugin.cpp
+++ b/src/plugins/render/opencaching/OpenCachingPlugin.cpp
@@ -186,6 +186,4 @@ void OpenCachingPlugin::validateDifficultyRange()
}
-Q_EXPORT_PLUGIN2( OpenCachingPlugin, Marble::OpenCachingPlugin )
-
#include "moc_OpenCachingPlugin.cpp"
diff --git a/src/plugins/render/opencachingcom/OpenCachingComPlugin.cpp b/src/plugins/render/opencachingcom/OpenCachingComPlugin.cpp
index 9ef7305..9399566 100644
--- a/src/plugins/render/opencachingcom/OpenCachingComPlugin.cpp
+++ b/src/plugins/render/opencachingcom/OpenCachingComPlugin.cpp
@@ -90,6 +90,4 @@ QIcon OpenCachingComPlugin::icon() const
}
-Q_EXPORT_PLUGIN2( OpenCachingComPlugin, Marble::OpenCachingComPlugin )
-
#include "moc_OpenCachingComPlugin.cpp"
diff --git a/src/plugins/render/opendesktop/OpenDesktopPlugin.cpp b/src/plugins/render/opendesktop/OpenDesktopPlugin.cpp
index bcb2cc7..e0ed2f2 100644
--- a/src/plugins/render/opendesktop/OpenDesktopPlugin.cpp
+++ b/src/plugins/render/opendesktop/OpenDesktopPlugin.cpp
@@ -151,7 +151,4 @@ void OpenDesktopPlugin::writeSettings()
emit settingsChanged( nameId() );
}
-// Because we want to create a plugin, we have to do the following line.
-Q_EXPORT_PLUGIN2( OpenDesktopPlugin, Marble::OpenDesktopPlugin )
-
#include "moc_OpenDesktopPlugin.cpp"
diff --git a/src/plugins/render/overviewmap/OverviewMap.cpp b/src/plugins/render/overviewmap/OverviewMap.cpp
index cc7cce7..faa7c38 100644
--- a/src/plugins/render/overviewmap/OverviewMap.cpp
+++ b/src/plugins/render/overviewmap/OverviewMap.cpp
@@ -536,6 +536,4 @@ void OverviewMap::useMapSuggestion( int index )
}
-Q_EXPORT_PLUGIN2( OverviewMap, Marble::OverviewMap )
-
#include "moc_OverviewMap.cpp"
diff --git a/src/plugins/render/panoramio/PanoramioPlugin.cpp b/src/plugins/render/panoramio/PanoramioPlugin.cpp
index b7ebc75..48037ae 100644
--- a/src/plugins/render/panoramio/PanoramioPlugin.cpp
+++ b/src/plugins/render/panoramio/PanoramioPlugin.cpp
@@ -84,6 +84,4 @@ bool PanoramioPlugin::eventFilter(QObject *object, QEvent *event)
return AbstractDataPlugin::eventFilter( object, event );
}
-Q_EXPORT_PLUGIN2(PanoramioPlugin, Marble::PanoramioPlugin)
-
#include "moc_PanoramioPlugin.cpp"
diff --git a/src/plugins/render/photo/PhotoPlugin.cpp b/src/plugins/render/photo/PhotoPlugin.cpp
index e9974d8..8bd515d 100644
--- a/src/plugins/render/photo/PhotoPlugin.cpp
+++ b/src/plugins/render/photo/PhotoPlugin.cpp
@@ -265,6 +265,4 @@ void PhotoPlugin::checkNumberOfItems( quint32 number ) {
readSettings();
}
-Q_EXPORT_PLUGIN2(PhotoPlugin, Marble::PhotoPlugin)
-
#include "moc_PhotoPlugin.cpp"
diff --git a/src/plugins/render/positionmarker/PositionMarker.cpp b/src/plugins/render/positionmarker/PositionMarker.cpp
index f80e423..d743963 100644
--- a/src/plugins/render/positionmarker/PositionMarker.cpp
+++ b/src/plugins/render/positionmarker/PositionMarker.cpp
@@ -476,6 +476,4 @@ qreal PositionMarker::zValue() const
}
-Q_EXPORT_PLUGIN2( PositionMarker, Marble::PositionMarker )
-
#include "moc_PositionMarker.cpp"
diff --git a/src/plugins/render/postalcode/PostalCodePlugin.cpp b/src/plugins/render/postalcode/PostalCodePlugin.cpp
index ced973f..429b6a7 100644
--- a/src/plugins/render/postalcode/PostalCodePlugin.cpp
+++ b/src/plugins/render/postalcode/PostalCodePlugin.cpp
@@ -74,6 +74,4 @@ QIcon PostalCodePlugin::icon() const
return QIcon(":/icons/postalcode.png");
}
-Q_EXPORT_PLUGIN2( PostalCodePlugin, Marble::PostalCodePlugin )
-
#include "moc_PostalCodePlugin.cpp"
diff --git a/src/plugins/render/progress/ProgressFloatItem.cpp b/src/plugins/render/progress/ProgressFloatItem.cpp
index 035d784..e0c4676 100644
--- a/src/plugins/render/progress/ProgressFloatItem.cpp
+++ b/src/plugins/render/progress/ProgressFloatItem.cpp
@@ -288,6 +288,4 @@ void ProgressFloatItem::scheduleRepaint()
}
-Q_EXPORT_PLUGIN2( ProgressFloatItem, Marble::ProgressFloatItem )
-
#include "moc_ProgressFloatItem.cpp"
diff --git a/src/plugins/render/routing/RoutingPlugin.cpp b/src/plugins/render/routing/RoutingPlugin.cpp
index 20806bd..9c4f7d1 100644
--- a/src/plugins/render/routing/RoutingPlugin.cpp
+++ b/src/plugins/render/routing/RoutingPlugin.cpp
@@ -586,6 +586,4 @@ QDialog *RoutingPlugin::configDialog()
}
-Q_EXPORT_PLUGIN2( RoutingPlugin, Marble::RoutingPlugin )
-
#include "moc_RoutingPlugin.cpp"
diff --git a/src/plugins/render/satellites/SatellitesPlugin.cpp b/src/plugins/render/satellites/SatellitesPlugin.cpp
index 6179629..5b49619 100644
--- a/src/plugins/render/satellites/SatellitesPlugin.cpp
+++ b/src/plugins/render/satellites/SatellitesPlugin.cpp
@@ -494,7 +494,5 @@ void SatellitesPlugin::addBuiltInDataSources()
} // namespace Marble
-Q_EXPORT_PLUGIN2( SatellitesPlugin, Marble::SatellitesPlugin )
-
#include "moc_SatellitesPlugin.cpp"
diff --git a/src/plugins/render/speedometer/Speedometer.cpp b/src/plugins/render/speedometer/Speedometer.cpp
index 56257ac..0d2443e 100644
--- a/src/plugins/render/speedometer/Speedometer.cpp
+++ b/src/plugins/render/speedometer/Speedometer.cpp
@@ -151,6 +151,4 @@ void Speedometer::updateLocation( const GeoDataCoordinates& coordinates, qreal s
}
-Q_EXPORT_PLUGIN2( Speedometer, Marble::Speedometer )
-
#include "moc_Speedometer.cpp"
diff --git a/src/plugins/render/stars/StarsPlugin.cpp b/src/plugins/render/stars/StarsPlugin.cpp
index 93094ff..f04998b 100644
--- a/src/plugins/render/stars/StarsPlugin.cpp
+++ b/src/plugins/render/stars/StarsPlugin.cpp
@@ -1515,6 +1515,4 @@ bool StarsPlugin::eventFilter( QObject *object, QEvent *e )
}
-Q_EXPORT_PLUGIN2( StarsPlugin, Marble::StarsPlugin )
-
#include "moc_StarsPlugin.cpp"
diff --git a/src/plugins/render/sun/SunPlugin.cpp b/src/plugins/render/sun/SunPlugin.cpp
index b40f36c..2e1ff8a 100644
--- a/src/plugins/render/sun/SunPlugin.cpp
+++ b/src/plugins/render/sun/SunPlugin.cpp
@@ -123,6 +123,4 @@ bool SunPlugin::render( GeoPainter *painter, ViewportParams *viewport,
}
-Q_EXPORT_PLUGIN2( SunPlugin, Marble::SunPlugin )
-
#include "moc_SunPlugin.cpp"
diff --git a/src/plugins/render/test/TestPlugin.cpp b/src/plugins/render/test/TestPlugin.cpp
index 1fcf467..9927a9e 100644
--- a/src/plugins/render/test/TestPlugin.cpp
+++ b/src/plugins/render/test/TestPlugin.cpp
@@ -262,6 +262,4 @@ bool TestPlugin::render( GeoPainter *painter, ViewportParams *viewport, const QS
}
-Q_EXPORT_PLUGIN2( TestPlugin, Marble::TestPlugin )
-
#include "moc_TestPlugin.cpp"
diff --git a/src/plugins/render/twitter/twitterPlugin.cpp b/src/plugins/render/twitter/twitterPlugin.cpp
index a6b69e2..2367e5d 100644
--- a/src/plugins/render/twitter/twitterPlugin.cpp
+++ b/src/plugins/render/twitter/twitterPlugin.cpp
@@ -159,8 +159,4 @@ mDebug()<<"::::::::::::::::::::twitter count has value == " << localCountOfTwitt
privateFlagForRenderingTwitts = 1;//1 means unblock
}
-
-
-Q_EXPORT_PLUGIN2(twitterPlugin, Marble::twitterPlugin)
-
#include "moc_twitterPlugin.cpp"
diff --git a/src/plugins/render/weather/WeatherPlugin.cpp b/src/plugins/render/weather/WeatherPlugin.cpp
index b0152bb..e0d44ce 100644
--- a/src/plugins/render/weather/WeatherPlugin.cpp
+++ b/src/plugins/render/weather/WeatherPlugin.cpp
@@ -316,6 +316,4 @@ void WeatherPlugin::favoriteItemsChanged( const QStringList& favoriteItems )
updateSettings();
}
-Q_EXPORT_PLUGIN2(WeatherPlugin, Marble::WeatherPlugin)
-
#include "moc_WeatherPlugin.cpp"
diff --git a/src/plugins/render/wikipedia/WikipediaPlugin.cpp b/src/plugins/render/wikipedia/WikipediaPlugin.cpp
index 3b90ae5..bb756ac 100644
--- a/src/plugins/render/wikipedia/WikipediaPlugin.cpp
+++ b/src/plugins/render/wikipedia/WikipediaPlugin.cpp
@@ -206,6 +206,4 @@ void WikipediaPlugin::checkNumberOfItems( quint32 number ) {
readSettings();
}
-Q_EXPORT_PLUGIN2(WikipediaPlugin, Marble::WikipediaPlugin)
-
#include "moc_WikipediaPlugin.cpp"
diff --git a/src/plugins/runner/cache/CachePlugin.cpp b/src/plugins/runner/cache/CachePlugin.cpp
index ba8c611..a982259 100644
--- a/src/plugins/runner/cache/CachePlugin.cpp
+++ b/src/plugins/runner/cache/CachePlugin.cpp
@@ -66,6 +66,4 @@ ParsingRunner* CachePlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( CachePlugin, Marble::CachePlugin )
-
#include "moc_CachePlugin.cpp"
diff --git a/src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp b/src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp
index 01d18b8..798e86a 100644
--- a/src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp
+++ b/src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp
@@ -143,6 +143,4 @@ bool CycleStreetsPlugin::supportsTemplate( RoutingProfilesModel::ProfileTemplate
}
-Q_EXPORT_PLUGIN2( CycleStreetsPlugin, Marble::CycleStreetsPlugin )
-
#include "CycleStreetsPlugin.moc" // needed for Q_OBJECT here in source
diff --git a/src/plugins/runner/geouri/GeoUriPlugin.cpp b/src/plugins/runner/geouri/GeoUriPlugin.cpp
index 125d1dc..22266f3 100644
--- a/src/plugins/runner/geouri/GeoUriPlugin.cpp
+++ b/src/plugins/runner/geouri/GeoUriPlugin.cpp
@@ -63,6 +63,4 @@ SearchRunner* GeoUriPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( GeoUriPlugin, Marble::GeoUriPlugin )
-
#include "moc_GeoUriPlugin.cpp"
diff --git a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp
index d3958ba..f09905c 100644
--- a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp
+++ b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.cpp
@@ -77,6 +77,4 @@ bool GosmorePlugin::canWork() const
}
-Q_EXPORT_PLUGIN2( GosmoreReverseGeocodingPlugin, Marble::GosmorePlugin )
-
#include "moc_GosmoreReverseGeocodingPlugin.cpp"
diff --git a/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp b/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp
index 4dc1dd4..bd29d58 100644
--- a/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp
+++ b/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.cpp
@@ -82,6 +82,4 @@ bool GosmorePlugin::supportsTemplate( RoutingProfilesModel::ProfileTemplate prof
}
-Q_EXPORT_PLUGIN2( GosmoreRoutingPlugin, Marble::GosmorePlugin )
-
#include "moc_GosmoreRoutingPlugin.cpp"
diff --git a/src/plugins/runner/gpsbabel/GpsbabelPlugin.cpp b/src/plugins/runner/gpsbabel/GpsbabelPlugin.cpp
index 9d8b054..b033943 100644
--- a/src/plugins/runner/gpsbabel/GpsbabelPlugin.cpp
+++ b/src/plugins/runner/gpsbabel/GpsbabelPlugin.cpp
@@ -67,6 +67,4 @@ ParsingRunner* GpsbabelPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( GpsbabelPlugin, Marble::GpsbabelPlugin )
-
#include "moc_GpsbabelPlugin.cpp"
diff --git a/src/plugins/runner/gpx/GpxPlugin.cpp b/src/plugins/runner/gpx/GpxPlugin.cpp
index 5de62c1..7bde01f 100644
--- a/src/plugins/runner/gpx/GpxPlugin.cpp
+++ b/src/plugins/runner/gpx/GpxPlugin.cpp
@@ -66,6 +66,4 @@ ParsingRunner* GpxPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( GpxPlugin, Marble::GpxPlugin )
-
#include "moc_GpxPlugin.cpp"
diff --git a/src/plugins/runner/hostip/HostipPlugin.cpp b/src/plugins/runner/hostip/HostipPlugin.cpp
index f2b7380..c4b4b11 100644
--- a/src/plugins/runner/hostip/HostipPlugin.cpp
+++ b/src/plugins/runner/hostip/HostipPlugin.cpp
@@ -72,6 +72,4 @@ bool HostipPlugin::canWork() const
}
-Q_EXPORT_PLUGIN2( HostipPlugin, Marble::HostipPlugin )
-
#include "moc_HostipPlugin.cpp"
diff --git a/src/plugins/runner/json/JsonPlugin.cpp b/src/plugins/runner/json/JsonPlugin.cpp
index c2bf0ee..3fc80a4 100644
--- a/src/plugins/runner/json/JsonPlugin.cpp
+++ b/src/plugins/runner/json/JsonPlugin.cpp
@@ -67,7 +67,5 @@ ParsingRunner* JsonPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( JsonPlugin, Marble::JsonPlugin )
-
#include "moc_JsonPlugin.cpp"
diff --git a/src/plugins/runner/kml/KmlPlugin.cpp b/src/plugins/runner/kml/KmlPlugin.cpp
index dab4c92..09a8ef7 100644
--- a/src/plugins/runner/kml/KmlPlugin.cpp
+++ b/src/plugins/runner/kml/KmlPlugin.cpp
@@ -68,6 +68,4 @@ ParsingRunner* KmlPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( KmlPlugin, Marble::KmlPlugin )
-
#include "moc_KmlPlugin.cpp"
diff --git a/src/plugins/runner/latlon/LatLonPlugin.cpp b/src/plugins/runner/latlon/LatLonPlugin.cpp
index f8761c7..da6a3dd 100644
--- a/src/plugins/runner/latlon/LatLonPlugin.cpp
+++ b/src/plugins/runner/latlon/LatLonPlugin.cpp
@@ -62,6 +62,4 @@ SearchRunner* LatLonPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( LatLonPlugin, Marble::LatLonPlugin )
-
#include "moc_LatLonPlugin.cpp"
diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp b/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp
index e669ee9..2e97fb0 100644
--- a/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp
+++ b/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.cpp
@@ -122,6 +122,4 @@ void LocalOsmSearchPlugin::updateDatabase()
}
-Q_EXPORT_PLUGIN2( LocalOsmSearchPlugin, Marble::LocalOsmSearchPlugin )
-
#include "moc_LocalOsmSearchPlugin.cpp"
diff --git a/src/plugins/runner/localdatabase/LocalDatabasePlugin.cpp b/src/plugins/runner/localdatabase/LocalDatabasePlugin.cpp
index 1f48f9c..d6d5762 100644
--- a/src/plugins/runner/localdatabase/LocalDatabasePlugin.cpp
+++ b/src/plugins/runner/localdatabase/LocalDatabasePlugin.cpp
@@ -62,6 +62,4 @@ SearchRunner* LocalDatabasePlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( LocalDatabasePlugin, Marble::LocalDatabasePlugin )
-
#include "moc_LocalDatabasePlugin.cpp"
diff --git a/src/plugins/runner/log/LogPlugin.cpp b/src/plugins/runner/log/LogPlugin.cpp
index a61ad60..c64ca61 100644
--- a/src/plugins/runner/log/LogPlugin.cpp
+++ b/src/plugins/runner/log/LogPlugin.cpp
@@ -66,6 +66,4 @@ ParsingRunner* LogfilePlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( LogfilePlugin, Marble::LogfilePlugin )
-
#include "moc_LogPlugin.cpp"
diff --git a/src/plugins/runner/mapquest/MapQuestPlugin.cpp b/src/plugins/runner/mapquest/MapQuestPlugin.cpp
index b6eef3d..ee78526 100644
--- a/src/plugins/runner/mapquest/MapQuestPlugin.cpp
+++ b/src/plugins/runner/mapquest/MapQuestPlugin.cpp
@@ -183,6 +183,4 @@ QHash< QString, QVariant > MapQuestPlugin::templateSettings( RoutingProfilesMode
}
-Q_EXPORT_PLUGIN2( MapQuestPlugin, Marble::MapQuestPlugin )
-
#include "MapQuestPlugin.moc" // needed for Q_OBJECT here in source
diff --git a/src/plugins/runner/monav/MonavPlugin.cpp b/src/plugins/runner/monav/MonavPlugin.cpp
index 63f13d5..13119d3 100644
--- a/src/plugins/runner/monav/MonavPlugin.cpp
+++ b/src/plugins/runner/monav/MonavPlugin.cpp
@@ -412,6 +412,4 @@ MonavPlugin::MonavRoutingDaemonVersion MonavPlugin::monavVersion() const
}
-Q_EXPORT_PLUGIN2( MonavPlugin, Marble::MonavPlugin )
-
#include "moc_MonavPlugin.cpp"
diff --git a/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.cpp b/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.cpp
index 782f9da..709525e 100644
--- a/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.cpp
+++ b/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.cpp
@@ -66,6 +66,4 @@ ReverseGeocodingRunner* NominatimPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( NominatimReverseGeocodingPlugin, Marble::NominatimPlugin )
-
#include "moc_NominatimReverseGeocodingPlugin.cpp"
diff --git a/src/plugins/runner/nominatim-search/NominatimSearchPlugin.cpp b/src/plugins/runner/nominatim-search/NominatimSearchPlugin.cpp
index dbe0cf1..fd80bd3 100644
--- a/src/plugins/runner/nominatim-search/NominatimSearchPlugin.cpp
+++ b/src/plugins/runner/nominatim-search/NominatimSearchPlugin.cpp
@@ -66,6 +66,4 @@ SearchRunner* NominatimPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( NominatimSearchPlugin, Marble::NominatimPlugin )
-
#include "moc_NominatimSearchPlugin.cpp"
diff --git a/src/plugins/runner/open-source-routing-machine/OSRMPlugin.cpp b/src/plugins/runner/open-source-routing-machine/OSRMPlugin.cpp
index f8d0247..893ba82 100644
--- a/src/plugins/runner/open-source-routing-machine/OSRMPlugin.cpp
+++ b/src/plugins/runner/open-source-routing-machine/OSRMPlugin.cpp
@@ -70,6 +70,4 @@ bool OSRMPlugin::supportsTemplate( RoutingProfilesModel::ProfileTemplate profile
}
-Q_EXPORT_PLUGIN2( OSRMPlugin, Marble::OSRMPlugin )
-
#include "moc_OSRMPlugin.cpp"
diff --git a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.cpp b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.cpp
index ef1fbde..3d8761b 100644
--- a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.cpp
+++ b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.cpp
@@ -62,6 +62,4 @@ SearchRunner* OpenLocationCodeSearchPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( OpenLocationCodeSearchPlugin, Marble::OpenLocationCodeSearchPlugin )
-
#include "moc_OpenLocationCodeSearchPlugin.cpp"
diff --git a/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp b/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp
index ea7cf95..9b1c0f0 100644
--- a/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp
+++ b/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp
@@ -159,6 +159,4 @@ QHash< QString, QVariant > OpenRouteServicePlugin::templateSettings( RoutingProf
}
-Q_EXPORT_PLUGIN2( OpenRouteServicePlugin, Marble::OpenRouteServicePlugin )
-
#include "OpenRouteServicePlugin.moc" // needed for Q_OBJECT here in source
diff --git a/src/plugins/runner/osm/OsmPlugin.cpp b/src/plugins/runner/osm/OsmPlugin.cpp
index 556e654..83beeb0 100644
--- a/src/plugins/runner/osm/OsmPlugin.cpp
+++ b/src/plugins/runner/osm/OsmPlugin.cpp
@@ -67,6 +67,4 @@ ParsingRunner* OsmPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( OsmPlugin, Marble::OsmPlugin )
-
#include "moc_OsmPlugin.cpp"
diff --git a/src/plugins/runner/pn2/Pn2Plugin.cpp b/src/plugins/runner/pn2/Pn2Plugin.cpp
index a2d18c1..c698f48 100644
--- a/src/plugins/runner/pn2/Pn2Plugin.cpp
+++ b/src/plugins/runner/pn2/Pn2Plugin.cpp
@@ -66,6 +66,4 @@ ParsingRunner* Pn2Plugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( Pn2Plugin, Marble::Pn2Plugin )
-
#include "moc_Pn2Plugin.cpp"
diff --git a/src/plugins/runner/pnt/PntPlugin.cpp b/src/plugins/runner/pnt/PntPlugin.cpp
index 2c9e844..393b059 100644
--- a/src/plugins/runner/pnt/PntPlugin.cpp
+++ b/src/plugins/runner/pnt/PntPlugin.cpp
@@ -66,6 +66,4 @@ ParsingRunner* PntPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( PntPlugin, Marble::PntPlugin )
-
#include "moc_PntPlugin.cpp"
diff --git a/src/plugins/runner/routino/RoutinoPlugin.cpp b/src/plugins/runner/routino/RoutinoPlugin.cpp
index 367a010..4c6eeb9 100644
--- a/src/plugins/runner/routino/RoutinoPlugin.cpp
+++ b/src/plugins/runner/routino/RoutinoPlugin.cpp
@@ -171,6 +171,4 @@ bool RoutinoPlugin::canWork() const
}
-Q_EXPORT_PLUGIN2( RoutinoPlugin, Marble::RoutinoPlugin )
-
#include "moc_RoutinoPlugin.cpp"
diff --git a/src/plugins/runner/shp/ShpPlugin.cpp b/src/plugins/runner/shp/ShpPlugin.cpp
index 705aeb3..40702e9 100644
--- a/src/plugins/runner/shp/ShpPlugin.cpp
+++ b/src/plugins/runner/shp/ShpPlugin.cpp
@@ -66,6 +66,4 @@ ParsingRunner* ShpPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( ShpPlugin, Marble::ShpPlugin )
-
#include "moc_ShpPlugin.cpp"
diff --git a/src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.cpp b/src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.cpp
index f1ffa9c..e2619bd 100644
--- a/src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.cpp
+++ b/src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.cpp
@@ -32,6 +32,4 @@ MarbleAbstractRunner* TravelingSalesmanPlugin::newRunner() const
}
-Q_EXPORT_PLUGIN2( TravelingSalesmanPlugin, Marble::TravelingSalesmanPlugin )
-
#include "moc_TravelingSalesmanPlugin.cpp"
diff --git a/src/plugins/runner/yours/YoursPlugin.cpp b/src/plugins/runner/yours/YoursPlugin.cpp
index f0f1ada..02585de 100644
--- a/src/plugins/runner/yours/YoursPlugin.cpp
+++ b/src/plugins/runner/yours/YoursPlugin.cpp
@@ -70,6 +70,4 @@ bool YoursPlugin::supportsTemplate( RoutingProfilesModel::ProfileTemplate profil
}
-Q_EXPORT_PLUGIN2( YoursPlugin, Marble::YoursPlugin )
-
#include "moc_YoursPlugin.cpp"
diff --git a/src/plugins/templates/floatitem/FITemplateFloatItem.cpp b/src/plugins/templates/floatitem/FITemplateFloatItem.cpp
index 6cf36a4..a2524e9 100644
--- a/src/plugins/templates/floatitem/FITemplateFloatItem.cpp
+++ b/src/plugins/templates/floatitem/FITemplateFloatItem.cpp
@@ -104,6 +104,4 @@ bool FITemplateFloatItem::renderFloatItem( GeoPainter *painter,
}
-Q_EXPORT_PLUGIN2(FITemplateFloatItem, Marble::FITemplateFloatItem )
-
#include "moc_FITemplateFloatItem.cpp"
diff --git a/tools/osm-addresses/SqlWriter.h b/tools/osm-addresses/SqlWriter.h
index 8e2118c..f8ce764 100644
--- a/tools/osm-addresses/SqlWriter.h
+++ b/tools/osm-addresses/SqlWriter.h
@@ -14,6 +14,7 @@
#include "Writer.h"
#include <QPair>
+#include <QHash>
#include <QSqlQuery>
namespace Marble