From kde-commits Mon Jan 10 18:42:12 2011 From: =?utf-8?q?Dennis=20Nienh=C3=BCser?= Date: Mon, 10 Jan 2011 18:42:12 +0000 To: kde-commits Subject: KDE/kdeedu/marble Message-Id: <20110110184212.6FCB2AC8B4 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=129468498127648 SVN commit 1213523 by nienhueser: Change the methods virtual QDialog *RenderPlugin::aboutDialog() const; virtual QDialog *RenderPlugin::configDialog() const; QStandardItem *RenderPlugin::item() const; to virtual QDialog *RenderPlugin::aboutDialog(); virtual QDialog *RenderPlugin::configDialog(); QStandardItem *RenderPlugin::item(); to be able to implement lazy loading of dialogs without cheating. Lazy creation of these dialogs is recommended to avoid wasting resources for dialogs that are likely not used. Increase RenderPlugin interface version. Introduce trivial (whitespace) changes in RenderPlugins not implementing aboutDialog and configDialog to force cmake to pick up the interface change. If you're using a custom Marble RenderPlugin (OnlineServices are RenderPlugins as well) in your application, please adapt to the change above, i.e. make aboutDialog() and configDialog() non const. A docs/release_notes/APIChanges-0.12.txt M +3 -3 src/lib/RenderPlugin.cpp M +3 -3 src/lib/RenderPlugin.h M +1 -1 src/lib/RenderPluginInterface.h M +2 -2 src/plugins/render/aprs/AprsPlugin.cpp M +2 -2 src/plugins/render/aprs/AprsPlugin.h M +2 -2 src/plugins/render/compass/CompassFloatItem.cpp M +2 -2 src/plugins/render/compass/CompassFloatItem.h M +2 -2 src/plugins/render/crosshairs/CrosshairsPlugin.cpp M +2 -2 src/plugins/render/crosshairs/CrosshairsPlugin.h M +2 -2 src/plugins/render/earthquake/EarthquakePlugin.cpp M +2 -2 src/plugins/render/earthquake/EarthquakePlugin.h M +2 -2 src/plugins/render/graticule/GraticulePlugin.cpp M +2 -2 src/plugins/render/graticule/GraticulePlugin.h M +2 -2 src/plugins/render/mapscale/MapScaleFloatItem.cpp M +2 -2 src/plugins/render/mapscale/MapScaleFloatItem.h M +2 -0 src/plugins/render/navigation/NavigationFloatItem.h M +3 -0 src/plugins/render/opendesktop/OpenDesktopPlugin.h M +1 -1 src/plugins/render/overviewmap/OverviewMap.cpp M +1 -1 src/plugins/render/overviewmap/OverviewMap.h M +2 -0 src/plugins/render/photo/PhotoPlugin.h M +2 -2 src/plugins/render/positionmarker/PositionMarker.cpp M +2 -2 src/plugins/render/positionmarker/PositionMarker.h M +1 -0 src/plugins/render/progress/ProgressFloatItem.h M +1 -0 src/plugins/render/routing/RoutingPlugin.h M +0 -2 src/plugins/render/stars/StarsPlugin.h M +2 -2 src/plugins/render/weather/WeatherPlugin.cpp M +2 -2 src/plugins/render/weather/WeatherPlugin.h M +2 -2 src/plugins/render/wikipedia/WikipediaPlugin.cpp M +2 -2 src/plugins/render/wikipedia/WikipediaPlugin.h --- trunk/KDE/kdeedu/marble/src/lib/RenderPlugin.cpp #1213522:1213523 @@ -96,7 +96,7 @@ return 0; } -QStandardItem* RenderPlugin::item() const +QStandardItem* RenderPlugin::item() { d->m_item->setIcon( icon() ); d->m_item->setText( name() ); @@ -159,12 +159,12 @@ return d->m_visible; } -QDialog *RenderPlugin::aboutDialog() const +QDialog *RenderPlugin::aboutDialog() { return 0; } -QDialog *RenderPlugin::configDialog() const +QDialog *RenderPlugin::configDialog() { return 0; } --- trunk/KDE/kdeedu/marble/src/lib/RenderPlugin.h #1213522:1213523 @@ -82,7 +82,7 @@ */ virtual QList* toolbarActionGroups() const; - QStandardItem *item() const; + QStandardItem *item(); void applyItemState(); void retrieveItemState(); @@ -95,13 +95,13 @@ * * @return: The about dialog or, if no about dialog exists, 0. */ - virtual QDialog *aboutDialog() const; + virtual QDialog *aboutDialog(); /** * Function for getting a pointer to the configuration dialog of the plugin. * * @return: The configuration dialog or, if no configuration dialog exists, 0. */ - virtual QDialog *configDialog() const; + virtual QDialog *configDialog(); /** * @return: The settings of the item. --- trunk/KDE/kdeedu/marble/src/lib/RenderPluginInterface.h #1213522:1213523 @@ -69,6 +69,6 @@ } -Q_DECLARE_INTERFACE( Marble::RenderPluginInterface, "org.kde.Marble.RenderPluginInterface/1.07" ) +Q_DECLARE_INTERFACE( Marble::RenderPluginInterface, "org.kde.Marble.RenderPluginInterface/1.08" ) #endif --- trunk/KDE/kdeedu/marble/src/plugins/render/aprs/AprsPlugin.cpp #1213522:1213523 @@ -136,7 +136,7 @@ return QIcon(); } -QDialog* AprsPlugin::aboutDialog() const +QDialog* AprsPlugin::aboutDialog() { if ( !m_aboutDialog ) { @@ -245,7 +245,7 @@ restartGatherers(); } -QDialog *AprsPlugin::configDialog() const +QDialog *AprsPlugin::configDialog() { if ( !m_configDialog ) { // Initializing configuration dialog --- trunk/KDE/kdeedu/marble/src/plugins/render/aprs/AprsPlugin.h #1213522:1213523 @@ -54,13 +54,13 @@ QString nameId() const; QString description() const; QIcon icon () const; - QDialog *aboutDialog() const; + QDialog *aboutDialog(); void initialize (); bool isInitialized () const; bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ); - QDialog *configDialog() const; + QDialog *configDialog(); QAction *action() const; QHash settings() const; --- trunk/KDE/kdeedu/marble/src/plugins/render/compass/CompassFloatItem.cpp #1213522:1213523 @@ -73,7 +73,7 @@ return QIcon(); } -QDialog* CompassFloatItem::aboutDialog() const +QDialog* CompassFloatItem::aboutDialog() { if ( !m_aboutDialog ) { // Initializing about dialog @@ -192,7 +192,7 @@ painter->restore(); } -QDialog *CompassFloatItem::configDialog() const +QDialog *CompassFloatItem::configDialog() { if ( !m_configDialog ) { m_configDialog = new QDialog(); --- trunk/KDE/kdeedu/marble/src/plugins/render/compass/CompassFloatItem.h #1213522:1213523 @@ -52,7 +52,7 @@ QIcon icon () const; - QDialog *aboutDialog() const; + QDialog *aboutDialog(); void initialize (); @@ -65,7 +65,7 @@ void paintContent( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ); - QDialog *configDialog() const; + QDialog *configDialog(); QHash settings() const; --- trunk/KDE/kdeedu/marble/src/plugins/render/crosshairs/CrosshairsPlugin.cpp #1213522:1213523 @@ -84,7 +84,7 @@ return QIcon( ":/icons/crosshairs.png" ); } -QDialog* CrosshairsPlugin::aboutDialog() const +QDialog* CrosshairsPlugin::aboutDialog() { if ( !m_aboutDialog ) { // Initializing about dialog @@ -122,7 +122,7 @@ return m_isInitialized; } -QDialog *CrosshairsPlugin::configDialog() const +QDialog *CrosshairsPlugin::configDialog() { if ( !m_configDialog ) { m_configDialog = new QDialog(); --- trunk/KDE/kdeedu/marble/src/plugins/render/crosshairs/CrosshairsPlugin.h #1213522:1213523 @@ -65,7 +65,7 @@ QIcon icon () const; - QDialog *aboutDialog() const; + QDialog *aboutDialog(); void initialize (); @@ -73,7 +73,7 @@ bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ); - QDialog *configDialog() const; + QDialog *configDialog(); QHash settings() const; --- trunk/KDE/kdeedu/marble/src/plugins/render/earthquake/EarthquakePlugin.cpp #1213522:1213523 @@ -66,7 +66,7 @@ return QIcon(); } -QDialog* EarthquakePlugin::aboutDialog() const +QDialog* EarthquakePlugin::aboutDialog() { if ( !m_aboutDialog ) { @@ -94,7 +94,7 @@ return m_aboutDialog; } -QDialog *EarthquakePlugin::configDialog() const +QDialog *EarthquakePlugin::configDialog() { if ( !m_configDialog ) { // Initializing configuration dialog --- trunk/KDE/kdeedu/marble/src/plugins/render/earthquake/EarthquakePlugin.h #1213522:1213523 @@ -52,9 +52,9 @@ QIcon icon() const; - QDialog *aboutDialog() const; + QDialog *aboutDialog(); - QDialog *configDialog() const; + QDialog *configDialog(); /** * @return: The settings of the item. --- trunk/KDE/kdeedu/marble/src/plugins/render/graticule/GraticulePlugin.cpp #1213522:1213523 @@ -105,7 +105,7 @@ return m_isInitialized; } -QDialog *GraticulePlugin::configDialog () const +QDialog *GraticulePlugin::configDialog() { if ( !m_configDialog ) { m_configDialog = new QDialog(); @@ -247,7 +247,7 @@ m_gridCirclePen = QPen( m_gridColor ); } -QDialog *GraticulePlugin::aboutDialog() const +QDialog *GraticulePlugin::aboutDialog() { if ( !m_aboutDialog ) { // Initializing about dialog --- trunk/KDE/kdeedu/marble/src/plugins/render/graticule/GraticulePlugin.h #1213522:1213523 @@ -78,9 +78,9 @@ QIcon icon () const; - QDialog *configDialog() const; + QDialog *configDialog(); - QDialog *aboutDialog() const; + QDialog *aboutDialog(); void initialize (); --- trunk/KDE/kdeedu/marble/src/plugins/render/mapscale/MapScaleFloatItem.cpp #1213522:1213523 @@ -98,7 +98,7 @@ return true; } -QDialog *MapScaleFloatItem::aboutDialog() const +QDialog *MapScaleFloatItem::aboutDialog() { if ( !m_aboutDialog ) { // Initializing about dialog @@ -326,7 +326,7 @@ m_valueInterval = (int)( bestMagValue * magnitude / m_bestDivisor ); } -QDialog *MapScaleFloatItem::configDialog() const +QDialog *MapScaleFloatItem::configDialog() { if ( !m_configDialog ) { // Initializing configuration dialog --- trunk/KDE/kdeedu/marble/src/plugins/render/mapscale/MapScaleFloatItem.h #1213522:1213523 @@ -53,7 +53,7 @@ QIcon icon () const; - QDialog *aboutDialog() const; + QDialog *aboutDialog(); void initialize (); @@ -66,7 +66,7 @@ const QString& renderPos, GeoSceneLayer * layer = 0 ); - QDialog *configDialog() const; + QDialog *configDialog(); protected: virtual void contextMenuEvent( QWidget *w, QContextMenuEvent *e ); --- trunk/KDE/kdeedu/marble/src/plugins/render/navigation/NavigationFloatItem.h #1213522:1213523 @@ -36,9 +36,11 @@ class NavigationFloatItem: public AbstractFloatItem { Q_OBJECT + Q_INTERFACES( Marble::RenderPluginInterface ) MARBLE_PLUGIN( NavigationFloatItem ) + public: explicit NavigationFloatItem( const QPointF &point = QPointF( -10, -10 ) ); ~NavigationFloatItem(); --- trunk/KDE/kdeedu/marble/src/plugins/render/opendesktop/OpenDesktopPlugin.h #1213522:1213523 @@ -19,8 +19,11 @@ namespace Marble { class OpenDesktopPlugin : public AbstractDataPlugin { + Q_OBJECT + Q_INTERFACES(Marble::RenderPluginInterface) + MARBLE_PLUGIN(OpenDesktopPlugin) public: --- trunk/KDE/kdeedu/marble/src/plugins/render/overviewmap/OverviewMap.cpp #1213522:1213523 @@ -88,7 +88,7 @@ return QIcon(); } -QDialog *OverviewMap::configDialog() const +QDialog *OverviewMap::configDialog() { if ( !m_configDialog ) { // Initializing configuration dialog --- trunk/KDE/kdeedu/marble/src/plugins/render/overviewmap/OverviewMap.h #1213522:1213523 @@ -62,7 +62,7 @@ QIcon icon () const; - QDialog *configDialog() const; + QDialog *configDialog(); void initialize (); --- trunk/KDE/kdeedu/marble/src/plugins/render/photo/PhotoPlugin.h #1213522:1213523 @@ -21,7 +21,9 @@ class PhotoPlugin : public AbstractDataPlugin { Q_OBJECT + Q_INTERFACES( Marble::RenderPluginInterface ) + MARBLE_PLUGIN( PhotoPlugin ) public: --- trunk/KDE/kdeedu/marble/src/plugins/render/positionmarker/PositionMarker.cpp #1213522:1213523 @@ -100,7 +100,7 @@ return QIcon(); } -QDialog *PositionMarker::aboutDialog() const +QDialog *PositionMarker::aboutDialog() { if ( !m_aboutDialog ) { // Initializing about dialog @@ -132,7 +132,7 @@ return m_aboutDialog; } -QDialog *PositionMarker::configDialog() const +QDialog *PositionMarker::configDialog() { if ( !m_configDialog ) { // Initializing configuration dialog --- trunk/KDE/kdeedu/marble/src/plugins/render/positionmarker/PositionMarker.h #1213522:1213523 @@ -55,9 +55,9 @@ QIcon icon () const; - QDialog *aboutDialog() const; + QDialog *aboutDialog(); - QDialog *configDialog() const; + QDialog *configDialog(); void initialize (); --- trunk/KDE/kdeedu/marble/src/plugins/render/progress/ProgressFloatItem.h #1213522:1213523 @@ -100,3 +100,4 @@ } #endif + --- trunk/KDE/kdeedu/marble/src/plugins/render/routing/RoutingPlugin.h #1213522:1213523 @@ -80,3 +80,4 @@ } #endif // MARBLE_ROUTINGPLUGIN_H + --- trunk/KDE/kdeedu/marble/src/plugins/render/stars/StarsPlugin.h #1213522:1213523 @@ -89,12 +89,10 @@ QIcon icon () const; - void initialize (); bool isInitialized () const; - bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ); // sidereal time in hours: --- trunk/KDE/kdeedu/marble/src/plugins/render/weather/WeatherPlugin.cpp #1213522:1213523 @@ -95,7 +95,7 @@ return m_icon; } -QDialog *WeatherPlugin::aboutDialog() const +QDialog *WeatherPlugin::aboutDialog() { if ( !m_aboutDialog ) { m_aboutDialog = new PluginAboutDialog(); @@ -117,7 +117,7 @@ return m_aboutDialog; } -QDialog *WeatherPlugin::configDialog() const +QDialog *WeatherPlugin::configDialog() { if ( !m_configDialog ) { // Initializing configuration dialog --- trunk/KDE/kdeedu/marble/src/plugins/render/weather/WeatherPlugin.h #1213522:1213523 @@ -51,9 +51,9 @@ QIcon icon() const; - QDialog *aboutDialog() const; + QDialog *aboutDialog(); - QDialog *configDialog() const; + QDialog *configDialog(); QHash settings() const; --- trunk/KDE/kdeedu/marble/src/plugins/render/wikipedia/WikipediaPlugin.cpp #1213522:1213523 @@ -93,7 +93,7 @@ return m_icon; } -QDialog *WikipediaPlugin::aboutDialog() const +QDialog *WikipediaPlugin::aboutDialog() { if ( !m_aboutDialog ) { // Initializing about dialog @@ -115,7 +115,7 @@ return m_aboutDialog; } -QDialog *WikipediaPlugin::configDialog() const +QDialog *WikipediaPlugin::configDialog() { if ( !m_configDialog ) { // Initializing configuration dialog --- trunk/KDE/kdeedu/marble/src/plugins/render/wikipedia/WikipediaPlugin.h #1213522:1213523 @@ -50,9 +50,9 @@ QIcon icon() const; - QDialog *aboutDialog() const; + QDialog *aboutDialog(); - QDialog *configDialog() const; + QDialog *configDialog(); /** * @return: The settings of the item.