Remove dead Q_EXPORT_PLUGIN macros, no longer used in Qt5

parent a591fb35
......@@ -15,6 +15,7 @@
#include <QFileDialog>
#include <QMenu>
#include <QAction>
#include <QPointer>
// Marble
#include "GeoDataContainer.h"
......
......@@ -18,6 +18,7 @@
#include <QColorDialog>
#include <QFontComboBox>
#include <QLineEdit>
#include <QPointer>
//Marble
#include "MarbleWidget.h"
......
......@@ -17,6 +17,8 @@
#include "GeoDataLatLonBox.h"
#include "GeoSceneTextureTileDataset.h"
#include <QHash>
class QString;
namespace Marble
......
......@@ -15,6 +15,7 @@
#include <QPainter>
#include <QApplication>
#include <QListView>
#include <QPointer>
#include "TourItemDelegate.h"
#include "MarblePlacemarkModel.h"
......
......@@ -52,6 +52,7 @@
#include <QUrl>
#include <QKeyEvent>
#include <QCloseEvent>
#include <QPointer>
namespace Marble
{
......
......@@ -13,6 +13,8 @@
#include "marble_export.h"
#include <QObject>
namespace Marble {
class CloudSyncManager;
......
......@@ -82,5 +82,3 @@ void MarbleDeclarativePlugin::initializeEngine( QQmlEngine *engine, const char *
}
#include "moc_MarbleDeclarativePlugin.cpp"
Q_EXPORT_PLUGIN2( MarbleDeclarativePlugin, MarbleDeclarativePlugin )
......@@ -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 );
......
......@@ -11,6 +11,8 @@
#include "GeoDataUpdate.h"
#include "GeoDataTypes.h"
#include <QString>
namespace Marble
{
......
......@@ -15,6 +15,8 @@
#include "marble_export.h"
#include "ScreenGraphicsItem.h"
#include <Qt> // for Qt::PenStyle
class QBrush;
class QPainterPath;
......
......@@ -15,6 +15,8 @@
#include "AbstractMarbleGraphicsLayout.h"
#include "marble_export.h"
#include <Qt> // for Qt::Alignment
namespace Marble
{
......
......@@ -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
......@@ -17,6 +17,7 @@
#include <QWidget>
#include <QTreeWidget>
#include <QMenu>
#include <QPointer>
#include <QDebug>
// Marble
......
......@@ -16,6 +16,7 @@
#include "marble_export.h"
#include <QVector>
#include <QMetaType>
class QTextStream;
......
......@@ -15,6 +15,7 @@
#include "marble_export.h"
#include <QVector>
#include <QString>
namespace Marble
{
......
......@@ -82,6 +82,4 @@ QWidget *LatLonEditPlugin::createWidget(QWidget *parent)
return new Marble::LatLonEdit(parent);
}
Q_EXPORT_PLUGIN2(LatLonEditPlugin, LatLonEditPlugin)
#include "moc_LatLonEditPlugin.cpp"
......@@ -96,6 +96,4 @@ QString MarbleWidgetPlugin::includeFile() const
return "MarbleWidget.h";
}
Q_EXPORT_PLUGIN2(MarbleWidgetPlugin, MarbleWidgetPlugin)
#include "moc_MarbleWidgetPlugin.cpp"
......@@ -92,6 +92,4 @@ QString MarbleNavigatorPlugin::includeFile() const
return "MarbleNavigator.h";
}
Q_EXPORT_PLUGIN2(MarbleNavigatorPlugin, MarbleNavigatorPlugin)
#include "moc_MarbleNavigatorPlugin.cpp"
......@@ -228,6 +228,4 @@ QString FlightGearPositionProviderPlugin::error() const
return QString();
}
Q_EXPORT_PLUGIN2( FlightGearPositionProviderPlugin, Marble::FlightGearPositionProviderPlugin )
#include "moc_FlightGearPositionProviderPlugin.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"
......@@ -191,9 +191,4 @@ QString GpsdPositionProviderPlugin::error() const
return m_thread->error();
}
Q_EXPORT_PLUGIN2( GpsdPositionProviderPlugin, Marble::GpsdPositionProviderPlugin )
#include "moc_GpsdPositionProviderPlugin.cpp"
......@@ -209,6 +209,4 @@ void QtPositioningPositionProviderPlugin::update()
} // namespace Marble
Q_EXPORT_PLUGIN2( Marble::QtPositioningPositionProviderPlugin, Marble::QtPositioningPositionProviderPlugin )
#include "moc_QtPositioningPositionProviderPlugin.cpp"
......@@ -197,6 +197,4 @@ void WlocatePositionProviderPlugin::handleWlocateResult()
} // namespace Marble
Q_EXPORT_PLUGIN2( Marble::WlocatePositionProviderPlugin, Marble::WlocatePositionProviderPlugin )
#include "moc_WlocatePositionProviderPlugin.cpp"
......@@ -1745,6 +1745,4 @@ const GeoDataCoordinates AnnotatePlugin::mouseGeoDataCoordinates( QMouseEvent *m
}
Q_EXPORT_PLUGIN2( AnnotatePlugin, Marble::AnnotatePlugin )
#include "moc_AnnotatePlugin.cpp"
......@@ -12,6 +12,7 @@
#define POLYLINEANNOTATION_H
#include <QColor>
#include <QPointer>
#include "SceneGraphicsItem.h"
#include "GeoDataCoordinates.h"
......
......@@ -446,6 +446,4 @@ QAction* AprsPlugin::action() const
return m_action;
}
Q_EXPORT_PLUGIN2( AprsPlugin, Marble::AprsPlugin )
#include "moc_AprsPlugin.cpp"
......@@ -191,6 +191,4 @@ void AtmospherePlugin::repaintPixmap(const ViewportParams *viewParams)
}
Q_EXPORT_PLUGIN2( AtmospherePlugin, Marble::AtmospherePlugin )
#include "moc_AtmospherePlugin.cpp"
......@@ -256,6 +256,4 @@ void CompassFloatItem::writeSettings()
}
Q_EXPORT_PLUGIN2( CompassFloatItem, Marble::CompassFloatItem )
#include "moc_CompassFloatItem.cpp"
......@@ -251,6 +251,4 @@ bool CrosshairsPlugin::render( GeoPainter *painter, ViewportParams *viewport,
}
Q_EXPORT_PLUGIN2( CrosshairsPlugin, Marble::CrosshairsPlugin )
#include "moc_CrosshairsPlugin.cpp"
......@@ -218,6 +218,4 @@ void EarthquakePlugin::validateDateRange()
}
Q_EXPORT_PLUGIN2( EarthquakePlugin, Marble::EarthquakePlugin )
#include "moc_EarthquakePlugin.cpp"
......@@ -500,7 +500,5 @@ void EclipsesPlugin::showEclipseFromMenu( QAction *action )
} // namespace Marble
Q_EXPORT_PLUGIN2( EclipsesPlugin, Marble::EclipsesPlugin )
#include "moc_EclipsesPlugin.cpp"
......@@ -725,6 +725,4 @@ void ElevationProfileFloatItem::switchDataSource(ElevationProfileDataSource* sou
}
Q_EXPORT_PLUGIN2(ElevationProfileFloatItem, Marble::ElevationProfileFloatItem)
#include "moc_ElevationProfileFloatItem.cpp"
......@@ -227,6 +227,4 @@ void ElevationProfileMarker::onGeoObjectRemoved( GeoDataObject *object )
}
Q_EXPORT_PLUGIN2(ElevationProfileMarker, Marble::ElevationProfileMarker)
#include "moc_ElevationProfileMarker.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"
......@@ -99,6 +99,5 @@ bool FoursquarePlugin::storeAccessToken(const QString& tokenUrl)
}
Q_EXPORT_PLUGIN2(FoursquarePlugin, Marble::FoursquarePlugin)
#include "moc_FoursquarePlugin.cpp"
......@@ -172,6 +172,4 @@ void GpsInfo::updateLocation( const GeoDataCoordinates& coordinates, qreal)
}
Q_EXPORT_PLUGIN2( GpsInfo, Marble::GpsInfo )
#include "moc_GpsInfo.cpp"
......@@ -789,6 +789,4 @@ void GraticulePlugin::initLineMaps( GeoDataCoordinates::Notation notation)
}
Q_EXPORT_PLUGIN2(GraticulePlugin, Marble::GraticulePlugin)
#include "moc_GraticulePlugin.cpp"
......@@ -173,6 +173,4 @@ QString InhibitScreensaverPlugin::renderPolicy() const
}
Q_EXPORT_PLUGIN2( InhibitScreensaverPlugin, Marble::InhibitScreensaverPlugin )
#include "moc_InhibitScreensaverPlugin.cpp"
......@@ -241,6 +241,4 @@ void License::contextMenuEvent( QWidget *w, QContextMenuEvent *e )
}
Q_EXPORT_PLUGIN2( License, Marble::License )
#include "moc_License.cpp"
......@@ -456,6 +456,4 @@ void MapScaleFloatItem::toggleMinimized()
}
Q_EXPORT_PLUGIN2(MapScaleFloatItem, Marble::MapScaleFloatItem)
#include "moc_MapScaleFloatItem.cpp"
......@@ -698,7 +698,5 @@ bool MeasureToolPlugin::eventFilter( QObject *object, QEvent *e )
}
Q_EXPORT_PLUGIN2( MeasureToolPlugin, Marble::MeasureToolPlugin )
#include "moc_MeasureToolPlugin.cpp"
......@@ -345,6 +345,4 @@ void NavigationFloatItem::setSettings( const QHash<QString, QVariant> &settings
}
}
Q_EXPORT_PLUGIN2( NavigationFloatItem, Marble::NavigationFloatItem )
#include "moc_NavigationFloatItem.cpp"
......@@ -186,6 +186,4 @@ void OpenCachingPlugin::validateDifficultyRange()
}
Q_EXPORT_PLUGIN2( OpenCachingPlugin, Marble::OpenCachingPlugin )
#include "moc_OpenCachingPlugin.cpp"
......@@ -90,6 +90,4 @@ QIcon OpenCachingComPlugin::icon() const
}
Q_EXPORT_PLUGIN2( OpenCachingComPlugin, Marble::OpenCachingComPlugin )
#include "moc_OpenCachingComPlugin.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"
......@@ -536,6 +536,4 @@ void OverviewMap::useMapSuggestion( int index )
}
Q_EXPORT_PLUGIN2( OverviewMap, Marble::OverviewMap )
#include "moc_OverviewMap.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"
......@@ -265,6 +265,4 @@ void PhotoPlugin::checkNumberOfItems( quint32 number ) {
readSettings();
}
Q_EXPORT_PLUGIN2(PhotoPlugin, Marble::PhotoPlugin)
#include "moc_PhotoPlugin.cpp"
......@@ -476,6 +476,4 @@ qreal PositionMarker::zValue() const
}
Q_EXPORT_PLUGIN2( PositionMarker, Marble::PositionMarker )
#include "moc_PositionMarker.cpp"
......@@ -74,6 +74,4 @@ QIcon PostalCodePlugin::icon() const
return QIcon(":/icons/postalcode.png");
}
Q_EXPORT_PLUGIN2( PostalCodePlugin, Marble::PostalCodePlugin )
#include "moc_PostalCodePlugin.cpp"
......@@ -288,6 +288,4 @@ void ProgressFloatItem::scheduleRepaint()
}
Q_EXPORT_PLUGIN2( ProgressFloatItem, Marble::ProgressFloatItem )
#include "moc_ProgressFloatItem.cpp"
......@@ -586,6 +586,4 @@ QDialog *RoutingPlugin::configDialog()
}
Q_EXPORT_PLUGIN2( RoutingPlugin, Marble::RoutingPlugin )
#include "moc_RoutingPlugin.cpp"
......@@ -503,7 +503,5 @@ void SatellitesPlugin::addBuiltInDataSources()
} // namespace Marble
Q_EXPORT_PLUGIN2( SatellitesPlugin, Marble::SatellitesPlugin )
#include "moc_SatellitesPlugin.cpp"
......@@ -151,6 +151,4 @@ void Speedometer::updateLocation( const GeoDataCoordinates& coordinates, qreal s
}
Q_EXPORT_PLUGIN2( Speedometer, Marble::Speedometer )
#include "moc_Speedometer.cpp"
......@@ -1482,6 +1482,4 @@ bool StarsPlugin::eventFilter( QObject *object, QEvent *e )
}
Q_EXPORT_PLUGIN2( StarsPlugin, Marble::StarsPlugin )
#include "moc_StarsPlugin.cpp"
......@@ -123,6 +123,4 @@ bool SunPlugin::render( GeoPainter *painter, ViewportParams *viewport,
}
Q_EXPORT_PLUGIN2( SunPlugin, Marble::SunPlugin )
#include "moc_SunPlugin.cpp"
......@@ -262,6 +262,4 @@ bool TestPlugin::render( GeoPainter *painter, ViewportParams *viewport, const QS
}
Q_EXPORT_PLUGIN2( TestPlugin, Marble::TestPlugin )
#include "moc_TestPlugin.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"
......@@ -316,6 +316,4 @@ void WeatherPlugin::favoriteItemsChanged( const QStringList& favoriteItems )
updateSettings();
}
Q_EXPORT_PLUGIN2(WeatherPlugin, Marble::WeatherPlugin)
#include "moc_WeatherPlugin.cpp"
......@@ -206,6 +206,4 @@ void WikipediaPlugin::checkNumberOfItems( quint32 number ) {
readSettings();
}
Q_EXPORT_PLUGIN2(WikipediaPlugin, Marble::WikipediaPlugin)
#include "moc_WikipediaPlugin.cpp"
......@@ -66,6 +66,4 @@ ParsingRunner* CachePlugin::newRunner() const
}
Q_EXPORT_PLUGIN2( CachePlugin, Marble::CachePlugin )
#include "moc_CachePlugin.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
......@@ -63,6 +63,4 @@ SearchRunner* GeoUriPlugin::newRunner() const
}
Q_EXPORT_PLUGIN2( GeoUriPlugin, Marble::GeoUriPlugin )
#include "moc_GeoUriPlugin.cpp"
......@@ -77,6 +77,4 @@ bool GosmorePlugin::canWork() const
}
Q_EXPORT_PLUGIN2( GosmoreReverseGeocodingPlugin, Marble::GosmorePlugin )
#include "moc_GosmoreReverseGeocodingPlugin.cpp"
......@@ -82,6 +82,4 @@ bool GosmorePlugin::supportsTemplate( RoutingProfilesModel::ProfileTemplate prof
}
Q_EXPORT_PLUGIN2( GosmoreRoutingPlugin, Marble::GosmorePlugin )
#include "moc_GosmoreRoutingPlugin.cpp"
......@@ -67,6 +67,4 @@ ParsingRunner* GpsbabelPlugin::newRunner() const
}
Q_EXPORT_PLUGIN2( GpsbabelPlugin, Marble::GpsbabelPlugin )
#include "moc_GpsbabelPlugin.cpp"
......@@ -66,6 +66,4 @@ ParsingRunner* GpxPlugin::newRunner() const
}
Q_EXPORT_PLUGIN2( GpxPlugin, Marble::GpxPlugin )
#include "moc_GpxPlugin.cpp"
......@@ -72,6 +72,4 @@ bool HostipPlugin::canWork() const
}
Q_EXPORT_PLUGIN2( HostipPlugin, Marble::HostipPlugin )
#include "moc_HostipPlugin.cpp"
......@@ -67,7 +67,5 @@ ParsingRunner* JsonPlugin::newRunner() const
}
Q_EXPORT_PLUGIN2( JsonPlugin, Marble::JsonPlugin )
#include "moc_JsonPlugin.cpp"
......@@ -68,6 +68,4 @@ ParsingRunner* KmlPlugin::newRunner() const
}
Q_EXPORT_PLUGIN2( KmlPlugin, Marble::KmlPlugin )
#include "moc_KmlPlugin.cpp"
......@@ -62,6 +62,4 @@ SearchRunner* LatLonPlugin::newRunner() const
}
Q_EXPORT_PLUGIN2( LatLonPlugin, Marble::LatLonPlugin )
#include "moc_LatLonPlugin.cpp"
......@@ -122,6 +122,4 @@ void LocalOsmSearchPlugin::updateDatabase()
}
Q_EXPORT_PLUGIN2( LocalOsmSearchPlugin, Marble::LocalOsmSearchPlugin )
#include "moc_LocalOsmSearchPlugin.cpp"
......@@ -62,6 +62,4 @@ SearchRunner* LocalDatabasePlugin::newRunner() const
}
Q_EXPORT_PLUGIN2( LocalDatabasePlugin, Marble::LocalDatabasePlugin )
#include "moc_LocalDatabasePlugin.cpp"
......@@ -66,6 +66,4 @@ ParsingRunner* LogfilePlugin::newRunner() const
}
<