diff --git a/src/apps/marble-kde/KdeMainWindow.h b/src/apps/marble-kde/KdeMainWindow.h --- a/src/apps/marble-kde/KdeMainWindow.h +++ b/src/apps/marble-kde/KdeMainWindow.h @@ -33,7 +33,7 @@ public: explicit MainWindow( const QString& marbleDataPath = QString(), QWidget *parent = 0 ); - ~MainWindow(); + ~MainWindow() override; ControlView* marbleControl() const; MarbleWidget* marbleWidget() const; @@ -43,7 +43,7 @@ void changeViewSize( QAction* ); protected: - void closeEvent( QCloseEvent *event ); + void closeEvent( QCloseEvent *event ) override; private: QSize m_savedSize; diff --git a/src/apps/marble-kde/marble_part.h b/src/apps/marble-kde/marble_part.h --- a/src/apps/marble-kde/marble_part.h +++ b/src/apps/marble-kde/marble_part.h @@ -52,7 +52,7 @@ public: MarblePart( QWidget *parentWidget, QObject *parent, const QVariantList& ); - virtual ~MarblePart(); + ~MarblePart() override; ControlView *controlView() const; @@ -66,8 +66,8 @@ void initializeCustomTimezone(); public Q_SLOTS: - bool openUrl( const QUrl &url ); - bool openFile(); + bool openUrl( const QUrl &url ) override; + bool openFile() override; void showPosition( const QString& position); void showZoomLevel( const int ); void showDateTime(); diff --git a/src/apps/marble-qt/QtMainWindow.h b/src/apps/marble-qt/QtMainWindow.h --- a/src/apps/marble-qt/QtMainWindow.h +++ b/src/apps/marble-qt/QtMainWindow.h @@ -44,7 +44,7 @@ explicit MainWindow(const QString& marbleDataPath = QString(), const QVariantMap& cmdLineSettings = QVariantMap(), QWidget *parent=0); - ~MainWindow(); + ~MainWindow() override; ControlView* marbleControl() { @@ -57,7 +57,7 @@ void addGeoDataFile( const QString &fileName ); protected: - void closeEvent( QCloseEvent *event ); + void closeEvent( QCloseEvent *event ) override; private: void createActions(); diff --git a/src/apps/marble-ui/ControlView.h b/src/apps/marble-ui/ControlView.h --- a/src/apps/marble-ui/ControlView.h +++ b/src/apps/marble-ui/ControlView.h @@ -48,7 +48,7 @@ public: explicit ControlView( QWidget * = 0 ); - virtual ~ControlView(); + ~ControlView() override; /** * Returns the version of the Marble applications (which differs from @@ -131,16 +131,16 @@ void mapThemeDeleted(); protected: - void closeEvent( QCloseEvent *event ); + void closeEvent( QCloseEvent *event ) override; /** * @brief Reimplementation of the dragEnterEvent() function in QWidget. */ - void dragEnterEvent(QDragEnterEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; /** * @brief Reimplementation of the dropEvent() function in QWidget. */ - void dropEvent(QDropEvent *event); + void dropEvent(QDropEvent *event) override; private Q_SLOTS: void showSearch(); diff --git a/src/lib/marble/AbstractDataPlugin.h b/src/lib/marble/AbstractDataPlugin.h --- a/src/lib/marble/AbstractDataPlugin.h +++ b/src/lib/marble/AbstractDataPlugin.h @@ -47,31 +47,31 @@ public: explicit AbstractDataPlugin( const MarbleModel *marbleModel ); - virtual ~AbstractDataPlugin(); + ~AbstractDataPlugin() override; - bool isInitialized() const; + bool isInitialized() const override; /** * @brief Returns the name(s) of the backend that the plugin can render */ - QStringList backendTypes() const; + QStringList backendTypes() const override; /** * @brief Return how the plugin settings should be used. */ - QString renderPolicy() const; + QString renderPolicy() const override; /** * @brief Preferred level in the layer stack for the rendering */ - QStringList renderPosition() const; + QStringList renderPosition() const override; /** * @brief Renders the content provided by the plugin on the viewport. * @return @c true Returns whether the rendering has been successful */ bool render( GeoPainter *painter, ViewportParams *viewport, - const QString& renderPos = QLatin1String("NONE"), GeoSceneLayer * layer = 0 ); + const QString& renderPos = QLatin1String("NONE"), GeoSceneLayer * layer = 0 ) override; /** * @return The model associated with the plugin. @@ -108,7 +108,7 @@ * * @return: The type of render plugin this is. */ - virtual RenderType renderType() const; + RenderType renderType() const override; /** Convenience method to set the favorite item state on the current model */ void setFavoriteItemsOnly( bool favoriteOnly ); diff --git a/src/lib/marble/AbstractDataPluginItem.h b/src/lib/marble/AbstractDataPluginItem.h --- a/src/lib/marble/AbstractDataPluginItem.h +++ b/src/lib/marble/AbstractDataPluginItem.h @@ -35,7 +35,7 @@ public: explicit AbstractDataPluginItem( QObject *parent = 0 ); - virtual ~AbstractDataPluginItem(); + ~AbstractDataPluginItem() override; /** * Returns the item's tool tip. diff --git a/src/lib/marble/AbstractDataPluginModel.h b/src/lib/marble/AbstractDataPluginModel.h --- a/src/lib/marble/AbstractDataPluginModel.h +++ b/src/lib/marble/AbstractDataPluginModel.h @@ -50,7 +50,7 @@ public: explicit AbstractDataPluginModel( const QString& name, const MarbleModel *marbleModel, QObject *parent = 0 ); - virtual ~AbstractDataPluginModel(); + ~AbstractDataPluginModel() override; const MarbleModel *marbleModel() const; diff --git a/src/lib/marble/AbstractDataPluginModel.cpp b/src/lib/marble/AbstractDataPluginModel.cpp --- a/src/lib/marble/AbstractDataPluginModel.cpp +++ b/src/lib/marble/AbstractDataPluginModel.cpp @@ -99,13 +99,13 @@ explicit FavoritesModel( AbstractDataPluginModelPrivate* d, QObject* parent = 0 ); - virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const; + int rowCount ( const QModelIndex & parent = QModelIndex() ) const override; - QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const; + QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const override; void reset(); - QHash roleNames() const; + QHash roleNames() const override; private: QHash m_roleNames; diff --git a/src/lib/marble/AbstractFloatItem.h b/src/lib/marble/AbstractFloatItem.h --- a/src/lib/marble/AbstractFloatItem.h +++ b/src/lib/marble/AbstractFloatItem.h @@ -49,7 +49,7 @@ explicit AbstractFloatItem( const MarbleModel *marbleModel, const QPointF &point = QPointF( 10.0, 10.0 ), const QSizeF &size = QSizeF( 150.0, 50.0 ) ); - virtual ~AbstractFloatItem(); + ~AbstractFloatItem() override; QHash settings() const override; void setSettings(const QHash &settings) override; diff --git a/src/lib/marble/AbstractWorkerThread.h b/src/lib/marble/AbstractWorkerThread.h --- a/src/lib/marble/AbstractWorkerThread.h +++ b/src/lib/marble/AbstractWorkerThread.h @@ -39,15 +39,15 @@ public: explicit AbstractWorkerThread( QObject *parent = 0 ); - virtual ~AbstractWorkerThread(); + ~AbstractWorkerThread() override; void ensureRunning(); protected: virtual bool workAvailable() = 0; virtual void work() = 0; - void run(); + void run() override; private: AbstractWorkerThreadPrivate * const d; diff --git a/src/lib/marble/AddLinkDialog.h b/src/lib/marble/AddLinkDialog.h --- a/src/lib/marble/AddLinkDialog.h +++ b/src/lib/marble/AddLinkDialog.h @@ -24,7 +24,7 @@ public: explicit AddLinkDialog(QWidget *parent = 0 ); - ~AddLinkDialog(); + ~AddLinkDialog() override; QString name() const; QString url() const; diff --git a/src/lib/marble/AutoNavigation.h b/src/lib/marble/AutoNavigation.h --- a/src/lib/marble/AutoNavigation.h +++ b/src/lib/marble/AutoNavigation.h @@ -37,7 +37,7 @@ explicit AutoNavigation( MarbleModel *model, const ViewportParams *viewport, QObject *parent = 0 ); /** Destructor */ - ~AutoNavigation(); + ~AutoNavigation() override; /** * An enum type diff --git a/src/lib/marble/BookmarkManager.h b/src/lib/marble/BookmarkManager.h --- a/src/lib/marble/BookmarkManager.h +++ b/src/lib/marble/BookmarkManager.h @@ -42,7 +42,7 @@ explicit BookmarkManager( GeoDataTreeModel *treeModel, QObject *parent = 0 ); - ~BookmarkManager(); + ~BookmarkManager() override; /** * @brief load bookmark file as GeoDataDocument and return true diff --git a/src/lib/marble/BookmarkManagerDialog.h b/src/lib/marble/BookmarkManagerDialog.h --- a/src/lib/marble/BookmarkManagerDialog.h +++ b/src/lib/marble/BookmarkManagerDialog.h @@ -32,7 +32,7 @@ explicit BookmarkManagerDialog( MarbleModel* model, QWidget *parent = 0 ); /** Destructor */ - ~BookmarkManagerDialog(); + ~BookmarkManagerDialog() override; void setButtonBoxVisible( bool visible ); diff --git a/src/lib/marble/BranchFilterProxyModel.h b/src/lib/marble/BranchFilterProxyModel.h --- a/src/lib/marble/BranchFilterProxyModel.h +++ b/src/lib/marble/BranchFilterProxyModel.h @@ -26,7 +26,7 @@ void setBranchIndex( GeoDataTreeModel *sourceModel, const QModelIndex &index ); protected: - bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const; + bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const override; private: GeoDataTreeModel *m_treeModel; diff --git a/src/lib/marble/CacheStoragePolicy.h b/src/lib/marble/CacheStoragePolicy.h --- a/src/lib/marble/CacheStoragePolicy.h +++ b/src/lib/marble/CacheStoragePolicy.h @@ -38,27 +38,27 @@ /** * Destroys the cache storage policy. */ - ~CacheStoragePolicy(); + ~CacheStoragePolicy() override; /** * Returns whether the @p fileName exists already. */ - bool fileExists( const QString &fileName ) const; + bool fileExists( const QString &fileName ) const override; /** * Updates the @p fileName with the given @p data. */ - bool updateFile( const QString &fileName, const QByteArray &data ); + bool updateFile( const QString &fileName, const QByteArray &data ) override; /** * Clears the cache. */ - void clearCache(); + void clearCache() override; /** * Returns the last error message. */ - QString lastErrorMessage() const; + QString lastErrorMessage() const override; /** * Returns the data of a file. diff --git a/src/lib/marble/CelestialSortFilterProxyModel.h b/src/lib/marble/CelestialSortFilterProxyModel.h --- a/src/lib/marble/CelestialSortFilterProxyModel.h +++ b/src/lib/marble/CelestialSortFilterProxyModel.h @@ -30,19 +30,19 @@ public: CelestialSortFilterProxyModel(); - ~CelestialSortFilterProxyModel(); + ~CelestialSortFilterProxyModel() override; /** * @brief A small trick to change names for dwarfs and moons */ - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; private: void setupPriorities(); void setupMoonsList(); void setupDwarfsList(); protected: - bool lessThan(const QModelIndex &left, const QModelIndex &right) const; + bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; private: QMap m_priority; diff --git a/src/lib/marble/CurrentLocationWidget.h b/src/lib/marble/CurrentLocationWidget.h --- a/src/lib/marble/CurrentLocationWidget.h +++ b/src/lib/marble/CurrentLocationWidget.h @@ -33,7 +33,7 @@ public: explicit CurrentLocationWidget( QWidget *parent = 0, Qt::WindowFlags f = 0 ); - ~CurrentLocationWidget(); + ~CurrentLocationWidget() override; /** * @brief Set a MarbleWidget associated to this widget. diff --git a/src/lib/marble/DataMigration.h b/src/lib/marble/DataMigration.h --- a/src/lib/marble/DataMigration.h +++ b/src/lib/marble/DataMigration.h @@ -23,7 +23,7 @@ public: explicit DataMigration( QObject *parent ); - virtual ~DataMigration(); + ~DataMigration() override; public Q_SLOTS: void exec(); diff --git a/src/lib/marble/DownloadQueueSet.h b/src/lib/marble/DownloadQueueSet.h --- a/src/lib/marble/DownloadQueueSet.h +++ b/src/lib/marble/DownloadQueueSet.h @@ -77,7 +77,7 @@ public: explicit DownloadQueueSet( QObject * const parent = 0 ); explicit DownloadQueueSet( const DownloadPolicy& policy, QObject * const parent = 0 ); - ~DownloadQueueSet(); + ~DownloadQueueSet() override; DownloadPolicy downloadPolicy() const; void setDownloadPolicy( const DownloadPolicy& ); diff --git a/src/lib/marble/DownloadRegion.h b/src/lib/marble/DownloadRegion.h --- a/src/lib/marble/DownloadRegion.h +++ b/src/lib/marble/DownloadRegion.h @@ -34,7 +34,7 @@ void setMarbleModel( MarbleModel *model ); - ~DownloadRegion(); + ~DownloadRegion() override; void setTileLevelRange( int const minimumTileLevel, int const maximumTileLevel ); diff --git a/src/lib/marble/DownloadRegionDialog.h b/src/lib/marble/DownloadRegionDialog.h --- a/src/lib/marble/DownloadRegionDialog.h +++ b/src/lib/marble/DownloadRegionDialog.h @@ -34,7 +34,7 @@ explicit DownloadRegionDialog( MarbleWidget *const widget, QWidget * const parent = 0, Qt::WindowFlags const f = 0 ); - ~DownloadRegionDialog(); + ~DownloadRegionDialog() override; void setAllowedTileLevelRange( int const minimumTileLevel, int const maximumTileLevel ); void setVisibleTileLevel( int const tileLevel ); @@ -56,8 +56,8 @@ void shown(); protected: - virtual void hideEvent( QHideEvent * event ); - virtual void showEvent( QShowEvent * event ); + void hideEvent( QHideEvent * event ) override; + void showEvent( QShowEvent * event ) override; private Q_SLOTS: void toggleSelectionMethod(); diff --git a/src/lib/marble/EditBookmarkDialog.h b/src/lib/marble/EditBookmarkDialog.h --- a/src/lib/marble/EditBookmarkDialog.h +++ b/src/lib/marble/EditBookmarkDialog.h @@ -36,7 +36,7 @@ explicit EditBookmarkDialog( BookmarkManager *manager, QWidget *parent = 0 ); /** Destructor */ - ~EditBookmarkDialog(); + ~EditBookmarkDialog() override; void setMarbleWidget( MarbleWidget* widget ); diff --git a/src/lib/marble/EditPlacemarkDialog.h b/src/lib/marble/EditPlacemarkDialog.h --- a/src/lib/marble/EditPlacemarkDialog.h +++ b/src/lib/marble/EditPlacemarkDialog.h @@ -32,7 +32,7 @@ EditPlacemarkDialog( GeoDataPlacemark *placemark, const QHash *relations = 0, QWidget *parent = 0 ); - ~EditPlacemarkDialog(); + ~EditPlacemarkDialog() override; /** * @brief setLabelColor tells the dialog what the label color is diff --git a/src/lib/marble/ElevationModel.h b/src/lib/marble/ElevationModel.h --- a/src/lib/marble/ElevationModel.h +++ b/src/lib/marble/ElevationModel.h @@ -36,7 +36,7 @@ Q_OBJECT public: explicit ElevationModel( HttpDownloadManager *downloadManager, PluginManager* pluginManager, QObject *parent = 0 ); - ~ElevationModel(); + ~ElevationModel() override; qreal height( qreal lon, qreal lat ) const; QVector heightProfile( qreal fromLon, qreal fromLat, qreal toLon, qreal toLat ) const; diff --git a/src/lib/marble/EquirectScanlineTextureMapper.h b/src/lib/marble/EquirectScanlineTextureMapper.h --- a/src/lib/marble/EquirectScanlineTextureMapper.h +++ b/src/lib/marble/EquirectScanlineTextureMapper.h @@ -31,11 +31,11 @@ public: explicit EquirectScanlineTextureMapper( StackedTileLoader *tileLoader ); - virtual void mapTexture( GeoPainter *painter, + void mapTexture( GeoPainter *painter, const ViewportParams *viewport, int tileZoomLevel, const QRect &dirtyRect, - TextureColorizer *texColorizer ); + TextureColorizer *texColorizer ) override; private: void mapTexture( const ViewportParams *viewport, int tileZoomLevel, MapQuality mapQuality ); diff --git a/src/lib/marble/EquirectScanlineTextureMapper.cpp b/src/lib/marble/EquirectScanlineTextureMapper.cpp --- a/src/lib/marble/EquirectScanlineTextureMapper.cpp +++ b/src/lib/marble/EquirectScanlineTextureMapper.cpp @@ -34,7 +34,7 @@ public: RenderJob( StackedTileLoader *tileLoader, int tileLevel, QImage *canvasImage, const ViewportParams *viewportParams, MapQuality mapQuality, int yTop, int yBottom ); - virtual void run(); + void run() override; private: StackedTileLoader *const m_tileLoader; diff --git a/src/lib/marble/ExternalEditorDialog.h b/src/lib/marble/ExternalEditorDialog.h --- a/src/lib/marble/ExternalEditorDialog.h +++ b/src/lib/marble/ExternalEditorDialog.h @@ -29,7 +29,7 @@ public: explicit ExternalEditorDialog( QWidget * parent = 0, Qt::WindowFlags f = 0 ); - ~ExternalEditorDialog(); + ~ExternalEditorDialog() override; QString externalEditor() const; diff --git a/src/lib/marble/FileLoader.h b/src/lib/marble/FileLoader.h --- a/src/lib/marble/FileLoader.h +++ b/src/lib/marble/FileLoader.h @@ -30,9 +30,9 @@ const QString& property, const GeoDataStyle::Ptr &style, DocumentRole role, int renderOrder ); FileLoader( QObject* parent, const PluginManager *pluginManager, const QString& contents, const QString& name, DocumentRole role ); - virtual ~FileLoader(); + ~FileLoader() override; - void run(); + void run() override; bool recenter() const; QString path() const; GeoDataDocument *document(); diff --git a/src/lib/marble/FileManager.h b/src/lib/marble/FileManager.h --- a/src/lib/marble/FileManager.h +++ b/src/lib/marble/FileManager.h @@ -49,7 +49,7 @@ /** * Destroys the file manager. */ - ~FileManager(); + ~FileManager() override; /** * Loads a new file into the manager. diff --git a/src/lib/marble/FileStoragePolicy.h b/src/lib/marble/FileStoragePolicy.h --- a/src/lib/marble/FileStoragePolicy.h +++ b/src/lib/marble/FileStoragePolicy.h @@ -31,27 +31,27 @@ /** * Destroys the cache storage policy. */ - ~FileStoragePolicy(); + ~FileStoragePolicy() override; /** * Returns whether the @p fileName exists already. */ - bool fileExists( const QString &fileName ) const; + bool fileExists( const QString &fileName ) const override; /** * Updates the @p fileName with the given @p data. */ - bool updateFile( const QString &fileName, const QByteArray &data ); + bool updateFile( const QString &fileName, const QByteArray &data ) override; /** * Clears the cache. */ - void clearCache(); + void clearCache() override; /** * Returns the last error message. */ - QString lastErrorMessage() const; + QString lastErrorMessage() const override; private: Q_DISABLE_COPY( FileStoragePolicy ) diff --git a/src/lib/marble/FileStorageWatcher.h b/src/lib/marble/FileStorageWatcher.h --- a/src/lib/marble/FileStorageWatcher.h +++ b/src/lib/marble/FileStorageWatcher.h @@ -27,7 +27,7 @@ public: explicit FileStorageWatcherThread( const QString &dataDirectory, QObject * parent = 0 ); - ~FileStorageWatcherThread(); + ~FileStorageWatcherThread() override; quint64 cacheLimit(); @@ -105,7 +105,7 @@ */ explicit FileStorageWatcher( const QString &dataDirectory = QString(), QObject * parent = 0 ); - ~FileStorageWatcher(); + ~FileStorageWatcher() override; /** * Returns the limit of the cache in bytes. @@ -139,7 +139,7 @@ * The function being called at starting Thread. * The thread is started by QThread::start(). */ - void run(); + void run() override; private: Q_DISABLE_COPY( FileStorageWatcher ) diff --git a/src/lib/marble/FileViewWidget.h b/src/lib/marble/FileViewWidget.h --- a/src/lib/marble/FileViewWidget.h +++ b/src/lib/marble/FileViewWidget.h @@ -34,7 +34,7 @@ public: explicit FileViewWidget( QWidget *parent = 0, Qt::WindowFlags f = 0 ); - ~FileViewWidget(); + ~FileViewWidget() override; void setMarbleWidget( MarbleWidget *widget ); diff --git a/src/lib/marble/FormattedTextWidget.h b/src/lib/marble/FormattedTextWidget.h --- a/src/lib/marble/FormattedTextWidget.h +++ b/src/lib/marble/FormattedTextWidget.h @@ -28,7 +28,7 @@ public: explicit FormattedTextWidget(QWidget *parent = 0); - ~FormattedTextWidget(); + ~FormattedTextWidget() override; void setText( const QString &text ); const QString text(); diff --git a/src/lib/marble/GenericScanlineTextureMapper.h b/src/lib/marble/GenericScanlineTextureMapper.h --- a/src/lib/marble/GenericScanlineTextureMapper.h +++ b/src/lib/marble/GenericScanlineTextureMapper.h @@ -30,11 +30,11 @@ public: explicit GenericScanlineTextureMapper( StackedTileLoader *tileLoader ); - virtual void mapTexture( GeoPainter *painter, + void mapTexture( GeoPainter *painter, const ViewportParams *viewport, int tileZoomLevel, const QRect &dirtyRect, - TextureColorizer *texColorizer ); + TextureColorizer *texColorizer ) override; private: class RenderJob; diff --git a/src/lib/marble/GenericScanlineTextureMapper.cpp b/src/lib/marble/GenericScanlineTextureMapper.cpp --- a/src/lib/marble/GenericScanlineTextureMapper.cpp +++ b/src/lib/marble/GenericScanlineTextureMapper.cpp @@ -38,7 +38,7 @@ public: RenderJob( StackedTileLoader *tileLoader, int tileLevel, QImage *canvasImage, const ViewportParams *viewport, MapQuality mapQuality, int yTop, int yBottom ); - virtual void run(); + void run() override; private: StackedTileLoader *const m_tileLoader; diff --git a/src/lib/marble/GeoDataTreeModel.h b/src/lib/marble/GeoDataTreeModel.h --- a/src/lib/marble/GeoDataTreeModel.h +++ b/src/lib/marble/GeoDataTreeModel.h @@ -46,9 +46,9 @@ /** * Destroys the GeoDataModel. */ - ~GeoDataTreeModel(); + ~GeoDataTreeModel() override; - virtual bool hasChildren(const QModelIndex &parent) const override; + bool hasChildren(const QModelIndex &parent) const override; /** * Return the number of Items in the Model. diff --git a/src/lib/marble/GeoGraphicsScene.h b/src/lib/marble/GeoGraphicsScene.h --- a/src/lib/marble/GeoGraphicsScene.h +++ b/src/lib/marble/GeoGraphicsScene.h @@ -40,7 +40,7 @@ * @param parent the QObject parent of the Scene */ explicit GeoGraphicsScene( QObject *parent = 0 ); - ~GeoGraphicsScene(); + ~GeoGraphicsScene() override; /** * @brief Add an item to the GeoGraphicsScene diff --git a/src/lib/marble/GoToDialog.h b/src/lib/marble/GoToDialog.h --- a/src/lib/marble/GoToDialog.h +++ b/src/lib/marble/GoToDialog.h @@ -37,7 +37,7 @@ public: explicit GoToDialog( MarbleModel* marbleModel, QWidget * parent = 0, Qt::WindowFlags f = 0 ); - ~GoToDialog(); + ~GoToDialog() override; /** Toggle whether routing items (source, destination and via points) are visible */ void setShowRoutingItems( bool show ); diff --git a/src/lib/marble/GoToDialog.cpp b/src/lib/marble/GoToDialog.cpp --- a/src/lib/marble/GoToDialog.cpp +++ b/src/lib/marble/GoToDialog.cpp @@ -39,9 +39,9 @@ public: TargetModel( MarbleModel* marbleModel, QObject * parent = 0 ); - virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const; + int rowCount ( const QModelIndex & parent = QModelIndex() ) const override; - virtual QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const; + QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const override; void setShowRoutingItems( bool show ); diff --git a/src/lib/marble/HttpDownloadManager.h b/src/lib/marble/HttpDownloadManager.h --- a/src/lib/marble/HttpDownloadManager.h +++ b/src/lib/marble/HttpDownloadManager.h @@ -57,7 +57,7 @@ /** * Destroys the http download manager. */ - virtual ~HttpDownloadManager(); + ~HttpDownloadManager() override; /** * Switches loading on/off, useful for offline mode. diff --git a/src/lib/marble/HttpJob.h b/src/lib/marble/HttpJob.h --- a/src/lib/marble/HttpJob.h +++ b/src/lib/marble/HttpJob.h @@ -36,7 +36,7 @@ public: HttpJob( const QUrl & sourceUrl, const QString & destFileName, const QString &id, QNetworkAccessManager *networkAccessManager ); - ~HttpJob(); + ~HttpJob() override; QUrl sourceUrl() const; void setSourceUrl( const QUrl & ); diff --git a/src/lib/marble/LatLonBoxWidget.h b/src/lib/marble/LatLonBoxWidget.h --- a/src/lib/marble/LatLonBoxWidget.h +++ b/src/lib/marble/LatLonBoxWidget.h @@ -24,7 +24,7 @@ public: explicit LatLonBoxWidget( QWidget * const parent = 0, Qt::WindowFlags const f = 0 ); - ~LatLonBoxWidget(); + ~LatLonBoxWidget() override; GeoDataLatLonBox latLonBox() const; void setLatLonBox( GeoDataLatLonBox const & ); diff --git a/src/lib/marble/LatLonEdit.h b/src/lib/marble/LatLonEdit.h --- a/src/lib/marble/LatLonEdit.h +++ b/src/lib/marble/LatLonEdit.h @@ -32,7 +32,7 @@ public: explicit LatLonEdit(QWidget *parent = 0, Dimension dimension = Longitude, GeoDataCoordinates::Notation notation = GeoDataCoordinates::DMS); - ~LatLonEdit(); + ~LatLonEdit() override; qreal value() const; Dimension dimension() const; GeoDataCoordinates::Notation notation() const; diff --git a/src/lib/marble/LatLonEdit.cpp b/src/lib/marble/LatLonEdit.cpp --- a/src/lib/marble/LatLonEdit.cpp +++ b/src/lib/marble/LatLonEdit.cpp @@ -62,42 +62,42 @@ public: explicit DecimalInputHandler(LatLonEditPrivate *ui) : AbstractInputHandler(ui) {} public: // AbstractInputHandler API - virtual void setupUi(); - virtual void setupMinMax(Dimension dimension); - virtual void setValue(qreal value); - virtual void handleIntEditChange(); - virtual void handleUIntEditChange(); - virtual void handleFloatEditChange(); - virtual qreal calculateValue() const; + void setupUi() override; + void setupMinMax(Dimension dimension) override; + void setValue(qreal value) override; + void handleIntEditChange() override; + void handleUIntEditChange() override; + void handleFloatEditChange() override; + qreal calculateValue() const override; }; class DMSInputHandler : public AbstractInputHandler { public: explicit DMSInputHandler(LatLonEditPrivate *ui) : AbstractInputHandler(ui) {} public: // AbstractInputHandler API - virtual void setupUi(); - virtual void setupMinMax(Dimension dimension); - virtual void setValue(qreal value); - virtual void handleIntEditChange(); - virtual void handleUIntEditChange(); - virtual void handleFloatEditChange(); - virtual qreal calculateValue() const; + void setupUi() override; + void setupMinMax(Dimension dimension) override; + void setValue(qreal value) override; + void handleIntEditChange() override; + void handleUIntEditChange() override; + void handleFloatEditChange() override; + qreal calculateValue() const override; }; class DMInputHandler : public AbstractInputHandler { public: explicit DMInputHandler(LatLonEditPrivate *ui) : AbstractInputHandler(ui) {} public: // AbstractInputHandler API - virtual void setupUi(); - virtual void setupMinMax(Dimension dimension); - virtual void setValue(qreal value); - virtual void handleIntEditChange(); - virtual void handleUIntEditChange(); - virtual void handleFloatEditChange(); - - virtual qreal calculateValue() const; + void setupUi() override; + void setupMinMax(Dimension dimension) override; + void setValue(qreal value) override; + void handleIntEditChange() override; + void handleUIntEditChange() override; + void handleFloatEditChange() override; + + qreal calculateValue() const override; }; class LatLonEditPrivate : public Ui::LatLonEditPrivate diff --git a/src/lib/marble/LayerManager.h b/src/lib/marble/LayerManager.h --- a/src/lib/marble/LayerManager.h +++ b/src/lib/marble/LayerManager.h @@ -42,7 +42,7 @@ public: explicit LayerManager(QObject *parent = nullptr); - ~LayerManager(); + ~LayerManager() override; void renderLayers( GeoPainter *painter, ViewportParams *viewport ); diff --git a/src/lib/marble/LegendWidget.h b/src/lib/marble/LegendWidget.h --- a/src/lib/marble/LegendWidget.h +++ b/src/lib/marble/LegendWidget.h @@ -30,7 +30,7 @@ public: explicit LegendWidget( QWidget *parent = 0, Qt::WindowFlags f = 0 ); - ~LegendWidget(); + ~LegendWidget() override; /** * @brief Set a MarbleModel associated to this widget. diff --git a/src/lib/marble/MapThemeDownloadDialog.h b/src/lib/marble/MapThemeDownloadDialog.h --- a/src/lib/marble/MapThemeDownloadDialog.h +++ b/src/lib/marble/MapThemeDownloadDialog.h @@ -26,7 +26,7 @@ public: explicit MapThemeDownloadDialog( MarbleWidget *marbleWidget ); - ~MapThemeDownloadDialog(); + ~MapThemeDownloadDialog() override; private: Q_DISABLE_COPY( MapThemeDownloadDialog ) diff --git a/src/lib/marble/MapThemeDownloadDialog.cpp b/src/lib/marble/MapThemeDownloadDialog.cpp --- a/src/lib/marble/MapThemeDownloadDialog.cpp +++ b/src/lib/marble/MapThemeDownloadDialog.cpp @@ -30,11 +30,11 @@ public: MapItemDelegate( QListView* view, NewstuffModel* newstuffModel, MarbleWidget* marbleWidget ); - void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const; - QSize sizeHint( const QStyleOptionViewItem &option, const QModelIndex &index ) const; + void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const override; + QSize sizeHint( const QStyleOptionViewItem &option, const QModelIndex &index ) const override; protected: - bool editorEvent( QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index ); + bool editorEvent( QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index ) override; private: enum Element { diff --git a/src/lib/marble/MapThemeManager.h b/src/lib/marble/MapThemeManager.h --- a/src/lib/marble/MapThemeManager.h +++ b/src/lib/marble/MapThemeManager.h @@ -50,7 +50,7 @@ public: explicit MapThemeManager(QObject *parent = 0); - ~MapThemeManager(); + ~MapThemeManager() override; /** * @brief Returns a list of all locally available map theme IDs diff --git a/src/lib/marble/MapThemeSortFilterProxyModel.h b/src/lib/marble/MapThemeSortFilterProxyModel.h --- a/src/lib/marble/MapThemeSortFilterProxyModel.h +++ b/src/lib/marble/MapThemeSortFilterProxyModel.h @@ -27,8 +27,8 @@ explicit MapThemeSortFilterProxyModel(QObject *parent = 0); protected: - bool lessThan( const QModelIndex &left, const QModelIndex &right ) const; - bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const; + bool lessThan( const QModelIndex &left, const QModelIndex &right ) const override; + bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const override; private: static bool isFavorite( const QModelIndex& index ); diff --git a/src/lib/marble/MapViewItemDelegate.h b/src/lib/marble/MapViewItemDelegate.h --- a/src/lib/marble/MapViewItemDelegate.h +++ b/src/lib/marble/MapViewItemDelegate.h @@ -33,8 +33,8 @@ public: explicit MapViewItemDelegate( QListView* view ); - void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const; - QSize sizeHint( const QStyleOptionViewItem &option, const QModelIndex &index ) const; + void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const override; + QSize sizeHint( const QStyleOptionViewItem &option, const QModelIndex &index ) const override; private: static QString text( const QModelIndex &index ); diff --git a/src/lib/marble/MapViewWidget.h b/src/lib/marble/MapViewWidget.h --- a/src/lib/marble/MapViewWidget.h +++ b/src/lib/marble/MapViewWidget.h @@ -32,16 +32,16 @@ Q_OBJECT public: explicit MapViewWidget( QWidget *parent = 0, Qt::WindowFlags f = 0 ); - ~MapViewWidget(); + ~MapViewWidget() override; /** * @brief Set a MarbleWidget associated to this widget. * @param widget the MarbleWidget to be set. */ void setMarbleWidget( MarbleWidget *widget, MapThemeManager *mapThemeManager ); protected: - void resizeEvent(QResizeEvent *event); + void resizeEvent(QResizeEvent *event) override; public Q_SLOTS: void setMapThemeId( const QString & ); diff --git a/src/lib/marble/MapWizard.h b/src/lib/marble/MapWizard.h --- a/src/lib/marble/MapWizard.h +++ b/src/lib/marble/MapWizard.h @@ -35,7 +35,7 @@ public: explicit MapWizard(QWidget *parent = 0); - ~MapWizard(); + ~MapWizard() override; QStringList wmsServers() const; void setWmsServers( const QStringList& uris ); @@ -47,9 +47,9 @@ static void deleteArchive( const QString& mapId ); // QWizard's functions - virtual void accept(); - virtual bool validateCurrentPage(); - virtual int nextId() const; + void accept() override; + bool validateCurrentPage() override; + int nextId() const override; public Q_SLOTS: // WMS protocol diff --git a/src/lib/marble/MapWizard.cpp b/src/lib/marble/MapWizard.cpp --- a/src/lib/marble/MapWizard.cpp +++ b/src/lib/marble/MapWizard.cpp @@ -101,7 +101,7 @@ Q_OBJECT public: PreviewDialog( QWidget* parent, const QString& mapThemeId ); - virtual void closeEvent(QCloseEvent* e ); + void closeEvent(QCloseEvent* e ) override; private: bool deleteTheme( const QString& directory ); QString m_mapThemeId; diff --git a/src/lib/marble/MarbleAboutDialog.h b/src/lib/marble/MarbleAboutDialog.h --- a/src/lib/marble/MarbleAboutDialog.h +++ b/src/lib/marble/MarbleAboutDialog.h @@ -40,7 +40,7 @@ }; explicit MarbleAboutDialog(QWidget *parent = 0); - ~MarbleAboutDialog(); + ~MarbleAboutDialog() override; /** * Set the application title (usually name and version) to show diff --git a/src/lib/marble/MarbleAbstractPresenter.h b/src/lib/marble/MarbleAbstractPresenter.h --- a/src/lib/marble/MarbleAbstractPresenter.h +++ b/src/lib/marble/MarbleAbstractPresenter.h @@ -44,7 +44,7 @@ public: explicit MarbleAbstractPresenter(MarbleMap *map, QObject *parent = 0); - virtual ~MarbleAbstractPresenter(); + ~MarbleAbstractPresenter() override; qreal moveStep() const; int radius() const; diff --git a/src/lib/marble/MarbleClock.h b/src/lib/marble/MarbleClock.h --- a/src/lib/marble/MarbleClock.h +++ b/src/lib/marble/MarbleClock.h @@ -30,7 +30,7 @@ public: explicit MarbleClock( QObject* parent = 0 ); - ~MarbleClock(); + ~MarbleClock() override; /** * @brief Determine how much of the current day has elapsed diff --git a/src/lib/marble/MarbleDBusInterface.h b/src/lib/marble/MarbleDBusInterface.h --- a/src/lib/marble/MarbleDBusInterface.h +++ b/src/lib/marble/MarbleDBusInterface.h @@ -39,7 +39,7 @@ public: explicit MarbleDBusInterface(MarbleWidget* widget); - ~MarbleDBusInterface(); + ~MarbleDBusInterface() override; QString mapTheme() const; QStringList mapThemes() const; diff --git a/src/lib/marble/MarbleDebug.cpp b/src/lib/marble/MarbleDebug.cpp --- a/src/lib/marble/MarbleDebug.cpp +++ b/src/lib/marble/MarbleDebug.cpp @@ -22,12 +22,12 @@ open( QIODevice::WriteOnly ); } - qint64 readData( char * /*data*/, qint64 /*maxSize*/ ) + qint64 readData( char * /*data*/, qint64 /*maxSize*/ ) override { return -1; } - qint64 writeData( const char * /*data*/, qint64 maxSize ) + qint64 writeData( const char * /*data*/, qint64 maxSize ) override { return maxSize; } diff --git a/src/lib/marble/MarbleInputHandler.h b/src/lib/marble/MarbleInputHandler.h --- a/src/lib/marble/MarbleInputHandler.h +++ b/src/lib/marble/MarbleInputHandler.h @@ -42,7 +42,7 @@ public: explicit MarbleInputHandler( MarbleAbstractPresenter* ); - virtual ~MarbleInputHandler(); + ~MarbleInputHandler() override; void setPositionSignalConnected( bool connected ); bool isPositionSignalConnected() const; @@ -122,10 +122,10 @@ public: explicit MarbleDefaultInputHandler( MarbleAbstractPresenter* marblePresenter); - virtual ~MarbleDefaultInputHandler(); + ~MarbleDefaultInputHandler() override; protected: - bool eventFilter( QObject *, QEvent * ); + bool eventFilter( QObject *, QEvent * ) override; bool handleMouseEvent(QMouseEvent *e); bool handlePinch(const QPointF ¢er, qreal scaleFactor, Qt::GestureState state); @@ -138,7 +138,7 @@ virtual void handleMouseButtonPressAndHold(const QPoint &position); private Q_SLOTS: - virtual void installPluginEventFilter( RenderPlugin *renderPlugin ) = 0; + void installPluginEventFilter( RenderPlugin *renderPlugin ) override = 0; virtual void showLmbMenu( int, int ) = 0; virtual void showRmbMenu( int, int ) = 0; void handlePressAndHold(); diff --git a/src/lib/marble/MarbleLegendBrowser.h b/src/lib/marble/MarbleLegendBrowser.h --- a/src/lib/marble/MarbleLegendBrowser.h +++ b/src/lib/marble/MarbleLegendBrowser.h @@ -41,10 +41,10 @@ public: explicit MarbleLegendBrowser( QWidget* parent ); - ~MarbleLegendBrowser(); + ~MarbleLegendBrowser() override; void setMarbleModel( MarbleModel *marbleModel ); - QSize sizeHint() const; + QSize sizeHint() const override; public Q_SLOTS: void setCheckedProperty( const QString& name, bool checked ); @@ -62,7 +62,7 @@ void openLinkExternally( const QUrl &url ); protected: - bool event( QEvent * event ); + bool event( QEvent * event ) override; QString readHtml( const QUrl & name ); QString generateSectionsHtml(); void translateHtml( QString & html ); diff --git a/src/lib/marble/MarbleLineEdit.h b/src/lib/marble/MarbleLineEdit.h --- a/src/lib/marble/MarbleLineEdit.h +++ b/src/lib/marble/MarbleLineEdit.h @@ -38,7 +38,7 @@ explicit MarbleLineEdit( QWidget *parent = 0 ); /** Destructor */ - ~MarbleLineEdit(); + ~MarbleLineEdit() override; void setDecorator( const QPixmap &decorator ); @@ -51,9 +51,9 @@ void decoratorButtonClicked(); protected: - virtual void mouseReleaseEvent( QMouseEvent* event ); + void mouseReleaseEvent( QMouseEvent* event ) override; - virtual void resizeEvent( QResizeEvent* event ); + void resizeEvent( QResizeEvent* event ) override; private Q_SLOTS: void updateClearButtonIcon( const QString& text ); diff --git a/src/lib/marble/MarbleMap.h b/src/lib/marble/MarbleMap.h --- a/src/lib/marble/MarbleMap.h +++ b/src/lib/marble/MarbleMap.h @@ -113,7 +113,7 @@ */ explicit MarbleMap( MarbleModel *model ); - virtual ~MarbleMap(); + ~MarbleMap() override; /** * @brief Return the model that this view shows. diff --git a/src/lib/marble/MarbleMap.cpp b/src/lib/marble/MarbleMap.cpp --- a/src/lib/marble/MarbleMap.cpp +++ b/src/lib/marble/MarbleMap.cpp @@ -86,10 +86,10 @@ { } - virtual QStringList renderPosition() const { return QStringList() << "USER_TOOLS"; } + QStringList renderPosition() const override { return QStringList() << "USER_TOOLS"; } - virtual bool render( GeoPainter *painter, ViewportParams *viewport, - const QString &renderPos, GeoSceneLayer *layer ) + bool render( GeoPainter *painter, ViewportParams *viewport, + const QString &renderPos, GeoSceneLayer *layer ) override { Q_UNUSED( viewport ); Q_UNUSED( renderPos ); @@ -100,11 +100,11 @@ return true; } - virtual qreal zValue() const { return 1.0e6; } + qreal zValue() const override { return 1.0e6; } - RenderState renderState() const { return RenderState(QStringLiteral("Custom Map Paint")); } + RenderState renderState() const override { return RenderState(QStringLiteral("Custom Map Paint")); } - virtual QString runtimeTrace() const { return QStringLiteral("CustomPaint"); } + QString runtimeTrace() const override { return QStringLiteral("CustomPaint"); } private: MarbleMap *const m_map; diff --git a/src/lib/marble/MarbleModel.h b/src/lib/marble/MarbleModel.h --- a/src/lib/marble/MarbleModel.h +++ b/src/lib/marble/MarbleModel.h @@ -103,7 +103,7 @@ * @param parent the parent widget */ explicit MarbleModel( QObject *parent = 0 ); - virtual ~MarbleModel(); + ~MarbleModel() override; /** * @brief Return the list of Placemarks as a QAbstractItemModel * diff --git a/src/lib/marble/MarbleNavigator.h b/src/lib/marble/MarbleNavigator.h --- a/src/lib/marble/MarbleNavigator.h +++ b/src/lib/marble/MarbleNavigator.h @@ -56,7 +56,7 @@ * @param parent the parent widget */ explicit MarbleNavigator(QWidget *parent = 0); - ~MarbleNavigator(); + ~MarbleNavigator() override; /** * @brief Return the minimum zoom level set in the widget. @@ -120,7 +120,7 @@ * If the MarbleNavigator gets shrunk enough, the slider will be * hidden, leaving only the Zoom Up and Zoom Down buttons. */ - void resizeEvent ( QResizeEvent * ); + void resizeEvent ( QResizeEvent * ) override; private: Q_DISABLE_COPY( MarbleNavigator ) diff --git a/src/lib/marble/MarblePhysics.h b/src/lib/marble/MarblePhysics.h --- a/src/lib/marble/MarblePhysics.h +++ b/src/lib/marble/MarblePhysics.h @@ -36,7 +36,7 @@ /** * @brief Destructor */ - ~MarblePhysics(); + ~MarblePhysics() override; /** * @brief Initiate an animation to the target according to the given mode. diff --git a/src/lib/marble/MarblePlacemarkModel.h b/src/lib/marble/MarblePlacemarkModel.h --- a/src/lib/marble/MarblePlacemarkModel.h +++ b/src/lib/marble/MarblePlacemarkModel.h @@ -76,28 +76,28 @@ /** * Destroys the place mark model. */ - ~MarblePlacemarkModel(); + ~MarblePlacemarkModel() override; void setPlacemarkContainer( QVector *container ); /** * Return the number of Placemarks in the Model. */ - int rowCount( const QModelIndex &parent = QModelIndex() ) const; - int columnCount( const QModelIndex &parent = QModelIndex() ) const; + int rowCount( const QModelIndex &parent = QModelIndex() ) const override; + int columnCount( const QModelIndex &parent = QModelIndex() ) const override; /** * Return the supported role names */ - QHash roleNames() const; + QHash roleNames() const override; /** * Return the data according to the index. * * @param index the index of the data * @param role which part of the data to return. @see Roles */ - QVariant data( const QModelIndex &index, int role ) const; + QVariant data( const QModelIndex &index, int role ) const override; QModelIndexList approxMatch( const QModelIndex &start, int role, const QVariant &value, int hits = 1, diff --git a/src/lib/marble/MarblePluginSettingsWidget.h b/src/lib/marble/MarblePluginSettingsWidget.h --- a/src/lib/marble/MarblePluginSettingsWidget.h +++ b/src/lib/marble/MarblePluginSettingsWidget.h @@ -42,7 +42,7 @@ public: explicit MarblePluginSettingsWidget( QWidget *parent = 0 ); - ~MarblePluginSettingsWidget(); + ~MarblePluginSettingsWidget() override; void setModel( RenderPluginModel* pluginModel ); diff --git a/src/lib/marble/MarbleWebView.h b/src/lib/marble/MarbleWebView.h --- a/src/lib/marble/MarbleWebView.h +++ b/src/lib/marble/MarbleWebView.h @@ -22,8 +22,8 @@ explicit MarbleWebView(QWidget *parent = 0); protected: - void contextMenuEvent(QContextMenuEvent *event); - void keyPressEvent(QKeyEvent *event); + void contextMenuEvent(QContextMenuEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; private Q_SLOTS: void copySelectedText(); diff --git a/src/lib/marble/MarbleWidget.h b/src/lib/marble/MarbleWidget.h --- a/src/lib/marble/MarbleWidget.h +++ b/src/lib/marble/MarbleWidget.h @@ -157,7 +157,7 @@ */ explicit MarbleWidget( QWidget *parent = 0 ); - virtual ~MarbleWidget(); + ~MarbleWidget() override; /// @name Access to helper objects //@{ @@ -1103,26 +1103,26 @@ /** * @brief Reimplementation of the leaveEvent() function in QWidget. */ - virtual void leaveEvent( QEvent *event ); + void leaveEvent( QEvent *event ) override; /** * @brief Reimplementation of the paintEvent() function in QWidget. */ - virtual void paintEvent( QPaintEvent *event ); + void paintEvent( QPaintEvent *event ) override; /** * @brief Reimplementation of the resizeEvent() function in QWidget. */ - virtual void resizeEvent( QResizeEvent *event ); + void resizeEvent( QResizeEvent *event ) override; - virtual void connectNotify(const QMetaMethod &signal); - virtual void disconnectNotify(const QMetaMethod &signal); + void connectNotify(const QMetaMethod &signal) override; + void disconnectNotify(const QMetaMethod &signal) override; /** * @brief Reimplementation of the changeEvent() function in QWidget to * react to changes of the enabled state */ - virtual void changeEvent( QEvent * event ); + void changeEvent( QEvent * event ) override; /** * @brief Enables custom drawing onto the MarbleWidget straight after diff --git a/src/lib/marble/MarbleWidget.cpp b/src/lib/marble/MarbleWidget.cpp --- a/src/lib/marble/MarbleWidget.cpp +++ b/src/lib/marble/MarbleWidget.cpp @@ -59,10 +59,10 @@ { } - virtual QStringList renderPosition() const { return QStringList() << "USER_TOOLS"; } + QStringList renderPosition() const override { return QStringList() << "USER_TOOLS"; } - virtual bool render( GeoPainter *painter, ViewportParams *viewport, - const QString &renderPos, GeoSceneLayer *layer ) + bool render( GeoPainter *painter, ViewportParams *viewport, + const QString &renderPos, GeoSceneLayer *layer ) override { Q_UNUSED( viewport ); Q_UNUSED( renderPos ); @@ -74,11 +74,11 @@ return true; } - virtual qreal zValue() const { return 1.0e7; } + qreal zValue() const override { return 1.0e7; } - RenderState renderState() const { return RenderState(QStringLiteral("Custom Widget Paint")); } + RenderState renderState() const override { return RenderState(QStringLiteral("Custom Widget Paint")); } - QString runtimeTrace() const { return QStringLiteral("MarbleWidget::CustomPaintLayer"); } + QString runtimeTrace() const override { return QStringLiteral("MarbleWidget::CustomPaintLayer"); } private: MarbleWidget *const m_widget; diff --git a/src/lib/marble/MarbleWidgetInputHandler.h b/src/lib/marble/MarbleWidgetInputHandler.h --- a/src/lib/marble/MarbleWidgetInputHandler.h +++ b/src/lib/marble/MarbleWidgetInputHandler.h @@ -34,16 +34,16 @@ void setDebugModeEnabled(bool enabled); private Q_SLOTS: - void installPluginEventFilter(RenderPlugin *renderPlugin); - void showLmbMenu(int x, int y); - void showRmbMenu(int x, int y); - void openItemToolTip(); - void setCursor(const QCursor &cursor); + void installPluginEventFilter(RenderPlugin *renderPlugin) override; + void showLmbMenu(int x, int y) override; + void showRmbMenu(int x, int y) override; + void openItemToolTip() override; + void setCursor(const QCursor &cursor) override; private: - bool handleKeyPress(QKeyEvent* event); - AbstractSelectionRubber *selectionRubber(); - bool layersEventFilter(QObject *o, QEvent *e); + bool handleKeyPress(QKeyEvent* event) override; + AbstractSelectionRubber *selectionRubber() override; + bool layersEventFilter(QObject *o, QEvent *e) override; typedef QSharedPointer MarbleWidgetInputHandlerPrivatePtr; MarbleWidgetInputHandlerPrivatePtr d; diff --git a/src/lib/marble/MarbleWidgetInputHandler.cpp b/src/lib/marble/MarbleWidgetInputHandler.cpp --- a/src/lib/marble/MarbleWidgetInputHandler.cpp +++ b/src/lib/marble/MarbleWidgetInputHandler.cpp @@ -39,11 +39,11 @@ m_rubberBand.hide(); } - void show() { m_rubberBand.show(); } - void hide() { m_rubberBand.hide(); } - bool isVisible() const { return m_rubberBand.isVisible(); } - const QRect &geometry() const { return m_rubberBand.geometry(); } - void setGeometry(const QRect &geometry) { m_rubberBand.setGeometry(geometry); } + void show() override { m_rubberBand.show(); } + void hide() override { m_rubberBand.hide(); } + bool isVisible() const override { return m_rubberBand.isVisible(); } + const QRect &geometry() const override { return m_rubberBand.geometry(); } + void setGeometry(const QRect &geometry) override { m_rubberBand.setGeometry(geometry); } private: QRubberBand m_rubberBand; diff --git a/src/lib/marble/MarbleWidgetPopupMenu.h b/src/lib/marble/MarbleWidgetPopupMenu.h --- a/src/lib/marble/MarbleWidgetPopupMenu.h +++ b/src/lib/marble/MarbleWidgetPopupMenu.h @@ -37,7 +37,7 @@ public: MarbleWidgetPopupMenu( MarbleWidget*, const MarbleModel* ); - virtual ~MarbleWidgetPopupMenu(); + ~MarbleWidgetPopupMenu() override; /** * Adds the action to the menu associated with the specified diff --git a/src/lib/marble/MercatorScanlineTextureMapper.h b/src/lib/marble/MercatorScanlineTextureMapper.h --- a/src/lib/marble/MercatorScanlineTextureMapper.h +++ b/src/lib/marble/MercatorScanlineTextureMapper.h @@ -32,11 +32,11 @@ public: explicit MercatorScanlineTextureMapper( StackedTileLoader *tileLoader ); - virtual void mapTexture( GeoPainter *painter, + void mapTexture( GeoPainter *painter, const ViewportParams *viewport, int tileZoomLevel, const QRect &dirtyRect, - TextureColorizer *texColorizer ); + TextureColorizer *texColorizer ) override; private: void mapTexture( const ViewportParams *viewport, int tileZoomLevel, MapQuality mapQuality ); diff --git a/src/lib/marble/MercatorScanlineTextureMapper.cpp b/src/lib/marble/MercatorScanlineTextureMapper.cpp --- a/src/lib/marble/MercatorScanlineTextureMapper.cpp +++ b/src/lib/marble/MercatorScanlineTextureMapper.cpp @@ -37,7 +37,7 @@ public: RenderJob( StackedTileLoader *tileLoader, int tileLevel, QImage *canvasImage, const ViewportParams *viewport, MapQuality mapQuality, int yTop, int yBottom ); - virtual void run(); + void run() override; private: StackedTileLoader *const m_tileLoader; diff --git a/src/lib/marble/MovieCapture.h b/src/lib/marble/MovieCapture.h --- a/src/lib/marble/MovieCapture.h +++ b/src/lib/marble/MovieCapture.h @@ -48,7 +48,7 @@ public: enum SnapshotMethod { TimeDriven, DataDriven }; MovieCapture(MarbleWidget *widget, QObject *parent); - ~MovieCapture(); + ~MovieCapture() override; int fps() const; QString destination() const; diff --git a/src/lib/marble/MovieCaptureDialog.h b/src/lib/marble/MovieCaptureDialog.h --- a/src/lib/marble/MovieCaptureDialog.h +++ b/src/lib/marble/MovieCaptureDialog.h @@ -30,7 +30,7 @@ public: explicit MovieCaptureDialog(MarbleWidget *widget, QWidget *parent = 0); - ~MovieCaptureDialog(); + ~MovieCaptureDialog() override; public Q_SLOTS: void startRecording(); diff --git a/src/lib/marble/NewBookmarkFolderDialog.h b/src/lib/marble/NewBookmarkFolderDialog.h --- a/src/lib/marble/NewBookmarkFolderDialog.h +++ b/src/lib/marble/NewBookmarkFolderDialog.h @@ -26,7 +26,7 @@ public: explicit NewBookmarkFolderDialog( QWidget *parent = 0 ); - ~NewBookmarkFolderDialog(); + ~NewBookmarkFolderDialog() override; void setFolderName( const QString &name ); diff --git a/src/lib/marble/NewstuffModel.h b/src/lib/marble/NewstuffModel.h --- a/src/lib/marble/NewstuffModel.h +++ b/src/lib/marble/NewstuffModel.h @@ -61,16 +61,16 @@ explicit NewstuffModel( QObject *parent = 0 ); /** Destructor */ - ~NewstuffModel(); + ~NewstuffModel() override; /** Overload of QAbstractListModel */ - int rowCount ( const QModelIndex &parent = QModelIndex() ) const; + int rowCount ( const QModelIndex &parent = QModelIndex() ) const override; /** Overload of QAbstractListModel */ - QVariant data ( const QModelIndex &index, int role = Qt::DisplayRole ) const; + QVariant data ( const QModelIndex &index, int role = Qt::DisplayRole ) const override; /** Overload of QAbstractListModel */ - QHash roleNames() const; + QHash roleNames() const override; /** @todo FIXME https://bugreports.qt-project.org/browse/QTCOMPONENTS-1206 */ int count() const; diff --git a/src/lib/marble/ParseRunnerPlugin.h b/src/lib/marble/ParseRunnerPlugin.h --- a/src/lib/marble/ParseRunnerPlugin.h +++ b/src/lib/marble/ParseRunnerPlugin.h @@ -33,7 +33,7 @@ explicit ParseRunnerPlugin( QObject* parent = 0 ); /** Destructor */ - virtual ~ParseRunnerPlugin(); + ~ParseRunnerPlugin() override; /** * Returns a short description of the supported file format. @@ -56,7 +56,7 @@ // Overridden methods with default implementations - virtual QIcon icon() const; + QIcon icon() const override; private: class Private; diff --git a/src/lib/marble/ParsingRunnerManager.h b/src/lib/marble/ParsingRunnerManager.h --- a/src/lib/marble/ParsingRunnerManager.h +++ b/src/lib/marble/ParsingRunnerManager.h @@ -36,7 +36,7 @@ */ explicit ParsingRunnerManager( const PluginManager *pluginManager, QObject *parent = 0 ); - ~ParsingRunnerManager(); + ~ParsingRunnerManager() override; /** * Parse the file using the runners for various formats diff --git a/src/lib/marble/PlacemarkEditHeader.h b/src/lib/marble/PlacemarkEditHeader.h --- a/src/lib/marble/PlacemarkEditHeader.h +++ b/src/lib/marble/PlacemarkEditHeader.h @@ -33,7 +33,7 @@ const QString& iconLink = QString(), const QString& id = QString(), const QStringList &idFilter = QStringList() ); - ~PlacemarkEditHeader(); + ~PlacemarkEditHeader() override; QString name() const; QString iconLink() const; qreal latitude() const; diff --git a/src/lib/marble/PlacemarkLayout.h b/src/lib/marble/PlacemarkLayout.h --- a/src/lib/marble/PlacemarkLayout.h +++ b/src/lib/marble/PlacemarkLayout.h @@ -67,7 +67,7 @@ /** * Destroys the place mark painter. */ - ~PlacemarkLayout(); + ~PlacemarkLayout() override; /** * @reimp diff --git a/src/lib/marble/PlaybackAnimatedUpdateItem.h b/src/lib/marble/PlaybackAnimatedUpdateItem.h --- a/src/lib/marble/PlaybackAnimatedUpdateItem.h +++ b/src/lib/marble/PlaybackAnimatedUpdateItem.h @@ -27,11 +27,11 @@ public: explicit PlaybackAnimatedUpdateItem( GeoDataAnimatedUpdate *animatedUpdate ); const GeoDataAnimatedUpdate* animatedUpdate() const; - double duration() const; - void play(); - void pause(); - void seek( double ); - void stop(); + double duration() const override; + void play() override; + void pause() override; + void seek( double ) override; + void stop() override; bool isApplied() const; private: diff --git a/src/lib/marble/PlaybackFlyToItem.h b/src/lib/marble/PlaybackFlyToItem.h --- a/src/lib/marble/PlaybackFlyToItem.h +++ b/src/lib/marble/PlaybackFlyToItem.h @@ -26,11 +26,11 @@ public: explicit PlaybackFlyToItem( const GeoDataFlyTo* flyTo ); const GeoDataFlyTo* flyTo() const; - double duration() const; - void play(); - void pause(); - void seek( double position ); - void stop(); + double duration() const override; + void play() override; + void pause() override; + void seek( double position ) override; + void stop() override; void center( double t ); void setBefore(PlaybackFlyToItem* before); void setNext(PlaybackFlyToItem* next); diff --git a/src/lib/marble/PlaybackItem.h b/src/lib/marble/PlaybackItem.h --- a/src/lib/marble/PlaybackItem.h +++ b/src/lib/marble/PlaybackItem.h @@ -25,7 +25,7 @@ { Q_OBJECT public: - virtual ~PlaybackItem(); + ~PlaybackItem() override; virtual void play() = 0; virtual void pause() = 0; virtual void seek( double position ) = 0; diff --git a/src/lib/marble/PlaybackSoundCueItem.h b/src/lib/marble/PlaybackSoundCueItem.h --- a/src/lib/marble/PlaybackSoundCueItem.h +++ b/src/lib/marble/PlaybackSoundCueItem.h @@ -30,11 +30,11 @@ public: explicit PlaybackSoundCueItem( const GeoDataSoundCue* soundCue ); const GeoDataSoundCue* soundCue() const; - double duration() const; - void play(); - void pause(); - void seek( double position ); - void stop(); + double duration() const override; + void play() override; + void pause() override; + void seek( double position ) override; + void stop() override; private: const GeoDataSoundCue* m_soundCue; QString m_href; diff --git a/src/lib/marble/PlaybackTourControlItem.h b/src/lib/marble/PlaybackTourControlItem.h --- a/src/lib/marble/PlaybackTourControlItem.h +++ b/src/lib/marble/PlaybackTourControlItem.h @@ -23,11 +23,11 @@ public: explicit PlaybackTourControlItem( const GeoDataTourControl* tourControl ); const GeoDataTourControl* tourControl() const; - double duration() const; - void play(); - void pause(); - void seek( double position ); - void stop(); + double duration() const override; + void play() override; + void pause() override; + void seek( double position ) override; + void stop() override; private: const GeoDataTourControl* m_tourControl; }; diff --git a/src/lib/marble/PlaybackWaitItem.h b/src/lib/marble/PlaybackWaitItem.h --- a/src/lib/marble/PlaybackWaitItem.h +++ b/src/lib/marble/PlaybackWaitItem.h @@ -25,11 +25,11 @@ public: explicit PlaybackWaitItem( const GeoDataWait* wait ); const GeoDataWait* wait() const; - double duration() const; - void play(); - void pause(); - void seek( double position ); - void stop(); + double duration() const override; + void play() override; + void pause() override; + void seek( double position ) override; + void stop() override; private Q_SLOTS: void playNext(); diff --git a/src/lib/marble/PluginAboutDialog.h b/src/lib/marble/PluginAboutDialog.h --- a/src/lib/marble/PluginAboutDialog.h +++ b/src/lib/marble/PluginAboutDialog.h @@ -43,7 +43,7 @@ }; explicit PluginAboutDialog( QWidget *parent = 0 ); - virtual ~PluginAboutDialog(); + ~PluginAboutDialog() override; /** * Sets the name of the plugin. diff --git a/src/lib/marble/PluginItemDelegate.h b/src/lib/marble/PluginItemDelegate.h --- a/src/lib/marble/PluginItemDelegate.h +++ b/src/lib/marble/PluginItemDelegate.h @@ -30,12 +30,12 @@ public: explicit PluginItemDelegate( QAbstractItemView *view, QObject * parent = 0 ); - ~PluginItemDelegate(); + ~PluginItemDelegate() override; void paint( QPainter *painter, const QStyleOptionViewItem& option, - const QModelIndex& index ) const; - QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex & index ) const; + const QModelIndex& index ) const override; + QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex & index ) const override; void setAboutIcon( const QIcon& icon ); void setConfigIcon( const QIcon& icon ); @@ -57,7 +57,7 @@ bool editorEvent( QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, - const QModelIndex &index ); + const QModelIndex &index ) override; private: enum ButtonType { diff --git a/src/lib/marble/PluginManager.h b/src/lib/marble/PluginManager.h --- a/src/lib/marble/PluginManager.h +++ b/src/lib/marble/PluginManager.h @@ -48,7 +48,7 @@ public: explicit PluginManager( QObject* parent = 0 ); - ~PluginManager(); + ~PluginManager() override; /** * @brief Returns all available RenderPlugins. diff --git a/src/lib/marble/PopupItem.h b/src/lib/marble/PopupItem.h --- a/src/lib/marble/PopupItem.h +++ b/src/lib/marble/PopupItem.h @@ -43,7 +43,7 @@ Q_OBJECT public: explicit PopupItem( QObject* parent = 0 ); - ~PopupItem(); + ~PopupItem() override; /** * @brief Print button visibility indicator @@ -118,7 +118,7 @@ */ void setBackgroundColor( const QColor &color ); - virtual bool eventFilter( QObject *, QEvent *e ); + bool eventFilter( QObject *, QEvent *e ) override; void clearHistory(); @@ -170,7 +170,7 @@ void openUrl(const QUrl &url); protected: - void paint( QPainter *painter ); + void paint( QPainter *painter ) override; Q_SIGNALS: void repaintNeeded(); diff --git a/src/lib/marble/PositionProviderPlugin.h b/src/lib/marble/PositionProviderPlugin.h --- a/src/lib/marble/PositionProviderPlugin.h +++ b/src/lib/marble/PositionProviderPlugin.h @@ -27,7 +27,7 @@ Q_OBJECT public: - virtual ~PositionProviderPlugin(); + ~PositionProviderPlugin() override; /** * @brief Returns the string that should appear in the user interface. diff --git a/src/lib/marble/PositionProviderPluginInterface.h b/src/lib/marble/PositionProviderPluginInterface.h --- a/src/lib/marble/PositionProviderPluginInterface.h +++ b/src/lib/marble/PositionProviderPluginInterface.h @@ -34,7 +34,7 @@ class MARBLE_EXPORT PositionProviderPluginInterface: public PluginInterface { public: - virtual ~PositionProviderPluginInterface(); + ~PositionProviderPluginInterface() override; virtual void initialize() = 0; diff --git a/src/lib/marble/PositionTracking.h b/src/lib/marble/PositionTracking.h --- a/src/lib/marble/PositionTracking.h +++ b/src/lib/marble/PositionTracking.h @@ -35,7 +35,7 @@ public: explicit PositionTracking( GeoDataTreeModel* model ); - ~PositionTracking(); + ~PositionTracking() override; /** * Change the position provider to use. You can provide 0 to disable diff --git a/src/lib/marble/QtMarbleConfigDialog.h b/src/lib/marble/QtMarbleConfigDialog.h --- a/src/lib/marble/QtMarbleConfigDialog.h +++ b/src/lib/marble/QtMarbleConfigDialog.h @@ -32,7 +32,7 @@ public: explicit QtMarbleConfigDialog(MarbleWidget *marbleWidget, CloudSyncManager *syncManager = 0, QWidget *parent = 0 ); - ~QtMarbleConfigDialog(); + ~QtMarbleConfigDialog() override; // View Settings diff --git a/src/lib/marble/RemoteIconLoader.h b/src/lib/marble/RemoteIconLoader.h --- a/src/lib/marble/RemoteIconLoader.h +++ b/src/lib/marble/RemoteIconLoader.h @@ -27,7 +27,7 @@ Q_OBJECT; public: explicit RemoteIconLoader( QObject *parent = 0 ); - ~RemoteIconLoader(); + ~RemoteIconLoader() override; /** * Handles the icon request for passed url( whether icon is available diff --git a/src/lib/marble/RenderPlugin.h b/src/lib/marble/RenderPlugin.h --- a/src/lib/marble/RenderPlugin.h +++ b/src/lib/marble/RenderPlugin.h @@ -65,7 +65,7 @@ }; explicit RenderPlugin( const MarbleModel *marbleModel ); - virtual ~RenderPlugin(); + ~RenderPlugin() override; /** * @brief String that should be displayed in GUI @@ -198,9 +198,9 @@ */ virtual RenderType renderType() const; - RenderState renderState() const; + RenderState renderState() const override; - virtual QString runtimeTrace() const; + QString runtimeTrace() const override; public Q_SLOTS: /** @@ -321,7 +321,7 @@ void repaintNeeded( const QRegion& dirtyRegion = QRegion() ); protected: - bool eventFilter( QObject *, QEvent * ); + bool eventFilter( QObject *, QEvent * ) override; private: friend class RenderPluginModel; diff --git a/src/lib/marble/RenderPluginInterface.h b/src/lib/marble/RenderPluginInterface.h --- a/src/lib/marble/RenderPluginInterface.h +++ b/src/lib/marble/RenderPluginInterface.h @@ -30,7 +30,7 @@ class RenderPluginInterface: public PluginInterface, public LayerInterface { public: - virtual ~RenderPluginInterface(); + ~RenderPluginInterface() override; virtual void initialize() = 0; diff --git a/src/lib/marble/RenderPluginModel.h b/src/lib/marble/RenderPluginModel.h --- a/src/lib/marble/RenderPluginModel.h +++ b/src/lib/marble/RenderPluginModel.h @@ -49,7 +49,7 @@ explicit RenderPluginModel( QObject *parent = 0 ); - ~RenderPluginModel(); + ~RenderPluginModel() override; /** * @brief Set the RenderPlugins the model should manage. diff --git a/src/lib/marble/ReverseGeocodingRunnerManager.h b/src/lib/marble/ReverseGeocodingRunnerManager.h --- a/src/lib/marble/ReverseGeocodingRunnerManager.h +++ b/src/lib/marble/ReverseGeocodingRunnerManager.h @@ -39,7 +39,7 @@ */ explicit ReverseGeocodingRunnerManager( const MarbleModel *marbleModel, QObject *parent = 0 ); - ~ReverseGeocodingRunnerManager(); + ~ReverseGeocodingRunnerManager() override; /** * Find the address and other meta information for a given geoposition. diff --git a/src/lib/marble/ReverseGeocodingRunnerPlugin.h b/src/lib/marble/ReverseGeocodingRunnerPlugin.h --- a/src/lib/marble/ReverseGeocodingRunnerPlugin.h +++ b/src/lib/marble/ReverseGeocodingRunnerPlugin.h @@ -33,7 +33,7 @@ explicit ReverseGeocodingRunnerPlugin( QObject* parent = 0 ); /** Destructor */ - virtual ~ReverseGeocodingRunnerPlugin(); + ~ReverseGeocodingRunnerPlugin() override; /** * @brief Returns the string that should appear in the user interface. @@ -63,7 +63,7 @@ // Overridden methods with default implementations - virtual QIcon icon() const; + QIcon icon() const override; protected: void setSupportedCelestialBodies( const QStringList &celestialBodies ); diff --git a/src/lib/marble/RouteSimulationPositionProviderPlugin.h b/src/lib/marble/RouteSimulationPositionProviderPlugin.h --- a/src/lib/marble/RouteSimulationPositionProviderPlugin.h +++ b/src/lib/marble/RouteSimulationPositionProviderPlugin.h @@ -33,7 +33,7 @@ public: explicit RouteSimulationPositionProviderPlugin( MarbleModel *marbleModel ); - virtual ~RouteSimulationPositionProviderPlugin(); + ~RouteSimulationPositionProviderPlugin() override; // Implementing PluginInterface QString name() const override; diff --git a/src/lib/marble/RoutingRunnerManager.h b/src/lib/marble/RoutingRunnerManager.h --- a/src/lib/marble/RoutingRunnerManager.h +++ b/src/lib/marble/RoutingRunnerManager.h @@ -38,7 +38,7 @@ */ explicit RoutingRunnerManager( const MarbleModel *marbleModel, QObject *parent = 0 ); - ~RoutingRunnerManager(); + ~RoutingRunnerManager() override; /** * Download routes traversing the stopover points in the given route request diff --git a/src/lib/marble/RoutingRunnerPlugin.h b/src/lib/marble/RoutingRunnerPlugin.h --- a/src/lib/marble/RoutingRunnerPlugin.h +++ b/src/lib/marble/RoutingRunnerPlugin.h @@ -39,7 +39,7 @@ explicit RoutingRunnerPlugin( QObject* parent = 0 ); /** Destructor */ - virtual ~RoutingRunnerPlugin(); + ~RoutingRunnerPlugin() override; /** * @brief Returns the string that should appear in the user interface. @@ -69,7 +69,7 @@ // Overridden methods with default implementations - virtual QIcon icon() const; + QIcon icon() const override; /** A status message showing whether the plugin will be able to deliver results */ QString statusMessage() const; diff --git a/src/lib/marble/RunnerTask.h b/src/lib/marble/RunnerTask.h --- a/src/lib/marble/RunnerTask.h +++ b/src/lib/marble/RunnerTask.h @@ -43,7 +43,7 @@ /** * @reimp */ - void run(); + void run() override; Q_SIGNALS: void finished( SearchTask *task ); @@ -65,7 +65,7 @@ /** * @reimp */ - void run(); + void run() override; Q_SIGNALS: void finished( ReverseGeocodingTask *task ); @@ -87,7 +87,7 @@ /** * @reimp */ - void run(); + void run() override; Q_SIGNALS: void finished( RoutingTask *task ); @@ -108,7 +108,7 @@ /** * @reimp */ - void run(); + void run() override; Q_SIGNALS: void parsed(GeoDataDocument* document, const QString &error); diff --git a/src/lib/marble/SearchRunnerManager.h b/src/lib/marble/SearchRunnerManager.h --- a/src/lib/marble/SearchRunnerManager.h +++ b/src/lib/marble/SearchRunnerManager.h @@ -42,7 +42,7 @@ */ explicit SearchRunnerManager( const MarbleModel *marbleModel, QObject *parent = 0 ); - ~SearchRunnerManager(); + ~SearchRunnerManager() override; /** * Search for placemarks matching the given search term. diff --git a/src/lib/marble/SearchRunnerPlugin.h b/src/lib/marble/SearchRunnerPlugin.h --- a/src/lib/marble/SearchRunnerPlugin.h +++ b/src/lib/marble/SearchRunnerPlugin.h @@ -31,7 +31,7 @@ explicit SearchRunnerPlugin( QObject* parent = 0 ); /** Destructor */ - virtual ~SearchRunnerPlugin(); + ~SearchRunnerPlugin() override; /** * @brief Returns the string that should appear in the user interface. @@ -61,7 +61,7 @@ // Overridden methods with default implementations - virtual QIcon icon() const; + QIcon icon() const override; protected: void setSupportedCelestialBodies( const QStringList &celestialBodies ); diff --git a/src/lib/marble/SearchWidget.h b/src/lib/marble/SearchWidget.h --- a/src/lib/marble/SearchWidget.h +++ b/src/lib/marble/SearchWidget.h @@ -29,7 +29,7 @@ void setMarbleWidget( MarbleWidget* widget ); - ~SearchWidget(); + ~SearchWidget() override; private: Q_PRIVATE_SLOT( d, void setSearchResult( const QVector& ) ) diff --git a/src/lib/marble/SerialTrack.h b/src/lib/marble/SerialTrack.h --- a/src/lib/marble/SerialTrack.h +++ b/src/lib/marble/SerialTrack.h @@ -24,7 +24,7 @@ Q_OBJECT public: SerialTrack(); - ~SerialTrack(); + ~SerialTrack() override; void append( PlaybackItem* item ); void play(); diff --git a/src/lib/marble/ServerLayout.h b/src/lib/marble/ServerLayout.h --- a/src/lib/marble/ServerLayout.h +++ b/src/lib/marble/ServerLayout.h @@ -58,9 +58,9 @@ /** * Completes the path of the @p prototypeUrl and returns it. */ - virtual QUrl downloadUrl( const QUrl &prototypeUrl, const TileId & ) const; + QUrl downloadUrl( const QUrl &prototypeUrl, const TileId & ) const override; - virtual QString name() const; + QString name() const override; }; class OsmServerLayout : public ServerLayout @@ -72,9 +72,9 @@ * Appends %zoomLevel/%x/%y.%suffix to the path of the @p prototypeUrl and returns * the result. */ - virtual QUrl downloadUrl( const QUrl &prototypeUrl, const TileId & ) const; + QUrl downloadUrl( const QUrl &prototypeUrl, const TileId & ) const override; - virtual QString name() const; + QString name() const override; }; class CustomServerLayout : public ServerLayout @@ -88,9 +88,9 @@ * * Escape sequences are: {zoomLevel}, {x}, and {y}. */ - virtual QUrl downloadUrl( const QUrl &prototypeUrl, const TileId &id ) const; + QUrl downloadUrl( const QUrl &prototypeUrl, const TileId &id ) const override; - virtual QString name() const; + QString name() const override; }; class WmsServerLayout : public ServerLayout @@ -106,20 +106,20 @@ * The following items are only added if they are not already specified in the dgml file: * styles, format, srs, layers. */ - virtual QUrl downloadUrl( const QUrl &prototypeUrl, const Marble::TileId &tileId ) const; + QUrl downloadUrl( const QUrl &prototypeUrl, const Marble::TileId &tileId ) const override; - virtual QString name() const; + QString name() const override; QString epsgCode() const; }; class QuadTreeServerLayout : public ServerLayout { public: explicit QuadTreeServerLayout( GeoSceneTileDataset* textureLayer ); - virtual QUrl downloadUrl( const QUrl &, const Marble::TileId & ) const; + QUrl downloadUrl( const QUrl &, const Marble::TileId & ) const override; - virtual QString name() const; + QString name() const override; private: static QString encodeQuadTree( const Marble::TileId & ); @@ -136,9 +136,9 @@ * TMS (TileMapService) maps take the origin for y coordinate at the bottom of the map, * as opposed to what Marble and OpenStreepMap (SlippyTiles) do. */ - virtual QUrl downloadUrl( const QUrl &prototypeUrl, const TileId & ) const; + QUrl downloadUrl( const QUrl &prototypeUrl, const TileId & ) const override; - virtual QString name() const; + QString name() const override; }; } diff --git a/src/lib/marble/SphericalScanlineTextureMapper.h b/src/lib/marble/SphericalScanlineTextureMapper.h --- a/src/lib/marble/SphericalScanlineTextureMapper.h +++ b/src/lib/marble/SphericalScanlineTextureMapper.h @@ -41,11 +41,11 @@ public: explicit SphericalScanlineTextureMapper( StackedTileLoader *tileLoader ); - virtual void mapTexture( GeoPainter *painter, + void mapTexture( GeoPainter *painter, const ViewportParams *viewport, int tileZoomLevel, const QRect &dirtyRect, - TextureColorizer *texColorizer ); + TextureColorizer *texColorizer ) override; private: void mapTexture( const ViewportParams *viewport, int tileZoomLevel, MapQuality mapQuality ); diff --git a/src/lib/marble/SphericalScanlineTextureMapper.cpp b/src/lib/marble/SphericalScanlineTextureMapper.cpp --- a/src/lib/marble/SphericalScanlineTextureMapper.cpp +++ b/src/lib/marble/SphericalScanlineTextureMapper.cpp @@ -37,7 +37,7 @@ public: RenderJob( StackedTileLoader *tileLoader, int tileLevel, QImage *canvasImage, const ViewportParams *viewport, MapQuality mapQuality, int yTop, int yBottom ); - virtual void run(); + void run() override; private: StackedTileLoader *const m_tileLoader; diff --git a/src/lib/marble/StackedTile.h b/src/lib/marble/StackedTile.h --- a/src/lib/marble/StackedTile.h +++ b/src/lib/marble/StackedTile.h @@ -56,7 +56,7 @@ { public: explicit StackedTile( TileId const &id, QImage const &resultImage, QVector > const &tiles ); - virtual ~StackedTile(); + ~StackedTile() override; void setUsed( bool used ); bool used() const; diff --git a/src/lib/marble/StackedTileLoader.h b/src/lib/marble/StackedTileLoader.h --- a/src/lib/marble/StackedTileLoader.h +++ b/src/lib/marble/StackedTileLoader.h @@ -68,7 +68,7 @@ * the tiles from a remote resource. */ explicit StackedTileLoader( MergedLayerDecorator *mergedLayerDecorator, QObject *parent = 0 ); - virtual ~StackedTileLoader(); + ~StackedTileLoader() override; int tileColumnCount( int level ) const; diff --git a/src/lib/marble/StoragePolicy.h b/src/lib/marble/StoragePolicy.h --- a/src/lib/marble/StoragePolicy.h +++ b/src/lib/marble/StoragePolicy.h @@ -28,7 +28,7 @@ public: explicit StoragePolicy( QObject *parent = 0 ); - virtual ~StoragePolicy() {} + ~StoragePolicy() override {} virtual bool fileExists( const QString &fileName ) const = 0; diff --git a/src/lib/marble/SunControlWidget.h b/src/lib/marble/SunControlWidget.h --- a/src/lib/marble/SunControlWidget.h +++ b/src/lib/marble/SunControlWidget.h @@ -32,7 +32,7 @@ public: explicit SunControlWidget( MarbleWidget *marbleWidget, QWidget* parent = 0 ); - virtual ~SunControlWidget(); + ~SunControlWidget() override; void setSunShading( bool ); private Q_SLOTS: @@ -46,7 +46,7 @@ protected: Q_DISABLE_COPY( SunControlWidget ) - void showEvent(QShowEvent* event); + void showEvent(QShowEvent* event) override; Ui::SunControlWidget *m_uiWidget; MarbleWidget *const m_marbleWidget; diff --git a/src/lib/marble/SunLocator.h b/src/lib/marble/SunLocator.h --- a/src/lib/marble/SunLocator.h +++ b/src/lib/marble/SunLocator.h @@ -35,7 +35,7 @@ public: SunLocator( const MarbleClock *clock, const Planet *planet ); - virtual ~SunLocator(); + ~SunLocator() override; qreal shading(qreal lon, qreal a, qreal c) const; void shadePixel(QRgb& pixcol, qreal shade) const; diff --git a/src/lib/marble/TextureTile.h b/src/lib/marble/TextureTile.h --- a/src/lib/marble/TextureTile.h +++ b/src/lib/marble/TextureTile.h @@ -58,7 +58,7 @@ { public: TextureTile(TileId const & tileId, QImage const & image, const Blending * blending ); - ~TextureTile(); + ~TextureTile() override; /*! \brief Returns the QImage that describes the look of the Tile diff --git a/src/lib/marble/TileCreator.h b/src/lib/marble/TileCreator.h --- a/src/lib/marble/TileCreator.h +++ b/src/lib/marble/TileCreator.h @@ -68,7 +68,7 @@ */ TileCreator( TileCreatorSource *source, const QString& dem, const QString& targetDir ); - virtual ~TileCreator(); + ~TileCreator() override; void cancelTileCreation(); @@ -82,7 +82,7 @@ bool verifyExactResult() const; protected: - virtual void run(); + void run() override; Q_SIGNALS: void progress( int value ); diff --git a/src/lib/marble/TileCreator.cpp b/src/lib/marble/TileCreator.cpp --- a/src/lib/marble/TileCreator.cpp +++ b/src/lib/marble/TileCreator.cpp @@ -76,16 +76,16 @@ { } - virtual QSize fullImageSize() const + QSize fullImageSize() const override { if ( m_sourceImage.size().width() > 21600 || m_sourceImage.height() > 10800 ) { qDebug("Install map too large!"); return QSize(); } return m_sourceImage.size(); } - virtual QImage tile(int n, int m, int maxTileLevel) + QImage tile(int n, int m, int maxTileLevel) override { int mmax = TileLoaderHelper::levelToColumn( defaultLevelZeroColumns, maxTileLevel ); int nmax = TileLoaderHelper::levelToRow( defaultLevelZeroRows, maxTileLevel ); diff --git a/src/lib/marble/TileCreatorDialog.h b/src/lib/marble/TileCreatorDialog.h --- a/src/lib/marble/TileCreatorDialog.h +++ b/src/lib/marble/TileCreatorDialog.h @@ -35,7 +35,7 @@ public: explicit TileCreatorDialog( TileCreator *creator, QWidget *parent = 0 ); - ~TileCreatorDialog(); + ~TileCreatorDialog() override; public Q_SLOTS: void setProgress( int progress ); diff --git a/src/lib/marble/TileLevelRangeWidget.h b/src/lib/marble/TileLevelRangeWidget.h --- a/src/lib/marble/TileLevelRangeWidget.h +++ b/src/lib/marble/TileLevelRangeWidget.h @@ -27,9 +27,9 @@ public: explicit TileLevelRangeWidget( QWidget * const parent = 0, Qt::WindowFlags const f = 0 ); - ~TileLevelRangeWidget(); + ~TileLevelRangeWidget() override; - virtual QSize sizeHint() const; + QSize sizeHint() const override; void setAllowedLevelRange( int const minimumLevel, int const maximumLevel ); void setDefaultLevel( int const ); diff --git a/src/lib/marble/TileLoader.h b/src/lib/marble/TileLoader.h --- a/src/lib/marble/TileLoader.h +++ b/src/lib/marble/TileLoader.h @@ -51,7 +51,7 @@ }; explicit TileLoader(HttpDownloadManager * const, const PluginManager * ); - ~TileLoader(); + ~TileLoader() override; QImage loadTileImage( GeoSceneTextureTileDataset const *textureData, TileId const & tileId, DownloadUsage const ); GeoDataDocument* loadTileVectorData( GeoSceneVectorTileDataset const *vectorData, TileId const & tileId, DownloadUsage const usage ); diff --git a/src/lib/marble/TileScalingTextureMapper.h b/src/lib/marble/TileScalingTextureMapper.h --- a/src/lib/marble/TileScalingTextureMapper.h +++ b/src/lib/marble/TileScalingTextureMapper.h @@ -33,11 +33,11 @@ public: explicit TileScalingTextureMapper( StackedTileLoader *tileLoader, QObject *parent = 0 ); - virtual void mapTexture( GeoPainter *painter, + void mapTexture( GeoPainter *painter, const ViewportParams *viewport, int tileZoomLevel, const QRect &dirtyRect, - TextureColorizer *texColorizer ); + TextureColorizer *texColorizer ) override; private Q_SLOTS: void removePixmap( const TileId &tileId ); diff --git a/src/lib/marble/TimeControlWidget.h b/src/lib/marble/TimeControlWidget.h --- a/src/lib/marble/TimeControlWidget.h +++ b/src/lib/marble/TimeControlWidget.h @@ -34,7 +34,7 @@ public: explicit TimeControlWidget( MarbleClock* clock, QWidget* parent = 0 ); - virtual ~TimeControlWidget(); + ~TimeControlWidget() override; private Q_SLOTS: /** @@ -65,7 +65,7 @@ protected: Q_DISABLE_COPY( TimeControlWidget ) - void showEvent( QShowEvent* event ); + void showEvent( QShowEvent* event ) override; Ui::TimeControlWidget *m_uiWidget; diff --git a/src/lib/marble/TinyWebBrowser.h b/src/lib/marble/TinyWebBrowser.h --- a/src/lib/marble/TinyWebBrowser.h +++ b/src/lib/marble/TinyWebBrowser.h @@ -38,7 +38,7 @@ public: explicit TinyWebBrowser( QWidget* parent = 0 ); - ~TinyWebBrowser(); + ~TinyWebBrowser() override; public Q_SLOTS: void setWikipediaPath( const QString& relativeUrl ); @@ -48,7 +48,7 @@ void statusMessage( const QString& ); protected: - QWebView *createWindow( QWebPage::WebWindowType type ); + QWebView *createWindow( QWebPage::WebWindowType type ) override; private Q_SLOTS: void openExternalLink( const QUrl& ); diff --git a/src/lib/marble/TourCaptureDialog.h b/src/lib/marble/TourCaptureDialog.h --- a/src/lib/marble/TourCaptureDialog.h +++ b/src/lib/marble/TourCaptureDialog.h @@ -31,7 +31,7 @@ public: explicit TourCaptureDialog(MarbleWidget *widget, QWidget *parent = 0); - ~TourCaptureDialog(); + ~TourCaptureDialog() override; public Q_SLOTS: void startRecording(); diff --git a/src/lib/marble/TourItemDelegate.h b/src/lib/marble/TourItemDelegate.h --- a/src/lib/marble/TourItemDelegate.h +++ b/src/lib/marble/TourItemDelegate.h @@ -32,9 +32,9 @@ public: TourItemDelegate( QListView* view, MarbleWidget* widget, TourWidget* tour ); - void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const; - QSize sizeHint( const QStyleOptionViewItem &option, const QModelIndex &index ) const; - QWidget* createEditor ( QWidget * parent, const QStyleOptionViewItem & option, const QModelIndex & index ) const; + void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const override; + QSize sizeHint( const QStyleOptionViewItem &option, const QModelIndex &index ) const override; + QWidget* createEditor ( QWidget * parent, const QStyleOptionViewItem & option, const QModelIndex & index ) const override; bool editable() const; void setEditable( bool editable ); QModelIndex firstFlyTo() const; @@ -66,7 +66,7 @@ }; protected: - bool editorEvent( QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index ); + bool editorEvent( QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index ) override; private Q_SLOTS: void closeEditor(const QModelIndex& index); diff --git a/src/lib/marble/TourPlayback.h b/src/lib/marble/TourPlayback.h --- a/src/lib/marble/TourPlayback.h +++ b/src/lib/marble/TourPlayback.h @@ -35,7 +35,7 @@ Q_OBJECT public: explicit TourPlayback(QObject *parent=0); - ~TourPlayback(); + ~TourPlayback() override; void setTour(GeoDataTour *tour); void setMarbleWidget( MarbleWidget *widget ); diff --git a/src/lib/marble/TourWidget.h b/src/lib/marble/TourWidget.h --- a/src/lib/marble/TourWidget.h +++ b/src/lib/marble/TourWidget.h @@ -33,13 +33,13 @@ public: explicit TourWidget( QWidget *parent = 0, Qt::WindowFlags f = 0 ); - ~TourWidget(); + ~TourWidget() override; void setMarbleWidget( MarbleWidget *widget ); bool openTour( const QString &filename ); bool isPlaying() const; - bool eventFilter( QObject *watched, QEvent *event ); + bool eventFilter( QObject *watched, QEvent *event ) override; public Q_SLOTS: void startPlaying(); @@ -72,7 +72,7 @@ void stopLooping(); protected: - void closeEvent( QCloseEvent *event ); + void closeEvent( QCloseEvent *event ) override; private: Q_PRIVATE_SLOT( d, void openFile() ) diff --git a/src/lib/marble/TreeViewDecoratorModel.h b/src/lib/marble/TreeViewDecoratorModel.h --- a/src/lib/marble/TreeViewDecoratorModel.h +++ b/src/lib/marble/TreeViewDecoratorModel.h @@ -26,10 +26,10 @@ public: explicit TreeViewDecoratorModel( QObject *parent = 0 ); - QVariant data( const QModelIndex & proxyIndex, int role = Qt::DisplayRole ) const; + QVariant data( const QModelIndex & proxyIndex, int role = Qt::DisplayRole ) const override; protected: - bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const; + bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const override; private: QList m_expandedRows; diff --git a/src/lib/marble/VectorTileModel.h b/src/lib/marble/VectorTileModel.h --- a/src/lib/marble/VectorTileModel.h +++ b/src/lib/marble/VectorTileModel.h @@ -37,7 +37,7 @@ public: TileRunner( TileLoader *loader, const GeoSceneVectorTileDataset *texture, const TileId &id ); - void run(); + void run() override; Q_SIGNALS: void documentLoaded( const TileId &id, GeoDataDocument *document ); diff --git a/src/lib/marble/blendings/BlendingAlgorithms.h b/src/lib/marble/blendings/BlendingAlgorithms.h --- a/src/lib/marble/blendings/BlendingAlgorithms.h +++ b/src/lib/marble/blendings/BlendingAlgorithms.h @@ -26,13 +26,13 @@ class OverpaintBlending: public Blending { public: - virtual void blend( QImage * const bottom, TextureTile const * const top ) const; + void blend( QImage * const bottom, TextureTile const * const top ) const override; }; class IndependentChannelBlending: public Blending { public: - virtual void blend( QImage * const bottom, TextureTile const * const top ) const; + void blend( QImage * const bottom, TextureTile const * const top ) const override; private: // bottomColorIntensity: intensity of one color channel (of one pixel) of the bottom image // topColorIntensity: intensity of one color channel (of one pixel) of the top image @@ -47,210 +47,210 @@ class AllanonBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class ArcusTangentBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class GeometricMeanBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class LinearLightBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class NoiseBlending: public Blending // or IndependentChannelBlending? { }; class OverlayBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class ParallelBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class TextureBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; // Darkening blendings class ColorBurnBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class DarkBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class DarkenBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class DivideBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class GammaDarkBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class LinearBurnBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class MultiplyBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class SubtractiveBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; // Lightening blendings class AdditiveBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class ColorDodgeBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class GammaLightBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class HardLightBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class LightBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class LightenBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class PinLightBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class ScreenBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class SoftLightBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class VividLightBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; // Inverter blendings class AdditiveSubtractiveBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class BleachBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class DifferenceBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class EquivalenceBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; class HalfDifferenceBlending: public IndependentChannelBlending { - virtual qreal blendChannel( qreal const bottomColorIntensity, - qreal const topColorIntensity ) const; + qreal blendChannel( qreal const bottomColorIntensity, + qreal const topColorIntensity ) const override; }; // Special purpose blendings class CloudsBlending: public Blending { public: - virtual void blend( QImage * const bottom, TextureTile const * const top ) const; + void blend( QImage * const bottom, TextureTile const * const top ) const override; }; class GrayscaleBlending: public Blending { public: - virtual void blend( QImage * const bottom, TextureTile const * const top ) const; + void blend( QImage * const bottom, TextureTile const * const top ) const override; }; } diff --git a/src/lib/marble/blendings/SunLightBlending.h b/src/lib/marble/blendings/SunLightBlending.h --- a/src/lib/marble/blendings/SunLightBlending.h +++ b/src/lib/marble/blendings/SunLightBlending.h @@ -29,8 +29,8 @@ { public: explicit SunLightBlending( const SunLocator * sunLocator ); - virtual ~SunLightBlending(); - virtual void blend( QImage * const bottom, TextureTile const * const top ) const; + ~SunLightBlending() override; + void blend( QImage * const bottom, TextureTile const * const top ) const override; void setLevelZeroLayout( int levelZeroColumns, int levelZeroRows ); diff --git a/src/lib/marble/cloudsync/BookmarkSyncManager.h b/src/lib/marble/cloudsync/BookmarkSyncManager.h --- a/src/lib/marble/cloudsync/BookmarkSyncManager.h +++ b/src/lib/marble/cloudsync/BookmarkSyncManager.h @@ -29,7 +29,7 @@ public: explicit BookmarkSyncManager( CloudSyncManager *cloudSyncManager ); - ~BookmarkSyncManager(); + ~BookmarkSyncManager() override; /** * Last time Marble synced everything up diff --git a/src/lib/marble/cloudsync/CloudRouteModel.h b/src/lib/marble/cloudsync/CloudRouteModel.h --- a/src/lib/marble/cloudsync/CloudRouteModel.h +++ b/src/lib/marble/cloudsync/CloudRouteModel.h @@ -41,11 +41,11 @@ explicit CloudRouteModel( QObject *parent = 0 ); - QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const; - int rowCount( const QModelIndex& parent = QModelIndex() ) const; + QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override; + int rowCount( const QModelIndex& parent = QModelIndex() ) const override; /** Overload of QAbstractListModel */ - QHash roleNames() const; + QHash roleNames() const override; /** * Sets the list of routes that will show up in CloudRoutesDialog. diff --git a/src/lib/marble/cloudsync/CloudRoutesDialog.h b/src/lib/marble/cloudsync/CloudRoutesDialog.h --- a/src/lib/marble/cloudsync/CloudRoutesDialog.h +++ b/src/lib/marble/cloudsync/CloudRoutesDialog.h @@ -23,7 +23,7 @@ public: explicit CloudRoutesDialog( CloudRouteModel *model, QWidget *parent = 0 ); - ~CloudRoutesDialog(); + ~CloudRoutesDialog() override; CloudRouteModel *model(); public Q_SLOTS: diff --git a/src/lib/marble/cloudsync/CloudSyncManager.h b/src/lib/marble/cloudsync/CloudSyncManager.h --- a/src/lib/marble/cloudsync/CloudSyncManager.h +++ b/src/lib/marble/cloudsync/CloudSyncManager.h @@ -38,7 +38,7 @@ public: explicit CloudSyncManager( QObject *parent = 0 ); - ~CloudSyncManager(); + ~CloudSyncManager() override; /** * Status enumeration diff --git a/src/lib/marble/cloudsync/ConflictDialog.h b/src/lib/marble/cloudsync/ConflictDialog.h --- a/src/lib/marble/cloudsync/ConflictDialog.h +++ b/src/lib/marble/cloudsync/ConflictDialog.h @@ -45,7 +45,7 @@ void setMergeItem( MergeItem *item ); public Q_SLOTS: - void open(); + void open() override; void stopAutoResolve(); Q_SIGNALS: diff --git a/src/lib/marble/cloudsync/OwncloudSyncBackend.h b/src/lib/marble/cloudsync/OwncloudSyncBackend.h --- a/src/lib/marble/cloudsync/OwncloudSyncBackend.h +++ b/src/lib/marble/cloudsync/OwncloudSyncBackend.h @@ -29,7 +29,7 @@ public: explicit OwncloudSyncBackend( CloudSyncManager* cloudSyncManager ); - ~OwncloudSyncBackend(); + ~OwncloudSyncBackend() override; /** * Generates an endpoint URL by appending endpoint name to API URL diff --git a/src/lib/marble/cloudsync/RouteItemDelegate.h b/src/lib/marble/cloudsync/RouteItemDelegate.h --- a/src/lib/marble/cloudsync/RouteItemDelegate.h +++ b/src/lib/marble/cloudsync/RouteItemDelegate.h @@ -14,9 +14,9 @@ public: RouteItemDelegate( QListView *view, CloudRouteModel *model ); - void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; - QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const; - bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index); + void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const override; + QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const override; + bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index) override; Q_SIGNALS: diff --git a/src/lib/marble/cloudsync/RouteSyncManager.h b/src/lib/marble/cloudsync/RouteSyncManager.h --- a/src/lib/marble/cloudsync/RouteSyncManager.h +++ b/src/lib/marble/cloudsync/RouteSyncManager.h @@ -30,7 +30,7 @@ public: explicit RouteSyncManager( CloudSyncManager *cloudSyncManager ); - ~RouteSyncManager(); + ~RouteSyncManager() override; void setRoutingManager( RoutingManager *routingManager ); diff --git a/src/lib/marble/declarative/DeclarativeDataPlugin.h b/src/lib/marble/declarative/DeclarativeDataPlugin.h --- a/src/lib/marble/declarative/DeclarativeDataPlugin.h +++ b/src/lib/marble/declarative/DeclarativeDataPlugin.h @@ -39,51 +39,51 @@ Q_PROPERTY( QQmlComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged ) public: - Marble::RenderPlugin* newInstance( const Marble::MarbleModel *marbleModel ) const; + Marble::RenderPlugin* newInstance( const Marble::MarbleModel *marbleModel ) const override; explicit DeclarativeDataPlugin( const Marble::MarbleModel *marbleModel=0 ); - virtual ~DeclarativeDataPlugin(); + ~DeclarativeDataPlugin() override; QString planet() const; void setPlanet( const QString & planet ); - QString name() const; + QString name() const override; void setName( const QString & name ); - virtual QString guiString() const; + QString guiString() const override; void setGuiString( const QString & guiString ); - virtual QString nameId() const; + QString nameId() const override; void setNameId( const QString & nameId ); - virtual QString version() const; + QString version() const override; void setVersion( const QString & version ); - virtual QString copyrightYears() const; + QString copyrightYears() const override; void setCopyrightYears( const QString & copyrightYears ); - virtual QString description() const; + QString description() const override; void setDescription( const QString & description ); - virtual QVector pluginAuthors() const; + QVector pluginAuthors() const override; void setAuthors( const QStringList & pluginAuthors ); QStringList authors() const; - virtual QString aboutDataText() const; + QString aboutDataText() const override; void setAboutDataText( const QString & aboutDataText ); - virtual QIcon icon() const; + QIcon icon() const override; QQmlComponent *delegate(); @@ -93,11 +93,11 @@ void setDeclarativeModel( const QVariant &model ); - virtual void initialize(); + void initialize() override; - virtual bool isInitialized() const; + bool isInitialized() const override; - Marble::RenderState renderState() const; + Marble::RenderState renderState() const override; Q_SIGNALS: /** Additional data for the currently visible map region is requested */ diff --git a/src/lib/marble/declarative/DeclarativeDataPluginItem.h b/src/lib/marble/declarative/DeclarativeDataPluginItem.h --- a/src/lib/marble/declarative/DeclarativeDataPluginItem.h +++ b/src/lib/marble/declarative/DeclarativeDataPluginItem.h @@ -25,11 +25,11 @@ public: explicit DeclarativeDataPluginItem ( QObject *parent = 0 ); - ~DeclarativeDataPluginItem(); + ~DeclarativeDataPluginItem() override; - virtual bool initialized() const; + bool initialized() const override; - bool operator<( const AbstractDataPluginItem *other ) const; + bool operator<( const AbstractDataPluginItem *other ) const override; }; } diff --git a/src/lib/marble/declarative/DeclarativeDataPluginModel.h b/src/lib/marble/declarative/DeclarativeDataPluginModel.h --- a/src/lib/marble/declarative/DeclarativeDataPluginModel.h +++ b/src/lib/marble/declarative/DeclarativeDataPluginModel.h @@ -25,14 +25,14 @@ explicit DeclarativeDataPluginModel( const MarbleModel *marbleModel, QObject *parent=0 ); - virtual ~DeclarativeDataPluginModel(); + ~DeclarativeDataPluginModel() override; Q_SIGNALS: /** Additional items for the given bound box (in degrees) are requested */ void dataRequest( qreal north, qreal south, qreal east, qreal west ); protected: - void getAdditionalItems( const GeoDataLatLonAltBox& box, qint32 number = 10 ); + void getAdditionalItems( const GeoDataLatLonAltBox& box, qint32 number = 10 ) override; }; } diff --git a/src/lib/marble/declarative/DeclarativeMapThemeManager.h b/src/lib/marble/declarative/DeclarativeMapThemeManager.h --- a/src/lib/marble/declarative/DeclarativeMapThemeManager.h +++ b/src/lib/marble/declarative/DeclarativeMapThemeManager.h @@ -20,7 +20,7 @@ public: MapThemeImageProvider(); - QPixmap requestPixmap( const QString &id, QSize *size, const QSize &requestedSize ); + QPixmap requestPixmap( const QString &id, QSize *size, const QSize &requestedSize ) override; private: /** @todo FIXME It is a bit ugly to keep a separate object that loads all themes again diff --git a/src/lib/marble/declarative/MapThemeModel.h b/src/lib/marble/declarative/MapThemeModel.h --- a/src/lib/marble/declarative/MapThemeModel.h +++ b/src/lib/marble/declarative/MapThemeModel.h @@ -42,7 +42,7 @@ /** @todo FIXME https://bugreports.qt-project.org/browse/QTCOMPONENTS-1206 */ int count() const; - QHash roleNames() const; + QHash roleNames() const override; Q_INVOKABLE QString name( const QString &id ) const; @@ -59,8 +59,8 @@ void mapThemeFilterChanged(); protected: - virtual bool filterAcceptsRow(int sourceRow, - const QModelIndex &sourceParent) const; + bool filterAcceptsRow(int sourceRow, + const QModelIndex &sourceParent) const override; private Q_SLOTS: void handleChangedThemes(); diff --git a/src/lib/marble/declarative/MarbleDeclarativeObject.h b/src/lib/marble/declarative/MarbleDeclarativeObject.h --- a/src/lib/marble/declarative/MarbleDeclarativeObject.h +++ b/src/lib/marble/declarative/MarbleDeclarativeObject.h @@ -28,7 +28,7 @@ public: explicit MarbleDeclarativeObject( QObject* parent = 0 ); - ~MarbleDeclarativeObject(); + ~MarbleDeclarativeObject() override; /** Returns the Marble library version */ QString version() const; diff --git a/src/lib/marble/declarative/MarbleDeclarativePlugin.h b/src/lib/marble/declarative/MarbleDeclarativePlugin.h --- a/src/lib/marble/declarative/MarbleDeclarativePlugin.h +++ b/src/lib/marble/declarative/MarbleDeclarativePlugin.h @@ -26,9 +26,9 @@ Q_OBJECT public: /** Overriding QQmlExtensionPlugin to register types */ - virtual void registerTypes( const char *uri ); + void registerTypes( const char *uri ) override; - void initializeEngine( QQmlEngine *engine, const char *); + void initializeEngine( QQmlEngine *engine, const char *) override; }; #endif diff --git a/src/lib/marble/declarative/MarbleQuickItem.h b/src/lib/marble/declarative/MarbleQuickItem.h --- a/src/lib/marble/declarative/MarbleQuickItem.h +++ b/src/lib/marble/declarative/MarbleQuickItem.h @@ -139,12 +139,12 @@ Q_INVOKABLE void writeSettings(); public: - void paint(QPainter *painter); + void paint(QPainter *painter) override; // QQmlParserStatus interface public: - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; public: virtual bool layersEventFilter(QObject *o, QEvent *e); diff --git a/src/lib/marble/declarative/MarbleQuickItem.cpp b/src/lib/marble/declarative/MarbleQuickItem.cpp --- a/src/lib/marble/declarative/MarbleQuickItem.cpp +++ b/src/lib/marble/declarative/MarbleQuickItem.cpp @@ -46,11 +46,11 @@ { //TODO: support rubber selection in MarbleQuickItem public: QuickItemSelectionRubber(); - void show() { m_visible = true; } - void hide() { m_visible = false; } - bool isVisible() const { return m_visible; } - const QRect &geometry() const { return m_geometry; } - void setGeometry(const QRect &/*geometry*/) {} + void show() override { m_visible = true; } + void hide() override { m_visible = false; } + bool isVisible() const override { return m_visible; } + const QRect &geometry() const override { return m_geometry; } + void setGeometry(const QRect &/*geometry*/) override {} private: QRect m_geometry; bool m_visible; @@ -67,7 +67,7 @@ setInertialEarthRotationEnabled(false); //Disabled by default, it's buggy. TODO - fix } - bool acceptMouse() + bool acceptMouse() override { return true; } @@ -77,37 +77,37 @@ (void)handlePinch(center, scale, state); } - void handleMouseButtonPressAndHold(const QPoint &position) + void handleMouseButtonPressAndHold(const QPoint &position) override { m_marbleQuick->reverseGeocoding(position); } private Q_SLOTS: - void showLmbMenu(int x, int y) + void showLmbMenu(int x, int y) override { m_marbleQuick->selectPlacemarkAt(x, y); } - void showRmbMenu(int, int) {} - void openItemToolTip() {} - void setCursor(const QCursor &cursor) + void showRmbMenu(int, int) override {} + void openItemToolTip() override {} + void setCursor(const QCursor &cursor) override { m_marbleQuick->setCursor(cursor); } private Q_SLOTS: - void installPluginEventFilter(RenderPlugin *) {} + void installPluginEventFilter(RenderPlugin *) override {} private: - bool layersEventFilter(QObject *o, QEvent *e) + bool layersEventFilter(QObject *o, QEvent *e) override { return m_marbleQuick->layersEventFilter(o, e); } //empty - don't check. It would be invalid with quick items - void checkReleasedMove(QMouseEvent *) {} + void checkReleasedMove(QMouseEvent *) override {} - bool handleTouch(QTouchEvent *event) + bool handleTouch(QTouchEvent *event) override { if (event->touchPoints().count() > 1) { //not handling multi-touch at all, let PinchArea or MultiPointTouchArea take care of it @@ -139,7 +139,7 @@ return false; } - AbstractSelectionRubber *selectionRubber() + AbstractSelectionRubber *selectionRubber() override { return &m_selectionRubber; } diff --git a/src/lib/marble/declarative/Navigation.h b/src/lib/marble/declarative/Navigation.h --- a/src/lib/marble/declarative/Navigation.h +++ b/src/lib/marble/declarative/Navigation.h @@ -39,7 +39,7 @@ public: explicit Navigation( QObject* parent = 0 ); - ~Navigation(); + ~Navigation() override; bool guidanceModeEnabled() const; diff --git a/src/lib/marble/declarative/OfflineDataModel.h b/src/lib/marble/declarative/OfflineDataModel.h --- a/src/lib/marble/declarative/OfflineDataModel.h +++ b/src/lib/marble/declarative/OfflineDataModel.h @@ -39,9 +39,9 @@ /** @todo FIXME https://bugreports.qt-project.org/browse/QTCOMPONENTS-1206 */ int count() const; - QHash roleNames() const; + QHash roleNames() const override; - virtual QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const; + QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const override; public Q_SLOTS: void setVehicleTypeFilter( VehicleTypes filter ); @@ -64,7 +64,7 @@ void uninstallationFinished( int newstuffindex ); protected: - virtual bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const; + bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const override; private Q_SLOTS: void handleInstallationProgress( int index, qreal progress ); diff --git a/src/lib/marble/declarative/RouteRequestModel.h b/src/lib/marble/declarative/RouteRequestModel.h --- a/src/lib/marble/declarative/RouteRequestModel.h +++ b/src/lib/marble/declarative/RouteRequestModel.h @@ -35,21 +35,21 @@ explicit RouteRequestModel( QObject *parent = 0 ); /** Destructor */ - ~RouteRequestModel(); + ~RouteRequestModel() override; // Model querying /** Overload of QAbstractListModel */ - int rowCount ( const QModelIndex &parent = QModelIndex() ) const; + int rowCount ( const QModelIndex &parent = QModelIndex() ) const override; /** Overload of QAbstractListModel */ - QHash roleNames() const; + QHash roleNames() const override; /** Overload of QAbstractListModel */ - QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; + QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override; /** Overload of QAbstractListModel */ - QVariant data ( const QModelIndex &index, int role = Qt::DisplayRole ) const; + QVariant data ( const QModelIndex &index, int role = Qt::DisplayRole ) const override; Marble::Routing *routing(); diff --git a/src/lib/marble/declarative/Routing.h b/src/lib/marble/declarative/Routing.h --- a/src/lib/marble/declarative/Routing.h +++ b/src/lib/marble/declarative/Routing.h @@ -38,7 +38,7 @@ explicit Routing( QQuickItem* parent = 0 ); - ~Routing(); + ~Routing() override; void setMarbleMap( MarbleMap* marbleMap ); @@ -110,7 +110,7 @@ protected: // Implements QQuickItem interface - QSGNode * updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *); + QSGNode * updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private Q_SLOTS: void updateWaypointItems(); diff --git a/src/lib/marble/geodata/data/GeoDataAbstractView.h b/src/lib/marble/geodata/data/GeoDataAbstractView.h --- a/src/lib/marble/geodata/data/GeoDataAbstractView.h +++ b/src/lib/marble/geodata/data/GeoDataAbstractView.h @@ -31,7 +31,7 @@ public: GeoDataAbstractView(); - ~GeoDataAbstractView(); + ~GeoDataAbstractView() override; GeoDataAbstractView( const GeoDataAbstractView &other ); diff --git a/src/lib/marble/geodata/data/GeoDataAlias.h b/src/lib/marble/geodata/data/GeoDataAlias.h --- a/src/lib/marble/geodata/data/GeoDataAlias.h +++ b/src/lib/marble/geodata/data/GeoDataAlias.h @@ -36,10 +36,10 @@ bool operator!=( const GeoDataAlias &other ) const; - ~GeoDataAlias(); + ~GeoDataAlias() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; QString sourceHref() const; diff --git a/src/lib/marble/geodata/data/GeoDataAnimatedUpdate.h b/src/lib/marble/geodata/data/GeoDataAnimatedUpdate.h --- a/src/lib/marble/geodata/data/GeoDataAnimatedUpdate.h +++ b/src/lib/marble/geodata/data/GeoDataAnimatedUpdate.h @@ -31,10 +31,10 @@ GeoDataAnimatedUpdate& operator=( const GeoDataAnimatedUpdate &other ); bool operator== (const GeoDataAnimatedUpdate &other) const; bool operator!= (const GeoDataAnimatedUpdate &other) const; - ~GeoDataAnimatedUpdate(); + ~GeoDataAnimatedUpdate() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; double duration() const; void setDuration( double duration ); diff --git a/src/lib/marble/geodata/data/GeoDataBalloonStyle.h b/src/lib/marble/geodata/data/GeoDataBalloonStyle.h --- a/src/lib/marble/geodata/data/GeoDataBalloonStyle.h +++ b/src/lib/marble/geodata/data/GeoDataBalloonStyle.h @@ -34,10 +34,10 @@ bool operator!=( const GeoDataBalloonStyle &other ) const; - ~GeoDataBalloonStyle(); + ~GeoDataBalloonStyle() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; enum DisplayMode { Default, @@ -56,9 +56,9 @@ DisplayMode displayMode() const; void setDisplayMode(DisplayMode mode ); - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataBalloonStylePrivate* const d; diff --git a/src/lib/marble/geodata/data/GeoDataCamera.h b/src/lib/marble/geodata/data/GeoDataCamera.h --- a/src/lib/marble/geodata/data/GeoDataCamera.h +++ b/src/lib/marble/geodata/data/GeoDataCamera.h @@ -32,9 +32,9 @@ bool operator==( const GeoDataCamera &other ) const; bool operator!=( const GeoDataCamera &other ) const; - ~GeoDataCamera(); + ~GeoDataCamera() override; - GeoDataAbstractView *copy() const; + GeoDataAbstractView *copy() const override; /** * @brief set the altitude in a GeoDataCamera object @@ -105,7 +105,7 @@ void setCoordinates( const GeoDataCoordinates& coordinates ); /// Provides type information for downcasting a GeoNode - virtual const char* nodeType() const; + const char* nodeType() const override; void detach(); private: diff --git a/src/lib/marble/geodata/data/GeoDataChange.h b/src/lib/marble/geodata/data/GeoDataChange.h --- a/src/lib/marble/geodata/data/GeoDataChange.h +++ b/src/lib/marble/geodata/data/GeoDataChange.h @@ -28,7 +28,7 @@ GeoDataChange( const GeoDataChange &other ); - ~GeoDataChange(); + ~GeoDataChange() override; GeoDataChange& operator=( const GeoDataChange &other ); @@ -38,7 +38,7 @@ GeoDataFeature * clone() const override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; private: Q_DECLARE_PRIVATE(GeoDataChange) diff --git a/src/lib/marble/geodata/data/GeoDataColorStyle.h b/src/lib/marble/geodata/data/GeoDataColorStyle.h --- a/src/lib/marble/geodata/data/GeoDataColorStyle.h +++ b/src/lib/marble/geodata/data/GeoDataColorStyle.h @@ -64,7 +64,7 @@ { public: /// Provides type information for downcasting a GeoData - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief Set a new color @@ -106,17 +106,17 @@ * @brief Serialize the style to a stream * @param stream the stream */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * @brief Unserialize the style from a stream * @param stream the stream */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; GeoDataColorStyle(); GeoDataColorStyle( const GeoDataColorStyle& other ); - virtual ~GeoDataColorStyle(); + ~GeoDataColorStyle() override; private: GeoDataColorStylePrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataContainer.h b/src/lib/marble/geodata/data/GeoDataContainer.h --- a/src/lib/marble/geodata/data/GeoDataContainer.h +++ b/src/lib/marble/geodata/data/GeoDataContainer.h @@ -51,11 +51,11 @@ GeoDataContainer(); GeoDataContainer( const GeoDataContainer& other ); /// Destruct the GeoDataContainer - virtual ~GeoDataContainer(); + ~GeoDataContainer() override; GeoDataContainer& operator=(const GeoDataContainer& other); - virtual const char* nodeType() const; + const char* nodeType() const override; GeoDataFeature * clone() const override; @@ -165,12 +165,12 @@ * @brief Serialize the container to a stream. * @param stream the stream */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * @brief Unserialize the container from a stream * @param stream the stream */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; protected: explicit GeoDataContainer(GeoDataContainerPrivate *priv); diff --git a/src/lib/marble/geodata/data/GeoDataContainer_p.h b/src/lib/marble/geodata/data/GeoDataContainer_p.h --- a/src/lib/marble/geodata/data/GeoDataContainer_p.h +++ b/src/lib/marble/geodata/data/GeoDataContainer_p.h @@ -34,7 +34,7 @@ } } - ~GeoDataContainerPrivate() + ~GeoDataContainerPrivate() override { qDeleteAll( m_vector ); } @@ -52,7 +52,7 @@ return *this; } - virtual EnumFeatureId featureId() const + EnumFeatureId featureId() const override { return GeoDataFolderId; } diff --git a/src/lib/marble/geodata/data/GeoDataCreate.h b/src/lib/marble/geodata/data/GeoDataCreate.h --- a/src/lib/marble/geodata/data/GeoDataCreate.h +++ b/src/lib/marble/geodata/data/GeoDataCreate.h @@ -28,7 +28,7 @@ GeoDataCreate( const GeoDataCreate &other ); - ~GeoDataCreate(); + ~GeoDataCreate() override; GeoDataCreate& operator=( const GeoDataCreate &other ); @@ -38,7 +38,7 @@ GeoDataFeature * clone() const override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; private: Q_DECLARE_PRIVATE(GeoDataCreate) diff --git a/src/lib/marble/geodata/data/GeoDataData.h b/src/lib/marble/geodata/data/GeoDataData.h --- a/src/lib/marble/geodata/data/GeoDataData.h +++ b/src/lib/marble/geodata/data/GeoDataData.h @@ -35,15 +35,15 @@ GeoDataData( const GeoDataData& other ); bool operator==( const GeoDataData& other ) const; bool operator!=( const GeoDataData& other ) const; - virtual ~GeoDataData(); + ~GeoDataData() override; /** * @brief assignment operator */ GeoDataData& operator=( const GeoDataData& other ); /// Provides type information for downcasting a GeoData - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief return a reference to the value of data; @@ -85,10 +85,10 @@ void setDisplayName( const QString& displayName ); /// Serialize the contents of the feature to @p stream. - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /// Unserialize the contents of the feature from @p stream. - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataDataPrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataDelete.h b/src/lib/marble/geodata/data/GeoDataDelete.h --- a/src/lib/marble/geodata/data/GeoDataDelete.h +++ b/src/lib/marble/geodata/data/GeoDataDelete.h @@ -28,7 +28,7 @@ GeoDataDelete( const GeoDataDelete &other ); - ~GeoDataDelete(); + ~GeoDataDelete() override; GeoDataDelete& operator=( const GeoDataDelete &other ); @@ -38,7 +38,7 @@ GeoDataFeature * clone() const override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; private: Q_DECLARE_PRIVATE(GeoDataDelete) diff --git a/src/lib/marble/geodata/data/GeoDataDocument.h b/src/lib/marble/geodata/data/GeoDataDocument.h --- a/src/lib/marble/geodata/data/GeoDataDocument.h +++ b/src/lib/marble/geodata/data/GeoDataDocument.h @@ -66,19 +66,19 @@ public: GeoDataDocument(); GeoDataDocument( const GeoDataDocument& other ); - ~GeoDataDocument(); + ~GeoDataDocument() override; GeoDataDocument& operator=(const GeoDataDocument& other); bool operator==( const GeoDataDocument &other ) const; bool operator!=( const GeoDataDocument &other ) const; - virtual const char* nodeType() const; + const char* nodeType() const override; GeoDataFeature * clone() const override; /// Provides type information for downcasting a GeoData - virtual bool isGeoDataDocument() const { return true; } + bool isGeoDataDocument() const override { return true; } DocumentRole documentRole() const; void setDocumentRole( DocumentRole role ); @@ -196,9 +196,9 @@ QList schemas() const; // Serialize the Placemark to @p stream - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; // Unserialize the Placemark from @p stream - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: Q_DECLARE_PRIVATE(GeoDataDocument) diff --git a/src/lib/marble/geodata/data/GeoDataDocument_p.h b/src/lib/marble/geodata/data/GeoDataDocument_p.h --- a/src/lib/marble/geodata/data/GeoDataDocument_p.h +++ b/src/lib/marble/geodata/data/GeoDataDocument_p.h @@ -43,7 +43,7 @@ { } - virtual EnumFeatureId featureId() const + EnumFeatureId featureId() const override { return GeoDataDocumentId; } diff --git a/src/lib/marble/geodata/data/GeoDataExtendedData.h b/src/lib/marble/geodata/data/GeoDataExtendedData.h --- a/src/lib/marble/geodata/data/GeoDataExtendedData.h +++ b/src/lib/marble/geodata/data/GeoDataExtendedData.h @@ -36,10 +36,10 @@ public: GeoDataExtendedData(); GeoDataExtendedData( const GeoDataExtendedData& other ); - virtual ~GeoDataExtendedData(); + ~GeoDataExtendedData() override; /// Provides type information for downcasting a GeoNode - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief assignment operator @@ -132,13 +132,13 @@ * @brief Serialize the ExtendedData to a stream * @param stream the stream */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * @brief Unserialize the ExtendedData from a stream * @param stream the stream */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataExtendedDataPrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataFeature.h b/src/lib/marble/geodata/data/GeoDataFeature.h --- a/src/lib/marble/geodata/data/GeoDataFeature.h +++ b/src/lib/marble/geodata/data/GeoDataFeature.h @@ -55,12 +55,12 @@ GeoDataFeature( const GeoDataFeature& other ); - virtual ~GeoDataFeature(); + ~GeoDataFeature() override; GeoDataFeature& operator=( const GeoDataFeature& other ); /// Provides type information for downcasting a GeoData - virtual const char* nodeType() const; + const char* nodeType() const override; EnumFeatureId featureId() const; @@ -264,9 +264,9 @@ /// Serialize the contents of the feature to @p stream. - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /// Unserialize the contents of the feature from @p stream. - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; protected: // the d-pointer needs to be protected to be accessible from derived classes diff --git a/src/lib/marble/geodata/data/GeoDataFlyTo.h b/src/lib/marble/geodata/data/GeoDataFlyTo.h --- a/src/lib/marble/geodata/data/GeoDataFlyTo.h +++ b/src/lib/marble/geodata/data/GeoDataFlyTo.h @@ -38,10 +38,10 @@ bool operator==( const GeoDataFlyTo& other ) const; bool operator!=( const GeoDataFlyTo& other ) const; - ~GeoDataFlyTo(); + ~GeoDataFlyTo() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; double duration() const; diff --git a/src/lib/marble/geodata/data/GeoDataFolder.h b/src/lib/marble/geodata/data/GeoDataFolder.h --- a/src/lib/marble/geodata/data/GeoDataFolder.h +++ b/src/lib/marble/geodata/data/GeoDataFolder.h @@ -51,14 +51,14 @@ public: GeoDataFolder(); GeoDataFolder( const GeoDataFolder& other ); - ~GeoDataFolder(); + ~GeoDataFolder() override; GeoDataFolder& operator=(const GeoDataFolder& other); bool operator==( const GeoDataFolder &other ) const; bool operator!=( const GeoDataFolder &other ) const; - virtual const char* nodeType() const; + const char* nodeType() const override; GeoDataFeature * clone() const override; diff --git a/src/lib/marble/geodata/data/GeoDataGeometry.h b/src/lib/marble/geodata/data/GeoDataGeometry.h --- a/src/lib/marble/geodata/data/GeoDataGeometry.h +++ b/src/lib/marble/geodata/data/GeoDataGeometry.h @@ -47,10 +47,10 @@ GeoDataGeometry( const GeoDataGeometry& other ); GeoDataGeometry& operator=( const GeoDataGeometry& other ); - virtual ~GeoDataGeometry(); + ~GeoDataGeometry() override; /// Provides type information for downcasting a GeoData - virtual const char* nodeType() const; + const char* nodeType() const override; virtual EnumGeometryId geometryId() const; bool extrude() const; @@ -62,9 +62,9 @@ virtual const GeoDataLatLonAltBox& latLonAltBox() const; /// Serialize the contents of the feature to @p stream. - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /// Unserialize the contents of the feature from @p stream. - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; void detach(); diff --git a/src/lib/marble/geodata/data/GeoDataGroundOverlay.h b/src/lib/marble/geodata/data/GeoDataGroundOverlay.h --- a/src/lib/marble/geodata/data/GeoDataGroundOverlay.h +++ b/src/lib/marble/geodata/data/GeoDataGroundOverlay.h @@ -30,16 +30,16 @@ GeoDataGroundOverlay( const GeoDataGroundOverlay &other ); - ~GeoDataGroundOverlay(); + ~GeoDataGroundOverlay() override; GeoDataGroundOverlay& operator=( const GeoDataGroundOverlay &other ); bool operator==( const GeoDataGroundOverlay &other ) const; bool operator!=( const GeoDataGroundOverlay &other ) const; GeoDataFeature * clone() const override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; double altitude() const; diff --git a/src/lib/marble/geodata/data/GeoDataHotSpot.h b/src/lib/marble/geodata/data/GeoDataHotSpot.h --- a/src/lib/marble/geodata/data/GeoDataHotSpot.h +++ b/src/lib/marble/geodata/data/GeoDataHotSpot.h @@ -34,14 +34,14 @@ GeoDataHotSpot( const QPointF& hotSpot = QPointF( 0.5, 0.5 ), Units xunits = Fraction, Units yunits = Fraction ); GeoDataHotSpot( const GeoDataHotSpot& other ); - ~GeoDataHotSpot(); + ~GeoDataHotSpot() override; GeoDataHotSpot& operator=( const GeoDataHotSpot& other ); bool operator==( const GeoDataHotSpot& other ) const; bool operator!=( const GeoDataHotSpot& other ) const; /// Provides type information for downcasting a GeoData - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief this function returns the hotspot and the units the hotspot is measured in @@ -55,9 +55,9 @@ Units xunits = Fraction, Units yunits = Fraction ); /// Serialize the contents of the feature to @p stream. - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /// Unserialize the contents of the feature from @p stream. - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataHotSpotPrivate *const d; diff --git a/src/lib/marble/geodata/data/GeoDataIconStyle.h b/src/lib/marble/geodata/data/GeoDataIconStyle.h --- a/src/lib/marble/geodata/data/GeoDataIconStyle.h +++ b/src/lib/marble/geodata/data/GeoDataIconStyle.h @@ -40,15 +40,15 @@ GeoDataIconStyle( const GeoDataIconStyle& other ); explicit GeoDataIconStyle( const QString& iconPath, const QPointF &hotSpot = QPointF( 0.5, 0.5 ) ); - ~GeoDataIconStyle(); + ~GeoDataIconStyle() override; GeoDataIconStyle& operator=( const GeoDataIconStyle& other ); bool operator==( const GeoDataIconStyle &other ) const; bool operator!=( const GeoDataIconStyle &other ) const; /// Provides type information for downcasting a GeoData - virtual const char* nodeType() const; + const char* nodeType() const override; void setIcon( const QImage& icon ); QImage icon() const; @@ -96,8 +96,8 @@ /* * Serializable methods */ - virtual void pack( QDataStream& stream ) const; - virtual void unpack( QDataStream& stream ); + void pack( QDataStream& stream ) const override; + void unpack( QDataStream& stream ) override; private: GeoDataIconStylePrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataImagePyramid.h b/src/lib/marble/geodata/data/GeoDataImagePyramid.h --- a/src/lib/marble/geodata/data/GeoDataImagePyramid.h +++ b/src/lib/marble/geodata/data/GeoDataImagePyramid.h @@ -32,10 +32,10 @@ bool operator==( const GeoDataImagePyramid &other ) const; bool operator!=( const GeoDataImagePyramid &other ) const; - ~GeoDataImagePyramid(); + ~GeoDataImagePyramid() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; enum GridOrigin { LowerLeft, diff --git a/src/lib/marble/geodata/data/GeoDataItemIcon.h b/src/lib/marble/geodata/data/GeoDataItemIcon.h --- a/src/lib/marble/geodata/data/GeoDataItemIcon.h +++ b/src/lib/marble/geodata/data/GeoDataItemIcon.h @@ -36,10 +36,10 @@ bool operator==( const GeoDataItemIcon &other ) const; bool operator!=( const GeoDataItemIcon &other ) const; - ~GeoDataItemIcon(); + ~GeoDataItemIcon() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; enum ItemIconState { Open = 1 << 0, diff --git a/src/lib/marble/geodata/data/GeoDataLabelStyle.h b/src/lib/marble/geodata/data/GeoDataLabelStyle.h --- a/src/lib/marble/geodata/data/GeoDataLabelStyle.h +++ b/src/lib/marble/geodata/data/GeoDataLabelStyle.h @@ -47,7 +47,7 @@ */ GeoDataLabelStyle( const QFont &font, const QColor &color ); - ~GeoDataLabelStyle(); + ~GeoDataLabelStyle() override; /** * @brief assignment operator @@ -58,7 +58,7 @@ bool operator!=( const GeoDataLabelStyle &other ) const; /// Provides type information for downcasting a GeoData - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief Set the scale of the label @@ -116,12 +116,12 @@ * @brief Serialize the style to a stream. * @param stream the stream */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * @brief Unserialize the style from a stream * @param stream the stream */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataLabelStylePrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataLatLonAltBox.h b/src/lib/marble/geodata/data/GeoDataLatLonAltBox.h --- a/src/lib/marble/geodata/data/GeoDataLatLonAltBox.h +++ b/src/lib/marble/geodata/data/GeoDataLatLonAltBox.h @@ -61,13 +61,13 @@ */ explicit GeoDataLatLonAltBox( const GeoDataCoordinates & coordinates ); - virtual ~GeoDataLatLonAltBox(); + ~GeoDataLatLonAltBox() override; GeoDataLatLonAltBox& operator=( const GeoDataLatLonAltBox& other ); GeoDataLatLonAltBox& operator=( const GeoDataCoordinates& other ); /// Provides type information for downcasting a GeoData - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief qHash, for using GeoDataLatLonAltBox in a QCache as Key @@ -97,7 +97,7 @@ AltitudeMode altitudeMode() const; void setAltitudeMode( const AltitudeMode altitudeMode ); - virtual bool contains( const GeoDataCoordinates & ) const; + bool contains( const GeoDataCoordinates & ) const override; bool contains( const GeoDataLatLonAltBox & ) const; /** @@ -116,29 +116,29 @@ /** * @brief Creates a text string of the bounding box */ - virtual QString toString( GeoDataCoordinates::Unit unit = GeoDataCoordinates::Radian ) const; + QString toString( GeoDataCoordinates::Unit unit = GeoDataCoordinates::Radian ) const override; /** * @brief Indicates whether the bounding box only contains a single 2D point ("singularity"). * @return Return value is true if the height and the width of the bounding box equal zero. */ - bool isNull() const; + bool isNull() const override; /** * @brief Resets the bounding box to its uninitialised state (and thus contains nothing). */ - virtual void clear(); + void clear() override; /** * @brief returns the center of this box * @return a coordinate, body-center of the box */ - virtual GeoDataCoordinates center() const; + GeoDataCoordinates center() const override; /// Serialize the contents of the feature to @p stream. - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /// Unserialize the contents of the feature from @p stream. - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataLatLonAltBoxPrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataLatLonBox.h b/src/lib/marble/geodata/data/GeoDataLatLonBox.h --- a/src/lib/marble/geodata/data/GeoDataLatLonBox.h +++ b/src/lib/marble/geodata/data/GeoDataLatLonBox.h @@ -57,12 +57,12 @@ GeoDataLatLonBox(); GeoDataLatLonBox( qreal north, qreal south, qreal east, qreal west, GeoDataCoordinates::Unit unit = GeoDataCoordinates::Radian ); GeoDataLatLonBox( const GeoDataLatLonBox & ); - virtual ~GeoDataLatLonBox(); + ~GeoDataLatLonBox() override; GeoDataLatLonBox& operator=( const GeoDataLatLonBox& other ); /// Provides type information for downcasting a GeoData - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief Get the northern boundary of the bounding box. @@ -233,9 +233,9 @@ GeoDataLatLonBox& operator |=( const GeoDataLatLonBox& other) ; /// Serialize the contents of the feature to @p stream. - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /// Unserialize the contents of the feature from @p stream. - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataLatLonBoxPrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataLatLonQuad.h b/src/lib/marble/geodata/data/GeoDataLatLonQuad.h --- a/src/lib/marble/geodata/data/GeoDataLatLonQuad.h +++ b/src/lib/marble/geodata/data/GeoDataLatLonQuad.h @@ -32,10 +32,10 @@ bool operator==( const GeoDataLatLonQuad &other ) const; bool operator!=( const GeoDataLatLonQuad &other ) const; - ~GeoDataLatLonQuad(); + ~GeoDataLatLonQuad() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; qreal bottomLeftLatitude( GeoDataCoordinates::Unit unit ) const; qreal bottomRightLatitude( GeoDataCoordinates::Unit unit ) const; diff --git a/src/lib/marble/geodata/data/GeoDataLineString.h b/src/lib/marble/geodata/data/GeoDataLineString.h --- a/src/lib/marble/geodata/data/GeoDataLineString.h +++ b/src/lib/marble/geodata/data/GeoDataLineString.h @@ -93,7 +93,7 @@ /*! \brief Destroys a LineString. */ - virtual ~GeoDataLineString(); + ~GeoDataLineString() override; /*! \brief Returns whether a LineString is a closed polygon. @@ -146,7 +146,7 @@ \see GeoDataLatLonAltBox */ - virtual const GeoDataLatLonAltBox& latLonAltBox() const; + const GeoDataLatLonAltBox& latLonAltBox() const override; /** * @brief Returns the length of LineString across a sphere starting from a coordinate in LineString @@ -383,14 +383,14 @@ \brief Serialize the LineString to a stream. \param stream the stream. */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /*! \brief Unserialize the LineString from a stream. \param stream the stream. */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; protected: explicit GeoDataLineString(GeoDataLineStringPrivate* priv); diff --git a/src/lib/marble/geodata/data/GeoDataLineString_p.h b/src/lib/marble/geodata/data/GeoDataLineString_p.h --- a/src/lib/marble/geodata/data/GeoDataLineString_p.h +++ b/src/lib/marble/geodata/data/GeoDataLineString_p.h @@ -38,7 +38,7 @@ { } - ~GeoDataLineStringPrivate() + ~GeoDataLineStringPrivate() override { delete m_rangeCorrected; } @@ -55,19 +55,19 @@ } - virtual GeoDataGeometryPrivate* copy() + GeoDataGeometryPrivate* copy() override { GeoDataLineStringPrivate* copy = new GeoDataLineStringPrivate; *copy = *this; return copy; } - virtual const char* nodeType() const + const char* nodeType() const override { return GeoDataTypes::GeoDataLineStringType; } - virtual EnumGeometryId geometryId() const + EnumGeometryId geometryId() const override { return GeoDataLineStringId; } diff --git a/src/lib/marble/geodata/data/GeoDataLineStyle.h b/src/lib/marble/geodata/data/GeoDataLineStyle.h --- a/src/lib/marble/geodata/data/GeoDataLineStyle.h +++ b/src/lib/marble/geodata/data/GeoDataLineStyle.h @@ -43,7 +43,7 @@ */ explicit GeoDataLineStyle( const QColor &color ); - ~GeoDataLineStyle(); + ~GeoDataLineStyle() override; /** * @brief assignment operator @@ -54,7 +54,7 @@ bool operator!=( const GeoDataLineStyle &other ) const; /// Provides type information for downcasting a GeoData - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief Set the width of the line @@ -140,12 +140,12 @@ * @brief Serialize the style to a stream. * @param stream the stream */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * @brief Unserialize the style from a stream * @param stream the stream */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataLineStylePrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataLinearRing.h b/src/lib/marble/geodata/data/GeoDataLinearRing.h --- a/src/lib/marble/geodata/data/GeoDataLinearRing.h +++ b/src/lib/marble/geodata/data/GeoDataLinearRing.h @@ -83,7 +83,7 @@ /*! \brief Destroys a LinearRing. */ - virtual ~GeoDataLinearRing(); + ~GeoDataLinearRing() override; /*! @@ -99,7 +99,7 @@ \return true for a LinearRing. */ - virtual bool isClosed() const; + bool isClosed() const override; /*! @@ -114,7 +114,7 @@ This method can be used as an approximation for the circumference of a LinearRing. */ - virtual qreal length( qreal planetRadius, int offset = 0 ) const; + qreal length( qreal planetRadius, int offset = 0 ) const override; /*! \brief Returns whether the given coordinates lie within the polygon. diff --git a/src/lib/marble/geodata/data/GeoDataLinearRing_p.h b/src/lib/marble/geodata/data/GeoDataLinearRing_p.h --- a/src/lib/marble/geodata/data/GeoDataLinearRing_p.h +++ b/src/lib/marble/geodata/data/GeoDataLinearRing_p.h @@ -30,19 +30,19 @@ { } - virtual GeoDataGeometryPrivate* copy() + GeoDataGeometryPrivate* copy() override { GeoDataLinearRingPrivate* copy = new GeoDataLinearRingPrivate; *copy = *this; return copy; } - virtual const char* nodeType() const + const char* nodeType() const override { return GeoDataTypes::GeoDataLinearRingType; } - virtual EnumGeometryId geometryId() const + EnumGeometryId geometryId() const override { return GeoDataLinearRingId; } diff --git a/src/lib/marble/geodata/data/GeoDataLink.h b/src/lib/marble/geodata/data/GeoDataLink.h --- a/src/lib/marble/geodata/data/GeoDataLink.h +++ b/src/lib/marble/geodata/data/GeoDataLink.h @@ -45,10 +45,10 @@ bool operator==( const GeoDataLink &other ) const; bool operator!=( const GeoDataLink &other ) const; - ~GeoDataLink(); + ~GeoDataLink() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; QString href() const; diff --git a/src/lib/marble/geodata/data/GeoDataListStyle.h b/src/lib/marble/geodata/data/GeoDataListStyle.h --- a/src/lib/marble/geodata/data/GeoDataListStyle.h +++ b/src/lib/marble/geodata/data/GeoDataListStyle.h @@ -37,10 +37,10 @@ bool operator==( const GeoDataListStyle &other ) const; bool operator!=( const GeoDataListStyle &other ) const; - ~GeoDataListStyle(); + ~GeoDataListStyle() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; enum ListItemType { Check, @@ -84,9 +84,9 @@ QVector::ConstIterator constEnd() const; void clear(); - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: friend class GeoDataItemIcon; diff --git a/src/lib/marble/geodata/data/GeoDataLocation.h b/src/lib/marble/geodata/data/GeoDataLocation.h --- a/src/lib/marble/geodata/data/GeoDataLocation.h +++ b/src/lib/marble/geodata/data/GeoDataLocation.h @@ -34,10 +34,10 @@ bool operator==( const GeoDataLocation &other ) const; bool operator!=( const GeoDataLocation &other ) const; - ~GeoDataLocation(); + ~GeoDataLocation() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; qreal latitude(GeoDataCoordinates::Unit) const; diff --git a/src/lib/marble/geodata/data/GeoDataLod.h b/src/lib/marble/geodata/data/GeoDataLod.h --- a/src/lib/marble/geodata/data/GeoDataLod.h +++ b/src/lib/marble/geodata/data/GeoDataLod.h @@ -58,7 +58,7 @@ /*! \brief Destroys a Level of Detail object. */ - virtual ~GeoDataLod(); + ~GeoDataLod() override; /*! @@ -68,7 +68,7 @@ bool operator==( const GeoDataLod &other ) const; bool operator!=( const GeoDataLod &other ) const; - virtual const char* nodeType() const; + const char* nodeType() const override; /*! @@ -144,14 +144,14 @@ \brief Serialize the Lod to a stream. \param stream the stream. */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /*! \brief Unserialize the Lod from a stream. \param stream the stream. */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; GeoDataLod &operator=( const GeoDataLod& other ); diff --git a/src/lib/marble/geodata/data/GeoDataLookAt.h b/src/lib/marble/geodata/data/GeoDataLookAt.h --- a/src/lib/marble/geodata/data/GeoDataLookAt.h +++ b/src/lib/marble/geodata/data/GeoDataLookAt.h @@ -34,9 +34,9 @@ bool operator==(const GeoDataLookAt &other) const; bool operator!=(const GeoDataLookAt &other) const; - ~GeoDataLookAt(); + ~GeoDataLookAt() override; - GeoDataAbstractView *copy() const; + GeoDataAbstractView *copy() const override; /** * @brief set the altitude in a GeoDataLookAt object @@ -112,7 +112,7 @@ void setCoordinates( const GeoDataCoordinates& coordinates ); /// Provides type information for downcasting a GeoNode - virtual const char* nodeType() const; + const char* nodeType() const override; void detach(); private: diff --git a/src/lib/marble/geodata/data/GeoDataModel.h b/src/lib/marble/geodata/data/GeoDataModel.h --- a/src/lib/marble/geodata/data/GeoDataModel.h +++ b/src/lib/marble/geodata/data/GeoDataModel.h @@ -40,7 +40,7 @@ bool operator==( const GeoDataModel &other ) const; bool operator!=( const GeoDataModel &other ) const; - ~GeoDataModel(); + ~GeoDataModel() override; const GeoDataLink& link() const; GeoDataLink& link(); diff --git a/src/lib/marble/geodata/data/GeoDataModel.cpp b/src/lib/marble/geodata/data/GeoDataModel.cpp --- a/src/lib/marble/geodata/data/GeoDataModel.cpp +++ b/src/lib/marble/geodata/data/GeoDataModel.cpp @@ -28,11 +28,11 @@ public: GeoDataModelPrivate(); - const char *nodeType() const { return GeoDataTypes::GeoDataModelType; } + const char *nodeType() const override { return GeoDataTypes::GeoDataModelType; } - GeoDataGeometryPrivate *copy() { return new GeoDataModelPrivate( *this ); } + GeoDataGeometryPrivate *copy() override { return new GeoDataModelPrivate( *this ); } - EnumGeometryId geometryId() const { return GeoDataModelId; } + EnumGeometryId geometryId() const override { return GeoDataModelId; } GeoDataCoordinates m_coordinates; diff --git a/src/lib/marble/geodata/data/GeoDataMultiGeometry.h b/src/lib/marble/geodata/data/GeoDataMultiGeometry.h --- a/src/lib/marble/geodata/data/GeoDataMultiGeometry.h +++ b/src/lib/marble/geodata/data/GeoDataMultiGeometry.h @@ -36,9 +36,9 @@ GeoDataMultiGeometry(); explicit GeoDataMultiGeometry( const GeoDataGeometry& other ); - virtual ~GeoDataMultiGeometry(); + ~GeoDataMultiGeometry() override; - virtual const GeoDataLatLonAltBox& latLonAltBox() const; + const GeoDataLatLonAltBox& latLonAltBox() const override; int size() const; GeoDataGeometry& at( int pos ); @@ -85,9 +85,9 @@ QVector::Iterator end ); // Serialize the Placemark to @p stream - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; // Unserialize the Placemark from @p stream - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: Q_DECLARE_PRIVATE(GeoDataMultiGeometry) diff --git a/src/lib/marble/geodata/data/GeoDataMultiGeometry_p.h b/src/lib/marble/geodata/data/GeoDataMultiGeometry_p.h --- a/src/lib/marble/geodata/data/GeoDataMultiGeometry_p.h +++ b/src/lib/marble/geodata/data/GeoDataMultiGeometry_p.h @@ -33,7 +33,7 @@ { } - ~GeoDataMultiGeometryPrivate() + ~GeoDataMultiGeometryPrivate() override { qDeleteAll(m_vector); } @@ -79,19 +79,19 @@ return *this; } - virtual GeoDataGeometryPrivate* copy() + GeoDataGeometryPrivate* copy() override { GeoDataMultiGeometryPrivate* copy = new GeoDataMultiGeometryPrivate; *copy = *this; return copy; } - virtual const char* nodeType() const + const char* nodeType() const override { return GeoDataTypes::GeoDataMultiGeometryType; } - virtual EnumGeometryId geometryId() const + EnumGeometryId geometryId() const override { return GeoDataMultiGeometryId; } diff --git a/src/lib/marble/geodata/data/GeoDataMultiTrack.h b/src/lib/marble/geodata/data/GeoDataMultiTrack.h --- a/src/lib/marble/geodata/data/GeoDataMultiTrack.h +++ b/src/lib/marble/geodata/data/GeoDataMultiTrack.h @@ -30,12 +30,12 @@ GeoDataMultiTrack(); explicit GeoDataMultiTrack( const GeoDataGeometry& other ); - virtual ~GeoDataMultiTrack(); + ~GeoDataMultiTrack() override; bool operator==( const GeoDataMultiTrack& other ) const; bool operator!=( const GeoDataMultiTrack& other ) const; - virtual const GeoDataLatLonAltBox& latLonAltBox() const; + const GeoDataLatLonAltBox& latLonAltBox() const override; int size() const; GeoDataTrack& at( int pos ); @@ -82,9 +82,9 @@ QVector::Iterator end ); // Serialize the Placemark to @p stream - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; // Unserialize the Placemark from @p stream - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: Q_DECLARE_PRIVATE(GeoDataMultiTrack) diff --git a/src/lib/marble/geodata/data/GeoDataMultiTrack_p.h b/src/lib/marble/geodata/data/GeoDataMultiTrack_p.h --- a/src/lib/marble/geodata/data/GeoDataMultiTrack_p.h +++ b/src/lib/marble/geodata/data/GeoDataMultiTrack_p.h @@ -25,7 +25,7 @@ { } - ~GeoDataMultiTrackPrivate() + ~GeoDataMultiTrackPrivate() override { qDeleteAll(m_vector); } @@ -44,19 +44,19 @@ return *this; } - virtual GeoDataGeometryPrivate* copy() + GeoDataGeometryPrivate* copy() override { GeoDataMultiTrackPrivate* copy = new GeoDataMultiTrackPrivate; *copy = *this; return copy; } - virtual const char* nodeType() const + const char* nodeType() const override { return GeoDataTypes::GeoDataMultiTrackType; } - virtual EnumGeometryId geometryId() const + EnumGeometryId geometryId() const override { return GeoDataMultiTrackId; } diff --git a/src/lib/marble/geodata/data/GeoDataNetworkLink.h b/src/lib/marble/geodata/data/GeoDataNetworkLink.h --- a/src/lib/marble/geodata/data/GeoDataNetworkLink.h +++ b/src/lib/marble/geodata/data/GeoDataNetworkLink.h @@ -34,12 +34,12 @@ bool operator==( const GeoDataNetworkLink &other ) const; bool operator!=( const GeoDataNetworkLink &other ) const; - ~GeoDataNetworkLink(); + ~GeoDataNetworkLink() override; GeoDataFeature * clone() const override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; bool refreshVisibility() const; diff --git a/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h b/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h --- a/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h +++ b/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h @@ -32,7 +32,7 @@ GeoDataNetworkLinkControl( const GeoDataNetworkLinkControl &other ); - ~GeoDataNetworkLinkControl(); + ~GeoDataNetworkLinkControl() override; GeoDataNetworkLinkControl& operator=( const GeoDataNetworkLinkControl &other ); @@ -42,7 +42,7 @@ GeoDataFeature * clone() const override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; qreal minRefreshPeriod() const; void setMinRefreshPeriod(qreal minRefreshPeriod); diff --git a/src/lib/marble/geodata/data/GeoDataNetworkLinkControl_p.h b/src/lib/marble/geodata/data/GeoDataNetworkLinkControl_p.h --- a/src/lib/marble/geodata/data/GeoDataNetworkLinkControl_p.h +++ b/src/lib/marble/geodata/data/GeoDataNetworkLinkControl_p.h @@ -25,7 +25,7 @@ public: GeoDataNetworkLinkControlPrivate(); GeoDataNetworkLinkControlPrivate(const GeoDataNetworkLinkControlPrivate &other); - ~GeoDataNetworkLinkControlPrivate(); + ~GeoDataNetworkLinkControlPrivate() override; GeoDataNetworkLinkControlPrivate& operator=(const GeoDataNetworkLinkControlPrivate &other); qreal m_minRefreshPeriod; diff --git a/src/lib/marble/geodata/data/GeoDataObject.h b/src/lib/marble/geodata/data/GeoDataObject.h --- a/src/lib/marble/geodata/data/GeoDataObject.h +++ b/src/lib/marble/geodata/data/GeoDataObject.h @@ -52,10 +52,10 @@ GeoDataObject(); GeoDataObject( const GeoDataObject & ); GeoDataObject & operator=( const GeoDataObject & ); - virtual ~GeoDataObject(); + ~GeoDataObject() override; /// Provides type information for downcasting a GeoNode - virtual const char* nodeType() const = 0; + const char* nodeType() const override = 0; /// Provides the parent of the object in GeoDataContainers virtual GeoDataObject *parent() const; @@ -86,9 +86,9 @@ QString resolvePath( const QString &relativePath ) const; /// Reimplemented from Serializable - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /// Reimplemented from Serializable - virtual void unpack( QDataStream& steam ); + void unpack( QDataStream& steam ) override; private: diff --git a/src/lib/marble/geodata/data/GeoDataOrientation.h b/src/lib/marble/geodata/data/GeoDataOrientation.h --- a/src/lib/marble/geodata/data/GeoDataOrientation.h +++ b/src/lib/marble/geodata/data/GeoDataOrientation.h @@ -32,10 +32,10 @@ bool operator==( const GeoDataOrientation &other ) const; bool operator!=( const GeoDataOrientation &other ) const; - ~GeoDataOrientation(); + ~GeoDataOrientation() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; /** Returns by how much degrees the camera has been rotated about the normal. * Default value= 0. Range: 0-360 degrees diff --git a/src/lib/marble/geodata/data/GeoDataOverlay.h b/src/lib/marble/geodata/data/GeoDataOverlay.h --- a/src/lib/marble/geodata/data/GeoDataOverlay.h +++ b/src/lib/marble/geodata/data/GeoDataOverlay.h @@ -31,7 +31,7 @@ /** Constructor */ GeoDataOverlay(); - ~GeoDataOverlay(); + ~GeoDataOverlay() override; GeoDataOverlay( const GeoDataOverlay &other ); diff --git a/src/lib/marble/geodata/data/GeoDataPhotoOverlay.h b/src/lib/marble/geodata/data/GeoDataPhotoOverlay.h --- a/src/lib/marble/geodata/data/GeoDataPhotoOverlay.h +++ b/src/lib/marble/geodata/data/GeoDataPhotoOverlay.h @@ -33,16 +33,16 @@ GeoDataPhotoOverlay( const GeoDataPhotoOverlay &other ); - ~GeoDataPhotoOverlay(); + ~GeoDataPhotoOverlay() override; GeoDataPhotoOverlay& operator=( const GeoDataPhotoOverlay &other ); bool operator==( const GeoDataPhotoOverlay &other ) const; bool operator!=( const GeoDataPhotoOverlay &other ) const; GeoDataFeature * clone() const override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; enum Shape { Rectangle, diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.h b/src/lib/marble/geodata/data/GeoDataPlacemark.h --- a/src/lib/marble/geodata/data/GeoDataPlacemark.h +++ b/src/lib/marble/geodata/data/GeoDataPlacemark.h @@ -71,7 +71,7 @@ /** * Delete the placemark */ - ~GeoDataPlacemark(); + ~GeoDataPlacemark() override; GeoDataPlacemark &operator=( const GeoDataPlacemark &other ); @@ -81,7 +81,7 @@ bool operator==( const GeoDataPlacemark& other ) const; bool operator!=( const GeoDataPlacemark& other ) const; - virtual const char* nodeType() const; + const char* nodeType() const override; GeoDataFeature * clone() const override; @@ -620,7 +620,7 @@ * and is deserialised using @see unpack() * @param stream the QDataStream to serialise object to. */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * Serialise this Placemark to a XML stream writer @see QXmlStreamWriter in @@ -639,7 +639,7 @@ * from @see pack() * @param stream the QDataStream to deserialise from. */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; /** * Returns GeoDataLookAt object if lookAt is setup earlier diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark_p.h b/src/lib/marble/geodata/data/GeoDataPlacemark_p.h --- a/src/lib/marble/geodata/data/GeoDataPlacemark_p.h +++ b/src/lib/marble/geodata/data/GeoDataPlacemark_p.h @@ -86,7 +86,7 @@ } } - virtual ~GeoDataPlacemarkPrivate() + ~GeoDataPlacemarkPrivate() override { delete m_geometry; delete m_placemarkExtendedData; @@ -125,7 +125,7 @@ return *this; } - virtual EnumFeatureId featureId() const + EnumFeatureId featureId() const override { return GeoDataPlacemarkId; } diff --git a/src/lib/marble/geodata/data/GeoDataPlaylist.h b/src/lib/marble/geodata/data/GeoDataPlaylist.h --- a/src/lib/marble/geodata/data/GeoDataPlaylist.h +++ b/src/lib/marble/geodata/data/GeoDataPlaylist.h @@ -27,7 +27,7 @@ bool operator==( const GeoDataPlaylist &other ) const; bool operator!=( const GeoDataPlaylist &other ) const; - const char *nodeType() const; + const char *nodeType() const override; GeoDataTourPrimitive* primitive( int index ); const GeoDataTourPrimitive* primitive( int index ) const; diff --git a/src/lib/marble/geodata/data/GeoDataPoint.h b/src/lib/marble/geodata/data/GeoDataPoint.h --- a/src/lib/marble/geodata/data/GeoDataPoint.h +++ b/src/lib/marble/geodata/data/GeoDataPoint.h @@ -65,7 +65,7 @@ GeoDataPoint( qreal lon, qreal lat, qreal alt = 0, GeoDataPoint::Unit _unit = GeoDataCoordinates::Radian ); - ~GeoDataPoint(); + ~GeoDataPoint() override; bool operator==( const GeoDataPoint &other ) const; bool operator!=( const GeoDataPoint &other ) const; @@ -75,16 +75,16 @@ const GeoDataCoordinates& coordinates() const; /// Provides type information for downcasting a GeoData - virtual const char* nodeType() const; + const char* nodeType() const override; // Type definitions typedef QVector Vector; // Serialize the Placemark to @p stream - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; // Unserialize the Placemark from @p stream - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; virtual void detach(); diff --git a/src/lib/marble/geodata/data/GeoDataPoint_p.h b/src/lib/marble/geodata/data/GeoDataPoint_p.h --- a/src/lib/marble/geodata/data/GeoDataPoint_p.h +++ b/src/lib/marble/geodata/data/GeoDataPoint_p.h @@ -25,14 +25,14 @@ { } - virtual GeoDataGeometryPrivate* copy() + GeoDataGeometryPrivate* copy() override { GeoDataPointPrivate* copy = new GeoDataPointPrivate; *copy = *this; return copy; } - virtual EnumGeometryId geometryId() const + EnumGeometryId geometryId() const override { return GeoDataPointId; } diff --git a/src/lib/marble/geodata/data/GeoDataPolyStyle.h b/src/lib/marble/geodata/data/GeoDataPolyStyle.h --- a/src/lib/marble/geodata/data/GeoDataPolyStyle.h +++ b/src/lib/marble/geodata/data/GeoDataPolyStyle.h @@ -40,7 +40,7 @@ */ explicit GeoDataPolyStyle( const QColor &color ); - ~GeoDataPolyStyle(); + ~GeoDataPolyStyle() override; /** * @brief assignment operator @@ -51,7 +51,7 @@ bool operator!=( const GeoDataPolyStyle &other ) const; /// Provides type information for downcasting a GeoNode - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief Set whether to fill the polygon @@ -108,12 +108,12 @@ * @brief Serialize the style to a stream. * @param stream the stream */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * @brief Unserialize the style from a stream * @param stream the stream */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataPolyStylePrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataPolygon.h b/src/lib/marble/geodata/data/GeoDataPolygon.h --- a/src/lib/marble/geodata/data/GeoDataPolygon.h +++ b/src/lib/marble/geodata/data/GeoDataPolygon.h @@ -96,7 +96,7 @@ /*! \brief Destroys a Polygon. */ - virtual ~GeoDataPolygon(); + ~GeoDataPolygon() override; /*! @@ -151,7 +151,7 @@ \see GeoDataLatLonAltBox */ - virtual const GeoDataLatLonAltBox& latLonAltBox() const; + const GeoDataLatLonAltBox& latLonAltBox() const override; /*! \brief Returns the outer boundary that is represented as a LinearRing. @@ -208,14 +208,14 @@ \brief Serialize the Polygon to a stream. \param stream the stream. */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /*! \brief Unserialize the Polygon from a stream. \param stream the stream. */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; int renderOrder() const; void setRenderOrder(int); diff --git a/src/lib/marble/geodata/data/GeoDataPolygon_p.h b/src/lib/marble/geodata/data/GeoDataPolygon_p.h --- a/src/lib/marble/geodata/data/GeoDataPolygon_p.h +++ b/src/lib/marble/geodata/data/GeoDataPolygon_p.h @@ -34,19 +34,19 @@ { } - virtual GeoDataGeometryPrivate* copy() + GeoDataGeometryPrivate* copy() override { GeoDataPolygonPrivate* copy = new GeoDataPolygonPrivate; *copy = *this; return copy; } - virtual const char* nodeType() const + const char* nodeType() const override { return GeoDataTypes::GeoDataPolygonType; } - virtual EnumGeometryId geometryId() const + EnumGeometryId geometryId() const override { return GeoDataPolygonId; } diff --git a/src/lib/marble/geodata/data/GeoDataRegion.h b/src/lib/marble/geodata/data/GeoDataRegion.h --- a/src/lib/marble/geodata/data/GeoDataRegion.h +++ b/src/lib/marble/geodata/data/GeoDataRegion.h @@ -73,13 +73,13 @@ /*! \brief Destroys a Region object. */ - virtual ~GeoDataRegion(); + ~GeoDataRegion() override; /*! \brief Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; bool operator==( const GeoDataRegion &other ) const; bool operator!=( const GeoDataRegion &other ) const; @@ -128,14 +128,14 @@ \brief Serialize the Region to a stream. \param stream the stream. */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /*! \brief Unserialize the Region from a stream. \param stream the stream. */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; GeoDataRegion &operator=( const GeoDataRegion& other ); diff --git a/src/lib/marble/geodata/data/GeoDataResourceMap.h b/src/lib/marble/geodata/data/GeoDataResourceMap.h --- a/src/lib/marble/geodata/data/GeoDataResourceMap.h +++ b/src/lib/marble/geodata/data/GeoDataResourceMap.h @@ -33,10 +33,10 @@ bool operator==( const GeoDataResourceMap &other ) const; bool operator!=( const GeoDataResourceMap &other ) const; - ~GeoDataResourceMap(); + ~GeoDataResourceMap() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; const GeoDataAlias& alias() const; diff --git a/src/lib/marble/geodata/data/GeoDataScale.h b/src/lib/marble/geodata/data/GeoDataScale.h --- a/src/lib/marble/geodata/data/GeoDataScale.h +++ b/src/lib/marble/geodata/data/GeoDataScale.h @@ -33,10 +33,10 @@ bool operator==( const GeoDataScale &other ) const; bool operator!=( const GeoDataScale &other ) const; - ~GeoDataScale(); + ~GeoDataScale() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; double x() const; diff --git a/src/lib/marble/geodata/data/GeoDataSchema.h b/src/lib/marble/geodata/data/GeoDataSchema.h --- a/src/lib/marble/geodata/data/GeoDataSchema.h +++ b/src/lib/marble/geodata/data/GeoDataSchema.h @@ -38,7 +38,7 @@ GeoDataSchema& operator=( const GeoDataSchema& other ); bool operator==( const GeoDataSchema& other ) const; bool operator!=( const GeoDataSchema& other ) const; - ~GeoDataSchema(); + ~GeoDataSchema() override; /* * @brief Returns the name attribute of schema @@ -68,11 +68,11 @@ */ QList simpleFields() const; - virtual const char* nodeType() const; + const char* nodeType() const override; - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataSchemaPrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataSchemaData.h b/src/lib/marble/geodata/data/GeoDataSchemaData.h --- a/src/lib/marble/geodata/data/GeoDataSchemaData.h +++ b/src/lib/marble/geodata/data/GeoDataSchemaData.h @@ -35,7 +35,7 @@ GeoDataSchemaData& operator=( const GeoDataSchemaData& rhs ); bool operator==( const GeoDataSchemaData &other ) const; bool operator!=( const GeoDataSchemaData &other ) const; - ~GeoDataSchemaData(); + ~GeoDataSchemaData() override; /* * @brief Returns the id for schema which defines custom data @@ -76,7 +76,7 @@ /* * @brief Provides information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; /* * @brief Serialize SchemaData to a stream @p stream diff --git a/src/lib/marble/geodata/data/GeoDataScreenOverlay.h b/src/lib/marble/geodata/data/GeoDataScreenOverlay.h --- a/src/lib/marble/geodata/data/GeoDataScreenOverlay.h +++ b/src/lib/marble/geodata/data/GeoDataScreenOverlay.h @@ -28,16 +28,16 @@ GeoDataScreenOverlay( const GeoDataScreenOverlay &other ); - ~GeoDataScreenOverlay(); + ~GeoDataScreenOverlay() override; GeoDataScreenOverlay& operator=( const GeoDataScreenOverlay &other ); bool operator==( const GeoDataScreenOverlay &other ) const; bool operator!=( const GeoDataScreenOverlay &other ) const; GeoDataFeature * clone() const override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; GeoDataVec2 overlayXY() const; void setOverlayXY( const GeoDataVec2 &vec2 ); diff --git a/src/lib/marble/geodata/data/GeoDataSimpleArrayData.h b/src/lib/marble/geodata/data/GeoDataSimpleArrayData.h --- a/src/lib/marble/geodata/data/GeoDataSimpleArrayData.h +++ b/src/lib/marble/geodata/data/GeoDataSimpleArrayData.h @@ -29,7 +29,7 @@ GeoDataSimpleArrayData( const GeoDataSimpleArrayData& other ); bool operator==( const GeoDataSimpleArrayData &other ) const; bool operator!=( const GeoDataSimpleArrayData &other) const; - ~GeoDataSimpleArrayData(); + ~GeoDataSimpleArrayData() override; /** * Returns the number of value in the array @@ -51,9 +51,9 @@ */ void append( const QVariant& value ); - virtual const char* nodeType() const; - virtual void pack( QDataStream& stream ) const; - virtual void unpack( QDataStream& stream ); + const char* nodeType() const override; + void pack( QDataStream& stream ) const override; + void unpack( QDataStream& stream ) override; private: GeoDataSimpleArrayDataPrivate *d; diff --git a/src/lib/marble/geodata/data/GeoDataSimpleData.h b/src/lib/marble/geodata/data/GeoDataSimpleData.h --- a/src/lib/marble/geodata/data/GeoDataSimpleData.h +++ b/src/lib/marble/geodata/data/GeoDataSimpleData.h @@ -28,7 +28,7 @@ public: GeoDataSimpleData(); GeoDataSimpleData( const GeoDataSimpleData &other ); - virtual ~GeoDataSimpleData(); + ~GeoDataSimpleData() override; /* * @brief Returns the value of name attribute of SimpleData tag @@ -64,7 +64,7 @@ /* * Provides information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; /* * Seriliaze SimpleData to stream @p stream diff --git a/src/lib/marble/geodata/data/GeoDataSimpleField.h b/src/lib/marble/geodata/data/GeoDataSimpleField.h --- a/src/lib/marble/geodata/data/GeoDataSimpleField.h +++ b/src/lib/marble/geodata/data/GeoDataSimpleField.h @@ -31,7 +31,7 @@ GeoDataSimpleField( const GeoDataSimpleField& other ); bool operator==( const GeoDataSimpleField& other ) const; bool operator!=( const GeoDataSimpleField& other ) const; - virtual ~GeoDataSimpleField(); + ~GeoDataSimpleField() override; /* * @brief Enum for different values of type attribute of SimpleField @@ -89,7 +89,7 @@ /* * @brief Provides information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; /* * @brief Serialize SimpleField to a stream diff --git a/src/lib/marble/geodata/data/GeoDataSoundCue.h b/src/lib/marble/geodata/data/GeoDataSoundCue.h --- a/src/lib/marble/geodata/data/GeoDataSoundCue.h +++ b/src/lib/marble/geodata/data/GeoDataSoundCue.h @@ -24,11 +24,11 @@ { public: GeoDataSoundCue(); - ~GeoDataSoundCue(); + ~GeoDataSoundCue() override; bool operator==( const GeoDataSoundCue &other ) const; bool operator!=( const GeoDataSoundCue &other ) const; - const char *nodeType() const; + const char *nodeType() const override; QString href() const; void setHref(const QString &url); diff --git a/src/lib/marble/geodata/data/GeoDataStyle.h b/src/lib/marble/geodata/data/GeoDataStyle.h --- a/src/lib/marble/geodata/data/GeoDataStyle.h +++ b/src/lib/marble/geodata/data/GeoDataStyle.h @@ -69,10 +69,10 @@ */ GeoDataStyle( const QString& iconPath, const QFont &font, const QColor &color ); - ~GeoDataStyle(); + ~GeoDataStyle() override; /// Provides type information for downcasting a GeoNode - virtual const char* nodeType() const; + const char* nodeType() const override; /// set the icon style void setIconStyle( const GeoDataIconStyle& style ); @@ -118,12 +118,12 @@ * @brief Serialize the style to a stream * @param stream the stream */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * @brief Unserialize the style from a stream * @param stream the stream */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataStylePrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataStyleMap.h b/src/lib/marble/geodata/data/GeoDataStyleMap.h --- a/src/lib/marble/geodata/data/GeoDataStyleMap.h +++ b/src/lib/marble/geodata/data/GeoDataStyleMap.h @@ -39,7 +39,7 @@ { public: /// Provides type information for downcasting a GeoNode - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief return the last key @@ -67,16 +67,16 @@ * @brief Serialize the stylemap to a stream * @param stream the stream */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * @brief Unserialize the stylemap from a stream * @param stream the stream */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; GeoDataStyleMap(); GeoDataStyleMap( const GeoDataStyleMap& other ); - ~GeoDataStyleMap(); + ~GeoDataStyleMap() override; private: GeoDataStyleMapPrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataStyleSelector.h b/src/lib/marble/geodata/data/GeoDataStyleSelector.h --- a/src/lib/marble/geodata/data/GeoDataStyleSelector.h +++ b/src/lib/marble/geodata/data/GeoDataStyleSelector.h @@ -37,7 +37,7 @@ class GEODATA_EXPORT GeoDataStyleSelector : public GeoDataObject { public: - ~GeoDataStyleSelector(); + ~GeoDataStyleSelector() override; /** * @brief assignment operator @@ -51,13 +51,13 @@ * @brief Serialize the styleselector to a stream * @param stream the stream */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * @brief Unserialize the styleselector from a stream * @param stream the stream */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; protected: GeoDataStyleSelector(); diff --git a/src/lib/marble/geodata/data/GeoDataTimePrimitive.h b/src/lib/marble/geodata/data/GeoDataTimePrimitive.h --- a/src/lib/marble/geodata/data/GeoDataTimePrimitive.h +++ b/src/lib/marble/geodata/data/GeoDataTimePrimitive.h @@ -33,25 +33,25 @@ { public: /// Provides type information for downcasting a GeoNode - virtual const char* nodeType() const; + const char* nodeType() const override; GeoDataTimePrimitive& operator=( const GeoDataTimePrimitive& other ); /** * @brief Serialize the styleselector to a stream * @param stream the stream */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * @brief Unserialize the styleselector from a stream * @param stream the stream */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; GeoDataTimePrimitive(); GeoDataTimePrimitive( const GeoDataTimePrimitive& other ); - ~GeoDataTimePrimitive(); + ~GeoDataTimePrimitive() override; private: GeoDataTimePrimitivePrivate * const d; }; diff --git a/src/lib/marble/geodata/data/GeoDataTimeSpan.h b/src/lib/marble/geodata/data/GeoDataTimeSpan.h --- a/src/lib/marble/geodata/data/GeoDataTimeSpan.h +++ b/src/lib/marble/geodata/data/GeoDataTimeSpan.h @@ -29,7 +29,7 @@ GeoDataTimeSpan(); GeoDataTimeSpan( const GeoDataTimeSpan& other ); - ~GeoDataTimeSpan(); + ~GeoDataTimeSpan() override; /** * @brief assignment operator @@ -43,7 +43,7 @@ bool operator!=( const GeoDataTimeSpan& other ) const; /// Provides type information for downcasting a GeoNode - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief return the beginning instant of a timespan @@ -78,13 +78,13 @@ * @brief Serialize the timespan to a stream * @param stream the stream */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * @brief Unserialize the timespan from a stream * @param stream the stream */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataTimeSpanPrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataTimeStamp.h b/src/lib/marble/geodata/data/GeoDataTimeStamp.h --- a/src/lib/marble/geodata/data/GeoDataTimeStamp.h +++ b/src/lib/marble/geodata/data/GeoDataTimeStamp.h @@ -36,7 +36,7 @@ GeoDataTimeStamp(); GeoDataTimeStamp( const GeoDataTimeStamp& other ); - virtual ~GeoDataTimeStamp(); + ~GeoDataTimeStamp() override; /** * @brief assignment operator @@ -51,7 +51,7 @@ /// Provides type information for downcasting a GeoNode - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief return the when time of timestamp @@ -72,13 +72,13 @@ * @brief Serialize the timestamp to a stream * @param stream the stream */ - virtual void pack( QDataStream& stream ) const; + void pack( QDataStream& stream ) const override; /** * @brief Unserialize the timestamp from a stream * @param stream the stream */ - virtual void unpack( QDataStream& stream ); + void unpack( QDataStream& stream ) override; private: GeoDataTimeStampPrivate * const d; diff --git a/src/lib/marble/geodata/data/GeoDataTour.h b/src/lib/marble/geodata/data/GeoDataTour.h --- a/src/lib/marble/geodata/data/GeoDataTour.h +++ b/src/lib/marble/geodata/data/GeoDataTour.h @@ -28,7 +28,7 @@ public: GeoDataTour(); GeoDataTour(const GeoDataTour& other); - virtual ~GeoDataTour(); + ~GeoDataTour() override; GeoDataTour& operator=(const GeoDataTour& other); @@ -41,7 +41,7 @@ const GeoDataPlaylist* playlist() const; void setPlaylist(GeoDataPlaylist* playlist); - virtual const char* nodeType() const; + const char* nodeType() const override; static const GeoDataTour null; diff --git a/src/lib/marble/geodata/data/GeoDataTourControl.h b/src/lib/marble/geodata/data/GeoDataTourControl.h --- a/src/lib/marble/geodata/data/GeoDataTourControl.h +++ b/src/lib/marble/geodata/data/GeoDataTourControl.h @@ -27,11 +27,11 @@ }; GeoDataTourControl(); - ~GeoDataTourControl(); + ~GeoDataTourControl() override; bool operator==( const GeoDataTourControl &other ) const; bool operator!=( const GeoDataTourControl &other ) const; - const char *nodeType() const; + const char *nodeType() const override; PlayMode playMode() const; void setPlayMode(PlayMode mode); diff --git a/src/lib/marble/geodata/data/GeoDataTour_p.h b/src/lib/marble/geodata/data/GeoDataTour_p.h --- a/src/lib/marble/geodata/data/GeoDataTour_p.h +++ b/src/lib/marble/geodata/data/GeoDataTour_p.h @@ -37,7 +37,7 @@ } } - virtual ~GeoDataTourPrivate() + ~GeoDataTourPrivate() override { delete m_playlist; } diff --git a/src/lib/marble/geodata/data/GeoDataTrack.h b/src/lib/marble/geodata/data/GeoDataTrack.h --- a/src/lib/marble/geodata/data/GeoDataTrack.h +++ b/src/lib/marble/geodata/data/GeoDataTrack.h @@ -184,9 +184,9 @@ */ void setExtendedData( const GeoDataExtendedData& extendedData ); - virtual const GeoDataLatLonAltBox& latLonAltBox() const; - virtual void pack( QDataStream& stream ) const; - virtual void unpack( QDataStream& stream ); + const GeoDataLatLonAltBox& latLonAltBox() const override; + void pack( QDataStream& stream ) const override; + void unpack( QDataStream& stream ) override; private: Q_DECLARE_PRIVATE(GeoDataTrack) diff --git a/src/lib/marble/geodata/data/GeoDataTrack.cpp b/src/lib/marble/geodata/data/GeoDataTrack.cpp --- a/src/lib/marble/geodata/data/GeoDataTrack.cpp +++ b/src/lib/marble/geodata/data/GeoDataTrack.cpp @@ -33,11 +33,11 @@ { } - const char *nodeType() const { return GeoDataTypes::GeoDataTrackType; } + const char *nodeType() const override { return GeoDataTypes::GeoDataTrackType; } - GeoDataGeometryPrivate *copy() { return new GeoDataTrackPrivate( *this ); } + GeoDataGeometryPrivate *copy() override { return new GeoDataTrackPrivate( *this ); } - EnumGeometryId geometryId() const { return GeoDataTrackId; } + EnumGeometryId geometryId() const override { return GeoDataTrackId; } void equalizeWhenSize() { diff --git a/src/lib/marble/geodata/data/GeoDataUpdate.h b/src/lib/marble/geodata/data/GeoDataUpdate.h --- a/src/lib/marble/geodata/data/GeoDataUpdate.h +++ b/src/lib/marble/geodata/data/GeoDataUpdate.h @@ -35,10 +35,10 @@ bool operator==( const GeoDataUpdate &other ) const; bool operator!=( const GeoDataUpdate &other ) const; - ~GeoDataUpdate(); + ~GeoDataUpdate() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; QString targetHref() const; void setTargetHref( const QString &targetHref ); diff --git a/src/lib/marble/geodata/data/GeoDataViewVolume.h b/src/lib/marble/geodata/data/GeoDataViewVolume.h --- a/src/lib/marble/geodata/data/GeoDataViewVolume.h +++ b/src/lib/marble/geodata/data/GeoDataViewVolume.h @@ -32,10 +32,10 @@ bool operator==( const GeoDataViewVolume &other ) const; bool operator!=( const GeoDataViewVolume &other ) const; - ~GeoDataViewVolume(); + ~GeoDataViewVolume() override; /** Provides type information for downcasting a GeoNode */ - virtual const char* nodeType() const; + const char* nodeType() const override; qreal leftFov() const; void setLeftFov(qreal leftFov); diff --git a/src/lib/marble/geodata/data/GeoDataWait.h b/src/lib/marble/geodata/data/GeoDataWait.h --- a/src/lib/marble/geodata/data/GeoDataWait.h +++ b/src/lib/marble/geodata/data/GeoDataWait.h @@ -23,11 +23,11 @@ public: GeoDataWait(); - ~GeoDataWait(); + ~GeoDataWait() override; bool operator==(const GeoDataWait &other) const; bool operator!=(const GeoDataWait &other) const; - const char *nodeType() const; + const char *nodeType() const override; double duration() const; void setDuration(double duration); diff --git a/src/lib/marble/geodata/graphicsitem/AbstractGeoPolygonGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/AbstractGeoPolygonGraphicsItem.h --- a/src/lib/marble/geodata/graphicsitem/AbstractGeoPolygonGraphicsItem.h +++ b/src/lib/marble/geodata/graphicsitem/AbstractGeoPolygonGraphicsItem.h @@ -29,11 +29,11 @@ protected: explicit AbstractGeoPolygonGraphicsItem(const GeoDataPlacemark *placemark, const GeoDataPolygon *polygon); explicit AbstractGeoPolygonGraphicsItem(const GeoDataPlacemark *placemark, const GeoDataLinearRing *ring); - ~AbstractGeoPolygonGraphicsItem(); + ~AbstractGeoPolygonGraphicsItem() override; public: - virtual const GeoDataLatLonAltBox& latLonAltBox() const; - virtual void paint(GeoPainter* painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel); + const GeoDataLatLonAltBox& latLonAltBox() const override; + void paint(GeoPainter* painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel) override; static quint64 s_previousStyle; diff --git a/src/lib/marble/geodata/graphicsitem/BuildingGeoPolygonGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/BuildingGeoPolygonGraphicsItem.h --- a/src/lib/marble/geodata/graphicsitem/BuildingGeoPolygonGraphicsItem.h +++ b/src/lib/marble/geodata/graphicsitem/BuildingGeoPolygonGraphicsItem.h @@ -26,7 +26,7 @@ explicit BuildingGeoPolygonGraphicsItem(const GeoDataPlacemark *placemark, const GeoDataLinearRing *ring); public: - virtual void paint(GeoPainter* painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel); + void paint(GeoPainter* painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel) override; private: struct NamedEntry { diff --git a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h --- a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h +++ b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h @@ -32,9 +32,9 @@ static GeoDataLineString merge(const QVector &lineStrings); void setMergedLineString(const GeoDataLineString &sharedLineString); - virtual const GeoDataLatLonAltBox& latLonAltBox() const; + const GeoDataLatLonAltBox& latLonAltBox() const override; - void paint(GeoPainter* painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel); + void paint(GeoPainter* painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel) override; static quint64 s_previousStyle; diff --git a/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.h --- a/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.h +++ b/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.h @@ -29,9 +29,9 @@ GeoDataPoint point() const; - virtual void paint(GeoPainter* painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel); + void paint(GeoPainter* painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel) override; - virtual const GeoDataLatLonAltBox& latLonAltBox() const; + const GeoDataLatLonAltBox& latLonAltBox() const override; protected: GeoDataPoint m_point; diff --git a/src/lib/marble/geodata/graphicsitem/GeoPointGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/GeoPointGraphicsItem.h --- a/src/lib/marble/geodata/graphicsitem/GeoPointGraphicsItem.h +++ b/src/lib/marble/geodata/graphicsitem/GeoPointGraphicsItem.h @@ -25,9 +25,9 @@ public: explicit GeoPointGraphicsItem(const GeoDataPlacemark *placemark, const GeoDataPoint *point); - virtual void paint(GeoPainter* painter, const ViewportParams *viewport, const QString &layer, int tileLevel); + void paint(GeoPainter* painter, const ViewportParams *viewport, const QString &layer, int tileLevel) override; - virtual const GeoDataLatLonAltBox& latLonAltBox() const; + const GeoDataLatLonAltBox& latLonAltBox() const override; protected: const GeoDataPoint *m_point; diff --git a/src/lib/marble/geodata/graphicsitem/GeoTrackGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/GeoTrackGraphicsItem.h --- a/src/lib/marble/geodata/graphicsitem/GeoTrackGraphicsItem.h +++ b/src/lib/marble/geodata/graphicsitem/GeoTrackGraphicsItem.h @@ -25,7 +25,7 @@ public: explicit GeoTrackGraphicsItem(const GeoDataPlacemark *placemark, const GeoDataTrack *track); - virtual void paint(GeoPainter *painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel); + void paint(GeoPainter *painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel) override; private: void setTrack(const GeoDataTrack *track); diff --git a/src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.h --- a/src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.h +++ b/src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.h @@ -29,10 +29,10 @@ const GeoDataScreenOverlay* screenOverlay() const; - void setProjection( const ViewportParams *viewport ); + void setProjection( const ViewportParams *viewport ) override; protected: - virtual void paint( QPainter* painter ); + void paint( QPainter* painter ) override; private: static qreal pixelValue( GeoDataVec2::Unit unit, qreal screenSize, qreal imageSize, qreal value ); diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlAvailableTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlAvailableTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlAvailableTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlAvailableTagHandler.h @@ -32,7 +32,7 @@ class DgmlAvailableTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlBlendingTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlBlendingTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlBlendingTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlBlendingTagHandler.h @@ -26,7 +26,7 @@ class DgmlBlendingTagHandler: public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.h @@ -32,7 +32,7 @@ class DgmlBrushTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlDescriptionTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlDescriptionTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlDescriptionTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlDescriptionTagHandler.h @@ -32,7 +32,7 @@ class DgmlDescriptionTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlDiscreteTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlDiscreteTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlDiscreteTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlDiscreteTagHandler.h @@ -32,7 +32,7 @@ class DgmlDiscreteTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlDocumentTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlDocumentTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlDocumentTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlDocumentTagHandler.h @@ -32,7 +32,7 @@ class DgmlDocumentTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.h @@ -26,7 +26,7 @@ class DgmlDownloadPolicyTagHandler: public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser & ) const; + GeoNode* parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.h @@ -32,7 +32,7 @@ class DgmlDownloadUrlTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlFilterTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlFilterTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlFilterTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlFilterTagHandler.h @@ -34,7 +34,7 @@ class DgmlFilterTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlGeodataTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlGeodataTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlGeodataTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlGeodataTagHandler.h @@ -32,7 +32,7 @@ class DgmlGeodataTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlGroupTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlGroupTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlGroupTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlGroupTagHandler.h @@ -32,7 +32,7 @@ class DgmlGroupTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlHeadTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlHeadTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlHeadTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlHeadTagHandler.h @@ -32,7 +32,7 @@ class DgmlHeadTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlHeadingTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlHeadingTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlHeadingTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlHeadingTagHandler.h @@ -33,7 +33,7 @@ class DgmlHeadingTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlIconTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlIconTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlIconTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlIconTagHandler.h @@ -32,7 +32,7 @@ class DgmlIconTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlInstallMapTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlInstallMapTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlInstallMapTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlInstallMapTagHandler.h @@ -32,7 +32,7 @@ class DgmlInstallMapTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlItemTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlItemTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlItemTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlItemTagHandler.h @@ -33,7 +33,7 @@ class DgmlItemTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlLayerTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlLayerTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlLayerTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlLayerTagHandler.h @@ -33,7 +33,7 @@ class DgmlLayerTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlLegendTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlLegendTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlLegendTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlLegendTagHandler.h @@ -33,7 +33,7 @@ class DgmlLegendTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlLicenseTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlLicenseTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlLicenseTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlLicenseTagHandler.h @@ -21,7 +21,7 @@ class DgmlLicenseTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser &parser ) const; + GeoNode* parse( GeoParser &parser ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlMapTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlMapTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlMapTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlMapTagHandler.h @@ -33,7 +33,7 @@ class DgmlMapTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlMaximumTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlMaximumTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlMaximumTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlMaximumTagHandler.h @@ -32,7 +32,7 @@ class DgmlMaximumTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlMinimumTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlMinimumTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlMinimumTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlMinimumTagHandler.h @@ -32,7 +32,7 @@ class DgmlMinimumTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlNameTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlNameTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlNameTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlNameTagHandler.h @@ -32,7 +32,7 @@ class DgmlNameTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlPaletteTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlPaletteTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlPaletteTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlPaletteTagHandler.h @@ -34,7 +34,7 @@ class DgmlPaletteTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlPenTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlPenTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlPenTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlPenTagHandler.h @@ -32,7 +32,7 @@ class DgmlPenTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlProjectionTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlProjectionTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlProjectionTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlProjectionTagHandler.h @@ -32,7 +32,7 @@ class DgmlProjectionTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlPropertyTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlPropertyTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlPropertyTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlPropertyTagHandler.h @@ -32,7 +32,7 @@ class DgmlPropertyTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlRenderOrderTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlRenderOrderTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlRenderOrderTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlRenderOrderTagHandler.h @@ -21,7 +21,7 @@ class DgmlRenderOrderTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlSectionTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlSectionTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlSectionTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlSectionTagHandler.h @@ -33,7 +33,7 @@ class DgmlSectionTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlSettingsTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlSettingsTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlSettingsTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlSettingsTagHandler.h @@ -32,7 +32,7 @@ class DgmlSettingsTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlSourceDirTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlSourceDirTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlSourceDirTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlSourceDirTagHandler.h @@ -32,7 +32,7 @@ class DgmlSourceDirTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlSourceFileTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlSourceFileTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlSourceFileTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlSourceFileTagHandler.h @@ -32,7 +32,7 @@ class DgmlSourceFileTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlStorageLayoutTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlStorageLayoutTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlStorageLayoutTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlStorageLayoutTagHandler.h @@ -32,7 +32,7 @@ class DgmlStorageLayoutTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlTargetTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlTargetTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlTargetTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlTargetTagHandler.h @@ -32,7 +32,7 @@ class DgmlTargetTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlTextTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlTextTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlTextTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlTextTagHandler.h @@ -32,7 +32,7 @@ class DgmlTextTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlTextureTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlTextureTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlTextureTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlTextureTagHandler.h @@ -32,7 +32,7 @@ class DgmlTextureTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlThemeTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlThemeTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlThemeTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlThemeTagHandler.h @@ -32,7 +32,7 @@ class DgmlThemeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlTileSizeTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlTileSizeTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlTileSizeTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlTileSizeTagHandler.h @@ -20,7 +20,7 @@ class DgmlTileSizeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlValueTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlValueTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlValueTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlValueTagHandler.h @@ -32,7 +32,7 @@ class DgmlValueTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.h @@ -32,7 +32,7 @@ class DgmlVectorTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlVectortileTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlVectortileTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlVectortileTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlVectortileTagHandler.h @@ -23,7 +23,7 @@ class DgmlVectortileTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlVisibleTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlVisibleTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlVisibleTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlVisibleTagHandler.h @@ -32,7 +32,7 @@ class DgmlVisibleTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlZoomTagHandler.h b/src/lib/marble/geodata/handlers/dgml/DgmlZoomTagHandler.h --- a/src/lib/marble/geodata/handlers/dgml/DgmlZoomTagHandler.h +++ b/src/lib/marble/geodata/handlers/dgml/DgmlZoomTagHandler.h @@ -32,7 +32,7 @@ class DgmlZoomTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlAliasTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlAliasTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlAliasTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlAliasTagHandler.h @@ -21,7 +21,7 @@ class KmlAliasTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.h @@ -32,7 +32,7 @@ class KmlaltitudeModeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlAltitudeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlAltitudeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlAltitudeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlAltitudeTagHandler.h @@ -21,7 +21,7 @@ class KmlaltitudeTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlAnimatedUpdateTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlAnimatedUpdateTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlAnimatedUpdateTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlAnimatedUpdateTagHandler.h @@ -21,7 +21,7 @@ class KmlAnimatedUpdateTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } } diff --git a/src/lib/marble/geodata/handlers/kml/KmlAreaTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlAreaTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlAreaTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlAreaTagHandler.h @@ -32,7 +32,7 @@ class KmlareaTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlBalloonStyleTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlBalloonStyleTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlBalloonStyleTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlBalloonStyleTagHandler.h @@ -21,7 +21,7 @@ class KmlBalloonStyleTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlBalloonVisibilityTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlBalloonVisibilityTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlBalloonVisibilityTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlBalloonVisibilityTagHandler.h @@ -22,7 +22,7 @@ class KmlballoonVisibilityTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlBeginTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlBeginTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlBeginTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlBeginTagHandler.h @@ -21,7 +21,7 @@ class KmlbeginTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlBgColorTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlBgColorTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlBgColorTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlBgColorTagHandler.h @@ -21,7 +21,7 @@ class KmlbgColorTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlBottomFovTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlBottomFovTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlBottomFovTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlBottomFovTagHandler.h @@ -21,7 +21,7 @@ class KmlbottomFovTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.h @@ -21,7 +21,7 @@ class KmlCameraTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse (GeoParser &) const; + GeoNode * parse (GeoParser &) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.h @@ -21,7 +21,7 @@ class KmlChangeTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.h @@ -32,7 +32,7 @@ class KmlcolorModeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlColorTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlColorTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlColorTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlColorTagHandler.h @@ -34,7 +34,7 @@ class KmlcolorTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; static QColor parseColor( const QString &colorString ); }; diff --git a/src/lib/marble/geodata/handlers/kml/KmlCookieTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlCookieTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlCookieTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlCookieTagHandler.h @@ -21,7 +21,7 @@ class KmlcookieTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.h @@ -32,7 +32,7 @@ class KmlcoordinatesTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlCountryNameCodeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlCountryNameCodeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlCountryNameCodeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlCountryNameCodeTagHandler.h @@ -32,7 +32,7 @@ class KmlCountryNameCodeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlCountrycodeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlCountrycodeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlCountrycodeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlCountrycodeTagHandler.h @@ -32,7 +32,7 @@ class KmlcountrycodeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlCreateTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlCreateTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlCreateTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlCreateTagHandler.h @@ -21,7 +21,7 @@ class KmlCreateTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlDataTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlDataTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlDataTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlDataTagHandler.h @@ -21,7 +21,7 @@ class KmlDataTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlDeleteTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlDeleteTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlDeleteTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlDeleteTagHandler.h @@ -21,7 +21,7 @@ class KmlDeleteTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlDescriptionTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlDescriptionTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlDescriptionTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlDescriptionTagHandler.h @@ -32,7 +32,7 @@ class KmldescriptionTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlDisplayModeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlDisplayModeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlDisplayModeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlDisplayModeTagHandler.h @@ -21,7 +21,7 @@ class KmldisplayModeTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlDisplayNameTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlDisplayNameTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlDisplayNameTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlDisplayNameTagHandler.h @@ -21,7 +21,7 @@ class KmldisplayNameTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.h @@ -32,7 +32,7 @@ class KmlDocumentTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlDurationTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlDurationTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlDurationTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlDurationTagHandler.h @@ -20,7 +20,7 @@ class KmldurationTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlEastTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlEastTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlEastTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlEastTagHandler.h @@ -21,7 +21,7 @@ class KmleastTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlEndTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlEndTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlEndTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlEndTagHandler.h @@ -21,7 +21,7 @@ class KmlendTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlExpiresTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlExpiresTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlExpiresTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlExpiresTagHandler.h @@ -21,7 +21,7 @@ class KmlexpiresTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlExtendedDataTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlExtendedDataTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlExtendedDataTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlExtendedDataTagHandler.h @@ -21,7 +21,7 @@ class KmlExtendedDataTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlExtrudeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlExtrudeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlExtrudeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlExtrudeTagHandler.h @@ -32,7 +32,7 @@ class KmlextrudeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlFillTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlFillTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlFillTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlFillTagHandler.h @@ -32,7 +32,7 @@ class KmlfillTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlFlyToModeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlFlyToModeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlFlyToModeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlFlyToModeTagHandler.h @@ -21,7 +21,7 @@ class KmlflyToModeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlFlyToTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlFlyToTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlFlyToTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlFlyToTagHandler.h @@ -20,7 +20,7 @@ class KmlFlyToTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlFlyToViewTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlFlyToViewTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlFlyToViewTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlFlyToViewTagHandler.h @@ -21,7 +21,7 @@ class KmlflyToViewTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlFolderTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlFolderTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlFolderTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlFolderTagHandler.h @@ -32,7 +32,7 @@ class KmlFolderTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlGridOriginTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlGridOriginTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlGridOriginTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlGridOriginTagHandler.h @@ -21,7 +21,7 @@ class KmlgridOriginTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlGroundOverlayTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlGroundOverlayTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlGroundOverlayTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlGroundOverlayTagHandler.h @@ -21,7 +21,7 @@ class KmlGroundOverlayTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.h @@ -22,7 +22,7 @@ class KmlaltitudeModeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlGxTimeSpanTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlGxTimeSpanTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlGxTimeSpanTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlGxTimeSpanTagHandler.h @@ -23,7 +23,7 @@ class KmlTimeSpanTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlGxTimeStampTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlGxTimeStampTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlGxTimeStampTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlGxTimeStampTagHandler.h @@ -23,7 +23,7 @@ class KmlTimeStampTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlHeadingTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlHeadingTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlHeadingTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlHeadingTagHandler.h @@ -32,7 +32,7 @@ class KmlheadingTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlHotSpotTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlHotSpotTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlHotSpotTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlHotSpotTagHandler.h @@ -32,7 +32,7 @@ class KmlhotSpotTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlHrefTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlHrefTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlHrefTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlHrefTagHandler.h @@ -32,7 +32,7 @@ class KmlhrefTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlHttpQueryTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlHttpQueryTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlHttpQueryTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlHttpQueryTagHandler.h @@ -21,7 +21,7 @@ class KmlhttpQueryTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlIconStyleTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlIconStyleTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlIconStyleTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlIconStyleTagHandler.h @@ -32,7 +32,7 @@ class KmlIconStyleTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlIconTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlIconTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlIconTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlIconTagHandler.h @@ -32,7 +32,7 @@ class KmlIconTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlImagePyramidTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlImagePyramidTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlImagePyramidTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlImagePyramidTagHandler.h @@ -21,7 +21,7 @@ class KmlImagePyramidTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlInnerBoundaryIsTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlInnerBoundaryIsTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlInnerBoundaryIsTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlInnerBoundaryIsTagHandler.h @@ -32,7 +32,7 @@ class KmlinnerBoundaryIsTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.h @@ -21,7 +21,7 @@ class KmlItemIconTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlKeyTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlKeyTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlKeyTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlKeyTagHandler.h @@ -32,7 +32,7 @@ class KmlkeyTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLabelStyleTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLabelStyleTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLabelStyleTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLabelStyleTagHandler.h @@ -32,7 +32,7 @@ class KmlLabelStyleTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLatLonAltBoxTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLatLonAltBoxTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLatLonAltBoxTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLatLonAltBoxTagHandler.h @@ -21,7 +21,7 @@ class KmlLatLonAltBoxTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLatLonBoxTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLatLonBoxTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLatLonBoxTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLatLonBoxTagHandler.h @@ -21,7 +21,7 @@ class KmlLatLonBoxTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLatLonQuadTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLatLonQuadTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLatLonQuadTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLatLonQuadTagHandler.h @@ -21,7 +21,7 @@ class KmlLatLonQuadTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLatitudeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLatitudeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLatitudeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLatitudeTagHandler.h @@ -21,7 +21,7 @@ class KmllatitudeTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse (GeoParser &) const; + GeoNode * parse (GeoParser &) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLeftFovTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLeftFovTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLeftFovTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLeftFovTagHandler.h @@ -21,7 +21,7 @@ class KmlleftFovTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLineStringTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLineStringTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLineStringTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLineStringTagHandler.h @@ -32,7 +32,7 @@ class KmlLineStringTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLineStyleTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLineStyleTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLineStyleTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLineStyleTagHandler.h @@ -32,7 +32,7 @@ class KmlLineStyleTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.h @@ -32,7 +32,7 @@ class KmlLinearRingTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLinkDescriptionTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLinkDescriptionTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLinkDescriptionTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLinkDescriptionTagHandler.h @@ -21,7 +21,7 @@ class KmllinkDescriptionTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLinkNameTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLinkNameTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLinkNameTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLinkNameTagHandler.h @@ -21,7 +21,7 @@ class KmllinkNameTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLinkSnippetTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLinkSnippetTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLinkSnippetTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLinkSnippetTagHandler.h @@ -21,7 +21,7 @@ class KmllinkSnippetTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.h @@ -21,7 +21,7 @@ class KmlLinkTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.h @@ -21,7 +21,7 @@ class KmllistItemTypeTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlListStyleTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlListStyleTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlListStyleTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlListStyleTagHandler.h @@ -21,7 +21,7 @@ class KmlListStyleTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLocationTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLocationTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLocationTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLocationTagHandler.h @@ -21,7 +21,7 @@ class KmlLocationTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLodTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLodTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLodTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLodTagHandler.h @@ -21,7 +21,7 @@ class KmlLodTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLongitudeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLongitudeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLongitudeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLongitudeTagHandler.h @@ -22,7 +22,7 @@ { public: - virtual GeoNode * parse ( GeoParser & ) const; + GeoNode * parse ( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.h @@ -20,7 +20,7 @@ class KmlLookAtTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse (GeoParser &) const; + GeoNode * parse (GeoParser &) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.h @@ -32,7 +32,7 @@ class KmlMarblePlacemarkTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMaxAltitudeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMaxAltitudeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMaxAltitudeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMaxAltitudeTagHandler.h @@ -21,7 +21,7 @@ class KmlmaxAltitudeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMaxFadeExtentTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMaxFadeExtentTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMaxFadeExtentTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMaxFadeExtentTagHandler.h @@ -21,7 +21,7 @@ class KmlmaxFadeExtentTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMaxHeightTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMaxHeightTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMaxHeightTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMaxHeightTagHandler.h @@ -21,7 +21,7 @@ class KmlmaxHeightTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMaxLodPixelsTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMaxLodPixelsTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMaxLodPixelsTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMaxLodPixelsTagHandler.h @@ -21,7 +21,7 @@ class KmlmaxLodPixelsTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMaxSessionLengthTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMaxSessionLengthTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMaxSessionLengthTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMaxSessionLengthTagHandler.h @@ -21,7 +21,7 @@ class KmlmaxSessionLengthTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMaxWidthTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMaxWidthTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMaxWidthTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMaxWidthTagHandler.h @@ -21,7 +21,7 @@ class KmlmaxWidthTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMemberTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMemberTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMemberTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMemberTagHandler.h @@ -21,7 +21,7 @@ class KmlmemberTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMessageTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMessageTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMessageTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMessageTagHandler.h @@ -21,7 +21,7 @@ class KmlmessageTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMinAltitudeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMinAltitudeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMinAltitudeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMinAltitudeTagHandler.h @@ -21,7 +21,7 @@ class KmlminAltitudeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMinFadeExtentTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMinFadeExtentTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMinFadeExtentTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMinFadeExtentTagHandler.h @@ -21,7 +21,7 @@ class KmlminFadeExtentTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMinLodPixelsTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMinLodPixelsTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMinLodPixelsTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMinLodPixelsTagHandler.h @@ -21,7 +21,7 @@ class KmlminLodPixelsTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMinRefreshPeriodTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMinRefreshPeriodTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMinRefreshPeriodTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMinRefreshPeriodTagHandler.h @@ -21,7 +21,7 @@ class KmlminRefreshPeriodTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.h @@ -21,7 +21,7 @@ class KmlModelTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMultiGeometryTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMultiGeometryTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMultiGeometryTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMultiGeometryTagHandler.h @@ -32,7 +32,7 @@ class KmlMultiGeometryTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMultiTrackTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMultiTrackTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMultiTrackTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMultiTrackTagHandler.h @@ -20,7 +20,7 @@ class KmlMultiTrackTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlMxSizeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMxSizeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlMxSizeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlMxSizeTagHandler.h @@ -23,7 +23,7 @@ class KmlsizeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlNameTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlNameTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlNameTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlNameTagHandler.h @@ -32,7 +32,7 @@ class KmlnameTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlNdTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlNdTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlNdTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlNdTagHandler.h @@ -22,7 +22,7 @@ class KmlndTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlNearTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlNearTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlNearTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlNearTagHandler.h @@ -21,7 +21,7 @@ class KmlnearTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkControlTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkControlTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkControlTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkControlTagHandler.h @@ -21,7 +21,7 @@ class KmlNetworkLinkControlTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.h @@ -21,7 +21,7 @@ class KmlNetworkLinkTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlNorthTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlNorthTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlNorthTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlNorthTagHandler.h @@ -21,7 +21,7 @@ class KmlnorthTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlOpenTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlOpenTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlOpenTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlOpenTagHandler.h @@ -32,7 +32,7 @@ class KmlopenTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlOrientationTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlOrientationTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlOrientationTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlOrientationTagHandler.h @@ -21,7 +21,7 @@ class KmlOrientationTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlOsmPlacemarkDataTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlOsmPlacemarkDataTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlOsmPlacemarkDataTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlOsmPlacemarkDataTagHandler.h @@ -23,7 +23,7 @@ class KmlOsmPlacemarkDataTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& parser ) const; + GeoNode* parse( GeoParser& parser ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlOuterBoundaryIsTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlOuterBoundaryIsTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlOuterBoundaryIsTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlOuterBoundaryIsTagHandler.h @@ -32,7 +32,7 @@ class KmlouterBoundaryIsTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlOutlineTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlOutlineTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlOutlineTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlOutlineTagHandler.h @@ -32,7 +32,7 @@ class KmloutlineTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlOverlayXYTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlOverlayXYTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlOverlayXYTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlOverlayXYTagHandler.h @@ -21,7 +21,7 @@ class KmloverlayXYTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlPairTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlPairTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlPairTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlPairTagHandler.h @@ -32,7 +32,7 @@ class KmlPairTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlPhotoOverlayTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlPhotoOverlayTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlPhotoOverlayTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlPhotoOverlayTagHandler.h @@ -21,7 +21,7 @@ class KmlPhotoOverlayTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.h @@ -32,7 +32,7 @@ class KmlPlacemarkTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlPlaylistTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlPlaylistTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlPlaylistTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlPlaylistTagHandler.h @@ -21,7 +21,7 @@ class KmlPlaylistTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser &parser) const; + GeoNode* parse(GeoParser &parser) const override; }; } // namespace kml diff --git a/src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.h @@ -32,7 +32,7 @@ class KmlPointTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlPolyStyleTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlPolyStyleTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlPolyStyleTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlPolyStyleTagHandler.h @@ -32,7 +32,7 @@ class KmlPolyStyleTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.h @@ -32,7 +32,7 @@ class KmlPolygonTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlPopTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlPopTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlPopTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlPopTagHandler.h @@ -32,7 +32,7 @@ class KmlpopTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlRangeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlRangeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlRangeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlRangeTagHandler.h @@ -11,7 +11,7 @@ class KmlrangeTagHandler:public GeoTagHandler { public: - virtual GeoNode * parse (GeoParser &) const; + GeoNode * parse (GeoParser &) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlRefreshIntervalTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlRefreshIntervalTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlRefreshIntervalTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlRefreshIntervalTagHandler.h @@ -21,7 +21,7 @@ class KmlrefreshIntervalTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlRefreshModeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlRefreshModeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlRefreshModeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlRefreshModeTagHandler.h @@ -11,7 +11,7 @@ class KmlrefreshModeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlRefreshVisibilityTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlRefreshVisibilityTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlRefreshVisibilityTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlRefreshVisibilityTagHandler.h @@ -20,7 +20,7 @@ class KmlrefreshVisibilityTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlRegionTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlRegionTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlRegionTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlRegionTagHandler.h @@ -21,7 +21,7 @@ class KmlRegionTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.h @@ -21,7 +21,7 @@ class KmlResourceMapTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlRightFovTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlRightFovTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlRightFovTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlRightFovTagHandler.h @@ -21,7 +21,7 @@ class KmlrightFovTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlRoleTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlRoleTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlRoleTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlRoleTagHandler.h @@ -31,7 +31,7 @@ class KmlroleTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlRollTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlRollTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlRollTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlRollTagHandler.h @@ -21,7 +21,7 @@ class KmlrollTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlRotationTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlRotationTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlRotationTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlRotationTagHandler.h @@ -21,7 +21,7 @@ class KmlrotationTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlRotationXYTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlRotationXYTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlRotationXYTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlRotationXYTagHandler.h @@ -21,7 +21,7 @@ class KmlrotationXYTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlScaleTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlScaleTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlScaleTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlScaleTagHandler.h @@ -21,7 +21,7 @@ class KmlScaleTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlSchemaDataTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlSchemaDataTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlSchemaDataTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlSchemaDataTagHandler.h @@ -21,7 +21,7 @@ class KmlSchemaDataTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlSchemaTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlSchemaTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlSchemaTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlSchemaTagHandler.h @@ -32,7 +32,7 @@ class KmlSchemaTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlScreenOverlayTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlScreenOverlayTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlScreenOverlayTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlScreenOverlayTagHandler.h @@ -21,7 +21,7 @@ class KmlScreenOverlayTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlScreenXYTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlScreenXYTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlScreenXYTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlScreenXYTagHandler.h @@ -21,7 +21,7 @@ class KmlscreenXYTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlShapeTagHandler.h @@ -21,7 +21,7 @@ class KmlshapeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlSimpleArrayDataTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlSimpleArrayDataTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlSimpleArrayDataTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlSimpleArrayDataTagHandler.h @@ -21,7 +21,7 @@ class KmlSimpleArrayDataTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.h @@ -21,7 +21,7 @@ class KmlSimpleDataTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlSimpleFieldTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlSimpleFieldTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlSimpleFieldTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlSimpleFieldTagHandler.h @@ -36,7 +36,7 @@ class KmlSimpleFieldTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; private: static GeoDataSimpleField::SimpleFieldType resolveType( const QString& type ); diff --git a/src/lib/marble/geodata/handlers/kml/KmlSizeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlSizeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlSizeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlSizeTagHandler.h @@ -21,7 +21,7 @@ class KmlsizeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.h @@ -21,7 +21,7 @@ class KmlSnippetTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlSoundCueTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlSoundCueTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlSoundCueTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlSoundCueTagHandler.h @@ -21,7 +21,7 @@ class KmlSoundCueTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser &parser) const; + GeoNode* parse(GeoParser &parser) const override; }; } // namespace kml diff --git a/src/lib/marble/geodata/handlers/kml/KmlSourceHrefTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlSourceHrefTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlSourceHrefTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlSourceHrefTagHandler.h @@ -21,7 +21,7 @@ class KmlsourceHrefTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlSouthTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlSouthTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlSouthTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlSouthTagHandler.h @@ -21,7 +21,7 @@ class KmlsouthTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlStateTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlStateTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlStateTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlStateTagHandler.h @@ -22,7 +22,7 @@ class KmlstateTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlStyleMapTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlStyleMapTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlStyleMapTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlStyleMapTagHandler.h @@ -32,7 +32,7 @@ class KmlStyleMapTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlStyleTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlStyleTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlStyleTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlStyleTagHandler.h @@ -32,7 +32,7 @@ class KmlStyleTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlStyleUrlTagHandler.h @@ -32,7 +32,7 @@ class KmlstyleUrlTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlTagTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTagTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTagTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTagTagHandler.h @@ -21,7 +21,7 @@ class KmltagTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlTargetHrefTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTargetHrefTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTargetHrefTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTargetHrefTagHandler.h @@ -21,7 +21,7 @@ class KmltargetHrefTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.h @@ -32,7 +32,7 @@ class KmltessellateTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlTextColorTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTextColorTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTextColorTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTextColorTagHandler.h @@ -21,7 +21,7 @@ class KmltextColorTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlTextTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTextTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTextTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTextTagHandler.h @@ -21,7 +21,7 @@ class KmltextTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlTileSizeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTileSizeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTileSizeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTileSizeTagHandler.h @@ -21,7 +21,7 @@ class KmltileSizeTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlTiltTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTiltTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTiltTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTiltTagHandler.h @@ -21,7 +21,7 @@ class KmltiltTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlTimeSpanTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTimeSpanTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTimeSpanTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTimeSpanTagHandler.h @@ -21,7 +21,7 @@ class KmlTimeSpanTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlTimeStampTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTimeStampTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTimeStampTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTimeStampTagHandler.h @@ -21,7 +21,7 @@ class KmlTimeStampTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlTopFovTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTopFovTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTopFovTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTopFovTagHandler.h @@ -21,7 +21,7 @@ class KmltopFovTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlTourControlTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTourControlTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTourControlTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTourControlTagHandler.h @@ -21,7 +21,7 @@ class KmlTourControlTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser &parser) const; + GeoNode* parse(GeoParser &parser) const override; }; } // namespace kml diff --git a/src/lib/marble/geodata/handlers/kml/KmlTourTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTourTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTourTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTourTagHandler.h @@ -21,7 +21,7 @@ class KmlTourTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser &parser) const; + GeoNode* parse(GeoParser &parser) const override; }; } // namespace kml diff --git a/src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.h @@ -22,7 +22,7 @@ { public: - virtual GeoNode *parse( GeoParser &parser ) const; + GeoNode *parse( GeoParser &parser ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlUpdateTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlUpdateTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlUpdateTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlUpdateTagHandler.h @@ -21,7 +21,7 @@ class KmlUpdateTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlValueTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlValueTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlValueTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlValueTagHandler.h @@ -21,7 +21,7 @@ class KmlvalueTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse( GeoParser& ) const; + GeoNode* parse( GeoParser& ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlViewBoundScaleTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlViewBoundScaleTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlViewBoundScaleTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlViewBoundScaleTagHandler.h @@ -21,7 +21,7 @@ class KmlviewBoundScaleTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlViewFormatTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlViewFormatTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlViewFormatTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlViewFormatTagHandler.h @@ -21,7 +21,7 @@ class KmlviewFormatTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlViewRefreshModeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlViewRefreshModeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlViewRefreshModeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlViewRefreshModeTagHandler.h @@ -21,7 +21,7 @@ class KmlviewRefreshModeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlViewRefreshTimeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlViewRefreshTimeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlViewRefreshTimeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlViewRefreshTimeTagHandler.h @@ -21,7 +21,7 @@ class KmlviewRefreshTimeTagHandler : public GeoTagHandler { public: - virtual GeoNode * parse( GeoParser & ) const; + GeoNode * parse( GeoParser & ) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlViewVolumeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlViewVolumeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlViewVolumeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlViewVolumeTagHandler.h @@ -21,7 +21,7 @@ class KmlViewVolumeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlVisibilityTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlVisibilityTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlVisibilityTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlVisibilityTagHandler.h @@ -32,7 +32,7 @@ class KmlvisibilityTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlWaitTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlWaitTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlWaitTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlWaitTagHandler.h @@ -21,7 +21,7 @@ class KmlWaitTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser &parser) const; + GeoNode* parse(GeoParser &parser) const override; }; } // namespace kml diff --git a/src/lib/marble/geodata/handlers/kml/KmlWestTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlWestTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlWestTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlWestTagHandler.h @@ -21,7 +21,7 @@ class KmlwestTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlWhenTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlWhenTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlWhenTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlWhenTagHandler.h @@ -24,7 +24,7 @@ class KmlwhenTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; static QDateTime parse( const QString &dateTime ); diff --git a/src/lib/marble/geodata/handlers/kml/KmlWidthTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlWidthTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlWidthTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlWidthTagHandler.h @@ -32,7 +32,7 @@ class KmlwidthTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlXTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlXTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlXTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlXTagHandler.h @@ -21,7 +21,7 @@ class KmlxTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlYTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlYTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlYTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlYTagHandler.h @@ -21,7 +21,7 @@ class KmlyTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmlZTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlZTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlZTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlZTagHandler.h @@ -21,7 +21,7 @@ class KmlzTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/Kml_scaleTagHandler.h b/src/lib/marble/geodata/handlers/kml/Kml_scaleTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/Kml_scaleTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/Kml_scaleTagHandler.h @@ -39,7 +39,7 @@ class KmlscaleTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/lib/marble/geodata/handlers/kml/KmldelayedStartTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmldelayedStartTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmldelayedStartTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmldelayedStartTagHandler.h @@ -21,7 +21,7 @@ class KmldelayedStartTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser &parser) const; + GeoNode* parse(GeoParser &parser) const override; }; } // namespace kml diff --git a/src/lib/marble/geodata/handlers/kml/KmldrawOrderTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmldrawOrderTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmldrawOrderTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmldrawOrderTagHandler.h @@ -21,7 +21,7 @@ class KmldrawOrderTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser &parser) const; + GeoNode* parse(GeoParser &parser) const override; }; } // namespace kml diff --git a/src/lib/marble/geodata/handlers/kml/KmlplayModeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlplayModeTagHandler.h --- a/src/lib/marble/geodata/handlers/kml/KmlplayModeTagHandler.h +++ b/src/lib/marble/geodata/handlers/kml/KmlplayModeTagHandler.h @@ -21,7 +21,7 @@ class KmlplayModeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser &parser) const; + GeoNode* parse(GeoParser &parser) const override; }; } // namespace kml diff --git a/src/lib/marble/geodata/parser/GeoDataParser.h b/src/lib/marble/geodata/parser/GeoDataParser.h --- a/src/lib/marble/geodata/parser/GeoDataParser.h +++ b/src/lib/marble/geodata/parser/GeoDataParser.h @@ -41,13 +41,13 @@ { public: explicit GeoDataParser(GeoDataSourceType source); - virtual ~GeoDataParser(); + ~GeoDataParser() override; private: - virtual bool isValidElement(const QString& tagName) const; - virtual bool isValidRootElement(); + bool isValidElement(const QString& tagName) const override; + bool isValidRootElement() override; - virtual GeoDocument* createDocument() const; + GeoDocument* createDocument() const override; }; // Global helper function for the tag handlers diff --git a/src/lib/marble/geodata/parser/GeoSceneParser.h b/src/lib/marble/geodata/parser/GeoSceneParser.h --- a/src/lib/marble/geodata/parser/GeoSceneParser.h +++ b/src/lib/marble/geodata/parser/GeoSceneParser.h @@ -39,13 +39,13 @@ { public: explicit GeoSceneParser(GeoSceneSourceType source); - virtual ~GeoSceneParser(); + ~GeoSceneParser() override; private: - virtual bool isValidElement(const QString& tagName) const; - virtual bool isValidRootElement(); + bool isValidElement(const QString& tagName) const override; + bool isValidRootElement() override; - virtual GeoDocument* createDocument() const; + GeoDocument* createDocument() const override; }; // Global helper function for the tag handlers diff --git a/src/lib/marble/geodata/scene/GeoSceneAbstractDataset.h b/src/lib/marble/geodata/scene/GeoSceneAbstractDataset.h --- a/src/lib/marble/geodata/scene/GeoSceneAbstractDataset.h +++ b/src/lib/marble/geodata/scene/GeoSceneAbstractDataset.h @@ -37,7 +37,7 @@ class GEODATA_EXPORT GeoSceneAbstractDataset : public GeoNode { public: - virtual ~GeoSceneAbstractDataset() {}; + ~GeoSceneAbstractDataset() override {}; QString name() const; diff --git a/src/lib/marble/geodata/scene/GeoSceneDocument.h b/src/lib/marble/geodata/scene/GeoSceneDocument.h --- a/src/lib/marble/geodata/scene/GeoSceneDocument.h +++ b/src/lib/marble/geodata/scene/GeoSceneDocument.h @@ -49,11 +49,11 @@ public: GeoSceneDocument(); - ~GeoSceneDocument(); + ~GeoSceneDocument() override; - virtual const char* nodeType() const; + const char* nodeType() const override; - virtual bool isGeoSceneDocument() const { return true; } + bool isGeoSceneDocument() const override { return true; } const GeoSceneHead* head() const; GeoSceneHead* head(); diff --git a/src/lib/marble/geodata/scene/GeoSceneFilter.h b/src/lib/marble/geodata/scene/GeoSceneFilter.h --- a/src/lib/marble/geodata/scene/GeoSceneFilter.h +++ b/src/lib/marble/geodata/scene/GeoSceneFilter.h @@ -40,7 +40,7 @@ { public: explicit GeoSceneFilter( const QString& name ); - ~GeoSceneFilter(); + ~GeoSceneFilter() override; QString name() const; void setName( const QString& name ); diff --git a/src/lib/marble/geodata/scene/GeoSceneGeodata.h b/src/lib/marble/geodata/scene/GeoSceneGeodata.h --- a/src/lib/marble/geodata/scene/GeoSceneGeodata.h +++ b/src/lib/marble/geodata/scene/GeoSceneGeodata.h @@ -25,8 +25,8 @@ { public: explicit GeoSceneGeodata( const QString& name ); - virtual ~GeoSceneGeodata(); - virtual const char* nodeType() const; + ~GeoSceneGeodata() override; + const char* nodeType() const override; bool operator==( const GeoSceneGeodata &other ) const; diff --git a/src/lib/marble/geodata/scene/GeoSceneGroup.h b/src/lib/marble/geodata/scene/GeoSceneGroup.h --- a/src/lib/marble/geodata/scene/GeoSceneGroup.h +++ b/src/lib/marble/geodata/scene/GeoSceneGroup.h @@ -44,7 +44,7 @@ public: explicit GeoSceneGroup( const QString& name ); - ~GeoSceneGroup(); + ~GeoSceneGroup() override; /** * @brief Get the availability of a property in this group diff --git a/src/lib/marble/geodata/scene/GeoSceneHead.h b/src/lib/marble/geodata/scene/GeoSceneHead.h --- a/src/lib/marble/geodata/scene/GeoSceneHead.h +++ b/src/lib/marble/geodata/scene/GeoSceneHead.h @@ -46,9 +46,9 @@ { public: GeoSceneHead(); - ~GeoSceneHead(); + ~GeoSceneHead() override; - virtual const char* nodeType() const; + const char* nodeType() const override; QString name() const; void setName( const QString& name ); diff --git a/src/lib/marble/geodata/scene/GeoSceneIcon.h b/src/lib/marble/geodata/scene/GeoSceneIcon.h --- a/src/lib/marble/geodata/scene/GeoSceneIcon.h +++ b/src/lib/marble/geodata/scene/GeoSceneIcon.h @@ -39,7 +39,7 @@ { public: GeoSceneIcon(); - ~GeoSceneIcon(); + ~GeoSceneIcon() override; QString pixmap() const; void setPixmap(const QString&); diff --git a/src/lib/marble/geodata/scene/GeoSceneItem.h b/src/lib/marble/geodata/scene/GeoSceneItem.h --- a/src/lib/marble/geodata/scene/GeoSceneItem.h +++ b/src/lib/marble/geodata/scene/GeoSceneItem.h @@ -39,9 +39,9 @@ { public: explicit GeoSceneItem( const QString& name ); - ~GeoSceneItem(); + ~GeoSceneItem() override; - virtual const char* nodeType() const; + const char* nodeType() const override; QString name() const; diff --git a/src/lib/marble/geodata/scene/GeoSceneLayer.h b/src/lib/marble/geodata/scene/GeoSceneLayer.h --- a/src/lib/marble/geodata/scene/GeoSceneLayer.h +++ b/src/lib/marble/geodata/scene/GeoSceneLayer.h @@ -44,9 +44,9 @@ { public: explicit GeoSceneLayer( const QString& name ); - ~GeoSceneLayer(); + ~GeoSceneLayer() override; - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief Add a section to the legend diff --git a/src/lib/marble/geodata/scene/GeoSceneLegend.h b/src/lib/marble/geodata/scene/GeoSceneLegend.h --- a/src/lib/marble/geodata/scene/GeoSceneLegend.h +++ b/src/lib/marble/geodata/scene/GeoSceneLegend.h @@ -42,9 +42,9 @@ { public: GeoSceneLegend(); - ~GeoSceneLegend(); + ~GeoSceneLegend() override; - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief Add a section to the legend diff --git a/src/lib/marble/geodata/scene/GeoSceneMap.h b/src/lib/marble/geodata/scene/GeoSceneMap.h --- a/src/lib/marble/geodata/scene/GeoSceneMap.h +++ b/src/lib/marble/geodata/scene/GeoSceneMap.h @@ -46,8 +46,8 @@ { public: GeoSceneMap(); - ~GeoSceneMap(); - virtual const char* nodeType() const; + ~GeoSceneMap() override; + const char* nodeType() const override; QColor backgroundColor() const; void setBackgroundColor( const QColor& ); diff --git a/src/lib/marble/geodata/scene/GeoSceneProperty.h b/src/lib/marble/geodata/scene/GeoSceneProperty.h --- a/src/lib/marble/geodata/scene/GeoSceneProperty.h +++ b/src/lib/marble/geodata/scene/GeoSceneProperty.h @@ -43,7 +43,7 @@ public: explicit GeoSceneProperty( const QString& name ); - virtual const char* nodeType() const; + const char* nodeType() const override; QString name() const; bool available() const; diff --git a/src/lib/marble/geodata/scene/GeoSceneSection.h b/src/lib/marble/geodata/scene/GeoSceneSection.h --- a/src/lib/marble/geodata/scene/GeoSceneSection.h +++ b/src/lib/marble/geodata/scene/GeoSceneSection.h @@ -40,9 +40,9 @@ { public: explicit GeoSceneSection( const QString& name ); - ~GeoSceneSection(); + ~GeoSceneSection() override; - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief Add an item to the legend section diff --git a/src/lib/marble/geodata/scene/GeoSceneSettings.h b/src/lib/marble/geodata/scene/GeoSceneSettings.h --- a/src/lib/marble/geodata/scene/GeoSceneSettings.h +++ b/src/lib/marble/geodata/scene/GeoSceneSettings.h @@ -49,8 +49,8 @@ public: GeoSceneSettings(); - virtual ~GeoSceneSettings(); - virtual const char* nodeType() const; + ~GeoSceneSettings() override; + const char* nodeType() const override; /** * @brief Get the availability of a property across groups diff --git a/src/lib/marble/geodata/scene/GeoSceneTextureTileDataset.h b/src/lib/marble/geodata/scene/GeoSceneTextureTileDataset.h --- a/src/lib/marble/geodata/scene/GeoSceneTextureTileDataset.h +++ b/src/lib/marble/geodata/scene/GeoSceneTextureTileDataset.h @@ -27,7 +27,7 @@ explicit GeoSceneTextureTileDataset( const QString& name ); - virtual const char* nodeType() const; + const char* nodeType() const override; /** * @brief set bounds for the texture. Tiles outside of these bounds won't be searched in this texture. diff --git a/src/lib/marble/geodata/scene/GeoSceneTileDataset.h b/src/lib/marble/geodata/scene/GeoSceneTileDataset.h --- a/src/lib/marble/geodata/scene/GeoSceneTileDataset.h +++ b/src/lib/marble/geodata/scene/GeoSceneTileDataset.h @@ -47,8 +47,8 @@ enum StorageLayout { Marble, OpenStreetMap, TileMapService }; explicit GeoSceneTileDataset( const QString& name ); - ~GeoSceneTileDataset(); - virtual const char* nodeType() const; + ~GeoSceneTileDataset() override; + const char* nodeType() const override; QString sourceDir() const; void setSourceDir( const QString& sourceDir ); diff --git a/src/lib/marble/geodata/scene/GeoSceneVector.h b/src/lib/marble/geodata/scene/GeoSceneVector.h --- a/src/lib/marble/geodata/scene/GeoSceneVector.h +++ b/src/lib/marble/geodata/scene/GeoSceneVector.h @@ -39,7 +39,7 @@ { public: explicit GeoSceneVector( const QString& name ); - virtual const char* nodeType() const; + const char* nodeType() const override; QString sourceFile() const; void setSourceFile( const QString& sourceFile ); diff --git a/src/lib/marble/geodata/scene/GeoSceneVectorTileDataset.h b/src/lib/marble/geodata/scene/GeoSceneVectorTileDataset.h --- a/src/lib/marble/geodata/scene/GeoSceneVectorTileDataset.h +++ b/src/lib/marble/geodata/scene/GeoSceneVectorTileDataset.h @@ -26,7 +26,7 @@ explicit GeoSceneVectorTileDataset( const QString& name ); - virtual const char* nodeType() const; + const char* nodeType() const override; }; } diff --git a/src/lib/marble/geodata/writers/dgml/DgmlDocumentTagWriter.h b/src/lib/marble/geodata/writers/dgml/DgmlDocumentTagWriter.h --- a/src/lib/marble/geodata/writers/dgml/DgmlDocumentTagWriter.h +++ b/src/lib/marble/geodata/writers/dgml/DgmlDocumentTagWriter.h @@ -19,7 +19,7 @@ class DgmlDocumentTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/dgml/DgmlGeodataTagWriter.h b/src/lib/marble/geodata/writers/dgml/DgmlGeodataTagWriter.h --- a/src/lib/marble/geodata/writers/dgml/DgmlGeodataTagWriter.h +++ b/src/lib/marble/geodata/writers/dgml/DgmlGeodataTagWriter.h @@ -19,7 +19,7 @@ class DgmlGeodataTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/dgml/DgmlHeadTagWriter.h b/src/lib/marble/geodata/writers/dgml/DgmlHeadTagWriter.h --- a/src/lib/marble/geodata/writers/dgml/DgmlHeadTagWriter.h +++ b/src/lib/marble/geodata/writers/dgml/DgmlHeadTagWriter.h @@ -19,7 +19,7 @@ class DgmlHeadTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/dgml/DgmlItemTagWriter.h b/src/lib/marble/geodata/writers/dgml/DgmlItemTagWriter.h --- a/src/lib/marble/geodata/writers/dgml/DgmlItemTagWriter.h +++ b/src/lib/marble/geodata/writers/dgml/DgmlItemTagWriter.h @@ -19,7 +19,7 @@ class DgmlItemTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/dgml/DgmlLayerTagWriter.h b/src/lib/marble/geodata/writers/dgml/DgmlLayerTagWriter.h --- a/src/lib/marble/geodata/writers/dgml/DgmlLayerTagWriter.h +++ b/src/lib/marble/geodata/writers/dgml/DgmlLayerTagWriter.h @@ -19,7 +19,7 @@ class DgmlLayerTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/dgml/DgmlLegendTagWriter.h b/src/lib/marble/geodata/writers/dgml/DgmlLegendTagWriter.h --- a/src/lib/marble/geodata/writers/dgml/DgmlLegendTagWriter.h +++ b/src/lib/marble/geodata/writers/dgml/DgmlLegendTagWriter.h @@ -19,7 +19,7 @@ class DgmlLegendTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/dgml/DgmlMapTagWriter.h b/src/lib/marble/geodata/writers/dgml/DgmlMapTagWriter.h --- a/src/lib/marble/geodata/writers/dgml/DgmlMapTagWriter.h +++ b/src/lib/marble/geodata/writers/dgml/DgmlMapTagWriter.h @@ -19,7 +19,7 @@ class DgmlMapTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/dgml/DgmlSectionTagWriter.h b/src/lib/marble/geodata/writers/dgml/DgmlSectionTagWriter.h --- a/src/lib/marble/geodata/writers/dgml/DgmlSectionTagWriter.h +++ b/src/lib/marble/geodata/writers/dgml/DgmlSectionTagWriter.h @@ -19,7 +19,7 @@ class DgmlSectionTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/dgml/DgmlSettingsTagWriter.h b/src/lib/marble/geodata/writers/dgml/DgmlSettingsTagWriter.h --- a/src/lib/marble/geodata/writers/dgml/DgmlSettingsTagWriter.h +++ b/src/lib/marble/geodata/writers/dgml/DgmlSettingsTagWriter.h @@ -19,7 +19,7 @@ class DgmlSettingsTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/dgml/DgmlTagWriter.h b/src/lib/marble/geodata/writers/dgml/DgmlTagWriter.h --- a/src/lib/marble/geodata/writers/dgml/DgmlTagWriter.h +++ b/src/lib/marble/geodata/writers/dgml/DgmlTagWriter.h @@ -19,7 +19,7 @@ class DgmlTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/dgml/DgmlTextureTagWriter.h b/src/lib/marble/geodata/writers/dgml/DgmlTextureTagWriter.h --- a/src/lib/marble/geodata/writers/dgml/DgmlTextureTagWriter.h +++ b/src/lib/marble/geodata/writers/dgml/DgmlTextureTagWriter.h @@ -19,7 +19,7 @@ class DgmlTextureTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/dgml/DgmlVectorTagWriter.h b/src/lib/marble/geodata/writers/dgml/DgmlVectorTagWriter.h --- a/src/lib/marble/geodata/writers/dgml/DgmlVectorTagWriter.h +++ b/src/lib/marble/geodata/writers/dgml/DgmlVectorTagWriter.h @@ -19,7 +19,7 @@ class DgmlVectorTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlAnimatedUpdateTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlAnimatedUpdateTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlAnimatedUpdateTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlAnimatedUpdateTagWriter.h @@ -19,7 +19,7 @@ class KmlAnimatedUpdateTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; diff --git a/src/lib/marble/geodata/writers/kml/KmlBalloonStyleTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlBalloonStyleTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlBalloonStyleTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlBalloonStyleTagWriter.h @@ -19,7 +19,7 @@ class KmlBalloonStyleTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlCameraTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlCameraTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlCameraTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlCameraTagWriter.h @@ -19,7 +19,7 @@ class KmlCameraTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlColorStyleTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlColorStyleTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlColorStyleTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlColorStyleTagWriter.h @@ -24,7 +24,7 @@ public: explicit KmlColorStyleTagWriter( const QString &elementName ); - bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; static QString formatColor( const QColor &color ); diff --git a/src/lib/marble/geodata/writers/kml/KmlDataTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlDataTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlDataTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlDataTagWriter.h @@ -19,7 +19,7 @@ class KmlDataTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlDocumentTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlDocumentTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlDocumentTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlDocumentTagWriter.h @@ -23,7 +23,7 @@ KmlDocumentTagWriter(); protected: - virtual bool writeMid( const GeoNode *node, GeoWriter& writer ) const; + bool writeMid( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlExtendedDataTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlExtendedDataTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlExtendedDataTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlExtendedDataTagWriter.h @@ -19,7 +19,7 @@ class KmlExtendedDataTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlFeatureTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlFeatureTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlFeatureTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlFeatureTagWriter.h @@ -24,7 +24,7 @@ public: explicit KmlFeatureTagWriter( const QString &elementName ); - bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; protected: virtual bool writeMid( const GeoNode *node, GeoWriter& writer ) const = 0; diff --git a/src/lib/marble/geodata/writers/kml/KmlFlyToTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlFlyToTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlFlyToTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlFlyToTagWriter.h @@ -19,7 +19,7 @@ class KmlFlyToTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; diff --git a/src/lib/marble/geodata/writers/kml/KmlFolderTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlFolderTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlFolderTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlFolderTagWriter.h @@ -23,7 +23,7 @@ KmlFolderTagWriter(); protected: - virtual bool writeMid( const GeoNode *node, GeoWriter& writer ) const; + bool writeMid( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlGroundOverlayWriter.h b/src/lib/marble/geodata/writers/kml/KmlGroundOverlayWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlGroundOverlayWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlGroundOverlayWriter.h @@ -24,7 +24,7 @@ public: KmlGroundOverlayWriter(); - bool writeMid( const GeoNode *node, GeoWriter &writer ) const; + bool writeMid( const GeoNode *node, GeoWriter &writer ) const override; static QString altitudeModeToString(AltitudeMode mode); diff --git a/src/lib/marble/geodata/writers/kml/KmlIconStyleTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlIconStyleTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlIconStyleTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlIconStyleTagWriter.h @@ -24,8 +24,8 @@ KmlIconStyleTagWriter(); protected: - virtual bool writeMid( const GeoNode *node, GeoWriter& writer ) const; - virtual bool isEmpty( const GeoNode *node ) const; + bool writeMid( const GeoNode *node, GeoWriter& writer ) const override; + bool isEmpty( const GeoNode *node ) const override; private: static QString unitString( GeoDataHotSpot::Units unit ); diff --git a/src/lib/marble/geodata/writers/kml/KmlLabelStyleTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlLabelStyleTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlLabelStyleTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlLabelStyleTagWriter.h @@ -22,9 +22,9 @@ KmlLabelStyleTagWriter(); protected: - virtual bool writeMid( const GeoNode *node, GeoWriter &writer ) const; - virtual bool isEmpty( const GeoNode *node ) const; - virtual QColor defaultColor() const; + bool writeMid( const GeoNode *node, GeoWriter &writer ) const override; + bool isEmpty( const GeoNode *node ) const override; + QColor defaultColor() const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlLatLonAltBoxWriter.h b/src/lib/marble/geodata/writers/kml/KmlLatLonAltBoxWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlLatLonAltBoxWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlLatLonAltBoxWriter.h @@ -20,7 +20,7 @@ class KmlLatLonAltBoxWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlLatLonBoxWriter.h b/src/lib/marble/geodata/writers/kml/KmlLatLonBoxWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlLatLonBoxWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlLatLonBoxWriter.h @@ -20,7 +20,7 @@ class KmlLatLonBoxWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlLatLonQuadWriter.h b/src/lib/marble/geodata/writers/kml/KmlLatLonQuadWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlLatLonQuadWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlLatLonQuadWriter.h @@ -19,7 +19,7 @@ class KmlLatLonQuadWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlLineStringTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlLineStringTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlLineStringTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlLineStringTagWriter.h @@ -19,7 +19,7 @@ class KmlLineStringTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlLineStyleTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlLineStyleTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlLineStyleTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlLineStyleTagWriter.h @@ -22,9 +22,9 @@ KmlLineStyleTagWriter(); protected: - virtual bool writeMid( const GeoNode *node, GeoWriter& writer ) const; + bool writeMid( const GeoNode *node, GeoWriter& writer ) const override; - virtual bool isEmpty( const GeoNode *node ) const; + bool isEmpty( const GeoNode *node ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlLinearRingTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlLinearRingTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlLinearRingTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlLinearRingTagWriter.h @@ -19,7 +19,7 @@ class KmlLinearRingTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlLinkTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlLinkTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlLinkTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlLinkTagWriter.h @@ -20,7 +20,7 @@ class KmlLinkTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; static QString refreshModeToString( GeoDataLink::RefreshMode refreshMode) ; diff --git a/src/lib/marble/geodata/writers/kml/KmlListStyleTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlListStyleTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlListStyleTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlListStyleTagWriter.h @@ -21,7 +21,7 @@ class KmlListStyleTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; private: static QString itemTypeToString( GeoDataListStyle::ListItemType itemType ); diff --git a/src/lib/marble/geodata/writers/kml/KmlLodTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlLodTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlLodTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlLodTagWriter.h @@ -19,7 +19,7 @@ class KmlLodTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlLookAtTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlLookAtTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlLookAtTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlLookAtTagWriter.h @@ -21,7 +21,7 @@ class KmlLookAtTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlModelTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlModelTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlModelTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlModelTagWriter.h @@ -21,7 +21,7 @@ class KmlModelTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlMultiGeometryTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlMultiGeometryTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlMultiGeometryTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlMultiGeometryTagWriter.h @@ -19,7 +19,7 @@ class KmlMultiGeometryTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlMultiTrackTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlMultiTrackTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlMultiTrackTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlMultiTrackTagWriter.h @@ -19,7 +19,7 @@ class KmlMultiTrackTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlNetworkLinkControlTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlNetworkLinkControlTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlNetworkLinkControlTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlNetworkLinkControlTagWriter.h @@ -19,7 +19,7 @@ class KmlNetworkLinkControlTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlNetworkLinkTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlNetworkLinkTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlNetworkLinkTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlNetworkLinkTagWriter.h @@ -19,7 +19,7 @@ class KmlNetworkLinkTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlOverlayTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlOverlayTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlOverlayTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlOverlayTagWriter.h @@ -25,7 +25,7 @@ explicit KmlOverlayTagWriter( const QString &elementName ); protected: - virtual bool writeMid( const GeoNode *node, GeoWriter& writer ) const = 0; + bool writeMid( const GeoNode *node, GeoWriter& writer ) const override = 0; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlPhotoOverlayWriter.h b/src/lib/marble/geodata/writers/kml/KmlPhotoOverlayWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlPhotoOverlayWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlPhotoOverlayWriter.h @@ -21,7 +21,7 @@ public: KmlPhotoOverlayWriter(); - bool writeMid( const GeoNode *node, GeoWriter &writer ) const; + bool writeMid( const GeoNode *node, GeoWriter &writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.h @@ -22,7 +22,7 @@ KmlPlacemarkTagWriter(); protected: - virtual bool writeMid( const GeoNode *node, GeoWriter& writer ) const; + bool writeMid( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.h @@ -23,7 +23,7 @@ class KmlPlaylistTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; private: void writeTourPrimitive( const GeoNode *primitive, GeoWriter& writer ) const; diff --git a/src/lib/marble/geodata/writers/kml/KmlPointTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlPointTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlPointTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlPointTagWriter.h @@ -19,7 +19,7 @@ class KmlPointTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlPolyStyleTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlPolyStyleTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlPolyStyleTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlPolyStyleTagWriter.h @@ -21,8 +21,8 @@ KmlPolyStyleTagWriter(); protected: - virtual bool writeMid( const GeoNode *node, GeoWriter& writer ) const; - virtual bool isEmpty( const GeoNode *node ) const; + bool writeMid( const GeoNode *node, GeoWriter& writer ) const override; + bool isEmpty( const GeoNode *node ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlPolygonTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlPolygonTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlPolygonTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlPolygonTagWriter.h @@ -19,7 +19,7 @@ class KmlPolygonTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlRegionTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlRegionTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlRegionTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlRegionTagWriter.h @@ -19,7 +19,7 @@ class KmlRegionTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlSchemaDataTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlSchemaDataTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlSchemaDataTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlSchemaDataTagWriter.h @@ -19,7 +19,7 @@ class KmlSchemaDataTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlSchemaTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlSchemaTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlSchemaTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlSchemaTagWriter.h @@ -19,7 +19,7 @@ class KmlSchemaTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlScreenOverlayWriter.h b/src/lib/marble/geodata/writers/kml/KmlScreenOverlayWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlScreenOverlayWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlScreenOverlayWriter.h @@ -23,7 +23,7 @@ { public: KmlScreenOverlayWriter(); - bool writeMid( const GeoNode *node, GeoWriter& writer ) const; + bool writeMid( const GeoNode *node, GeoWriter& writer ) const override; private: static void writeVec2( const QString &element, const GeoDataVec2 &vec2, GeoWriter& writer ); diff --git a/src/lib/marble/geodata/writers/kml/KmlSimpleDataTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlSimpleDataTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlSimpleDataTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlSimpleDataTagWriter.h @@ -19,7 +19,7 @@ class KmlSimpleDataTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter &writer ) const; + bool write( const GeoNode *node, GeoWriter &writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlSimpleFieldTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlSimpleFieldTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlSimpleFieldTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlSimpleFieldTagWriter.h @@ -22,7 +22,7 @@ class KmlSimpleFieldTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; private: static QString resolveType( GeoDataSimpleField::SimpleFieldType type ); diff --git a/src/lib/marble/geodata/writers/kml/KmlStyleMapTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlStyleMapTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlStyleMapTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlStyleMapTagWriter.h @@ -19,7 +19,7 @@ class KmlStyleMapTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlStyleTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlStyleTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlStyleTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlStyleTagWriter.h @@ -19,7 +19,7 @@ class KmlStyleTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlTagWriter.h @@ -19,7 +19,7 @@ class KmlTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlTimeSpanWriter.h b/src/lib/marble/geodata/writers/kml/KmlTimeSpanWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlTimeSpanWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlTimeSpanWriter.h @@ -21,7 +21,7 @@ class KmlTimeSpanWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; diff --git a/src/lib/marble/geodata/writers/kml/KmlTimeStampTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlTimeStampTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlTimeStampTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlTimeStampTagWriter.h @@ -20,7 +20,7 @@ class KmlTimeStampTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; static QString toString( const GeoDataTimeStamp ×tamp ); }; diff --git a/src/lib/marble/geodata/writers/kml/KmlTourTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlTourTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlTourTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlTourTagWriter.h @@ -21,7 +21,7 @@ public: KmlTourTagWriter(); - virtual bool writeMid( const GeoNode *node, GeoWriter& writer ) const; + bool writeMid( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlTrackWriter.h b/src/lib/marble/geodata/writers/kml/KmlTrackWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlTrackWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlTrackWriter.h @@ -19,7 +19,7 @@ { public: - virtual bool write( const GeoNode *node, GeoWriter &writer ) const; + bool write( const GeoNode *node, GeoWriter &writer ) const override; }; } diff --git a/src/lib/marble/geodata/writers/kml/KmlUpdateTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlUpdateTagWriter.h --- a/src/lib/marble/geodata/writers/kml/KmlUpdateTagWriter.h +++ b/src/lib/marble/geodata/writers/kml/KmlUpdateTagWriter.h @@ -19,7 +19,7 @@ class KmlUpdateTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; diff --git a/src/lib/marble/graphicsview/FrameGraphicsItem.h b/src/lib/marble/graphicsview/FrameGraphicsItem.h --- a/src/lib/marble/graphicsview/FrameGraphicsItem.h +++ b/src/lib/marble/graphicsview/FrameGraphicsItem.h @@ -37,7 +37,7 @@ explicit FrameGraphicsItem( MarbleGraphicsItem *parent = 0 ); - virtual ~FrameGraphicsItem(); + ~FrameGraphicsItem() override; /** * Returns the type of the frame. @@ -153,14 +153,14 @@ QRectF paintedRect() const; - QRectF contentRect() const; - QSizeF contentSize() const; + QRectF contentRect() const override; + QSizeF contentSize() const override; /** * Sets the size of the content of the item. * @p size is the size required for contents. */ - void setContentSize( const QSizeF& size ); + void setContentSize( const QSizeF& size ) override; protected: /** @@ -171,7 +171,7 @@ /** * This function won't be reimplemented in most cases. */ - virtual void paint( QPainter *painter ); + void paint( QPainter *painter ) override; /** * Here the items paint their content. diff --git a/src/lib/marble/graphicsview/LabelGraphicsItem.h b/src/lib/marble/graphicsview/LabelGraphicsItem.h --- a/src/lib/marble/graphicsview/LabelGraphicsItem.h +++ b/src/lib/marble/graphicsview/LabelGraphicsItem.h @@ -34,9 +34,9 @@ { public: explicit LabelGraphicsItem( MarbleGraphicsItem *parent = 0 ); - ~LabelGraphicsItem(); + ~LabelGraphicsItem() override; - void setContentSize( const QSizeF &contentSize ); + void setContentSize( const QSizeF &contentSize ) override; QString text() const; void setText( const QString& text ); @@ -53,7 +53,7 @@ void clear(); protected: - void paintContent( QPainter *painter ); + void paintContent( QPainter *painter ) override; private: Q_DISABLE_COPY( LabelGraphicsItem ) diff --git a/src/lib/marble/graphicsview/MarbleGraphicsGridLayout.h b/src/lib/marble/graphicsview/MarbleGraphicsGridLayout.h --- a/src/lib/marble/graphicsview/MarbleGraphicsGridLayout.h +++ b/src/lib/marble/graphicsview/MarbleGraphicsGridLayout.h @@ -27,15 +27,15 @@ { public: MarbleGraphicsGridLayout( int rows, int columns ); - ~MarbleGraphicsGridLayout(); + ~MarbleGraphicsGridLayout() override; void addItem( ScreenGraphicsItem *item, int row, int column ); /** * This updates the positions of all items in the layout. * Calling this will be done on every repainting, so you won't have to do it yourself. */ - void updatePositions( MarbleGraphicsItem *parent ); + void updatePositions( MarbleGraphicsItem *parent ) override; Qt::Alignment alignment() const; diff --git a/src/lib/marble/graphicsview/ScreenGraphicsItem.h b/src/lib/marble/graphicsview/ScreenGraphicsItem.h --- a/src/lib/marble/graphicsview/ScreenGraphicsItem.h +++ b/src/lib/marble/graphicsview/ScreenGraphicsItem.h @@ -34,7 +34,7 @@ explicit ScreenGraphicsItem( MarbleGraphicsItem *parent = 0 ); - virtual ~ScreenGraphicsItem(); + ~ScreenGraphicsItem() override; /** * @brief Set the position of the ScreenGraphicsItem @@ -94,7 +94,7 @@ protected: explicit ScreenGraphicsItem(ScreenGraphicsItemPrivate *dd); - virtual bool eventFilter( QObject *, QEvent * ); + bool eventFilter( QObject *, QEvent * ) override; private: Q_DECLARE_PRIVATE(ScreenGraphicsItem) diff --git a/src/lib/marble/graphicsview/ScreenGraphicsItem_p.h b/src/lib/marble/graphicsview/ScreenGraphicsItem_p.h --- a/src/lib/marble/graphicsview/ScreenGraphicsItem_p.h +++ b/src/lib/marble/graphicsview/ScreenGraphicsItem_p.h @@ -34,7 +34,7 @@ { } - virtual ~ScreenGraphicsItemPrivate() + ~ScreenGraphicsItemPrivate() override { } diff --git a/src/lib/marble/graphicsview/WidgetGraphicsItem.h b/src/lib/marble/graphicsview/WidgetGraphicsItem.h --- a/src/lib/marble/graphicsview/WidgetGraphicsItem.h +++ b/src/lib/marble/graphicsview/WidgetGraphicsItem.h @@ -27,18 +27,18 @@ public: explicit WidgetGraphicsItem( MarbleGraphicsItem *parent = 0 ); - virtual ~WidgetGraphicsItem(); + ~WidgetGraphicsItem() override; void setWidget( QWidget *widget ); QWidget *widget() const; protected: /** * Paints the item in item coordinates. */ - virtual void paint( QPainter *painter ); + void paint( QPainter *painter ) override; - virtual bool eventFilter( QObject *, QEvent * ); + bool eventFilter( QObject *, QEvent * ) override; private: Q_DISABLE_COPY( WidgetGraphicsItem ) diff --git a/src/lib/marble/graphicsview/WidgetGraphicsItem_p.h b/src/lib/marble/graphicsview/WidgetGraphicsItem_p.h --- a/src/lib/marble/graphicsview/WidgetGraphicsItem_p.h +++ b/src/lib/marble/graphicsview/WidgetGraphicsItem_p.h @@ -25,7 +25,7 @@ WidgetGraphicsItemPrivate(WidgetGraphicsItem *widgetGraphicsItem, MarbleGraphicsItem *parent); - ~WidgetGraphicsItemPrivate(); + ~WidgetGraphicsItemPrivate() override; QWidget *m_widget; QWidget *m_marbleWidget; diff --git a/src/lib/marble/kdescendantsproxymodel.h b/src/lib/marble/kdescendantsproxymodel.h --- a/src/lib/marble/kdescendantsproxymodel.h +++ b/src/lib/marble/kdescendantsproxymodel.h @@ -86,7 +86,7 @@ /** * Destroys the descendant entities proxy model. */ - virtual ~KDescendantsProxyModel(); + ~KDescendantsProxyModel() override; /** * Sets the source @p model of the proxy. @@ -177,7 +177,7 @@ /** Reimplemented to match all descendants. */ - virtual QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, + QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const Q_DECL_OVERRIDE; private: diff --git a/src/lib/marble/kineticmodel.h b/src/lib/marble/kineticmodel.h --- a/src/lib/marble/kineticmodel.h +++ b/src/lib/marble/kineticmodel.h @@ -45,7 +45,7 @@ public: explicit KineticModel(QObject *parent = 0); - ~KineticModel(); + ~KineticModel() override; int duration() const; QPointF position() const; diff --git a/src/lib/marble/layers/FogLayer.h b/src/lib/marble/layers/FogLayer.h --- a/src/lib/marble/layers/FogLayer.h +++ b/src/lib/marble/layers/FogLayer.h @@ -24,14 +24,14 @@ class FogLayer : public LayerInterface { public: - virtual QStringList renderPosition() const; + QStringList renderPosition() const override; - virtual bool render( GeoPainter *painter, ViewportParams *viewport, + bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos = QLatin1String("NONE"), - GeoSceneLayer * layer = 0 ); + GeoSceneLayer * layer = 0 ) override; - RenderState renderState() const; - virtual QString runtimeTrace() const { return QStringLiteral("FogLayer"); } + RenderState renderState() const override; + QString runtimeTrace() const override { return QStringLiteral("FogLayer"); } }; } diff --git a/src/lib/marble/layers/GeometryLayer.h b/src/lib/marble/layers/GeometryLayer.h --- a/src/lib/marble/layers/GeometryLayer.h +++ b/src/lib/marble/layers/GeometryLayer.h @@ -36,17 +36,17 @@ Q_OBJECT public: explicit GeometryLayer(const QAbstractItemModel *model, const StyleBuilder *styleBuilder); - ~GeometryLayer(); + ~GeometryLayer() override; - virtual QStringList renderPosition() const; + QStringList renderPosition() const override; - virtual bool render( GeoPainter *painter, ViewportParams *viewport, + bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos = QLatin1String("NONE"), - GeoSceneLayer * layer = 0 ); + GeoSceneLayer * layer = 0 ) override; - RenderState renderState() const; + RenderState renderState() const override; - virtual QString runtimeTrace() const; + QString runtimeTrace() const override; QVector whichFeatureAt( const QPoint& curpos, const ViewportParams * viewport ); diff --git a/src/lib/marble/layers/GroundLayer.h b/src/lib/marble/layers/GroundLayer.h --- a/src/lib/marble/layers/GroundLayer.h +++ b/src/lib/marble/layers/GroundLayer.h @@ -24,23 +24,23 @@ GroundLayer(); - ~GroundLayer(); + ~GroundLayer() override; - virtual QStringList renderPosition() const; + QStringList renderPosition() const override; - virtual bool render( GeoPainter *painter, ViewportParams *viewport, + bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos = QLatin1String("NONE"), - GeoSceneLayer * layer = 0 ); + GeoSceneLayer * layer = 0 ) override; - virtual qreal zValue() const; + qreal zValue() const override; void setColor( const QColor &color ); QColor color() const; - RenderState renderState() const; + RenderState renderState() const override; - virtual QString runtimeTrace() const { return QStringLiteral("GroundLayer"); } + QString runtimeTrace() const override { return QStringLiteral("GroundLayer"); } private: QColor m_color; // Gets the color specified via DGML's diff --git a/src/lib/marble/layers/MarbleSplashLayer.h b/src/lib/marble/layers/MarbleSplashLayer.h --- a/src/lib/marble/layers/MarbleSplashLayer.h +++ b/src/lib/marble/layers/MarbleSplashLayer.h @@ -23,15 +23,15 @@ public: MarbleSplashLayer(); - virtual QStringList renderPosition() const; + QStringList renderPosition() const override; - virtual bool render( GeoPainter *painter, ViewportParams *viewport, + bool render( GeoPainter *painter, ViewportParams *viewport, const QString &renderPos = QLatin1String("SURFACE"), - GeoSceneLayer *layer = 0 ); + GeoSceneLayer *layer = 0 ) override; - RenderState renderState() const; + RenderState renderState() const override; - virtual QString runtimeTrace() const { return QStringLiteral("SplashLayer"); } + QString runtimeTrace() const override { return QStringLiteral("SplashLayer"); } }; diff --git a/src/lib/marble/layers/PlacemarkLayer.h b/src/lib/marble/layers/PlacemarkLayer.h --- a/src/lib/marble/layers/PlacemarkLayer.h +++ b/src/lib/marble/layers/PlacemarkLayer.h @@ -56,28 +56,28 @@ MarbleClock *clock, const StyleBuilder *styleBuilder, QObject *parent = 0 ); - ~PlacemarkLayer(); + ~PlacemarkLayer() override; /** * @reimp */ - QStringList renderPosition() const; + QStringList renderPosition() const override; /** * @reimp */ - qreal zValue() const; + qreal zValue() const override; /** * @reimp */ bool render( GeoPainter *painter, ViewportParams *viewport, const QString &renderPos = QLatin1String("NONE"), - GeoSceneLayer *layer = 0 ); + GeoSceneLayer *layer = 0 ) override; - RenderState renderState() const; + RenderState renderState() const override; - virtual QString runtimeTrace() const; + QString runtimeTrace() const override; /** * Returns a list of model indexes that are at position @p pos. diff --git a/src/lib/marble/layers/PopupLayer.h b/src/lib/marble/layers/PopupLayer.h --- a/src/lib/marble/layers/PopupLayer.h +++ b/src/lib/marble/layers/PopupLayer.h @@ -38,17 +38,17 @@ Q_OBJECT public: explicit PopupLayer( MarbleWidget *widget, QObject* parent = 0 ); - ~PopupLayer(); + ~PopupLayer() override; - QStringList renderPosition() const; + QStringList renderPosition() const override; bool render( GeoPainter *painter, ViewportParams *viewport, - const QString &, GeoSceneLayer * ); - virtual bool eventFilter( QObject *, QEvent * ); - qreal zValue() const; + const QString &, GeoSceneLayer * ) override; + bool eventFilter( QObject *, QEvent * ) override; + qreal zValue() const override; - RenderState renderState() const; + RenderState renderState() const override; - virtual QString runtimeTrace() const { return QStringLiteral("PopupLayer"); } + QString runtimeTrace() const override { return QStringLiteral("PopupLayer"); } /** * @brief Is popup item visible diff --git a/src/lib/marble/layers/TextureLayer.h b/src/lib/marble/layers/TextureLayer.h --- a/src/lib/marble/layers/TextureLayer.h +++ b/src/lib/marble/layers/TextureLayer.h @@ -43,9 +43,9 @@ const SunLocator *sunLocator, QAbstractItemModel *groundOverlayModel ); - ~TextureLayer(); + ~TextureLayer() override; - QStringList renderPosition() const; + QStringList renderPosition() const override; void addSeaDocument( const GeoDataDocument *seaDocument ); @@ -89,13 +89,13 @@ int preferredRadiusCeil( int radius ) const; int preferredRadiusFloor( int radius ) const; - RenderState renderState() const; + RenderState renderState() const override; - virtual QString runtimeTrace() const; + QString runtimeTrace() const override; - virtual bool render( GeoPainter *painter, ViewportParams *viewport, + bool render( GeoPainter *painter, ViewportParams *viewport, const QString &renderPos = QLatin1String("NONE"), - GeoSceneLayer *layer = 0 ); + GeoSceneLayer *layer = 0 ) override; public Q_SLOTS: void setShowRelief( bool show ); diff --git a/src/lib/marble/layers/VectorTileLayer.h b/src/lib/marble/layers/VectorTileLayer.h --- a/src/lib/marble/layers/VectorTileLayer.h +++ b/src/lib/marble/layers/VectorTileLayer.h @@ -41,19 +41,19 @@ const PluginManager *pluginManager, GeoDataTreeModel *treeModel); - ~VectorTileLayer(); + ~VectorTileLayer() override; - QStringList renderPosition() const; + QStringList renderPosition() const override; - RenderState renderState() const; + RenderState renderState() const override; int tileZoomLevel() const; - QString runtimeTrace() const; + QString runtimeTrace() const override; bool render( GeoPainter *painter, ViewportParams *viewport, const QString &renderPos = QLatin1String("NONE"), - GeoSceneLayer *layer = 0 ); + GeoSceneLayer *layer = 0 ) override; Q_SIGNALS: void tileLevelChanged(int tileLevel); diff --git a/src/lib/marble/osm/OsmPlacemarkData.h b/src/lib/marble/osm/OsmPlacemarkData.h --- a/src/lib/marble/osm/OsmPlacemarkData.h +++ b/src/lib/marble/osm/OsmPlacemarkData.h @@ -62,7 +62,7 @@ QString user() const; QString timestamp() const; QString action() const; - const char* nodeType() const; + const char* nodeType() const override; void setId( qint64 id ); void setVersion( const QString& version ); diff --git a/src/lib/marble/osm/OsmRelationEditorDialog.h b/src/lib/marble/osm/OsmRelationEditorDialog.h --- a/src/lib/marble/osm/OsmRelationEditorDialog.h +++ b/src/lib/marble/osm/OsmRelationEditorDialog.h @@ -35,7 +35,7 @@ public: explicit OsmRelationEditorDialog( OsmPlacemarkData *relationData, QWidget *parent = 0 ); - ~OsmRelationEditorDialog(); + ~OsmRelationEditorDialog() override; private Q_SLOTS: void checkFields(); diff --git a/src/lib/marble/osm/OsmRelationManagerWidget.h b/src/lib/marble/osm/OsmRelationManagerWidget.h --- a/src/lib/marble/osm/OsmRelationManagerWidget.h +++ b/src/lib/marble/osm/OsmRelationManagerWidget.h @@ -44,7 +44,7 @@ explicit OsmRelationManagerWidget( GeoDataPlacemark *placemark, const QHash *relations, QWidget *parent = 0 ); - ~OsmRelationManagerWidget(); + ~OsmRelationManagerWidget() override; public Q_SLOTS: /** diff --git a/src/lib/marble/osm/OsmTagEditorWidget.h b/src/lib/marble/osm/OsmTagEditorWidget.h --- a/src/lib/marble/osm/OsmTagEditorWidget.h +++ b/src/lib/marble/osm/OsmTagEditorWidget.h @@ -32,7 +32,7 @@ public: explicit OsmTagEditorWidget( GeoDataPlacemark *placemark, QWidget *parent = 0 ); - ~OsmTagEditorWidget(); + ~OsmTagEditorWidget() override; /** * @brief returns the current tag set for the placemark diff --git a/src/lib/marble/projections/AzimuthalEquidistantProjection.h b/src/lib/marble/projections/AzimuthalEquidistantProjection.h --- a/src/lib/marble/projections/AzimuthalEquidistantProjection.h +++ b/src/lib/marble/projections/AzimuthalEquidistantProjection.h @@ -35,26 +35,26 @@ */ AzimuthalEquidistantProjection(); - virtual ~AzimuthalEquidistantProjection(); + ~AzimuthalEquidistantProjection() override; /** * @brief Returns the user-visible name of the projection. */ - QString name() const; + QString name() const override; /** * @brief Returns a short user description of the projection * that can be used in tooltips or dialogs. */ - QString description() const; + QString description() const override; /** * @brief Returns an icon for the projection. */ - QIcon icon() const; + QIcon icon() const override; - virtual qreal clippingRadius() const; + qreal clippingRadius() const override; /** * @brief Get the screen coordinates corresponding to geographical coordinates in the map. @@ -65,15 +65,15 @@ * @return @c true if the geographical coordinates are visible on the screen * @c false if the geographical coordinates are not visible on the screen */ - virtual bool screenCoordinates( const GeoDataCoordinates &coordinates, + bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams *params, - qreal &x, qreal &y, bool &globeHidesPoint ) const; + qreal &x, qreal &y, bool &globeHidesPoint ) const override; - virtual bool screenCoordinates( const GeoDataCoordinates &coordinates, + bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams * viewport, qreal *x, qreal &y, int &pointRepeatNum, const QSizeF& size, - bool &globeHidesPoint ) const; + bool &globeHidesPoint ) const override; using AbstractProjection::screenCoordinates; @@ -89,7 +89,7 @@ bool geoCoordinates( const int x, const int y, const ViewportParams *params, qreal& lon, qreal& lat, - GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const; + GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const override; protected: explicit AzimuthalEquidistantProjection(AzimuthalEquidistantProjectionPrivate *dd ); diff --git a/src/lib/marble/projections/AzimuthalProjection.h b/src/lib/marble/projections/AzimuthalProjection.h --- a/src/lib/marble/projections/AzimuthalProjection.h +++ b/src/lib/marble/projections/AzimuthalProjection.h @@ -34,35 +34,35 @@ AzimuthalProjection(); - virtual ~AzimuthalProjection(); + ~AzimuthalProjection() override; - virtual bool repeatableX() const { return false; } - virtual qreal maxValidLat() const; - virtual qreal minValidLat() const; + bool repeatableX() const override { return false; } + qreal maxValidLat() const override; + qreal minValidLat() const override; - virtual bool traversablePoles() const { return true; } - virtual bool traversableDateLine() const { return true; } + bool traversablePoles() const override { return true; } + bool traversableDateLine() const override { return true; } - virtual SurfaceType surfaceType() const { return Azimuthal; } + SurfaceType surfaceType() const override { return Azimuthal; } - virtual PreservationType preservationType() const { return NoPreservation; } + PreservationType preservationType() const override { return NoPreservation; } - virtual bool isClippedToSphere() const; + bool isClippedToSphere() const override; - virtual qreal clippingRadius() const; + qreal clippingRadius() const override; - bool mapCoversViewport( const ViewportParams *viewport ) const; + bool mapCoversViewport( const ViewportParams *viewport ) const override; - virtual bool screenCoordinates( const GeoDataLineString &lineString, + bool screenCoordinates( const GeoDataLineString &lineString, const ViewportParams *viewport, - QVector &polygons ) const; + QVector &polygons ) const override; using AbstractProjection::screenCoordinates; - virtual QPainterPath mapShape( const ViewportParams *viewport ) const; + QPainterPath mapShape( const ViewportParams *viewport ) const override; - virtual GeoDataLatLonAltBox latLonAltBox( const QRect& screenRect, - const ViewportParams *viewport ) const; + GeoDataLatLonAltBox latLonAltBox( const QRect& screenRect, + const ViewportParams *viewport ) const override; protected: explicit AzimuthalProjection( AzimuthalProjectionPrivate* dd ); diff --git a/src/lib/marble/projections/AzimuthalProjection_p.h b/src/lib/marble/projections/AzimuthalProjection_p.h --- a/src/lib/marble/projections/AzimuthalProjection_p.h +++ b/src/lib/marble/projections/AzimuthalProjection_p.h @@ -32,7 +32,7 @@ } - virtual ~AzimuthalProjectionPrivate() {}; + ~AzimuthalProjectionPrivate() override {}; // This method tessellates a line segment in a way that the line segment // follows great circles. The count parameter specifies the diff --git a/src/lib/marble/projections/CylindricalProjection.h b/src/lib/marble/projections/CylindricalProjection.h --- a/src/lib/marble/projections/CylindricalProjection.h +++ b/src/lib/marble/projections/CylindricalProjection.h @@ -37,22 +37,22 @@ CylindricalProjection(); - virtual ~CylindricalProjection(); + ~CylindricalProjection() override; - virtual bool repeatableX() const { return true; }; + bool repeatableX() const override { return true; }; - virtual bool traversablePoles() const { return false; } - virtual bool traversableDateLine() const { return false; } + bool traversablePoles() const override { return false; } + bool traversableDateLine() const override { return false; } - virtual SurfaceType surfaceType() const { return Cylindrical; } + SurfaceType surfaceType() const override { return Cylindrical; } - virtual bool screenCoordinates( const GeoDataLineString &lineString, + bool screenCoordinates( const GeoDataLineString &lineString, const ViewportParams *viewport, - QVector &polygons ) const; + QVector &polygons ) const override; using AbstractProjection::screenCoordinates; - virtual QPainterPath mapShape( const ViewportParams *viewport ) const; + QPainterPath mapShape( const ViewportParams *viewport ) const override; protected: explicit CylindricalProjection( CylindricalProjectionPrivate* dd ); diff --git a/src/lib/marble/projections/EquirectProjection.h b/src/lib/marble/projections/EquirectProjection.h --- a/src/lib/marble/projections/EquirectProjection.h +++ b/src/lib/marble/projections/EquirectProjection.h @@ -42,28 +42,28 @@ */ EquirectProjection(); - virtual ~EquirectProjection(); + ~EquirectProjection() override; /** * @brief Returns the user-visible name of the projection. */ - QString name() const; + QString name() const override; /** * @brief Returns a short user description of the projection * that can be used in tooltips or dialogs. */ - QString description() const; + QString description() const override; /** * @brief Returns an icon for the projection. */ - QIcon icon() const; + QIcon icon() const override; - virtual qreal maxValidLat() const; - virtual qreal minValidLat() const; + qreal maxValidLat() const override; + qreal minValidLat() const override; - virtual PreservationType preservationType() const { return NoPreservation; } + PreservationType preservationType() const override { return NoPreservation; } /** * @brief Get the screen coordinates corresponding to geographical coordinates in the map. @@ -76,13 +76,13 @@ */ bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams *params, - qreal &x, qreal &y, bool &globeHidesPoint ) const; + qreal &x, qreal &y, bool &globeHidesPoint ) const override; bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams *viewport, qreal *x, qreal &y, int &pointRepeatNum, const QSizeF& size, - bool &globeHidesPoint ) const; + bool &globeHidesPoint ) const override; using CylindricalProjection::screenCoordinates; @@ -102,12 +102,12 @@ bool geoCoordinates( const int x, const int y, const ViewportParams *params, qreal& lon, qreal& lat, - GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const; + GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const override; GeoDataLatLonAltBox latLonAltBox( const QRect& screenRect, - const ViewportParams *viewport ) const; + const ViewportParams *viewport ) const override; - bool mapCoversViewport( const ViewportParams *viewport ) const; + bool mapCoversViewport( const ViewportParams *viewport ) const override; private: Q_DISABLE_COPY( EquirectProjection ) diff --git a/src/lib/marble/projections/GnomonicProjection.h b/src/lib/marble/projections/GnomonicProjection.h --- a/src/lib/marble/projections/GnomonicProjection.h +++ b/src/lib/marble/projections/GnomonicProjection.h @@ -35,25 +35,25 @@ */ GnomonicProjection(); - virtual ~GnomonicProjection(); + ~GnomonicProjection() override; /** * @brief Returns the user-visible name of the projection. */ - QString name() const; + QString name() const override; /** * @brief Returns a short user description of the projection * that can be used in tooltips or dialogs. */ - QString description() const; + QString description() const override; /** * @brief Returns an icon for the projection. */ - QIcon icon() const; + QIcon icon() const override; - virtual qreal clippingRadius() const; + qreal clippingRadius() const override; /** * @brief Get the screen coordinates corresponding to geographical coordinates in the map. @@ -64,15 +64,15 @@ * @return @c true if the geographical coordinates are visible on the screen * @c false if the geographical coordinates are not visible on the screen */ - virtual bool screenCoordinates( const GeoDataCoordinates &coordinates, + bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams *params, - qreal &x, qreal &y, bool &globeHidesPoint ) const; + qreal &x, qreal &y, bool &globeHidesPoint ) const override; - virtual bool screenCoordinates( const GeoDataCoordinates &coordinates, + bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams * viewport, qreal *x, qreal &y, int &pointRepeatNum, const QSizeF& size, - bool &globeHidesPoint ) const; + bool &globeHidesPoint ) const override; using AbstractProjection::screenCoordinates; @@ -88,7 +88,7 @@ bool geoCoordinates( const int x, const int y, const ViewportParams *params, qreal& lon, qreal& lat, - GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const; + GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const override; protected: explicit GnomonicProjection(GnomonicProjectionPrivate *dd ); diff --git a/src/lib/marble/projections/LambertAzimuthalProjection.h b/src/lib/marble/projections/LambertAzimuthalProjection.h --- a/src/lib/marble/projections/LambertAzimuthalProjection.h +++ b/src/lib/marble/projections/LambertAzimuthalProjection.h @@ -35,25 +35,25 @@ */ LambertAzimuthalProjection(); - virtual ~LambertAzimuthalProjection(); + ~LambertAzimuthalProjection() override; /** * @brief Returns the user-visible name of the projection. */ - QString name() const; + QString name() const override; /** * @brief Returns a short user description of the projection * that can be used in tooltips or dialogs. */ - QString description() const; + QString description() const override; /** * @brief Returns an icon for the projection. */ - QIcon icon() const; + QIcon icon() const override; - virtual qreal clippingRadius() const; + qreal clippingRadius() const override; /** * @brief Get the screen coordinates corresponding to geographical coordinates in the map. @@ -64,15 +64,15 @@ * @return @c true if the geographical coordinates are visible on the screen * @c false if the geographical coordinates are not visible on the screen */ - virtual bool screenCoordinates( const GeoDataCoordinates &coordinates, + bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams *params, - qreal &x, qreal &y, bool &globeHidesPoint ) const; + qreal &x, qreal &y, bool &globeHidesPoint ) const override; - virtual bool screenCoordinates( const GeoDataCoordinates &coordinates, + bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams * viewport, qreal *x, qreal &y, int &pointRepeatNum, const QSizeF& size, - bool &globeHidesPoint ) const; + bool &globeHidesPoint ) const override; using AbstractProjection::screenCoordinates; @@ -88,7 +88,7 @@ bool geoCoordinates( const int x, const int y, const ViewportParams *params, qreal& lon, qreal& lat, - GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const; + GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const override; protected: explicit LambertAzimuthalProjection(LambertAzimuthalProjectionPrivate *dd ); diff --git a/src/lib/marble/projections/MercatorProjection.h b/src/lib/marble/projections/MercatorProjection.h --- a/src/lib/marble/projections/MercatorProjection.h +++ b/src/lib/marble/projections/MercatorProjection.h @@ -41,28 +41,28 @@ */ MercatorProjection(); - virtual ~MercatorProjection(); + ~MercatorProjection() override; /** * @brief Returns the user-visible name of the projection. */ - QString name() const; + QString name() const override; /** * @brief Returns a short user description of the projection * that can be used in tooltips or dialogs. */ - QString description() const; + QString description() const override; /** * @brief Returns an icon for the projection. */ - QIcon icon() const; + QIcon icon() const override; - virtual qreal maxValidLat() const; - virtual qreal minValidLat() const; + qreal maxValidLat() const override; + qreal minValidLat() const override; - virtual PreservationType preservationType() const { return Conformal; } + PreservationType preservationType() const override { return Conformal; } /** * @brief Get the screen coordinates corresponding to geographical coordinates in the map. @@ -75,13 +75,13 @@ */ bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams *params, - qreal &x, qreal &y, bool &globeHidesPoint ) const; + qreal &x, qreal &y, bool &globeHidesPoint ) const override; bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams * viewport, qreal *x, qreal &y, int &pointRepeatNum, const QSizeF& size, - bool &globeHidesPoint ) const; + bool &globeHidesPoint ) const override; using CylindricalProjection::screenCoordinates; @@ -101,12 +101,12 @@ bool geoCoordinates( const int x, const int y, const ViewportParams *params, qreal& lon, qreal& lat, - GeoDataCoordinates::Unit = GeoDataCoordinates::Degree ) const; + GeoDataCoordinates::Unit = GeoDataCoordinates::Degree ) const override; GeoDataLatLonAltBox latLonAltBox( const QRect &screenRect, - const ViewportParams *viewport ) const; + const ViewportParams *viewport ) const override; - bool mapCoversViewport( const ViewportParams *viewport ) const; + bool mapCoversViewport( const ViewportParams *viewport ) const override; private: mutable qreal m_lastCenterLat; diff --git a/src/lib/marble/projections/SphericalProjection.h b/src/lib/marble/projections/SphericalProjection.h --- a/src/lib/marble/projections/SphericalProjection.h +++ b/src/lib/marble/projections/SphericalProjection.h @@ -44,23 +44,23 @@ */ SphericalProjection(); - virtual ~SphericalProjection(); + ~SphericalProjection() override; /** * @brief Returns the user-visible name of the projection. */ - QString name() const; + QString name() const override; /** * @brief Returns a short user description of the projection * that can be used in tooltips or dialogs. */ - QString description() const; + QString description() const override; /** * @brief Returns an icon for the projection. */ - QIcon icon() const; + QIcon icon() const override; /** * @brief Get the screen coordinates corresponding to geographical coordinates in the map. @@ -71,15 +71,15 @@ * @return @c true if the geographical coordinates are visible on the screen * @c false if the geographical coordinates are not visible on the screen */ - virtual bool screenCoordinates( const GeoDataCoordinates &coordinates, + bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams *params, - qreal &x, qreal &y, bool &globeHidesPoint ) const; + qreal &x, qreal &y, bool &globeHidesPoint ) const override; - virtual bool screenCoordinates( const GeoDataCoordinates &coordinates, + bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams * viewport, qreal *x, qreal &y, int &pointRepeatNum, const QSizeF& size, - bool &globeHidesPoint ) const; + bool &globeHidesPoint ) const override; using AbstractProjection::screenCoordinates; @@ -95,7 +95,7 @@ bool geoCoordinates( const int x, const int y, const ViewportParams *params, qreal& lon, qreal& lat, - GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const; + GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const override; protected: explicit SphericalProjection(SphericalProjectionPrivate *dd ); diff --git a/src/lib/marble/projections/StereographicProjection.h b/src/lib/marble/projections/StereographicProjection.h --- a/src/lib/marble/projections/StereographicProjection.h +++ b/src/lib/marble/projections/StereographicProjection.h @@ -35,25 +35,25 @@ */ StereographicProjection(); - virtual ~StereographicProjection(); + ~StereographicProjection() override; /** * @brief Returns the user-visible name of the projection. */ - QString name() const; + QString name() const override; /** * @brief Returns a short user description of the projection * that can be used in tooltips or dialogs. */ - QString description() const; + QString description() const override; /** * @brief Returns an icon for the projection. */ - QIcon icon() const; + QIcon icon() const override; - virtual qreal clippingRadius() const; + qreal clippingRadius() const override; /** * @brief Get the screen coordinates corresponding to geographical coordinates in the map. @@ -64,15 +64,15 @@ * @return @c true if the geographical coordinates are visible on the screen * @c false if the geographical coordinates are not visible on the screen */ - virtual bool screenCoordinates( const GeoDataCoordinates &coordinates, + bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams *params, - qreal &x, qreal &y, bool &globeHidesPoint ) const; + qreal &x, qreal &y, bool &globeHidesPoint ) const override; - virtual bool screenCoordinates( const GeoDataCoordinates &coordinates, + bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams * viewport, qreal *x, qreal &y, int &pointRepeatNum, const QSizeF& size, - bool &globeHidesPoint ) const; + bool &globeHidesPoint ) const override; using AbstractProjection::screenCoordinates; @@ -88,7 +88,7 @@ bool geoCoordinates( const int x, const int y, const ViewportParams *params, qreal& lon, qreal& lat, - GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const; + GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const override; protected: explicit StereographicProjection(StereographicProjectionPrivate *dd ); diff --git a/src/lib/marble/projections/VerticalPerspectiveProjection.h b/src/lib/marble/projections/VerticalPerspectiveProjection.h --- a/src/lib/marble/projections/VerticalPerspectiveProjection.h +++ b/src/lib/marble/projections/VerticalPerspectiveProjection.h @@ -35,25 +35,25 @@ */ VerticalPerspectiveProjection(); - virtual ~VerticalPerspectiveProjection(); + ~VerticalPerspectiveProjection() override; /** * @brief Returns the user-visible name of the projection. */ - QString name() const; + QString name() const override; /** * @brief Returns a short user description of the projection * that can be used in tooltips or dialogs. */ - QString description() const; + QString description() const override; /** * @brief Returns an icon for the projection. */ - QIcon icon() const; + QIcon icon() const override; - virtual qreal clippingRadius() const; + qreal clippingRadius() const override; /** * @brief Get the screen coordinates corresponding to geographical coordinates in the map. @@ -64,15 +64,15 @@ * @return @c true if the geographical coordinates are visible on the screen * @c false if the geographical coordinates are not visible on the screen */ - virtual bool screenCoordinates( const GeoDataCoordinates &coordinates, + bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams *params, - qreal &x, qreal &y, bool &globeHidesPoint ) const; + qreal &x, qreal &y, bool &globeHidesPoint ) const override; - virtual bool screenCoordinates( const GeoDataCoordinates &coordinates, + bool screenCoordinates( const GeoDataCoordinates &coordinates, const ViewportParams * viewport, qreal *x, qreal &y, int &pointRepeatNum, const QSizeF& size, - bool &globeHidesPoint ) const; + bool &globeHidesPoint ) const override; using AbstractProjection::screenCoordinates; @@ -88,7 +88,7 @@ bool geoCoordinates( const int x, const int y, const ViewportParams *params, qreal& lon, qreal& lat, - GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const; + GeoDataCoordinates::Unit unit = GeoDataCoordinates::Degree ) const override; protected: explicit VerticalPerspectiveProjection(VerticalPerspectiveProjectionPrivate *dd ); diff --git a/src/lib/marble/routing/AlternativeRoutesModel.h b/src/lib/marble/routing/AlternativeRoutesModel.h --- a/src/lib/marble/routing/AlternativeRoutesModel.h +++ b/src/lib/marble/routing/AlternativeRoutesModel.h @@ -42,18 +42,18 @@ explicit AlternativeRoutesModel( QObject *parent = 0 ); /** Destructor */ - ~AlternativeRoutesModel(); + ~AlternativeRoutesModel() override; // Model querying /** Overload of QAbstractListModel */ - int rowCount ( const QModelIndex &parent = QModelIndex() ) const; + int rowCount ( const QModelIndex &parent = QModelIndex() ) const override; /** Overload of QAbstractListModel */ - QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; + QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override; /** Overload of QAbstractListModel */ - QVariant data ( const QModelIndex &index, int role = Qt::DisplayRole ) const; + QVariant data ( const QModelIndex &index, int role = Qt::DisplayRole ) const override; GeoDataDocument* route( int index ); diff --git a/src/lib/marble/routing/RouteRequest.h b/src/lib/marble/routing/RouteRequest.h --- a/src/lib/marble/routing/RouteRequest.h +++ b/src/lib/marble/routing/RouteRequest.h @@ -38,7 +38,7 @@ explicit RouteRequest( QObject *parent = 0 ); /** Destructor */ - ~RouteRequest(); + ~RouteRequest() override; /** The first point, or a default constructed if empty */ GeoDataCoordinates source() const; diff --git a/src/lib/marble/routing/RoutingInputWidget.h b/src/lib/marble/routing/RoutingInputWidget.h --- a/src/lib/marble/routing/RoutingInputWidget.h +++ b/src/lib/marble/routing/RoutingInputWidget.h @@ -42,7 +42,7 @@ explicit RoutingInputWidget( MarbleModel* model, int index, QWidget *parent = 0 ); /** Destructor */ - ~RoutingInputWidget(); + ~RoutingInputWidget() override; /** * Returns true if the user has selected a valid geo position diff --git a/src/lib/marble/routing/RoutingInputWidget.cpp b/src/lib/marble/routing/RoutingInputWidget.cpp --- a/src/lib/marble/routing/RoutingInputWidget.cpp +++ b/src/lib/marble/routing/RoutingInputWidget.cpp @@ -55,7 +55,7 @@ explicit RoutingInputLineEdit( QWidget *parent = 0 ); protected: - virtual void keyPressEvent(QKeyEvent *); + void keyPressEvent(QKeyEvent *) override; }; class RoutingInputWidgetPrivate diff --git a/src/lib/marble/routing/RoutingLayer.h b/src/lib/marble/routing/RoutingLayer.h --- a/src/lib/marble/routing/RoutingLayer.h +++ b/src/lib/marble/routing/RoutingLayer.h @@ -45,19 +45,19 @@ explicit RoutingLayer( MarbleWidget *widget, QWidget *parent = 0 ); /** Destructor */ - ~RoutingLayer(); + ~RoutingLayer() override; /** Reimplemented from LayerInterface. We'll hover above the surface */ - QStringList renderPosition() const; + QStringList renderPosition() const override; /** Reimplemented from LayerInterface. */ - qreal zValue() const; + qreal zValue() const override; /** Reimplemented from LayerInterface. Paints route items and placemarks */ bool render( GeoPainter *painter, ViewportParams *viewport, - const QString &renderPos = "NONE", GeoSceneLayer *layer = 0 ); + const QString &renderPos = "NONE", GeoSceneLayer *layer = 0 ) override; - RenderState renderState() const; + RenderState renderState() const override; /** * Set the proxy model another QAbstractItemView uses that should share @@ -88,7 +88,7 @@ */ bool isInteractive() const; - QString runtimeTrace() const; + QString runtimeTrace() const override; Q_SIGNALS: /** @@ -101,7 +101,7 @@ public: /** Overriding QWidget, used to make the layer interactive */ - bool eventFilter( QObject *obj, QEvent *event ); + bool eventFilter( QObject *obj, QEvent *event ) override; private Q_SLOTS: void removeViaPoint(); diff --git a/src/lib/marble/routing/RoutingManager.h b/src/lib/marble/routing/RoutingManager.h --- a/src/lib/marble/routing/RoutingManager.h +++ b/src/lib/marble/routing/RoutingManager.h @@ -45,7 +45,7 @@ explicit RoutingManager( MarbleModel *marbleModel, QObject *parent = 0 ); /** Destructor */ - ~RoutingManager(); + ~RoutingManager() override; /** * Provides access to the model which contains all possible routing profiles diff --git a/src/lib/marble/routing/RoutingModel.h b/src/lib/marble/routing/RoutingModel.h --- a/src/lib/marble/routing/RoutingModel.h +++ b/src/lib/marble/routing/RoutingModel.h @@ -50,21 +50,21 @@ explicit RoutingModel( RouteRequest* request, MarbleModel *model, QObject *parent = 0 ); /** Destructor */ - ~RoutingModel(); + ~RoutingModel() override; // Model querying /** Overload of QAbstractListModel */ - int rowCount ( const QModelIndex &parent = QModelIndex() ) const; + int rowCount ( const QModelIndex &parent = QModelIndex() ) const override; /** Overload of QAbstractListModel */ - QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; + QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override; /** Overload of QAbstractListModel */ - QVariant data ( const QModelIndex &index, int role = Qt::DisplayRole ) const; + QVariant data ( const QModelIndex &index, int role = Qt::DisplayRole ) const override; /** Overload of QAbstractListModel */ - QHash roleNames() const; + QHash roleNames() const override; // Model data filling diff --git a/src/lib/marble/routing/RoutingProfileSettingsDialog.h b/src/lib/marble/routing/RoutingProfileSettingsDialog.h --- a/src/lib/marble/routing/RoutingProfileSettingsDialog.h +++ b/src/lib/marble/routing/RoutingProfileSettingsDialog.h @@ -30,7 +30,7 @@ Q_OBJECT public: RoutingProfileSettingsDialog( const PluginManager *pluginManager, RoutingProfilesModel *profilesModel, QWidget *parent = 0 ); - ~RoutingProfileSettingsDialog(); + ~RoutingProfileSettingsDialog() override; void editProfile( int profileIndex ); diff --git a/src/lib/marble/routing/RoutingProfilesModel.h b/src/lib/marble/routing/RoutingProfilesModel.h --- a/src/lib/marble/routing/RoutingProfilesModel.h +++ b/src/lib/marble/routing/RoutingProfilesModel.h @@ -28,9 +28,9 @@ public: explicit RoutingProfilesModel( const PluginManager *pluginManager, QObject *parent = 0 ); - virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const; - virtual int rowCount( const QModelIndex& parent = QModelIndex() ) const; - virtual bool removeRows( int row, int count, const QModelIndex& parent = QModelIndex() ); + QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override; + int rowCount( const QModelIndex& parent = QModelIndex() ) const override; + bool removeRows( int row, int count, const QModelIndex& parent = QModelIndex() ) override; enum ProfileTemplate { CarFastestTemplate, diff --git a/src/lib/marble/routing/RoutingProfilesWidget.h b/src/lib/marble/routing/RoutingProfilesWidget.h --- a/src/lib/marble/routing/RoutingProfilesWidget.h +++ b/src/lib/marble/routing/RoutingProfilesWidget.h @@ -27,7 +27,7 @@ public: explicit RoutingProfilesWidget( MarbleModel *marbleModel ); - ~RoutingProfilesWidget(); + ~RoutingProfilesWidget() override; Q_PRIVATE_SLOT( d, void add() ) Q_PRIVATE_SLOT( d, void configure() ) diff --git a/src/lib/marble/routing/RoutingWidget.h b/src/lib/marble/routing/RoutingWidget.h --- a/src/lib/marble/routing/RoutingWidget.h +++ b/src/lib/marble/routing/RoutingWidget.h @@ -46,7 +46,7 @@ explicit RoutingWidget( MarbleWidget *marbleWidget, QWidget *parent ); /** Destructor */ - ~RoutingWidget(); + ~RoutingWidget() override; /** Show or hide the "open file..." button. Default is false (not visible) */ void setShowDirectionsButtonVisible( bool visible ); @@ -151,8 +151,8 @@ void handlePlanetChange(); protected: - bool eventFilter( QObject *o, QEvent *e ); - void resizeEvent(QResizeEvent *e); + bool eventFilter( QObject *o, QEvent *e ) override; + void resizeEvent(QResizeEvent *e) override; private: RoutingWidgetPrivate *const d; diff --git a/src/lib/marble/routing/SpeakersModel.h b/src/lib/marble/routing/SpeakersModel.h --- a/src/lib/marble/routing/SpeakersModel.h +++ b/src/lib/marble/routing/SpeakersModel.h @@ -38,16 +38,16 @@ explicit SpeakersModel( QObject *parent = 0 ); /** Destructor */ - ~SpeakersModel(); + ~SpeakersModel() override; /** Overload of QAbstractListModel */ - int rowCount ( const QModelIndex &parent = QModelIndex() ) const; + int rowCount ( const QModelIndex &parent = QModelIndex() ) const override; /** Overload of QAbstractListModel */ - QVariant data ( const QModelIndex &index, int role = Qt::DisplayRole ) const; + QVariant data ( const QModelIndex &index, int role = Qt::DisplayRole ) const override; /** Overload of QAbstractListModel */ - QHash roleNames() const; + QHash roleNames() const override; /** @todo FIXME https://bugreports.qt-project.org/browse/QTCOMPONENTS-1206 */ int count() const; diff --git a/src/lib/marble/routing/VoiceNavigationModel.h b/src/lib/marble/routing/VoiceNavigationModel.h --- a/src/lib/marble/routing/VoiceNavigationModel.h +++ b/src/lib/marble/routing/VoiceNavigationModel.h @@ -36,7 +36,7 @@ explicit VoiceNavigationModel( QObject *parent = 0 ); /** Destructor */ - ~VoiceNavigationModel(); + ~VoiceNavigationModel() override; // Initialization QString speaker() const; diff --git a/src/plugins/designer/latloneditwidget/LatLonEditPlugin.h b/src/plugins/designer/latloneditwidget/LatLonEditPlugin.h --- a/src/plugins/designer/latloneditwidget/LatLonEditPlugin.h +++ b/src/plugins/designer/latloneditwidget/LatLonEditPlugin.h @@ -27,17 +27,17 @@ public: explicit LatLonEditPlugin(QObject *parent = 0); - bool isContainer() const; - bool isInitialized() const; - QIcon icon() const; - QString domXml() const; - QString group() const; - QString includeFile() const; - QString name() const; - QString toolTip() const; - QString whatsThis() const; - QWidget *createWidget(QWidget *parent); - void initialize(QDesignerFormEditorInterface *core); + bool isContainer() const override; + bool isInitialized() const override; + QIcon icon() const override; + QString domXml() const override; + QString group() const override; + QString includeFile() const override; + QString name() const override; + QString toolTip() const override; + QString whatsThis() const override; + QWidget *createWidget(QWidget *parent) override; + void initialize(QDesignerFormEditorInterface *core) override; private: bool m_initialized; diff --git a/src/plugins/designer/marblewidget/MarbleWidgetPlugin.h b/src/plugins/designer/marblewidget/MarbleWidgetPlugin.h --- a/src/plugins/designer/marblewidget/MarbleWidgetPlugin.h +++ b/src/plugins/designer/marblewidget/MarbleWidgetPlugin.h @@ -31,18 +31,18 @@ public: explicit MarbleWidgetPlugin(QObject *parent = 0); - bool isContainer() const; - bool isInitialized() const; - QIcon icon() const; - QString domXml() const; - QString name() const; - QString group() const; - QString includeFile() const; - QString toolTip() const; - QString whatsThis() const; - QWidget *createWidget(QWidget *parent); - - void initialize(QDesignerFormEditorInterface *core); + bool isContainer() const override; + bool isInitialized() const override; + QIcon icon() const override; + QString domXml() const override; + QString name() const override; + QString group() const override; + QString includeFile() const override; + QString toolTip() const override; + QString whatsThis() const override; + QWidget *createWidget(QWidget *parent) override; + + void initialize(QDesignerFormEditorInterface *core) override; private: bool m_initialized; diff --git a/src/plugins/designer/navigator/MarbleNavigatorPlugin.h b/src/plugins/designer/navigator/MarbleNavigatorPlugin.h --- a/src/plugins/designer/navigator/MarbleNavigatorPlugin.h +++ b/src/plugins/designer/navigator/MarbleNavigatorPlugin.h @@ -31,18 +31,18 @@ public: explicit MarbleNavigatorPlugin(QObject *parent = 0); - bool isContainer() const; - bool isInitialized() const; - QIcon icon() const; - QString domXml() const; - QString name() const; - QString group() const; - QString includeFile() const; - QString toolTip() const; - QString whatsThis() const; - QWidget *createWidget(QWidget *parent); - - void initialize(QDesignerFormEditorInterface *core); + bool isContainer() const override; + bool isInitialized() const override; + QIcon icon() const override; + QString domXml() const override; + QString name() const override; + QString group() const override; + QString includeFile() const override; + QString toolTip() const override; + QString whatsThis() const override; + QWidget *createWidget(QWidget *parent) override; + + void initialize(QDesignerFormEditorInterface *core) override; private: bool m_initialized; diff --git a/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h b/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h --- a/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h +++ b/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h @@ -29,28 +29,28 @@ public: FlightGearPositionProviderPlugin(); - virtual ~FlightGearPositionProviderPlugin(); + ~FlightGearPositionProviderPlugin() override; - virtual QString name() const; - virtual QString nameId() const; - virtual QString guiString() const; - virtual QString version() const; - virtual QString description() const; - virtual QString copyrightYears() const; + QString name() const override; + QString nameId() const override; + QString guiString() const override; + QString version() const override; + QString description() const override; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual QIcon icon() const; - virtual void initialize(); - virtual bool isInitialized() const; + QIcon icon() const override; + void initialize() override; + bool isInitialized() const override; - virtual PositionProviderPlugin * newInstance() const; + PositionProviderPlugin * newInstance() const override; - virtual PositionProviderStatus status() const; - virtual GeoDataCoordinates position() const; - virtual GeoDataAccuracy accuracy() const; - virtual QString error() const; - virtual qreal speed() const; - virtual qreal direction() const; - virtual QDateTime timestamp() const; + PositionProviderStatus status() const override; + GeoDataCoordinates position() const override; + GeoDataAccuracy accuracy() const override; + QString error() const override; + qreal speed() const override; + qreal direction() const override; + QDateTime timestamp() const override; private Q_SLOTS: void readPendingDatagrams(); diff --git a/src/plugins/render/annotate/AnnotatePlugin.h b/src/plugins/render/annotate/AnnotatePlugin.h --- a/src/plugins/render/annotate/AnnotatePlugin.h +++ b/src/plugins/render/annotate/AnnotatePlugin.h @@ -48,40 +48,40 @@ public: explicit AnnotatePlugin(const MarbleModel *model = 0); - virtual ~AnnotatePlugin(); + ~AnnotatePlugin() override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString renderPolicy() const; + QString renderPolicy() const override; - QStringList renderPosition() const; + QStringList renderPosition() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QIcon icon () const; + QIcon icon () const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; - virtual QString runtimeTrace() const; + QString runtimeTrace() const override; - virtual const QList *actionGroups() const; + const QList *actionGroups() const override; bool render( GeoPainter *painter, ViewportParams *viewport, - const QString &renderPos, GeoSceneLayer *layer = 0 ); + const QString &renderPos, GeoSceneLayer *layer = 0 ) override; Q_SIGNALS: void placemarkMoved(); @@ -128,7 +128,7 @@ void addRelation( const OsmPlacemarkData &relationOsmData ); protected: - bool eventFilter( QObject *watched, QEvent *event ); + bool eventFilter( QObject *watched, QEvent *event ) override; private: void addContextItems(); diff --git a/src/plugins/render/annotate/AreaAnnotation.h b/src/plugins/render/annotate/AreaAnnotation.h --- a/src/plugins/render/annotate/AreaAnnotation.h +++ b/src/plugins/render/annotate/AreaAnnotation.h @@ -37,13 +37,13 @@ public: explicit AreaAnnotation( GeoDataPlacemark *placemark ); - ~AreaAnnotation(); + ~AreaAnnotation() override; /** * @brief Paints the nodes on the screen and updates the regions which correspond * to each node using the given GeoPainter. */ - virtual void paint( GeoPainter *painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel ); + void paint( GeoPainter *painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel ) override; /** * @brief Returns true if the given QPoint is contained by the current polygon. Note @@ -53,18 +53,18 @@ * polygon if either polygon's interior, the outer nodes or the inner nodes contain * it). */ - virtual bool containsPoint( const QPoint &point ) const; + bool containsPoint( const QPoint &point ) const override; /** * @brief It is used so far to remove the hover effect while being in the * AddingPolylineNodes state (@see SceneGraphicsItem::dealWithItemChange documentation). */ - virtual void dealWithItemChange( const SceneGraphicsItem *other ); + void dealWithItemChange( const SceneGraphicsItem *other ) override; /** * @brief Moves the whole polygon to the destination coordinates. */ - virtual void move( const GeoDataCoordinates &source, const GeoDataCoordinates &destination ); + void move( const GeoDataCoordinates &source, const GeoDataCoordinates &destination ) override; /** * @brief Changes the busy state of the object according to @param enabled. It is mostly @@ -122,23 +122,23 @@ /** * @brief Provides information for downcasting a SceneGraphicsItem. */ - virtual const char *graphicType() const; + const char *graphicType() const override; protected: /** * @brief Protected methods which handle mouse events and are called by * SceneGraphicsItem::sceneEvent() (@see Template Method pattern). Each of these * event handlers are structured according to the state. */ - virtual bool mousePressEvent( QMouseEvent *event ); - virtual bool mouseMoveEvent( QMouseEvent *event ); - virtual bool mouseReleaseEvent( QMouseEvent *event ); + bool mousePressEvent( QMouseEvent *event ) override; + bool mouseMoveEvent( QMouseEvent *event ) override; + bool mouseReleaseEvent( QMouseEvent *event ) override; /** * @brief Protected method which applies the Polygons modifications when changing * states. */ - virtual void dealWithStateChange( SceneGraphicsItem::ActionState previousState ); + void dealWithStateChange( SceneGraphicsItem::ActionState previousState ) override; private: /** diff --git a/src/plugins/render/annotate/EditGroundOverlayDialog.h b/src/plugins/render/annotate/EditGroundOverlayDialog.h --- a/src/plugins/render/annotate/EditGroundOverlayDialog.h +++ b/src/plugins/render/annotate/EditGroundOverlayDialog.h @@ -25,7 +25,7 @@ public: EditGroundOverlayDialog( GeoDataGroundOverlay *overlay, TextureLayer *textureLayer, QWidget *parent = 0 ); - ~EditGroundOverlayDialog(); + ~EditGroundOverlayDialog() override; private Q_SLOTS: void updateGroundOverlay(); diff --git a/src/plugins/render/annotate/EditPolygonDialog.h b/src/plugins/render/annotate/EditPolygonDialog.h --- a/src/plugins/render/annotate/EditPolygonDialog.h +++ b/src/plugins/render/annotate/EditPolygonDialog.h @@ -37,7 +37,7 @@ EditPolygonDialog( GeoDataPlacemark *placemark, const QHash *relations = 0, QWidget *parent = 0 ); - ~EditPolygonDialog(); + ~EditPolygonDialog() override; public Q_SLOTS: void handleAddingNode( const GeoDataCoordinates &node ); diff --git a/src/plugins/render/annotate/EditPolylineDialog.h b/src/plugins/render/annotate/EditPolylineDialog.h --- a/src/plugins/render/annotate/EditPolylineDialog.h +++ b/src/plugins/render/annotate/EditPolylineDialog.h @@ -28,7 +28,7 @@ EditPolylineDialog( GeoDataPlacemark *placemark, const QHash *relations = 0, QWidget *parent = 0 ); - ~EditPolylineDialog(); + ~EditPolylineDialog() override; public Q_SLOTS: void handleAddingNode( const GeoDataCoordinates &node ); diff --git a/src/plugins/render/annotate/GroundOverlayFrame.h b/src/plugins/render/annotate/GroundOverlayFrame.h --- a/src/plugins/render/annotate/GroundOverlayFrame.h +++ b/src/plugins/render/annotate/GroundOverlayFrame.h @@ -44,24 +44,24 @@ void update(); - virtual bool containsPoint( const QPoint &eventPos ) const; + bool containsPoint( const QPoint &eventPos ) const override; - virtual void dealWithItemChange( const SceneGraphicsItem *other ); + void dealWithItemChange( const SceneGraphicsItem *other ) override; - virtual void move( const GeoDataCoordinates &source, const GeoDataCoordinates &destination ); + void move( const GeoDataCoordinates &source, const GeoDataCoordinates &destination ) override; /** * @brief Provides information for downcasting a SceneGraphicsItem. */ - virtual const char *graphicType() const; + const char *graphicType() const override; protected: - virtual void paint( GeoPainter *painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel ); - virtual bool mousePressEvent( QMouseEvent *event ); - virtual bool mouseMoveEvent( QMouseEvent *event ); - virtual bool mouseReleaseEvent( QMouseEvent *event ); + void paint( GeoPainter *painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel ) override; + bool mousePressEvent( QMouseEvent *event ) override; + bool mouseMoveEvent( QMouseEvent *event ) override; + bool mouseReleaseEvent( QMouseEvent *event ) override; - virtual void dealWithStateChange( SceneGraphicsItem::ActionState previousState ); + void dealWithStateChange( SceneGraphicsItem::ActionState previousState ) override; private: GeoDataGroundOverlay *m_overlay; TextureLayer *m_textureLayer; diff --git a/src/plugins/render/annotate/MergingPolygonNodesAnimation.h b/src/plugins/render/annotate/MergingPolygonNodesAnimation.h --- a/src/plugins/render/annotate/MergingPolygonNodesAnimation.h +++ b/src/plugins/render/annotate/MergingPolygonNodesAnimation.h @@ -28,7 +28,7 @@ public: explicit MergingPolygonNodesAnimation( AreaAnnotation *polygon ); - ~MergingPolygonNodesAnimation(); + ~MergingPolygonNodesAnimation() override; enum NodesBoundary { InnerBoundary, diff --git a/src/plugins/render/annotate/MergingPolylineNodesAnimation.h b/src/plugins/render/annotate/MergingPolylineNodesAnimation.h --- a/src/plugins/render/annotate/MergingPolylineNodesAnimation.h +++ b/src/plugins/render/annotate/MergingPolylineNodesAnimation.h @@ -29,7 +29,7 @@ public: explicit MergingPolylineNodesAnimation( PolylineAnnotation *polyline ); - ~MergingPolylineNodesAnimation(); + ~MergingPolylineNodesAnimation() override; public Q_SLOTS: void startAnimation(); diff --git a/src/plugins/render/annotate/NodeItemDelegate.h b/src/plugins/render/annotate/NodeItemDelegate.h --- a/src/plugins/render/annotate/NodeItemDelegate.h +++ b/src/plugins/render/annotate/NodeItemDelegate.h @@ -35,12 +35,12 @@ public: NodeItemDelegate( GeoDataPlacemark* placemark, QTreeView* view ); - QSize sizeHint( const QStyleOptionViewItem &option, const QModelIndex &index ) const; - QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; - void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const; - void setEditorData(QWidget *editor, const QModelIndex &index) const; - void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; + QSize sizeHint( const QStyleOptionViewItem &option, const QModelIndex &index ) const override; + QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; + void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; private: GeoDataPlacemark* m_placemark; diff --git a/src/plugins/render/annotate/NodeModel.h b/src/plugins/render/annotate/NodeModel.h --- a/src/plugins/render/annotate/NodeModel.h +++ b/src/plugins/render/annotate/NodeModel.h @@ -22,12 +22,12 @@ Q_OBJECT public: explicit NodeModel( QObject *parent = 0 ); - int rowCount( const QModelIndex &parent ) const; - int columnCount( const QModelIndex &parent ) const; - QVariant data( const QModelIndex &index, int role ) const; - QVariant headerData( int section, Qt::Orientation orientation, int role ) const; + int rowCount( const QModelIndex &parent ) const override; + int columnCount( const QModelIndex &parent ) const override; + QVariant data( const QModelIndex &index, int role ) const override; + QVariant headerData( int section, Qt::Orientation orientation, int role ) const override; void clear(); - Qt::ItemFlags flags(const QModelIndex & index) const ; + Qt::ItemFlags flags(const QModelIndex & index) const override ; public Q_SLOTS: int addNode( const GeoDataCoordinates &node ); private: diff --git a/src/plugins/render/annotate/PlacemarkTextAnnotation.h b/src/plugins/render/annotate/PlacemarkTextAnnotation.h --- a/src/plugins/render/annotate/PlacemarkTextAnnotation.h +++ b/src/plugins/render/annotate/PlacemarkTextAnnotation.h @@ -23,32 +23,32 @@ { public: explicit PlacemarkTextAnnotation( GeoDataPlacemark *placemark ); - ~PlacemarkTextAnnotation(); + ~PlacemarkTextAnnotation() override; - virtual void paint(GeoPainter *painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel); + void paint(GeoPainter *painter, const ViewportParams *viewport, const QString &layer, int tileZoomLevel) override; - virtual bool containsPoint( const QPoint &eventPos ) const; + bool containsPoint( const QPoint &eventPos ) const override; - virtual void dealWithItemChange( const SceneGraphicsItem *other ); + void dealWithItemChange( const SceneGraphicsItem *other ) override; - virtual void move( const GeoDataCoordinates &source, const GeoDataCoordinates &destination ); + void move( const GeoDataCoordinates &source, const GeoDataCoordinates &destination ) override; /** * @brief Provides information for downcasting a SceneGraphicsItem. */ - virtual const char *graphicType() const; + const char *graphicType() const override; /** * @brief Real label color, which is being hidden when placemark has focus */ QColor labelColor() const; protected: - virtual bool mousePressEvent( QMouseEvent *event ); - virtual bool mouseMoveEvent( QMouseEvent *event ); - virtual bool mouseReleaseEvent( QMouseEvent *event ); + bool mousePressEvent( QMouseEvent *event ) override; + bool mouseMoveEvent( QMouseEvent *event ) override; + bool mouseReleaseEvent( QMouseEvent *event ) override; - virtual void dealWithStateChange( SceneGraphicsItem::ActionState previousState ); + void dealWithStateChange( SceneGraphicsItem::ActionState previousState ) override; private: const ViewportParams *m_viewport; diff --git a/src/plugins/render/annotate/PolylineAnnotation.h b/src/plugins/render/annotate/PolylineAnnotation.h --- a/src/plugins/render/annotate/PolylineAnnotation.h +++ b/src/plugins/render/annotate/PolylineAnnotation.h @@ -30,30 +30,30 @@ public: explicit PolylineAnnotation( GeoDataPlacemark *placemark ); - ~PolylineAnnotation(); + ~PolylineAnnotation() override; /** * @brief Paints the nodes on the screen and updates the regions which correspond * to each node using the given GeoPainter. */ - virtual void paint( GeoPainter *painter, const ViewportParams *viewport, const QString &layer , int tileZoomLevel); + void paint( GeoPainter *painter, const ViewportParams *viewport, const QString &layer , int tileZoomLevel) override; /** * @brief Returns true if either the polyline's associated region or one of its nodes * contains the given QPoint. Note that the return value depends on the state. */ - virtual bool containsPoint( const QPoint &eventPos ) const; + bool containsPoint( const QPoint &eventPos ) const override; /** * @brief It is used so far to remove the hover effect while being in the * AddingPolylineNodes state (@see SceneGraphicsItem::dealWithItemChange documentation). */ - virtual void dealWithItemChange( const SceneGraphicsItem *other ); + void dealWithItemChange( const SceneGraphicsItem *other ) override; /** * @brief Moves the whole polyline to the destination point. */ - virtual void move( const GeoDataCoordinates &source, const GeoDataCoordinates &destination ); + void move( const GeoDataCoordinates &source, const GeoDataCoordinates &destination ) override; /** * @brief Changes the busy state of the object according to @p enabled. It is mostly used @@ -110,19 +110,19 @@ /** * @brief Provides information for downcasting a SceneGraphicsItem. */ - virtual const char *graphicType() const; + const char *graphicType() const override; protected: /** * @brief Protected methods which handle mouse events and are called by * SceneGraphicsItem::sceneEvent() (@see Template Method pattern). Each of these * event handlers are structured according to the state. */ - virtual bool mousePressEvent( QMouseEvent *event ); - virtual bool mouseMoveEvent( QMouseEvent *event ); - virtual bool mouseReleaseEvent( QMouseEvent *event ); + bool mousePressEvent( QMouseEvent *event ) override; + bool mouseMoveEvent( QMouseEvent *event ) override; + bool mouseReleaseEvent( QMouseEvent *event ) override; - virtual void dealWithStateChange( SceneGraphicsItem::ActionState previousState ); + void dealWithStateChange( SceneGraphicsItem::ActionState previousState ) override; private: /** diff --git a/src/plugins/render/annotate/SceneGraphicsItem.h b/src/plugins/render/annotate/SceneGraphicsItem.h --- a/src/plugins/render/annotate/SceneGraphicsItem.h +++ b/src/plugins/render/annotate/SceneGraphicsItem.h @@ -33,7 +33,7 @@ { public: explicit SceneGraphicsItem( GeoDataPlacemark *placemark ); - ~SceneGraphicsItem(); + ~SceneGraphicsItem() override; enum ActionState { // General action states diff --git a/src/plugins/render/aprs/AprsFile.h b/src/plugins/render/aprs/AprsFile.h --- a/src/plugins/render/aprs/AprsFile.h +++ b/src/plugins/render/aprs/AprsFile.h @@ -19,14 +19,14 @@ { public: explicit AprsFile( const QString &fileName ); - ~AprsFile(); + ~AprsFile() override; - QString sourceName() const; - QIODevice *openSocket(); + QString sourceName() const override; + QIODevice *openSocket() override; void checkReadReturn( int length, QIODevice **socket, - AprsGatherer *gatherer ); + AprsGatherer *gatherer ) override; - bool canDoDirect() const; + bool canDoDirect() const override; private: QString m_fileName; diff --git a/src/plugins/render/aprs/AprsGatherer.h b/src/plugins/render/aprs/AprsGatherer.h --- a/src/plugins/render/aprs/AprsGatherer.h +++ b/src/plugins/render/aprs/AprsGatherer.h @@ -38,7 +38,7 @@ QMutex *mutex, QString *filter ); - void run(); + void run() override; void addObject( const QString &callSign, qreal latitude, qreal longitude, bool canDoDirect, diff --git a/src/plugins/render/aprs/AprsPlugin.h b/src/plugins/render/aprs/AprsPlugin.h --- a/src/plugins/render/aprs/AprsPlugin.h +++ b/src/plugins/render/aprs/AprsPlugin.h @@ -45,33 +45,33 @@ public: explicit AprsPlugin( const MarbleModel *marbleModel=0 ); - ~AprsPlugin(); - QStringList backendTypes() const; - QString renderPolicy() const; - QStringList renderPosition() const; - QString name() const; - QString guiString() const; - QString nameId() const; + ~AprsPlugin() override; + QStringList backendTypes() const override; + QString renderPolicy() const override; + QStringList renderPosition() const override; + QString name() const override; + QString guiString() const override; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; + QIcon icon () const override; - void initialize (); - bool isInitialized () const; - bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ); + void initialize () override; + bool isInitialized () const override; + bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ) override; - QDialog *configDialog(); + QDialog *configDialog() override; QAction *action() const; - QHash settings() const; - void setSettings( const QHash &settings ); + QHash settings() const override; + void setSettings( const QHash &settings ) override; void stopGatherers(); void restartGatherers(); @@ -81,7 +81,7 @@ void readSettings(); void writeSettings(); void updateVisibility( bool visible ); - virtual RenderType renderType() const; + RenderType renderType() const override; private: diff --git a/src/plugins/render/aprs/AprsTCPIP.h b/src/plugins/render/aprs/AprsTCPIP.h --- a/src/plugins/render/aprs/AprsTCPIP.h +++ b/src/plugins/render/aprs/AprsTCPIP.h @@ -19,14 +19,14 @@ { public: AprsTCPIP( const QString& hostName, int port ); - ~AprsTCPIP(); + ~AprsTCPIP() override; - QString sourceName() const; - QIODevice *openSocket(); + QString sourceName() const override; + QIODevice *openSocket() override; void checkReadReturn( int length, QIODevice **socket, - AprsGatherer *gatherer ); + AprsGatherer *gatherer ) override; - bool canDoDirect() const; + bool canDoDirect() const override; private: QString m_hostName; diff --git a/src/plugins/render/aprs/AprsTTY.h b/src/plugins/render/aprs/AprsTTY.h --- a/src/plugins/render/aprs/AprsTTY.h +++ b/src/plugins/render/aprs/AprsTTY.h @@ -19,14 +19,14 @@ { public: explicit AprsTTY( const QString &ttyName ); - ~AprsTTY(); + ~AprsTTY() override; - QString sourceName() const; - QIODevice *openSocket(); + QString sourceName() const override; + QIODevice *openSocket() override; void checkReadReturn( int length, QIODevice **socket, - AprsGatherer *gatherer ); + AprsGatherer *gatherer ) override; - bool canDoDirect() const; + bool canDoDirect() const override; private: QString m_ttyName; diff --git a/src/plugins/render/aprs/GeoAprsCoordinates.h b/src/plugins/render/aprs/GeoAprsCoordinates.h --- a/src/plugins/render/aprs/GeoAprsCoordinates.h +++ b/src/plugins/render/aprs/GeoAprsCoordinates.h @@ -29,7 +29,7 @@ }; GeoAprsCoordinates( qreal lon, qreal lat, int where ); - ~GeoAprsCoordinates(); + ~GeoAprsCoordinates() override; void addSeenFrom( int where ); int seenFrom() const; diff --git a/src/plugins/render/atmosphere/AtmospherePlugin.h b/src/plugins/render/atmosphere/AtmospherePlugin.h --- a/src/plugins/render/atmosphere/AtmospherePlugin.h +++ b/src/plugins/render/atmosphere/AtmospherePlugin.h @@ -31,37 +31,37 @@ explicit AtmospherePlugin( const MarbleModel *marbleModel ); - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString renderPolicy() const; + QString renderPolicy() const override; - QStringList renderPosition() const; + QStringList renderPosition() const override; - virtual RenderType renderType() const; + RenderType renderType() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QIcon icon() const; + QIcon icon() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - qreal zValue() const; + qreal zValue() const override; - void initialize(); + void initialize() override; - bool isInitialized() const; + bool isInitialized() const override; - bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ); + bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ) override; void repaintPixmap(const ViewportParams *viewParams); public Q_SLOTS: diff --git a/src/plugins/render/compass/CompassFloatItem.h b/src/plugins/render/compass/CompassFloatItem.h --- a/src/plugins/render/compass/CompassFloatItem.h +++ b/src/plugins/render/compass/CompassFloatItem.h @@ -40,41 +40,41 @@ public: CompassFloatItem(); explicit CompassFloatItem( const MarbleModel *marbleModel ); - ~CompassFloatItem (); + ~CompassFloatItem () override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; + QIcon icon () const override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; - QPainterPath backgroundShape() const; + QPainterPath backgroundShape() const override; - void setProjection( const ViewportParams *viewport ); + void setProjection( const ViewportParams *viewport ) override; - void paintContent( QPainter *painter ); + void paintContent( QPainter *painter ) override; - QDialog *configDialog(); + QDialog *configDialog() override; - QHash settings() const; + QHash settings() const override; - void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; private Q_SLOTS: void readSettings(); diff --git a/src/plugins/render/crosshairs/CrosshairsPlugin.h b/src/plugins/render/crosshairs/CrosshairsPlugin.h --- a/src/plugins/render/crosshairs/CrosshairsPlugin.h +++ b/src/plugins/render/crosshairs/CrosshairsPlugin.h @@ -50,43 +50,43 @@ explicit CrosshairsPlugin( const MarbleModel *marbleModel ); - ~CrosshairsPlugin(); + ~CrosshairsPlugin() override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString renderPolicy() const; + QString renderPolicy() const override; - QStringList renderPosition() const; + QStringList renderPosition() const override; - virtual RenderType renderType() const; + RenderType renderType() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; + QIcon icon () const override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; - bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ); + bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ) override; - QDialog *configDialog(); + QDialog *configDialog() override; - QHash settings() const; + QHash settings() const override; - void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; private Q_SLOTS: void readSettings(); diff --git a/src/plugins/render/earthquake/EarthquakeItem.h b/src/plugins/render/earthquake/EarthquakeItem.h --- a/src/plugins/render/earthquake/EarthquakeItem.h +++ b/src/plugins/render/earthquake/EarthquakeItem.h @@ -27,15 +27,15 @@ public: explicit EarthquakeItem( QObject *parent ); - ~EarthquakeItem(); + ~EarthquakeItem() override; // Returns true if the item is paintable - bool initialized() const; + bool initialized() const override; // Here the item gets painted - void paint( QPainter *painter ); + void paint( QPainter *painter ) override; - bool operator<( const AbstractDataPluginItem *other ) const; + bool operator<( const AbstractDataPluginItem *other ) const override; // Magnitude whose value we use to determine circle's diameter double magnitude() const; diff --git a/src/plugins/render/earthquake/EarthquakeModel.h b/src/plugins/render/earthquake/EarthquakeModel.h --- a/src/plugins/render/earthquake/EarthquakeModel.h +++ b/src/plugins/render/earthquake/EarthquakeModel.h @@ -23,7 +23,7 @@ public: explicit EarthquakeModel( const MarbleModel *marbleModel, QObject *parent = 0 ); - ~EarthquakeModel(); + ~EarthquakeModel() override; void setMinMagnitude( double minMagnitude ); void setStartDate( const QDateTime& startDate ); @@ -34,14 +34,14 @@ * Generates the download url for the description file from the web service depending on * the @p box surrounding the view and the @p number of files to show. **/ - virtual void getAdditionalItems( const GeoDataLatLonAltBox& box, - qint32 number = 10 ); + void getAdditionalItems( const GeoDataLatLonAltBox& box, + qint32 number = 10 ) override; /** * Parses the @p file which getAdditionalItems downloads and * prepares the data for usage. **/ - void parseFile( const QByteArray& file ); + void parseFile( const QByteArray& file ) override; private: double m_minMagnitude; diff --git a/src/plugins/render/earthquake/EarthquakePlugin.h b/src/plugins/render/earthquake/EarthquakePlugin.h --- a/src/plugins/render/earthquake/EarthquakePlugin.h +++ b/src/plugins/render/earthquake/EarthquakePlugin.h @@ -39,35 +39,35 @@ explicit EarthquakePlugin( const MarbleModel *marbleModel ); - virtual void initialize(); + void initialize() override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon() const; + QIcon icon() const override; - QDialog *configDialog(); + QDialog *configDialog() override; /** * @return: The settings of the item. */ - virtual QHash settings() const; + QHash settings() const override; /** * Set the settings of the item. */ - virtual void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; public Q_SLOTS: void readSettings(); diff --git a/src/plugins/render/eclipses/EclipsesBrowserDialog.h b/src/plugins/render/eclipses/EclipsesBrowserDialog.h --- a/src/plugins/render/eclipses/EclipsesBrowserDialog.h +++ b/src/plugins/render/eclipses/EclipsesBrowserDialog.h @@ -35,7 +35,7 @@ explicit EclipsesBrowserDialog( const MarbleModel *model, QWidget *parent = 0 ); - ~EclipsesBrowserDialog(); + ~EclipsesBrowserDialog() override; /** * @brief Set the year @@ -91,7 +91,7 @@ * * @see buttonShowClicked */ - void accept(); + void accept() override; /** * @brief Update the list of eclipses for the given year diff --git a/src/plugins/render/eclipses/EclipsesItem.h b/src/plugins/render/eclipses/EclipsesItem.h --- a/src/plugins/render/eclipses/EclipsesItem.h +++ b/src/plugins/render/eclipses/EclipsesItem.h @@ -62,7 +62,7 @@ */ explicit EclipsesItem( EclSolar *ecl, int index, QObject *parent = 0 ); - ~EclipsesItem(); + ~EclipsesItem() override; /** * @brief The index of the eclipse event diff --git a/src/plugins/render/eclipses/EclipsesModel.h b/src/plugins/render/eclipses/EclipsesModel.h --- a/src/plugins/render/eclipses/EclipsesModel.h +++ b/src/plugins/render/eclipses/EclipsesModel.h @@ -38,7 +38,7 @@ public: explicit EclipsesModel( const MarbleModel *model, QObject *parent = 0 ); - ~EclipsesModel(); + ~EclipsesModel() override; /** * @brief Return the current observation point @@ -132,14 +132,14 @@ // QT abstract item model interface QModelIndex index( int row, int column, - const QModelIndex &parent = QModelIndex() ) const; - QModelIndex parent( const QModelIndex &index ) const; - int rowCount( const QModelIndex &parent = QModelIndex() ) const; - int columnCount( const QModelIndex &parent = QModelIndex() ) const; + const QModelIndex &parent = QModelIndex() ) const override; + QModelIndex parent( const QModelIndex &index ) const override; + int rowCount( const QModelIndex &parent = QModelIndex() ) const override; + int columnCount( const QModelIndex &parent = QModelIndex() ) const override; QVariant data( const QModelIndex &index, - int role = Qt::DisplayRole ) const; + int role = Qt::DisplayRole ) const override; QVariant headerData( int section, Qt::Orientation orientation, - int role = Qt::DisplayRole ) const; + int role = Qt::DisplayRole ) const override; public Q_SLOTS: /** diff --git a/src/plugins/render/eclipses/EclipsesPlugin.h b/src/plugins/render/eclipses/EclipsesPlugin.h --- a/src/plugins/render/eclipses/EclipsesPlugin.h +++ b/src/plugins/render/eclipses/EclipsesPlugin.h @@ -48,39 +48,39 @@ public: EclipsesPlugin(); explicit EclipsesPlugin( const MarbleModel *marbleModel ); - virtual ~EclipsesPlugin(); + ~EclipsesPlugin() override; // this is the implementation of the RenderPlugin interface // see RenderPlugin.h for a description - QStringList backendTypes() const; - QString renderPolicy() const; - QStringList renderPosition() const; - QString name() const; - QString nameId() const; - QString guiString() const; - QString version() const; - QString description() const; - QString copyrightYears() const; + QStringList backendTypes() const override; + QString renderPolicy() const override; + QStringList renderPosition() const override; + QString name() const override; + QString nameId() const override; + QString guiString() const override; + QString version() const override; + QString description() const override; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon() const; - RenderPlugin::RenderType renderType() const; - QList* actionGroups() const; - QDialog *configDialog(); + QIcon icon() const override; + RenderPlugin::RenderType renderType() const override; + QList* actionGroups() const override; + QDialog *configDialog() override; - void initialize(); - bool isInitialized() const; + void initialize() override; + bool isInitialized() const override; bool render( GeoPainter *painter, ViewportParams *viewport, const QString &renderPos, - GeoSceneLayer *layer ); + GeoSceneLayer *layer ) override; - QHash settings() const; - void setSettings( const QHash &settings ); + QHash settings() const override; + void setSettings( const QHash &settings ) override; protected: - bool eventFilter( QObject *object, QEvent *e ); + bool eventFilter( QObject *object, QEvent *e ) override; private Q_SLOTS: void readSettings(); diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.h b/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.h --- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.h +++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.h @@ -66,19 +66,19 @@ public: explicit ElevationProfileTrackDataSource( const GeoDataTreeModel *treeModel, QObject *parent = 0 ); - virtual bool isDataAvailable() const; + bool isDataAvailable() const override; QStringList sourceDescriptions() const; void setSourceIndex(int index); int currentSourceIndex() const; public Q_SLOTS: - virtual void requestUpdate(); + void requestUpdate() override; protected: - virtual qreal getElevation(const GeoDataCoordinates &coordinates) const; + qreal getElevation(const GeoDataCoordinates &coordinates) const override; private Q_SLOTS: void handleObjectAdded( GeoDataObject *object ); @@ -101,13 +101,13 @@ public: ElevationProfileRouteDataSource( const RoutingModel *routingModel, const ElevationModel *elevationModel, QObject *parent = 0 ); - virtual bool isDataAvailable() const; + bool isDataAvailable() const override; public Q_SLOTS: - virtual void requestUpdate(); + void requestUpdate() override; protected: - virtual qreal getElevation(const GeoDataCoordinates &coordinates) const; + qreal getElevation(const GeoDataCoordinates &coordinates) const override; private: const RoutingModel *const m_routingModel; diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h --- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h +++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h @@ -54,41 +54,41 @@ public: explicit ElevationProfileFloatItem( const MarbleModel *marbleModel = 0 ); - ~ElevationProfileFloatItem(); + ~ElevationProfileFloatItem() override; - virtual QStringList backendTypes() const; + QStringList backendTypes() const override; - virtual qreal zValue() const; // Overriding LayerInterface to paint on top of the route + qreal zValue() const override; // Overriding LayerInterface to paint on top of the route - virtual QString name() const; + QString name() const override; - virtual QString guiString() const; + QString guiString() const override; - virtual QString nameId() const; + QString nameId() const override; - virtual QString version() const; + QString version() const override; - virtual QString description() const; + QString description() const override; - virtual QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual QIcon icon() const; + QIcon icon() const override; - virtual void initialize(); + void initialize() override; - virtual bool isInitialized() const; + bool isInitialized() const override; - virtual void setProjection( const ViewportParams *viewport ); + void setProjection( const ViewportParams *viewport ) override; - virtual void paintContent( QPainter *painter ); + void paintContent( QPainter *painter ) override; - QDialog *configDialog(); + QDialog *configDialog() override; protected: - bool eventFilter( QObject *object, QEvent *e ); - virtual void contextMenuEvent( QWidget *w, QContextMenuEvent *e ); + bool eventFilter( QObject *object, QEvent *e ) override; + void contextMenuEvent( QWidget *w, QContextMenuEvent *e ) override; private Q_SLOTS: void handleDataUpdate(const GeoDataLineString &points, const QVector &eleData); diff --git a/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.h b/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.h --- a/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.h +++ b/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.h @@ -35,38 +35,38 @@ public: explicit ElevationProfileMarker( const MarbleModel *marbleModel = 0 ); - ~ElevationProfileMarker(); + ~ElevationProfileMarker() override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString renderPolicy() const; + QString renderPolicy() const override; - QStringList renderPosition() const; + QStringList renderPosition() const override; - qreal zValue() const; // Overriding LayerInterface to paint on top of the route + qreal zValue() const override; // Overriding LayerInterface to paint on top of the route - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon() const; + QIcon icon() const override; - void initialize(); + void initialize() override; - bool isInitialized() const; + bool isInitialized() const override; bool render( GeoPainter *painter, ViewportParams *viewport, - const QString &renderPos, GeoSceneLayer *layer = 0 ); + const QString &renderPos, GeoSceneLayer *layer = 0 ) override; private Q_SLOTS: void onGeoObjectAdded( GeoDataObject *object ); diff --git a/src/plugins/render/foursquare/FoursquareItem.h b/src/plugins/render/foursquare/FoursquareItem.h --- a/src/plugins/render/foursquare/FoursquareItem.h +++ b/src/plugins/render/foursquare/FoursquareItem.h @@ -33,13 +33,13 @@ public: explicit FoursquareItem( QObject *parent=0 ); - ~FoursquareItem(); + ~FoursquareItem() override; - bool initialized() const; + bool initialized() const override; - void paint( QPainter* painter ); + void paint( QPainter* painter ) override; - bool operator<( const AbstractDataPluginItem *other ) const; + bool operator<( const AbstractDataPluginItem *other ) const override; QString name() const; diff --git a/src/plugins/render/foursquare/FoursquareModel.h b/src/plugins/render/foursquare/FoursquareModel.h --- a/src/plugins/render/foursquare/FoursquareModel.h +++ b/src/plugins/render/foursquare/FoursquareModel.h @@ -21,21 +21,21 @@ public: explicit FoursquareModel( const MarbleModel *marbleModel, QObject *parent = 0 ); - ~FoursquareModel(); + ~FoursquareModel() override; protected: /** * Generates the download url for the description file from the web service depending on * the @p box surrounding the view and the @p number of files to show. **/ - virtual void getAdditionalItems( const GeoDataLatLonAltBox& box, - qint32 number = 10 ); + void getAdditionalItems( const GeoDataLatLonAltBox& box, + qint32 number = 10 ) override; /** * Parses the @p file which getAdditionalItems downloads and * prepares the data for usage. **/ - void parseFile( const QByteArray& file ); + void parseFile( const QByteArray& file ) override; }; } diff --git a/src/plugins/render/foursquare/FoursquarePlugin.h b/src/plugins/render/foursquare/FoursquarePlugin.h --- a/src/plugins/render/foursquare/FoursquarePlugin.h +++ b/src/plugins/render/foursquare/FoursquarePlugin.h @@ -27,23 +27,23 @@ explicit FoursquarePlugin( const MarbleModel *marbleModel ); - virtual void initialize(); + void initialize() override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon() const; + QIcon icon() const override; /** * @brief Checks if there is an access token stored. diff --git a/src/plugins/render/gpsinfo/GpsInfo.h b/src/plugins/render/gpsinfo/GpsInfo.h --- a/src/plugins/render/gpsinfo/GpsInfo.h +++ b/src/plugins/render/gpsinfo/GpsInfo.h @@ -43,29 +43,29 @@ public: GpsInfo(); explicit GpsInfo( const MarbleModel *marbleModel ); - ~GpsInfo(); + ~GpsInfo() override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; + QIcon icon () const override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; void forceRepaint(); diff --git a/src/plugins/render/graticule/GraticulePlugin.h b/src/plugins/render/graticule/GraticulePlugin.h --- a/src/plugins/render/graticule/GraticulePlugin.h +++ b/src/plugins/render/graticule/GraticulePlugin.h @@ -59,41 +59,41 @@ explicit GraticulePlugin( const MarbleModel *marbleModel ); - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString renderPolicy() const; + QString renderPolicy() const override; - QStringList renderPosition() const; + QStringList renderPosition() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; + QIcon icon () const override; - QDialog *configDialog(); + QDialog *configDialog() override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; - virtual bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ); + bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ) override; - virtual qreal zValue() const; + qreal zValue() const override; - virtual QHash settings() const; + QHash settings() const override; - virtual void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; diff --git a/src/plugins/render/license/License.h b/src/plugins/render/license/License.h --- a/src/plugins/render/license/License.h +++ b/src/plugins/render/license/License.h @@ -34,28 +34,28 @@ MARBLE_PLUGIN( License ) public: explicit License( const MarbleModel *marbleModel=0 ); - ~License(); + ~License() override; - QStringList backendTypes() const; - QString name() const; - QString guiString() const; - QString nameId() const; - QString version() const; - QString description() const; - QString copyrightYears() const; + QStringList backendTypes() const override; + QString name() const override; + QString guiString() const override; + QString nameId() const override; + QString version() const override; + QString description() const override; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; - void initialize (); - bool isInitialized () const; + QIcon icon () const override; + void initialize () override; + bool isInitialized () const override; private Q_SLOTS: void updateLicenseText(); void toggleLicenseSize(); void showAboutDialog(); protected: - bool eventFilter(QObject *, QEvent *e); - void contextMenuEvent( QWidget *w, QContextMenuEvent *e ); + bool eventFilter(QObject *, QEvent *e) override; + void contextMenuEvent( QWidget *w, QContextMenuEvent *e ) override; private: WidgetGraphicsItem* m_widgetItem; diff --git a/src/plugins/render/license/License.cpp b/src/plugins/render/license/License.cpp --- a/src/plugins/render/license/License.cpp +++ b/src/plugins/render/license/License.cpp @@ -33,7 +33,7 @@ class OutlinedStyle : public QCommonStyle { public: void drawItemText( QPainter *painter, const QRect &rect, int alignment, const QPalette &palette, - bool enabled, const QString& text, QPalette::ColorRole textRole ) const { + bool enabled, const QString& text, QPalette::ColorRole textRole ) const override { Q_UNUSED( alignment ); Q_UNUSED( enabled ); diff --git a/src/plugins/render/mapscale/MapScaleFloatItem.h b/src/plugins/render/mapscale/MapScaleFloatItem.h --- a/src/plugins/render/mapscale/MapScaleFloatItem.h +++ b/src/plugins/render/mapscale/MapScaleFloatItem.h @@ -36,40 +36,40 @@ MARBLE_PLUGIN( MapScaleFloatItem ) public: explicit MapScaleFloatItem( const MarbleModel *marbleModel = 0 ); - ~MapScaleFloatItem(); + ~MapScaleFloatItem() override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; + QIcon icon () const override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; - void setProjection( const ViewportParams *viewport ); + void setProjection( const ViewportParams *viewport ) override; - void paintContent( QPainter *painter ); + void paintContent( QPainter *painter ) override; - QDialog *configDialog(); + QDialog *configDialog() override; protected: - virtual void contextMenuEvent( QWidget *w, QContextMenuEvent *e ); - virtual void toolTipEvent( QHelpEvent *e ); + void contextMenuEvent( QWidget *w, QContextMenuEvent *e ) override; + void toolTipEvent( QHelpEvent *e ) override; private Q_SLOTS: void readSettings(); diff --git a/src/plugins/render/measure/MeasureConfigDialog.h b/src/plugins/render/measure/MeasureConfigDialog.h --- a/src/plugins/render/measure/MeasureConfigDialog.h +++ b/src/plugins/render/measure/MeasureConfigDialog.h @@ -22,7 +22,7 @@ public: explicit MeasureConfigDialog(QDialog *parent = 0); - ~MeasureConfigDialog(); + ~MeasureConfigDialog() override; bool showBearingLabel() const; bool showBearingLabelChange() const; diff --git a/src/plugins/render/measure/MeasureToolPlugin.h b/src/plugins/render/measure/MeasureToolPlugin.h --- a/src/plugins/render/measure/MeasureToolPlugin.h +++ b/src/plugins/render/measure/MeasureToolPlugin.h @@ -48,38 +48,38 @@ Circular }; - QStringList backendTypes() const; - QString renderPolicy() const; - QStringList renderPosition() const; - QString name() const; - QString guiString() const; - QString nameId() const; + QStringList backendTypes() const override; + QString renderPolicy() const override; + QStringList renderPosition() const override; + QString name() const override; + QString guiString() const override; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; + QIcon icon () const override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; - bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ); + bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ) override; - QDialog *configDialog(); - QHash settings() const; - void setSettings( const QHash &settings ); + QDialog *configDialog() override; + QHash settings() const override; + void setSettings( const QHash &settings ) override; Q_SIGNALS: void numberOfMeasurePointsChanged( int newNumber ); public Q_SLOTS: - bool eventFilter( QObject *object, QEvent *event ); + bool eventFilter( QObject *object, QEvent *event ) override; private: void drawMeasurePoints( GeoPainter *painter ); diff --git a/src/plugins/render/navigation/ArrowDiscWidget.h b/src/plugins/render/navigation/ArrowDiscWidget.h --- a/src/plugins/render/navigation/ArrowDiscWidget.h +++ b/src/plugins/render/navigation/ArrowDiscWidget.h @@ -25,19 +25,19 @@ Q_OBJECT public: explicit ArrowDiscWidget( QWidget *parent = 0 ); - ~ArrowDiscWidget(); + ~ArrowDiscWidget() override; void setMarbleWidget( MarbleWidget *marbleWidget ); Q_SIGNALS: void repaintNeeded(); protected: - void paintEvent( QPaintEvent * ); - void mouseMoveEvent( QMouseEvent *mouseEvent ); - void mousePressEvent( QMouseEvent *mouseEvent ); - void mouseReleaseEvent( QMouseEvent *mouseEvent ); - void leaveEvent( QEvent *event ); + void paintEvent( QPaintEvent * ) override; + void mouseMoveEvent( QMouseEvent *mouseEvent ) override; + void mousePressEvent( QMouseEvent *mouseEvent ) override; + void mouseReleaseEvent( QMouseEvent *mouseEvent ) override; + void leaveEvent( QEvent *event ) override; void repaint(); private Q_SLOTS: diff --git a/src/plugins/render/navigation/NavigationButton.h b/src/plugins/render/navigation/NavigationButton.h --- a/src/plugins/render/navigation/NavigationButton.h +++ b/src/plugins/render/navigation/NavigationButton.h @@ -26,12 +26,12 @@ void repaintNeeded(); protected: - void mousePressEvent ( QMouseEvent *mouseEvent ); - void mouseReleaseEvent ( QMouseEvent *mouseEvent ); - void enterEvent( QEvent * e); - void leaveEvent( QEvent * e); - void changeEvent( QEvent *e ); - void paintEvent( QPaintEvent * ); + void mousePressEvent ( QMouseEvent *mouseEvent ) override; + void mouseReleaseEvent ( QMouseEvent *mouseEvent ) override; + void enterEvent( QEvent * e) override; + void leaveEvent( QEvent * e) override; + void changeEvent( QEvent *e ) override; + void paintEvent( QPaintEvent * ) override; private: QIcon::Mode m_iconMode; diff --git a/src/plugins/render/navigation/NavigationFloatItem.h b/src/plugins/render/navigation/NavigationFloatItem.h --- a/src/plugins/render/navigation/NavigationFloatItem.h +++ b/src/plugins/render/navigation/NavigationFloatItem.h @@ -44,42 +44,42 @@ public: explicit NavigationFloatItem( const MarbleModel *marbleModel = 0 ); - ~NavigationFloatItem(); + ~NavigationFloatItem() override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; + QIcon icon () const override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; - void setProjection( const ViewportParams *viewport ); + void setProjection( const ViewportParams *viewport ) override; static QPixmap pixmap( const QString &Id ); - QHash settings() const; + QHash settings() const override; - void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; protected: - bool eventFilter( QObject *object, QEvent *e ); - void paintContent( QPainter *painter ); - void contextMenuEvent( QWidget *w, QContextMenuEvent *e ); + bool eventFilter( QObject *object, QEvent *e ) override; + void paintContent( QPainter *painter ) override; + void contextMenuEvent( QWidget *w, QContextMenuEvent *e ) override; private Q_SLOTS: /** Map theme was changed, adjust controls */ diff --git a/src/plugins/render/navigation/NavigationSlider.h b/src/plugins/render/navigation/NavigationSlider.h --- a/src/plugins/render/navigation/NavigationSlider.h +++ b/src/plugins/render/navigation/NavigationSlider.h @@ -22,18 +22,18 @@ Q_OBJECT public: explicit NavigationSlider( QWidget *parent = 0 ); - ~NavigationSlider(); + ~NavigationSlider() override; Q_SIGNALS: void repaintNeeded(); protected: - void enterEvent( QEvent * ); - void mouseMoveEvent( QMouseEvent * mouseEvent); - void mousePressEvent( QMouseEvent * ); - void mouseReleaseEvent( QMouseEvent * ); - void leaveEvent( QEvent * ); - void paintEvent( QPaintEvent * ); + void enterEvent( QEvent * ) override; + void mouseMoveEvent( QMouseEvent * mouseEvent) override; + void mousePressEvent( QMouseEvent * ) override; + void mouseReleaseEvent( QMouseEvent * ) override; + void leaveEvent( QEvent * ) override; + void paintEvent( QPaintEvent * ) override; void repaint(); private: diff --git a/src/plugins/render/opencachingcom/OpenCachingComItem.h b/src/plugins/render/opencachingcom/OpenCachingComItem.h --- a/src/plugins/render/opencachingcom/OpenCachingComItem.h +++ b/src/plugins/render/opencachingcom/OpenCachingComItem.h @@ -34,17 +34,17 @@ public: OpenCachingComItem( const QVariantMap& cache, OpenCachingComModel *parent ); - ~OpenCachingComItem(); + ~OpenCachingComItem() override; - bool initialized() const; + bool initialized() const override; - void paint( QPainter *painter ); + void paint( QPainter *painter ) override; - QAction *action(); + QAction *action() override; - bool operator<( const AbstractDataPluginItem *other ) const; + bool operator<( const AbstractDataPluginItem *other ) const override; - void addDownloadedFile( const QString &url, const QString &type ); + void addDownloadedFile( const QString &url, const QString &type ) override; public Q_SLOTS: void showInfoDialog(); diff --git a/src/plugins/render/opencachingcom/OpenCachingComModel.h b/src/plugins/render/opencachingcom/OpenCachingComModel.h --- a/src/plugins/render/opencachingcom/OpenCachingComModel.h +++ b/src/plugins/render/opencachingcom/OpenCachingComModel.h @@ -35,7 +35,7 @@ public: explicit OpenCachingComModel( const MarbleModel *marbleModel, QObject *parent = 0 ); - ~OpenCachingComModel(); + ~OpenCachingComModel() override; /// Fetch a file for a cache @@ -49,14 +49,14 @@ * Generates the download url for the description file from the web service depending on * the @p box surrounding the view and the @p number of files to show. **/ - virtual void getAdditionalItems( const GeoDataLatLonAltBox& box, - qint32 number = numberOfItemsOnScreen ); + void getAdditionalItems( const GeoDataLatLonAltBox& box, + qint32 number = numberOfItemsOnScreen ) override; /** * Parses the @p file which getAdditionalItems downloads and * prepares the data for usage. **/ - void parseFile( const QByteArray& file ); + void parseFile( const QByteArray& file ) override; private: GeoDataLatLonAltBox m_previousbox; diff --git a/src/plugins/render/opencachingcom/OpenCachingComPlugin.h b/src/plugins/render/opencachingcom/OpenCachingComPlugin.h --- a/src/plugins/render/opencachingcom/OpenCachingComPlugin.h +++ b/src/plugins/render/opencachingcom/OpenCachingComPlugin.h @@ -37,27 +37,27 @@ OpenCachingComPlugin(); explicit OpenCachingComPlugin(const MarbleModel *marbleModel); - virtual void initialize(); + void initialize() override; - virtual bool isInitialized() const; + bool isInitialized() const override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon() const; + QIcon icon() const override; QDialog *configDialog(); diff --git a/src/plugins/render/opendesktop/OpenDesktopItem.h b/src/plugins/render/opendesktop/OpenDesktopItem.h --- a/src/plugins/render/opendesktop/OpenDesktopItem.h +++ b/src/plugins/render/opendesktop/OpenDesktopItem.h @@ -28,19 +28,19 @@ public: explicit OpenDesktopItem(QObject *parent); - ~OpenDesktopItem(); + ~OpenDesktopItem() override; - bool initialized() const; + bool initialized() const override; - void addDownloadedFile( const QString& url, const QString& type ); + void addDownloadedFile( const QString& url, const QString& type ) override; - void paint( QPainter *painter ); + void paint( QPainter *painter ) override; - bool operator<( const AbstractDataPluginItem *other ) const; + bool operator<( const AbstractDataPluginItem *other ) const override; void updateToolTip(); - QAction *action(); + QAction *action() override; QUrl profileUrl() const; diff --git a/src/plugins/render/opendesktop/OpenDesktopModel.h b/src/plugins/render/opendesktop/OpenDesktopModel.h --- a/src/plugins/render/opendesktop/OpenDesktopModel.h +++ b/src/plugins/render/opendesktop/OpenDesktopModel.h @@ -24,21 +24,21 @@ public: explicit OpenDesktopModel( const MarbleModel *marbleModel, QObject *parent = 0 ); - ~OpenDesktopModel(); + ~OpenDesktopModel() override; void setMarbleWidget(MarbleWidget *widget); protected: /** * Generates the download url for the description file from the web service depending on * the @p box surrounding the view and the @p number of files to show. **/ - void getAdditionalItems(const Marble::GeoDataLatLonAltBox& box, qint32 number = 10); + void getAdditionalItems(const Marble::GeoDataLatLonAltBox& box, qint32 number = 10) override; /** * Parses the @p file which getAdditionalItems downloads and * prepares the data for usage. **/ - void parseFile(const QByteArray& file); + void parseFile(const QByteArray& file) override; private: MarbleWidget *m_marbleWidget; diff --git a/src/plugins/render/opendesktop/OpenDesktopPlugin.h b/src/plugins/render/opendesktop/OpenDesktopPlugin.h --- a/src/plugins/render/opendesktop/OpenDesktopPlugin.h +++ b/src/plugins/render/opendesktop/OpenDesktopPlugin.h @@ -38,32 +38,32 @@ explicit OpenDesktopPlugin( const MarbleModel *marbleModel ); - virtual void initialize(); + void initialize() override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon() const; + QIcon icon() const override; - QDialog *configDialog(); + QDialog *configDialog() override; - QHash settings() const; + QHash settings() const override; - void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; protected: - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; private Q_SLOTS: void readSettings(); diff --git a/src/plugins/render/overviewmap/OverviewMap.h b/src/plugins/render/overviewmap/OverviewMap.h --- a/src/plugins/render/overviewmap/OverviewMap.h +++ b/src/plugins/render/overviewmap/OverviewMap.h @@ -45,53 +45,53 @@ public: OverviewMap(); explicit OverviewMap( const MarbleModel *marbleModel ); - ~OverviewMap(); + ~OverviewMap() override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; + QIcon icon () const override; - QDialog *configDialog(); + QDialog *configDialog() override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; - void setProjection( const ViewportParams *viewport ); + void setProjection( const ViewportParams *viewport ) override; - void paintContent( QPainter *painter ); + void paintContent( QPainter *painter ) override; /** * @return: The settings of the item. */ - virtual QHash settings() const; + QHash settings() const override; /** * Set the settings of the item. */ - virtual void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; public Q_SLOTS: void readSettings(); void writeSettings(); void updateSettings(); protected: - bool eventFilter( QObject *object, QEvent *e ); + bool eventFilter( QObject *object, QEvent *e ) override; private: void changeBackground( const QString& target ); diff --git a/src/plugins/render/photo/PhotoPlugin.h b/src/plugins/render/photo/PhotoPlugin.h --- a/src/plugins/render/photo/PhotoPlugin.h +++ b/src/plugins/render/photo/PhotoPlugin.h @@ -37,40 +37,40 @@ explicit PhotoPlugin( const MarbleModel *marbleModel ); - ~PhotoPlugin(); + ~PhotoPlugin() override; - void initialize(); + void initialize() override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon() const; + QIcon icon() const override; - QDialog *configDialog(); + QDialog *configDialog() override; /** * @return: The settings of the item. */ - virtual QHash settings() const; + QHash settings() const override; /** * Set the settings of the item. */ - virtual void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; protected: - bool eventFilter( QObject *object, QEvent *event ); + bool eventFilter( QObject *object, QEvent *event ) override; private Q_SLOTS: void readSettings(); diff --git a/src/plugins/render/photo/PhotoPluginItem.h b/src/plugins/render/photo/PhotoPluginItem.h --- a/src/plugins/render/photo/PhotoPluginItem.h +++ b/src/plugins/render/photo/PhotoPluginItem.h @@ -31,15 +31,15 @@ Q_OBJECT public: explicit PhotoPluginItem( MarbleWidget *widget, QObject *parent ); - ~PhotoPluginItem(); + ~PhotoPluginItem() override; QString name() const; - bool initialized() const; + bool initialized() const override; - void addDownloadedFile( const QString& url, const QString& type ); + void addDownloadedFile( const QString& url, const QString& type ) override; - bool operator<( const AbstractDataPluginItem *other ) const; + bool operator<( const AbstractDataPluginItem *other ) const override; QUrl photoUrl() const; @@ -65,7 +65,7 @@ void setTitle( const QString& title ); - QAction *action(); + QAction *action() override; public Q_SLOTS: void openBrowser(); diff --git a/src/plugins/render/photo/PhotoPluginModel.h b/src/plugins/render/photo/PhotoPluginModel.h --- a/src/plugins/render/photo/PhotoPluginModel.h +++ b/src/plugins/render/photo/PhotoPluginModel.h @@ -42,14 +42,14 @@ * the @p box surrounding the view and the @p number of files to show. **/ void getAdditionalItems( const GeoDataLatLonAltBox& box, - qint32 number = 10 ); + qint32 number = 10 ) override; /** * The reimplementation has to parse the @p file and should generate items. This items * have to be scheduled to downloadItemData or could be directly added to the list, * depending on if they have to download information to be shown. **/ - void parseFile( const QByteArray& file ); + void parseFile( const QByteArray& file ) override; private: MarbleWidget *m_marbleWidget; diff --git a/src/plugins/render/positionmarker/PositionMarker.h b/src/plugins/render/positionmarker/PositionMarker.h --- a/src/plugins/render/positionmarker/PositionMarker.h +++ b/src/plugins/render/positionmarker/PositionMarker.h @@ -41,51 +41,51 @@ MARBLE_PLUGIN( PositionMarker ) public: explicit PositionMarker(const MarbleModel *marbleModel = 0 ); - ~PositionMarker (); + ~PositionMarker () override; - QStringList renderPosition() const; + QStringList renderPosition() const override; - QString renderPolicy() const; + QString renderPolicy() const override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; + QIcon icon () const override; - QDialog *configDialog(); + QDialog *configDialog() override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; bool render( GeoPainter *painter, ViewportParams *viewport, - const QString& renderPos, GeoSceneLayer * layer = 0 ); + const QString& renderPos, GeoSceneLayer * layer = 0 ) override; // Overriding LayerInterface to paint on top of the route - virtual qreal zValue() const; + qreal zValue() const override; /** * @return: The settings of the item. */ - virtual QHash settings() const; + QHash settings() const override; /** * Set the settings of the item. */ - virtual void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; public Q_SLOTS: diff --git a/src/plugins/render/postalcode/PostalCodeItem.h b/src/plugins/render/postalcode/PostalCodeItem.h --- a/src/plugins/render/postalcode/PostalCodeItem.h +++ b/src/plugins/render/postalcode/PostalCodeItem.h @@ -25,13 +25,13 @@ public: explicit PostalCodeItem( QObject *parent ); - ~PostalCodeItem(); + ~PostalCodeItem() override; - bool initialized() const; + bool initialized() const override; - void paint( QPainter *painter ); + void paint( QPainter *painter ) override; - bool operator<( const AbstractDataPluginItem *other ) const; + bool operator<( const AbstractDataPluginItem *other ) const override; QString text() const; diff --git a/src/plugins/render/postalcode/PostalCodeModel.h b/src/plugins/render/postalcode/PostalCodeModel.h --- a/src/plugins/render/postalcode/PostalCodeModel.h +++ b/src/plugins/render/postalcode/PostalCodeModel.h @@ -21,21 +21,21 @@ public: explicit PostalCodeModel( const MarbleModel *marbleModel, QObject *parent = 0 ); - ~PostalCodeModel(); + ~PostalCodeModel() override; protected: /** * Generates the download url for the description file from the web service depending on * the @p box surrounding the view and the @p number of files to show. **/ void getAdditionalItems( const GeoDataLatLonAltBox& box, - qint32 number = 10 ); + qint32 number = 10 ) override; /** * Parses the @p file which getAdditionalItems downloads and * prepares the data for usage. **/ - void parseFile( const QByteArray& file ); + void parseFile( const QByteArray& file ) override; private: static void addLine( QString* string, const QString &line ); diff --git a/src/plugins/render/postalcode/PostalCodePlugin.h b/src/plugins/render/postalcode/PostalCodePlugin.h --- a/src/plugins/render/postalcode/PostalCodePlugin.h +++ b/src/plugins/render/postalcode/PostalCodePlugin.h @@ -26,23 +26,23 @@ explicit PostalCodePlugin( const MarbleModel *marbleModel ); - virtual void initialize(); + void initialize() override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon() const; + QIcon icon() const override; }; } diff --git a/src/plugins/render/progress/ProgressFloatItem.h b/src/plugins/render/progress/ProgressFloatItem.h --- a/src/plugins/render/progress/ProgressFloatItem.h +++ b/src/plugins/render/progress/ProgressFloatItem.h @@ -35,33 +35,33 @@ public: explicit ProgressFloatItem( const MarbleModel *marbleModel = 0 ); - ~ProgressFloatItem (); + ~ProgressFloatItem () override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; + QIcon icon () const override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; - QPainterPath backgroundShape() const; + QPainterPath backgroundShape() const override; - void paintContent( QPainter *painter ); + void paintContent( QPainter *painter ) override; private Q_SLOTS: void removeProgressItem(); diff --git a/src/plugins/render/routing/AudioOutput.h b/src/plugins/render/routing/AudioOutput.h --- a/src/plugins/render/routing/AudioOutput.h +++ b/src/plugins/render/routing/AudioOutput.h @@ -31,7 +31,7 @@ explicit AudioOutput( QObject* parent = 0 ); /** Destructor */ - ~AudioOutput(); + ~AudioOutput() override; /** * Generate an audible notification (if needed) after the position on the route has changed. diff --git a/src/plugins/render/routing/RoutingPlugin.h b/src/plugins/render/routing/RoutingPlugin.h --- a/src/plugins/render/routing/RoutingPlugin.h +++ b/src/plugins/render/routing/RoutingPlugin.h @@ -35,37 +35,37 @@ explicit RoutingPlugin( const MarbleModel *marbleModel ); - ~RoutingPlugin(); + ~RoutingPlugin() override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - void initialize(); + void initialize() override; - bool isInitialized() const; + bool isInitialized() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon() const; + QIcon icon() const override; - bool eventFilter( QObject *object, QEvent *event ); + bool eventFilter( QObject *object, QEvent *event ) override; - virtual QHash settings() const; + QHash settings() const override; - virtual void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; - QDialog *configDialog(); + QDialog *configDialog() override; private Q_SLOTS: /** Write settings */ diff --git a/src/plugins/render/satellites/SatellitesConfigDialog.h b/src/plugins/render/satellites/SatellitesConfigDialog.h --- a/src/plugins/render/satellites/SatellitesConfigDialog.h +++ b/src/plugins/render/satellites/SatellitesConfigDialog.h @@ -33,7 +33,7 @@ }; explicit SatellitesConfigDialog( QWidget *parent = 0 ); - ~SatellitesConfigDialog(); + ~SatellitesConfigDialog() override; void update(); diff --git a/src/plugins/render/satellites/SatellitesConfigLeafItem.h b/src/plugins/render/satellites/SatellitesConfigLeafItem.h --- a/src/plugins/render/satellites/SatellitesConfigLeafItem.h +++ b/src/plugins/render/satellites/SatellitesConfigLeafItem.h @@ -21,17 +21,17 @@ public: explicit SatellitesConfigLeafItem( const QString &name, const QString &id ); - ~SatellitesConfigLeafItem(); + ~SatellitesConfigLeafItem() override; void loadSettings(const QHash &settings) override; - QVariant data( int column, int role ) const; - bool setData(int column, int role, const QVariant& data); + QVariant data( int column, int role ) const override; + bool setData(int column, int role, const QVariant& data) override; - bool isLeaf() const; - SatellitesConfigAbstractItem *childAt( int row ) const; - int indexOf( const SatellitesConfigAbstractItem *child ) const; - int childrenCount() const; + bool isLeaf() const override; + SatellitesConfigAbstractItem *childAt( int row ) const override; + int indexOf( const SatellitesConfigAbstractItem *child ) const override; + int childrenCount() const override; QString id() const; QString url() const; diff --git a/src/plugins/render/satellites/SatellitesConfigModel.h b/src/plugins/render/satellites/SatellitesConfigModel.h --- a/src/plugins/render/satellites/SatellitesConfigModel.h +++ b/src/plugins/render/satellites/SatellitesConfigModel.h @@ -22,7 +22,7 @@ Q_OBJECT public: explicit SatellitesConfigModel( QObject *parent = 0 ); - ~SatellitesConfigModel(); + ~SatellitesConfigModel() override; void loadSettings(const QHash &settings); @@ -34,19 +34,19 @@ QStringList urlList() const; QVariant data( const QModelIndex &index, - int role = Qt::DisplayRole ) const; + int role = Qt::DisplayRole ) const override; bool setData( const QModelIndex &index, const QVariant &value, - int role = Qt::EditRole ); - int columnCount( const QModelIndex &parent = QModelIndex() ) const; - int rowCount( const QModelIndex &parent = QModelIndex() ) const; - QModelIndex parent( const QModelIndex &child ) const; + int role = Qt::EditRole ) override; + int columnCount( const QModelIndex &parent = QModelIndex() ) const override; + int rowCount( const QModelIndex &parent = QModelIndex() ) const override; + QModelIndex parent( const QModelIndex &child ) const override; QModelIndex index( int row, int column, - const QModelIndex &parent = QModelIndex() ) const; + const QModelIndex &parent = QModelIndex() ) const override; QVariant headerData( int section, Qt::Orientation orientation, - int role = Qt::DisplayRole ) const; - Qt::ItemFlags flags( const QModelIndex &index ) const; + int role = Qt::DisplayRole ) const override; + Qt::ItemFlags flags( const QModelIndex &index ) const override; SatellitesConfigNodeItem* rootItem() const; protected: diff --git a/src/plugins/render/satellites/SatellitesConfigNodeItem.h b/src/plugins/render/satellites/SatellitesConfigNodeItem.h --- a/src/plugins/render/satellites/SatellitesConfigNodeItem.h +++ b/src/plugins/render/satellites/SatellitesConfigNodeItem.h @@ -21,20 +21,20 @@ { public: explicit SatellitesConfigNodeItem( const QString &name ); - ~SatellitesConfigNodeItem(); + ~SatellitesConfigNodeItem() override; void loadSettings(const QHash &settings) override; - QVariant data( int column, int role ) const; - bool setData(int column, int role, const QVariant& data); + QVariant data( int column, int role ) const override; + bool setData(int column, int role, const QVariant& data) override; - bool isLeaf() const; - SatellitesConfigAbstractItem *childAt( int row ) const; - int indexOf( const SatellitesConfigAbstractItem *child ) const; - int childrenCount() const; + bool isLeaf() const override; + SatellitesConfigAbstractItem *childAt( int row ) const override; + int indexOf( const SatellitesConfigAbstractItem *child ) const override; + int childrenCount() const override; void appendChild( SatellitesConfigAbstractItem *item ); - void clear(); + void clear() override; private: QVector m_children; diff --git a/src/plugins/render/satellites/SatellitesMSCItem.h b/src/plugins/render/satellites/SatellitesMSCItem.h --- a/src/plugins/render/satellites/SatellitesMSCItem.h +++ b/src/plugins/render/satellites/SatellitesMSCItem.h @@ -41,7 +41,7 @@ int catalogIndex, PlanetarySats *planSat, const MarbleClock *clock ); - ~SatellitesMSCItem(); + ~SatellitesMSCItem() override; QString category() const; QString relatedBody() const; @@ -52,7 +52,7 @@ const QDateTime& missionStart() const; const QDateTime& missionEnd() const; - void update(); + void update() override; private: GeoDataTrack *m_track; diff --git a/src/plugins/render/satellites/SatellitesModel.h b/src/plugins/render/satellites/SatellitesModel.h --- a/src/plugins/render/satellites/SatellitesModel.h +++ b/src/plugins/render/satellites/SatellitesModel.h @@ -36,7 +36,7 @@ void setPlanet( const QString &lcPlanet ); void updateVisibility(); - void parseFile( const QString &id, const QByteArray &file ); + void parseFile( const QString &id, const QByteArray &file ) override; protected: /** diff --git a/src/plugins/render/satellites/SatellitesPlugin.h b/src/plugins/render/satellites/SatellitesPlugin.h --- a/src/plugins/render/satellites/SatellitesPlugin.h +++ b/src/plugins/render/satellites/SatellitesPlugin.h @@ -37,35 +37,35 @@ public: explicit SatellitesPlugin( const MarbleModel *marbleModel = 0 ); - virtual ~SatellitesPlugin(); + ~SatellitesPlugin() override; - QStringList backendTypes() const; - QString renderPolicy() const; - QStringList renderPosition() const; - QString name() const; - QString nameId() const; - QString guiString() const; - QString version() const; - QString description() const; - QString copyrightYears() const; + QStringList backendTypes() const override; + QString renderPolicy() const override; + QStringList renderPosition() const override; + QString name() const override; + QString nameId() const override; + QString guiString() const override; + QString version() const override; + QString description() const override; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QString aboutDataText() const; - QIcon icon() const; - RenderType renderType() const; - void initialize(); - bool isInitialized() const; + QString aboutDataText() const override; + QIcon icon() const override; + RenderType renderType() const override; + void initialize() override; + bool isInitialized() const override; bool render( GeoPainter *painter, ViewportParams *viewport, const QString &renderPos, - GeoSceneLayer *layer ); + GeoSceneLayer *layer ) override; - bool eventFilter( QObject *object, QEvent *event ); + bool eventFilter( QObject *object, QEvent *event ) override; - QHash settings() const; - void setSettings( const QHash &settings ); + QHash settings() const override; + void setSettings( const QHash &settings ) override; - SatellitesConfigDialog *configDialog(); + SatellitesConfigDialog *configDialog() override; private Q_SLOTS: void activate(); diff --git a/src/plugins/render/satellites/SatellitesTLEItem.h b/src/plugins/render/satellites/SatellitesTLEItem.h --- a/src/plugins/render/satellites/SatellitesTLEItem.h +++ b/src/plugins/render/satellites/SatellitesTLEItem.h @@ -35,7 +35,7 @@ elsetrec satrec, const MarbleClock *clock ); - void update(); + void update() override; private: double m_earthSemiMajorAxis; // in km diff --git a/src/plugins/render/satellites/TrackerPluginModel.h b/src/plugins/render/satellites/TrackerPluginModel.h --- a/src/plugins/render/satellites/TrackerPluginModel.h +++ b/src/plugins/render/satellites/TrackerPluginModel.h @@ -38,7 +38,7 @@ */ explicit TrackerPluginModel( GeoDataTreeModel *treeModel ); - virtual ~TrackerPluginModel(); + ~TrackerPluginModel() override; void enable( bool enabled ); diff --git a/src/plugins/render/speedometer/Speedometer.h b/src/plugins/render/speedometer/Speedometer.h --- a/src/plugins/render/speedometer/Speedometer.h +++ b/src/plugins/render/speedometer/Speedometer.h @@ -41,29 +41,29 @@ public: Speedometer(); explicit Speedometer( const MarbleModel *marbleModel ); - ~Speedometer(); + ~Speedometer() override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; QVector pluginAuthors() const override; - QString copyrightYears() const; + QString copyrightYears() const override; - QIcon icon () const; + QIcon icon () const override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; private Q_SLOTS: void updateLocation( const GeoDataCoordinates& coordinates, qreal speed ); diff --git a/src/plugins/render/stars/StarsPlugin.h b/src/plugins/render/stars/StarsPlugin.h --- a/src/plugins/render/stars/StarsPlugin.h +++ b/src/plugins/render/stars/StarsPlugin.h @@ -133,48 +133,48 @@ MARBLE_PLUGIN(StarsPlugin) public: explicit StarsPlugin( const MarbleModel *marbleModel=0 ); - ~StarsPlugin(); + ~StarsPlugin() override; - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString renderPolicy() const; + QString renderPolicy() const override; - QStringList renderPosition() const; + QStringList renderPosition() const override; - virtual RenderType renderType() const; + RenderType renderType() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon() const; + QIcon icon() const override; - void initialize(); + void initialize() override; - bool isInitialized() const; + bool isInitialized() const override; - bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ); + bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ) override; - QDialog *configDialog(); + QDialog *configDialog() override; - QHash settings() const; + QHash settings() const override; - void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; QString assembledConstellation(const QString &name); protected: - bool eventFilter( QObject *object, QEvent *e ); + bool eventFilter( QObject *object, QEvent *e ) override; private Q_SLOTS: void requestRepaint(); diff --git a/src/plugins/render/sun/SunPlugin.h b/src/plugins/render/sun/SunPlugin.h --- a/src/plugins/render/sun/SunPlugin.h +++ b/src/plugins/render/sun/SunPlugin.h @@ -35,33 +35,33 @@ explicit SunPlugin( const MarbleModel *marbleModel ); - QStringList backendTypes() const; + QStringList backendTypes() const override; - QString renderPolicy() const; + QString renderPolicy() const override; - QStringList renderPosition() const; + QStringList renderPosition() const override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QIcon icon () const; + QIcon icon () const override; - void initialize (); + void initialize () override; - bool isInitialized () const; + bool isInitialized () const override; - bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ); + bool render( GeoPainter *painter, ViewportParams *viewport, const QString& renderPos, GeoSceneLayer * layer = 0 ) override; private: QPixmap m_pixmap; diff --git a/src/plugins/render/weather/AbstractWeatherService.h b/src/plugins/render/weather/AbstractWeatherService.h --- a/src/plugins/render/weather/AbstractWeatherService.h +++ b/src/plugins/render/weather/AbstractWeatherService.h @@ -30,7 +30,7 @@ public: explicit AbstractWeatherService( const MarbleModel *model, QObject *parent ); - virtual ~AbstractWeatherService(); + ~AbstractWeatherService() override; void setMarbleWidget( MarbleWidget* widget ); public Q_SLOTS: diff --git a/src/plugins/render/weather/BBCItemGetter.h b/src/plugins/render/weather/BBCItemGetter.h --- a/src/plugins/render/weather/BBCItemGetter.h +++ b/src/plugins/render/weather/BBCItemGetter.h @@ -31,7 +31,7 @@ public: explicit BBCItemGetter( QObject *parent = 0 ); - ~BBCItemGetter(); + ~BBCItemGetter() override; void setSchedule( const GeoDataLatLonBox& box, qint32 number ); @@ -41,8 +41,8 @@ BBCStation station( const QString &id ); protected: - bool workAvailable(); - void work(); + bool workAvailable() override; + void work() override; Q_SIGNALS: void foundStation( const BBCStation& ); diff --git a/src/plugins/render/weather/BBCParser.h b/src/plugins/render/weather/BBCParser.h --- a/src/plugins/render/weather/BBCParser.h +++ b/src/plugins/render/weather/BBCParser.h @@ -41,14 +41,14 @@ { Q_OBJECT public: - ~BBCParser(); + ~BBCParser() override; static BBCParser *instance(); void scheduleRead( const QString& path, BBCWeatherItem *item, const QString& type ); protected: - bool workAvailable(); - void work(); + bool workAvailable() override; + void work() override; Q_SIGNALS: void parsedFile(); diff --git a/src/plugins/render/weather/BBCWeatherItem.h b/src/plugins/render/weather/BBCWeatherItem.h --- a/src/plugins/render/weather/BBCWeatherItem.h +++ b/src/plugins/render/weather/BBCWeatherItem.h @@ -25,12 +25,12 @@ public: explicit BBCWeatherItem( QObject *parent = 0 ); - ~BBCWeatherItem(); + ~BBCWeatherItem() override; - virtual bool request( const QString& type ); + bool request( const QString& type ) override; - QString service() const; - void addDownloadedFile( const QString& url, const QString& type ); + QString service() const override; + void addDownloadedFile( const QString& url, const QString& type ) override; QUrl observationUrl() const; QUrl forecastUrl() const; diff --git a/src/plugins/render/weather/BBCWeatherService.h b/src/plugins/render/weather/BBCWeatherService.h --- a/src/plugins/render/weather/BBCWeatherService.h +++ b/src/plugins/render/weather/BBCWeatherService.h @@ -30,14 +30,14 @@ public: explicit BBCWeatherService( const MarbleModel *model, QObject *parent ); - ~BBCWeatherService(); + ~BBCWeatherService() override; - void setFavoriteItems( const QStringList& favorite ); + void setFavoriteItems( const QStringList& favorite ) override; public Q_SLOTS: void getAdditionalItems( const GeoDataLatLonAltBox& box, - qint32 number = 10 ); - virtual void getItem( const QString &id ); + qint32 number = 10 ) override; + void getItem( const QString &id ) override; private Q_SLOTS: void fetchStationList(); diff --git a/src/plugins/render/weather/FakeWeatherItem.h b/src/plugins/render/weather/FakeWeatherItem.h --- a/src/plugins/render/weather/FakeWeatherItem.h +++ b/src/plugins/render/weather/FakeWeatherItem.h @@ -22,10 +22,10 @@ { public: explicit FakeWeatherItem( QObject *parent = 0 ); - ~FakeWeatherItem(); + ~FakeWeatherItem() override; - QString service() const; - void addDownloadedFile( const QString& url, const QString& type ); + QString service() const override; + void addDownloadedFile( const QString& url, const QString& type ) override; }; } // namespace Marble diff --git a/src/plugins/render/weather/FakeWeatherService.h b/src/plugins/render/weather/FakeWeatherService.h --- a/src/plugins/render/weather/FakeWeatherService.h +++ b/src/plugins/render/weather/FakeWeatherService.h @@ -22,12 +22,12 @@ public: explicit FakeWeatherService( const MarbleModel *model, QObject *parent ); - ~FakeWeatherService(); + ~FakeWeatherService() override; public Q_SLOTS: void getAdditionalItems( const GeoDataLatLonAltBox& box, - qint32 number = 10 ); - virtual void getItem( const QString &id ); + qint32 number = 10 ) override; + void getItem( const QString &id ) override; }; } // namespace Marble diff --git a/src/plugins/render/weather/GeoNamesWeatherItem.h b/src/plugins/render/weather/GeoNamesWeatherItem.h --- a/src/plugins/render/weather/GeoNamesWeatherItem.h +++ b/src/plugins/render/weather/GeoNamesWeatherItem.h @@ -22,11 +22,11 @@ public: explicit GeoNamesWeatherItem( QObject *parent = 0 ); - ~GeoNamesWeatherItem(); + ~GeoNamesWeatherItem() override; - void addDownloadedFile( const QString& url, const QString& type ); + void addDownloadedFile( const QString& url, const QString& type ) override; - QString service() const; + QString service() const override; QString creditHtml() const; }; diff --git a/src/plugins/render/weather/GeoNamesWeatherService.h b/src/plugins/render/weather/GeoNamesWeatherService.h --- a/src/plugins/render/weather/GeoNamesWeatherService.h +++ b/src/plugins/render/weather/GeoNamesWeatherService.h @@ -25,13 +25,13 @@ public: explicit GeoNamesWeatherService( const MarbleModel *model, QObject *parent ); - ~GeoNamesWeatherService(); + ~GeoNamesWeatherService() override; public Q_SLOTS: void getAdditionalItems( const GeoDataLatLonAltBox& box, - qint32 number = 10 ); - void getItem( const QString &id ); - void parseFile( const QByteArray& file ); + qint32 number = 10 ) override; + void getItem( const QString &id ) override; + void parseFile( const QByteArray& file ) override; private: AbstractDataPluginItem* parse(const QJsonObject &weatherObservationObject); diff --git a/src/plugins/render/weather/StationListParser.h b/src/plugins/render/weather/StationListParser.h --- a/src/plugins/render/weather/StationListParser.h +++ b/src/plugins/render/weather/StationListParser.h @@ -28,16 +28,16 @@ Q_OBJECT public: explicit StationListParser( QObject *parent ); - ~StationListParser(); + ~StationListParser() override; void read(); QList stationList() const; void setPath( const QString& path ); protected: - void run(); + void run() override; private: void readUnknownElement(); diff --git a/src/plugins/render/weather/WeatherItem.h b/src/plugins/render/weather/WeatherItem.h --- a/src/plugins/render/weather/WeatherItem.h +++ b/src/plugins/render/weather/WeatherItem.h @@ -46,9 +46,9 @@ public: explicit WeatherItem( QObject *parent = 0 ); explicit WeatherItem( MarbleWidget* widget, QObject *parent = 0 ); - ~WeatherItem(); + ~WeatherItem() override; - QAction *action(); + QAction *action() override; /** * Test if the item wants to request @p type again. @@ -60,11 +60,11 @@ */ virtual QString service() const = 0; - bool initialized() const; + bool initialized() const override; - virtual void addDownloadedFile( const QString& url, const QString& type ) = 0; + void addDownloadedFile( const QString& url, const QString& type ) override = 0; - bool operator<( const AbstractDataPluginItem *other ) const; + bool operator<( const AbstractDataPluginItem *other ) const override; QString stationName() const; void setStationName( const QString& name ); @@ -84,11 +84,11 @@ quint8 priority() const; void setPriority( quint8 priority ); - void setSettings( const QHash& settings ); + void setSettings( const QHash& settings ) override; void setMarbleWidget( MarbleWidget *widget ); - virtual QList actions(); + QList actions() override; QString description() const; diff --git a/src/plugins/render/weather/WeatherModel.h b/src/plugins/render/weather/WeatherModel.h --- a/src/plugins/render/weather/WeatherModel.h +++ b/src/plugins/render/weather/WeatherModel.h @@ -34,11 +34,11 @@ public: explicit WeatherModel( const MarbleModel *marbleModel, QObject *parent ); - ~WeatherModel(); + ~WeatherModel() override; void setUpdateInterval( quint32 hours ); - void setFavoriteItems( const QStringList& list ); + void setFavoriteItems( const QStringList& list ) override; public Q_SLOTS: /** @@ -58,9 +58,9 @@ protected: void getAdditionalItems( const GeoDataLatLonAltBox& box, - qint32 number = 10 ); - virtual void getItem( const QString &id ); - void parseFile( const QByteArray& file ); + qint32 number = 10 ) override; + void getItem( const QString &id ) override; + void parseFile( const QByteArray& file ) override; private: void addService( AbstractWeatherService *service ); diff --git a/src/plugins/render/weather/WeatherPlugin.h b/src/plugins/render/weather/WeatherPlugin.h --- a/src/plugins/render/weather/WeatherPlugin.h +++ b/src/plugins/render/weather/WeatherPlugin.h @@ -39,42 +39,42 @@ explicit WeatherPlugin( const MarbleModel *marbleModel ); - ~WeatherPlugin(); + ~WeatherPlugin() override; - void initialize(); + void initialize() override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QString aboutDataText() const; + QString aboutDataText() const override; - QIcon icon() const; + QIcon icon() const override; - QDialog *configDialog(); + QDialog *configDialog() override; - QHash settings() const; + QHash settings() const override; - void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; protected: - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; private Q_SLOTS: void readSettings(); void writeSettings(); void updateItemSettings(); - void favoriteItemsChanged( const QStringList& favoriteItems ); + void favoriteItemsChanged( const QStringList& favoriteItems ) override; Q_SIGNALS: void changedSettings(); diff --git a/src/plugins/render/wikipedia/WikipediaItem.h b/src/plugins/render/wikipedia/WikipediaItem.h --- a/src/plugins/render/wikipedia/WikipediaItem.h +++ b/src/plugins/render/wikipedia/WikipediaItem.h @@ -33,19 +33,19 @@ public: WikipediaItem( MarbleWidget* widget, QObject *parent ); - ~WikipediaItem(); + ~WikipediaItem() override; QString name() const; void setName( const QString& name ); - bool initialized() const; + bool initialized() const override; - void addDownloadedFile( const QString& url, const QString& type ); + void addDownloadedFile( const QString& url, const QString& type ) override; - void paint( QPainter *painter ); + void paint( QPainter *painter ) override; - bool operator<( const AbstractDataPluginItem *other ) const; + bool operator<( const AbstractDataPluginItem *other ) const override; qreal longitude() const; @@ -67,11 +67,11 @@ void setSummary( const QString& summary ); - QAction *action(); + QAction *action() override; void setIcon( const QIcon& icon ); - void setSettings( const QHash& settings ); + void setSettings( const QHash& settings ) override; /** Set a popularity rank. Larger means more popular. Default rank is 0 */ void setRank( double rank ); diff --git a/src/plugins/render/wikipedia/WikipediaModel.h b/src/plugins/render/wikipedia/WikipediaModel.h --- a/src/plugins/render/wikipedia/WikipediaModel.h +++ b/src/plugins/render/wikipedia/WikipediaModel.h @@ -28,7 +28,7 @@ public: explicit WikipediaModel( const MarbleModel *marbleModel, QObject *parent = 0 ); - ~WikipediaModel(); + ~WikipediaModel() override; void setShowThumbnail( bool show ); @@ -40,14 +40,14 @@ * the @p box surrounding the view and the @p number of files to show. **/ void getAdditionalItems( const GeoDataLatLonAltBox& box, - qint32 number = 10 ); + qint32 number = 10 ) override; /** * The reimplementation has to parse the @p file and should generate widgets. This widgets * have to be scheduled to downloadItemData or could be directly added to the list, * depending on if they have to download information to be shown. **/ - void parseFile( const QByteArray& file ); + void parseFile( const QByteArray& file ) override; private: MarbleWidget* m_marbleWidget; diff --git a/src/plugins/render/wikipedia/WikipediaPlugin.h b/src/plugins/render/wikipedia/WikipediaPlugin.h --- a/src/plugins/render/wikipedia/WikipediaPlugin.h +++ b/src/plugins/render/wikipedia/WikipediaPlugin.h @@ -36,42 +36,42 @@ public: WikipediaPlugin(); explicit WikipediaPlugin( const MarbleModel *marbleModel ); - ~WikipediaPlugin(); + ~WikipediaPlugin() override; - void initialize(); + void initialize() override; - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString copyrightYears() const; + QString copyrightYears() const override; - QString description() const; + QString description() const override; QVector pluginAuthors() const override; - QString aboutDataText() const; + QString aboutDataText() const override; - QIcon icon() const; + QIcon icon() const override; - QDialog *configDialog(); + QDialog *configDialog() override; /** * @return: The settings of the item. */ - virtual QHash settings() const; + QHash settings() const override; /** * Set the settings of the item. */ - virtual void setSettings( const QHash &settings ); + void setSettings( const QHash &settings ) override; protected: - bool eventFilter( QObject *object, QEvent *event ); + bool eventFilter( QObject *object, QEvent *event ) override; private Q_SLOTS: void readSettings(); diff --git a/src/plugins/runner/cache/CachePlugin.h b/src/plugins/runner/cache/CachePlugin.h --- a/src/plugins/runner/cache/CachePlugin.h +++ b/src/plugins/runner/cache/CachePlugin.h @@ -24,23 +24,23 @@ public: explicit CachePlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QString fileFormatDescription() const; + QString fileFormatDescription() const override; - QStringList fileExtensions() const; + QStringList fileExtensions() const override; - virtual ParsingRunner* newRunner() const; + ParsingRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/cache/CacheRunner.h b/src/plugins/runner/cache/CacheRunner.h --- a/src/plugins/runner/cache/CacheRunner.h +++ b/src/plugins/runner/cache/CacheRunner.h @@ -20,8 +20,8 @@ Q_OBJECT public: explicit CacheRunner(QObject *parent = 0); - ~CacheRunner(); - GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ); + ~CacheRunner() override; + GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ) override; }; diff --git a/src/plugins/runner/cyclestreets/CycleStreetsPlugin.h b/src/plugins/runner/cyclestreets/CycleStreetsPlugin.h --- a/src/plugins/runner/cyclestreets/CycleStreetsPlugin.h +++ b/src/plugins/runner/cyclestreets/CycleStreetsPlugin.h @@ -26,25 +26,25 @@ public: explicit CycleStreetsPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual RoutingRunner *newRunner() const; + RoutingRunner *newRunner() const override; - ConfigWidget* configWidget(); + ConfigWidget* configWidget() override; - virtual bool supportsTemplate( RoutingProfilesModel::ProfileTemplate profileTemplate ) const; + bool supportsTemplate( RoutingProfilesModel::ProfileTemplate profileTemplate ) const override; }; diff --git a/src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp b/src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp --- a/src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp +++ b/src/plugins/runner/cyclestreets/CycleStreetsPlugin.cpp @@ -24,8 +24,8 @@ public: CycleStreetsConfigWidget(); - virtual void loadSettings( const QHash &settings ); - virtual QHash settings() const; + void loadSettings( const QHash &settings ) override; + QHash settings() const override; private: Ui::CycleStreetsConfigWidget *ui_configWidget; diff --git a/src/plugins/runner/cyclestreets/CycleStreetsRunner.h b/src/plugins/runner/cyclestreets/CycleStreetsRunner.h --- a/src/plugins/runner/cyclestreets/CycleStreetsRunner.h +++ b/src/plugins/runner/cyclestreets/CycleStreetsRunner.h @@ -27,10 +27,10 @@ public: explicit CycleStreetsRunner(QObject *parent = 0); - ~CycleStreetsRunner(); + ~CycleStreetsRunner() override; // Overriding MarbleAbstractRunner - virtual void retrieveRoute( const RouteRequest *request ); + void retrieveRoute( const RouteRequest *request ) override; private Q_SLOTS: void get(); diff --git a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.h b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.h --- a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.h +++ b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.h @@ -27,23 +27,23 @@ public: explicit GosmorePlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual ReverseGeocodingRunner* newRunner() const; + ReverseGeocodingRunner* newRunner() const override; - virtual bool canWork() const; + bool canWork() const override; }; } diff --git a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.h b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.h --- a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.h +++ b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.h @@ -25,10 +25,10 @@ public: explicit GosmoreRunner(QObject *parent = 0); - ~GosmoreRunner(); + ~GosmoreRunner() override; // Overriding MarbleAbstractRunner - virtual void reverseGeocoding( const GeoDataCoordinates &coordinates ); + void reverseGeocoding( const GeoDataCoordinates &coordinates ) override; private: GosmoreRunnerPrivate* const d; diff --git a/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.h b/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.h --- a/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.h +++ b/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.h @@ -26,25 +26,25 @@ public: explicit GosmorePlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual RoutingRunner *newRunner() const; + RoutingRunner *newRunner() const override; - virtual bool supportsTemplate(RoutingProfilesModel::ProfileTemplate profileTemplate) const; + bool supportsTemplate(RoutingProfilesModel::ProfileTemplate profileTemplate) const override; - virtual bool canWork() const; + bool canWork() const override; }; } diff --git a/src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.h b/src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.h --- a/src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.h +++ b/src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.h @@ -26,10 +26,10 @@ public: explicit GosmoreRunner(QObject *parent = 0); - ~GosmoreRunner(); + ~GosmoreRunner() override; // Overriding MarbleAbstractRunner - virtual void retrieveRoute( const RouteRequest *request ); + void retrieveRoute( const RouteRequest *request ) override; private: GosmoreRunnerPrivate* const d; diff --git a/src/plugins/runner/gpsbabel/GpsbabelPlugin.h b/src/plugins/runner/gpsbabel/GpsbabelPlugin.h --- a/src/plugins/runner/gpsbabel/GpsbabelPlugin.h +++ b/src/plugins/runner/gpsbabel/GpsbabelPlugin.h @@ -24,23 +24,23 @@ public: explicit GpsbabelPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QString fileFormatDescription() const; + QString fileFormatDescription() const override; - QStringList fileExtensions() const; + QStringList fileExtensions() const override; - virtual ParsingRunner* newRunner() const; + ParsingRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/gpsbabel/GpsbabelRunner.h b/src/plugins/runner/gpsbabel/GpsbabelRunner.h --- a/src/plugins/runner/gpsbabel/GpsbabelRunner.h +++ b/src/plugins/runner/gpsbabel/GpsbabelRunner.h @@ -22,7 +22,7 @@ public: explicit GpsbabelRunner( QObject *parent = 0 ); - GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ); + GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ) override; }; diff --git a/src/plugins/runner/gpx/GpxParser.h b/src/plugins/runner/gpx/GpxParser.h --- a/src/plugins/runner/gpx/GpxParser.h +++ b/src/plugins/runner/gpx/GpxParser.h @@ -18,13 +18,13 @@ { public: GpxParser(); - virtual ~GpxParser(); + ~GpxParser() override; private: - virtual bool isValidElement(const QString& tagName) const; - virtual bool isValidRootElement(); + bool isValidElement(const QString& tagName) const override; + bool isValidRootElement() override; - virtual GeoDocument* createDocument() const; + GeoDocument* createDocument() const override; }; diff --git a/src/plugins/runner/gpx/GpxPlugin.h b/src/plugins/runner/gpx/GpxPlugin.h --- a/src/plugins/runner/gpx/GpxPlugin.h +++ b/src/plugins/runner/gpx/GpxPlugin.h @@ -24,23 +24,23 @@ public: explicit GpxPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QString fileFormatDescription() const; + QString fileFormatDescription() const override; - QStringList fileExtensions() const; + QStringList fileExtensions() const override; - virtual ParsingRunner* newRunner() const; + ParsingRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/gpx/GpxRunner.h b/src/plugins/runner/gpx/GpxRunner.h --- a/src/plugins/runner/gpx/GpxRunner.h +++ b/src/plugins/runner/gpx/GpxRunner.h @@ -20,8 +20,8 @@ Q_OBJECT public: explicit GpxRunner(QObject *parent = 0); - ~GpxRunner(); - GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ); + ~GpxRunner() override; + GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ) override; }; diff --git a/src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.h b/src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.h @@ -21,7 +21,7 @@ class GPXTrackPointExtensionTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXcmtTagHandler.h b/src/plugins/runner/gpx/handlers/GPXcmtTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXcmtTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXcmtTagHandler.h @@ -21,7 +21,7 @@ class GPXcmtTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXdescTagHandler.h b/src/plugins/runner/gpx/handlers/GPXdescTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXdescTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXdescTagHandler.h @@ -22,7 +22,7 @@ class GPXdescTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXeleTagHandler.h b/src/plugins/runner/gpx/handlers/GPXeleTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXeleTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXeleTagHandler.h @@ -21,7 +21,7 @@ class GPXeleTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.h b/src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.h @@ -21,7 +21,7 @@ class GPXextensionsTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXgpxTagHandler.h b/src/plugins/runner/gpx/handlers/GPXgpxTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXgpxTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXgpxTagHandler.h @@ -32,7 +32,7 @@ class GPXgpxTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXhrTagHandler.h b/src/plugins/runner/gpx/handlers/GPXhrTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXhrTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXhrTagHandler.h @@ -21,7 +21,7 @@ class GPXhrTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXlinkTagHandler.h b/src/plugins/runner/gpx/handlers/GPXlinkTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXlinkTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXlinkTagHandler.h @@ -21,7 +21,7 @@ class GPXlinkTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXnameTagHandler.h b/src/plugins/runner/gpx/handlers/GPXnameTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXnameTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXnameTagHandler.h @@ -30,7 +30,7 @@ class GPXnameTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXrteTagHandler.h b/src/plugins/runner/gpx/handlers/GPXrteTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXrteTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXrteTagHandler.h @@ -31,7 +31,7 @@ class GPXrteTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXrteptTagHandler.h b/src/plugins/runner/gpx/handlers/GPXrteptTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXrteptTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXrteptTagHandler.h @@ -31,7 +31,7 @@ class GPXrteptTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXtimeTagHandler.h b/src/plugins/runner/gpx/handlers/GPXtimeTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXtimeTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXtimeTagHandler.h @@ -21,7 +21,7 @@ class GPXtimeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXtrkTagHandler.h b/src/plugins/runner/gpx/handlers/GPXtrkTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXtrkTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXtrkTagHandler.h @@ -30,7 +30,7 @@ class GPXtrkTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXtrkptTagHandler.h b/src/plugins/runner/gpx/handlers/GPXtrkptTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXtrkptTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXtrkptTagHandler.h @@ -30,7 +30,7 @@ class GPXtrkptTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.h b/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.h @@ -30,7 +30,7 @@ class GPXtrksegTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXtypeTagHandler.h b/src/plugins/runner/gpx/handlers/GPXtypeTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXtypeTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXtypeTagHandler.h @@ -21,7 +21,7 @@ class GPXtypeTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXurlTagHandler.h b/src/plugins/runner/gpx/handlers/GPXurlTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXurlTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXurlTagHandler.h @@ -21,7 +21,7 @@ class GPXurlTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.h b/src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.h @@ -21,7 +21,7 @@ class GPXurlnameTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/gpx/handlers/GPXwptTagHandler.h b/src/plugins/runner/gpx/handlers/GPXwptTagHandler.h --- a/src/plugins/runner/gpx/handlers/GPXwptTagHandler.h +++ b/src/plugins/runner/gpx/handlers/GPXwptTagHandler.h @@ -30,7 +30,7 @@ class GPXwptTagHandler : public GeoTagHandler { public: - virtual GeoNode* parse(GeoParser&) const; + GeoNode* parse(GeoParser&) const override; }; } diff --git a/src/plugins/runner/hostip/HostipPlugin.h b/src/plugins/runner/hostip/HostipPlugin.h --- a/src/plugins/runner/hostip/HostipPlugin.h +++ b/src/plugins/runner/hostip/HostipPlugin.h @@ -26,23 +26,23 @@ public: explicit HostipPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual SearchRunner* newRunner() const; + SearchRunner* newRunner() const override; - bool canWork() const; + bool canWork() const override; }; } diff --git a/src/plugins/runner/hostip/HostipRunner.h b/src/plugins/runner/hostip/HostipRunner.h --- a/src/plugins/runner/hostip/HostipRunner.h +++ b/src/plugins/runner/hostip/HostipRunner.h @@ -28,7 +28,7 @@ public: explicit HostipRunner(QObject *parent = 0); - ~HostipRunner(); + ~HostipRunner() override; private Q_SLOTS: void get(); @@ -42,7 +42,7 @@ // No results (or an error) void slotNoResults(); - void search( const QString &searchTerm, const GeoDataLatLonBox &preferred ); + void search( const QString &searchTerm, const GeoDataLatLonBox &preferred ) override; private: QHostInfo m_hostInfo; diff --git a/src/plugins/runner/json/JsonPlugin.h b/src/plugins/runner/json/JsonPlugin.h --- a/src/plugins/runner/json/JsonPlugin.h +++ b/src/plugins/runner/json/JsonPlugin.h @@ -25,23 +25,23 @@ public: explicit JsonPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QString fileFormatDescription() const; + QString fileFormatDescription() const override; - QStringList fileExtensions() const; + QStringList fileExtensions() const override; - virtual ParsingRunner* newRunner() const; + ParsingRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/json/JsonRunner.h b/src/plugins/runner/json/JsonRunner.h --- a/src/plugins/runner/json/JsonRunner.h +++ b/src/plugins/runner/json/JsonRunner.h @@ -21,8 +21,8 @@ Q_OBJECT public: explicit JsonRunner(QObject *parent = 0); - ~JsonRunner(); - GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ); + ~JsonRunner() override; + GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ) override; }; } diff --git a/src/plugins/runner/kml/KmlDocument.h b/src/plugins/runner/kml/KmlDocument.h --- a/src/plugins/runner/kml/KmlDocument.h +++ b/src/plugins/runner/kml/KmlDocument.h @@ -19,7 +19,7 @@ class KmlDocument : public GeoDataDocument { public: - ~KmlDocument(); + ~KmlDocument() override; /** * @brief Temporary files to delete at destruction diff --git a/src/plugins/runner/kml/KmlParser.h b/src/plugins/runner/kml/KmlParser.h --- a/src/plugins/runner/kml/KmlParser.h +++ b/src/plugins/runner/kml/KmlParser.h @@ -19,13 +19,13 @@ { public: KmlParser(); - virtual ~KmlParser(); + ~KmlParser() override; private: - virtual bool isValidElement(const QString& tagName) const; - virtual bool isValidRootElement(); + bool isValidElement(const QString& tagName) const override; + bool isValidRootElement() override; - virtual GeoDocument* createDocument() const; + GeoDocument* createDocument() const override; }; diff --git a/src/plugins/runner/kml/KmlPlugin.h b/src/plugins/runner/kml/KmlPlugin.h --- a/src/plugins/runner/kml/KmlPlugin.h +++ b/src/plugins/runner/kml/KmlPlugin.h @@ -24,23 +24,23 @@ public: explicit KmlPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QString fileFormatDescription() const; + QString fileFormatDescription() const override; - QStringList fileExtensions() const; + QStringList fileExtensions() const override; - virtual ParsingRunner* newRunner() const; + ParsingRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/kml/KmlRunner.h b/src/plugins/runner/kml/KmlRunner.h --- a/src/plugins/runner/kml/KmlRunner.h +++ b/src/plugins/runner/kml/KmlRunner.h @@ -20,8 +20,8 @@ Q_OBJECT public: explicit KmlRunner(QObject *parent = 0); - ~KmlRunner(); - GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ); + ~KmlRunner() override; + GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ) override; }; } diff --git a/src/plugins/runner/latlon/LatLonPlugin.h b/src/plugins/runner/latlon/LatLonPlugin.h --- a/src/plugins/runner/latlon/LatLonPlugin.h +++ b/src/plugins/runner/latlon/LatLonPlugin.h @@ -26,21 +26,21 @@ public: explicit LatLonPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual SearchRunner* newRunner() const; + SearchRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/latlon/LatLonRunner.h b/src/plugins/runner/latlon/LatLonRunner.h --- a/src/plugins/runner/latlon/LatLonRunner.h +++ b/src/plugins/runner/latlon/LatLonRunner.h @@ -22,8 +22,8 @@ Q_OBJECT public: explicit LatLonRunner(QObject *parent = 0); - ~LatLonRunner(); - virtual void search( const QString &searchTerm, const GeoDataLatLonBox &preferred ); + ~LatLonRunner() override; + void search( const QString &searchTerm, const GeoDataLatLonBox &preferred ) override; }; diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.h b/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.h --- a/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.h +++ b/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.h @@ -30,21 +30,21 @@ public: explicit LocalOsmSearchPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual SearchRunner* newRunner() const; + SearchRunner* newRunner() const override; private Q_SLOTS: void updateDirectory( const QString &directory ); diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.h b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.h --- a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.h +++ b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.h @@ -29,9 +29,9 @@ public: explicit LocalOsmSearchRunner( const QStringList &databaseFiles, QObject *parent = 0 ); - ~LocalOsmSearchRunner(); + ~LocalOsmSearchRunner() override; - virtual void search( const QString &searchTerm, const GeoDataLatLonBox &preferred ); + void search( const QString &searchTerm, const GeoDataLatLonBox &preferred ) override; private: OsmDatabase m_database; diff --git a/src/plugins/runner/localdatabase/LocalDatabasePlugin.h b/src/plugins/runner/localdatabase/LocalDatabasePlugin.h --- a/src/plugins/runner/localdatabase/LocalDatabasePlugin.h +++ b/src/plugins/runner/localdatabase/LocalDatabasePlugin.h @@ -26,21 +26,21 @@ public: explicit LocalDatabasePlugin(QObject *parent = 0); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual SearchRunner* newRunner() const; + SearchRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/localdatabase/LocalDatabaseRunner.h b/src/plugins/runner/localdatabase/LocalDatabaseRunner.h --- a/src/plugins/runner/localdatabase/LocalDatabaseRunner.h +++ b/src/plugins/runner/localdatabase/LocalDatabaseRunner.h @@ -21,9 +21,9 @@ Q_OBJECT public: explicit LocalDatabaseRunner(QObject *parent = 0); - ~LocalDatabaseRunner(); + ~LocalDatabaseRunner() override; - void search( const QString &searchTerm, const GeoDataLatLonBox &preferred ); + void search( const QString &searchTerm, const GeoDataLatLonBox &preferred ) override; }; } diff --git a/src/plugins/runner/log/LogPlugin.h b/src/plugins/runner/log/LogPlugin.h --- a/src/plugins/runner/log/LogPlugin.h +++ b/src/plugins/runner/log/LogPlugin.h @@ -24,23 +24,23 @@ public: explicit LogfilePlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QString fileFormatDescription() const; + QString fileFormatDescription() const override; - QStringList fileExtensions() const; + QStringList fileExtensions() const override; - virtual ParsingRunner* newRunner() const; + ParsingRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/log/LogRunner.h b/src/plugins/runner/log/LogRunner.h --- a/src/plugins/runner/log/LogRunner.h +++ b/src/plugins/runner/log/LogRunner.h @@ -21,9 +21,9 @@ public: explicit LogRunner( QObject *parent = 0 ); - ~LogRunner(); + ~LogRunner() override; - GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ); + GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ) override; }; } diff --git a/src/plugins/runner/mapquest/MapQuestPlugin.h b/src/plugins/runner/mapquest/MapQuestPlugin.h --- a/src/plugins/runner/mapquest/MapQuestPlugin.h +++ b/src/plugins/runner/mapquest/MapQuestPlugin.h @@ -26,26 +26,26 @@ public: explicit MapQuestPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual RoutingRunner *newRunner() const; + RoutingRunner *newRunner() const override; - ConfigWidget* configWidget(); + ConfigWidget* configWidget() override; - virtual bool supportsTemplate( RoutingProfilesModel::ProfileTemplate profileTemplate ) const; - virtual QHash templateSettings( RoutingProfilesModel::ProfileTemplate profileTemplate ) const; + bool supportsTemplate( RoutingProfilesModel::ProfileTemplate profileTemplate ) const override; + QHash templateSettings( RoutingProfilesModel::ProfileTemplate profileTemplate ) const override; }; diff --git a/src/plugins/runner/mapquest/MapQuestPlugin.cpp b/src/plugins/runner/mapquest/MapQuestPlugin.cpp --- a/src/plugins/runner/mapquest/MapQuestPlugin.cpp +++ b/src/plugins/runner/mapquest/MapQuestPlugin.cpp @@ -92,7 +92,7 @@ ui_configWidget->descending->addItem( tr( "Favor" ), "FAVOR_DOWN_HILL" ); } - virtual void loadSettings( const QHash &settings_ ) + void loadSettings( const QHash &settings_ ) override { QHash settings = settings_; @@ -121,7 +121,7 @@ ui_configWidget->descending->findData(settings.value(QStringLiteral("descending")).toString())); } - virtual QHash settings() const + QHash settings() const override { QHash settings; settings.insert(QStringLiteral("appKey"), ui_configWidget->appKey->text()); diff --git a/src/plugins/runner/mapquest/MapQuestRunner.h b/src/plugins/runner/mapquest/MapQuestRunner.h --- a/src/plugins/runner/mapquest/MapQuestRunner.h +++ b/src/plugins/runner/mapquest/MapQuestRunner.h @@ -27,10 +27,10 @@ public: explicit MapQuestRunner(QObject *parent = 0); - ~MapQuestRunner(); + ~MapQuestRunner() override; // Overriding MarbleAbstractRunner - virtual void retrieveRoute( const RouteRequest *request ); + void retrieveRoute( const RouteRequest *request ) override; private Q_SLOTS: void get(); diff --git a/src/plugins/runner/monav/MonavConfigWidget.h b/src/plugins/runner/monav/MonavConfigWidget.h --- a/src/plugins/runner/monav/MonavConfigWidget.h +++ b/src/plugins/runner/monav/MonavConfigWidget.h @@ -31,14 +31,14 @@ public: explicit MonavConfigWidget( MonavPlugin* plugin ); - ~MonavConfigWidget(); + ~MonavConfigWidget() override; - virtual void loadSettings( const QHash &settings ); + void loadSettings( const QHash &settings ) override; - virtual QHash settings() const; + QHash settings() const override; protected: - virtual void showEvent ( QShowEvent * event ); + void showEvent ( QShowEvent * event ) override; private Q_SLOTS: void retrieveMapList( QNetworkReply *reply ); diff --git a/src/plugins/runner/monav/MonavMapsModel.h b/src/plugins/runner/monav/MonavMapsModel.h --- a/src/plugins/runner/monav/MonavMapsModel.h +++ b/src/plugins/runner/monav/MonavMapsModel.h @@ -25,13 +25,13 @@ public: explicit MonavMapsModel( const QVector &data, QObject * parent = 0 ); - virtual QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; + QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override; - virtual QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const; + QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const override; - virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const; + int rowCount ( const QModelIndex & parent = QModelIndex() ) const override; - virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const; + int columnCount ( const QModelIndex & parent = QModelIndex() ) const override; static bool sortByName( const MonavMap &first, const MonavMap &second ); diff --git a/src/plugins/runner/monav/MonavPlugin.h b/src/plugins/runner/monav/MonavPlugin.h --- a/src/plugins/runner/monav/MonavPlugin.h +++ b/src/plugins/runner/monav/MonavPlugin.h @@ -35,31 +35,31 @@ explicit MonavPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - ~MonavPlugin(); + ~MonavPlugin() override; - virtual RoutingRunner *newRunner() const; + RoutingRunner *newRunner() const override; - virtual bool supportsTemplate(RoutingProfilesModel::ProfileTemplate profileTemplate) const; + bool supportsTemplate(RoutingProfilesModel::ProfileTemplate profileTemplate) const override; - virtual QHash< QString, QVariant > templateSettings( RoutingProfilesModel::ProfileTemplate profileTemplate ) const; + QHash< QString, QVariant > templateSettings( RoutingProfilesModel::ProfileTemplate profileTemplate ) const override; - virtual ConfigWidget *configWidget(); + ConfigWidget *configWidget() override; - virtual bool canWork() const; + bool canWork() const override; QString mapDirectoryForRequest( const RouteRequest* request ) const; diff --git a/src/plugins/runner/monav/MonavRunner.h b/src/plugins/runner/monav/MonavRunner.h --- a/src/plugins/runner/monav/MonavRunner.h +++ b/src/plugins/runner/monav/MonavRunner.h @@ -25,10 +25,10 @@ public: explicit MonavRunner( const MonavPlugin* plugin, QObject *parent = 0 ); - ~MonavRunner(); + ~MonavRunner() override; // Overriding MarbleAbstractRunner - virtual void retrieveRoute( const RouteRequest *request ); + void retrieveRoute( const RouteRequest *request ) override; #if 0 // Overriding MarbleAbstractRunner diff --git a/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.h b/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.h --- a/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.h +++ b/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.h @@ -27,21 +27,21 @@ public: explicit NominatimPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual ReverseGeocodingRunner* newRunner() const; + ReverseGeocodingRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.h b/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.h --- a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.h +++ b/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.h @@ -33,10 +33,10 @@ public: explicit OsmNominatimRunner(QObject *parent = 0); - ~OsmNominatimRunner(); + ~OsmNominatimRunner() override; // Overriding MarbleAbstractRunner - virtual void reverseGeocoding( const GeoDataCoordinates &coordinates ); + void reverseGeocoding( const GeoDataCoordinates &coordinates ) override; private Q_SLOTS: // Forward a result to the search or reverse geocoding handler diff --git a/src/plugins/runner/nominatim-search/NominatimSearchPlugin.h b/src/plugins/runner/nominatim-search/NominatimSearchPlugin.h --- a/src/plugins/runner/nominatim-search/NominatimSearchPlugin.h +++ b/src/plugins/runner/nominatim-search/NominatimSearchPlugin.h @@ -27,21 +27,21 @@ public: explicit NominatimPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual SearchRunner* newRunner() const; + SearchRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h --- a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h +++ b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h @@ -31,9 +31,9 @@ public: explicit OsmNominatimRunner(QObject *parent = 0); - ~OsmNominatimRunner(); + ~OsmNominatimRunner() override; - void search( const QString &searchTerm, const GeoDataLatLonBox &preferred ); + void search( const QString &searchTerm, const GeoDataLatLonBox &preferred ) override; private Q_SLOTS: // Forward a result to the search or reverse geocoding handler diff --git a/src/plugins/runner/open-source-routing-machine/OSRMPlugin.h b/src/plugins/runner/open-source-routing-machine/OSRMPlugin.h --- a/src/plugins/runner/open-source-routing-machine/OSRMPlugin.h +++ b/src/plugins/runner/open-source-routing-machine/OSRMPlugin.h @@ -26,23 +26,23 @@ public: explicit OSRMPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual RoutingRunner *newRunner() const; + RoutingRunner *newRunner() const override; - virtual bool supportsTemplate( RoutingProfilesModel::ProfileTemplate profileTemplate ) const; + bool supportsTemplate( RoutingProfilesModel::ProfileTemplate profileTemplate ) const override; }; } diff --git a/src/plugins/runner/open-source-routing-machine/OSRMRunner.h b/src/plugins/runner/open-source-routing-machine/OSRMRunner.h --- a/src/plugins/runner/open-source-routing-machine/OSRMRunner.h +++ b/src/plugins/runner/open-source-routing-machine/OSRMRunner.h @@ -32,10 +32,10 @@ public: explicit OSRMRunner(QObject *parent = 0); - ~OSRMRunner(); + ~OSRMRunner() override; // Overriding MarbleAbstractRunner - virtual void retrieveRoute( const RouteRequest *request ); + void retrieveRoute( const RouteRequest *request ) override; private Q_SLOTS: /** Route data was retrieved via http */ diff --git a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.h b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.h --- a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.h +++ b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.h @@ -23,21 +23,21 @@ public: explicit OpenLocationCodeSearchPlugin(QObject *parent = 0); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual SearchRunner* newRunner() const; + SearchRunner* newRunner() const override; }; diff --git a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.h b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.h --- a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.h +++ b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.h @@ -26,7 +26,7 @@ public: explicit OpenLocationCodeSearchRunner( QObject *parent = 0 ); - void search( const QString &searchTerm, const GeoDataLatLonBox &preferred ); + void search( const QString &searchTerm, const GeoDataLatLonBox &preferred ) override; private: diff --git a/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.h b/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.h --- a/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.h +++ b/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.h @@ -26,26 +26,26 @@ public: explicit OpenRouteServicePlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual RoutingRunner *newRunner() const; + RoutingRunner *newRunner() const override; - ConfigWidget* configWidget(); + ConfigWidget* configWidget() override; - virtual bool supportsTemplate( RoutingProfilesModel::ProfileTemplate profileTemplate ) const; - virtual QHash templateSettings( RoutingProfilesModel::ProfileTemplate profileTemplate ) const; + bool supportsTemplate( RoutingProfilesModel::ProfileTemplate profileTemplate ) const override; + QHash templateSettings( RoutingProfilesModel::ProfileTemplate profileTemplate ) const override; }; diff --git a/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp b/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp --- a/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp +++ b/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.cpp @@ -88,7 +88,7 @@ ui_configWidget->preference->addItem( tr( "Bicycle (preferred Cycleway/-route)" ), "BicycleTour" ); } - virtual void loadSettings( const QHash &settings_ ) + void loadSettings( const QHash &settings_ ) override { QHash settings = settings_; @@ -103,7 +103,7 @@ ui_configWidget->noFerries->setCheckState(static_cast(settings.value(QStringLiteral("noFerries")).toInt())); } - virtual QHash settings() const + QHash settings() const override { QHash settings; settings.insert(QStringLiteral("preference"), diff --git a/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.h b/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.h --- a/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.h +++ b/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.h @@ -38,7 +38,7 @@ explicit OpenRouteServiceRunner(QObject *parent = 0); // Overriding MarbleAbstractRunner - virtual void retrieveRoute( const RouteRequest *request ); + void retrieveRoute( const RouteRequest *request ) override; private Q_SLOTS: /** Route data was retrieved via http */ diff --git a/src/plugins/runner/osm/OsmPlugin.h b/src/plugins/runner/osm/OsmPlugin.h --- a/src/plugins/runner/osm/OsmPlugin.h +++ b/src/plugins/runner/osm/OsmPlugin.h @@ -24,23 +24,23 @@ public: explicit OsmPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QString fileFormatDescription() const; + QString fileFormatDescription() const override; - QStringList fileExtensions() const; + QStringList fileExtensions() const override; - virtual ParsingRunner* newRunner() const; + ParsingRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/osm/OsmRunner.h b/src/plugins/runner/osm/OsmRunner.h --- a/src/plugins/runner/osm/OsmRunner.h +++ b/src/plugins/runner/osm/OsmRunner.h @@ -20,7 +20,7 @@ Q_OBJECT public: explicit OsmRunner(QObject *parent = 0); - GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ); + GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ) override; }; } diff --git a/src/plugins/runner/osm/translators/OsmDocumentTagTranslator.h b/src/plugins/runner/osm/translators/OsmDocumentTagTranslator.h --- a/src/plugins/runner/osm/translators/OsmDocumentTagTranslator.h +++ b/src/plugins/runner/osm/translators/OsmDocumentTagTranslator.h @@ -33,7 +33,7 @@ class OsmDocumentTagTranslator : public GeoTagWriter { public: - bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/plugins/runner/osm/writers/OsmTagWriter.h b/src/plugins/runner/osm/writers/OsmTagWriter.h --- a/src/plugins/runner/osm/writers/OsmTagWriter.h +++ b/src/plugins/runner/osm/writers/OsmTagWriter.h @@ -19,7 +19,7 @@ class OsmTagWriter : public GeoTagWriter { public: - virtual bool write( const GeoNode *node, GeoWriter& writer ) const; + bool write( const GeoNode *node, GeoWriter& writer ) const override; }; } diff --git a/src/plugins/runner/pn2/Pn2Plugin.h b/src/plugins/runner/pn2/Pn2Plugin.h --- a/src/plugins/runner/pn2/Pn2Plugin.h +++ b/src/plugins/runner/pn2/Pn2Plugin.h @@ -24,23 +24,23 @@ public: explicit Pn2Plugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QString fileFormatDescription() const; + QString fileFormatDescription() const override; - QStringList fileExtensions() const; + QStringList fileExtensions() const override; - virtual ParsingRunner* newRunner() const; + ParsingRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/pn2/Pn2Runner.h b/src/plugins/runner/pn2/Pn2Runner.h --- a/src/plugins/runner/pn2/Pn2Runner.h +++ b/src/plugins/runner/pn2/Pn2Runner.h @@ -26,8 +26,8 @@ Q_OBJECT public: explicit Pn2Runner(QObject *parent = 0); - ~Pn2Runner(); - GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ); + ~Pn2Runner() override; + GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ) override; private: static bool errorCheckLat( qint16 lat ); diff --git a/src/plugins/runner/pnt/PntPlugin.h b/src/plugins/runner/pnt/PntPlugin.h --- a/src/plugins/runner/pnt/PntPlugin.h +++ b/src/plugins/runner/pnt/PntPlugin.h @@ -24,23 +24,23 @@ public: explicit PntPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - QString fileFormatDescription() const; + QString fileFormatDescription() const override; - QStringList fileExtensions() const; + QStringList fileExtensions() const override; - virtual ParsingRunner* newRunner() const; + ParsingRunner* newRunner() const override; }; } diff --git a/src/plugins/runner/pnt/PntRunner.h b/src/plugins/runner/pnt/PntRunner.h --- a/src/plugins/runner/pnt/PntRunner.h +++ b/src/plugins/runner/pnt/PntRunner.h @@ -20,8 +20,8 @@ Q_OBJECT public: explicit PntRunner(QObject *parent = 0); - ~PntRunner(); - GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ); + ~PntRunner() override; + GeoDataDocument* parseFile( const QString &fileName, DocumentRole role, QString& error ) override; }; } diff --git a/src/plugins/runner/routino/RoutinoPlugin.h b/src/plugins/runner/routino/RoutinoPlugin.h --- a/src/plugins/runner/routino/RoutinoPlugin.h +++ b/src/plugins/runner/routino/RoutinoPlugin.h @@ -26,29 +26,29 @@ public: explicit RoutinoPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual RoutingRunner *newRunner() const; + RoutingRunner *newRunner() const override; - ConfigWidget* configWidget(); + ConfigWidget* configWidget() override; - bool supportsTemplate(RoutingProfilesModel::ProfileTemplate profileTemplate) const; + bool supportsTemplate(RoutingProfilesModel::ProfileTemplate profileTemplate) const override; - QHash< QString, QVariant > templateSettings(RoutingProfilesModel::ProfileTemplate profileTemplate) const; + QHash< QString, QVariant > templateSettings(RoutingProfilesModel::ProfileTemplate profileTemplate) const override; - virtual bool canWork() const; + bool canWork() const override; }; } diff --git a/src/plugins/runner/routino/RoutinoPlugin.cpp b/src/plugins/runner/routino/RoutinoPlugin.cpp --- a/src/plugins/runner/routino/RoutinoPlugin.cpp +++ b/src/plugins/runner/routino/RoutinoPlugin.cpp @@ -87,11 +87,11 @@ ui_configWidget->transport->addItem(tr("Large lorry"), "hgv"); ui_configWidget->transport->addItem(tr("Public Service Vehicle"), "psv"); } - virtual ~RoutinoConfigWidget() + ~RoutinoConfigWidget() override { delete ui_configWidget; } - virtual void loadSettings( const QHash &settings_ ) + void loadSettings( const QHash &settings_ ) override { QHash settings = settings_; @@ -108,7 +108,7 @@ } } - virtual QHash settings() const + QHash settings() const override { QHash settings; settings.insert(QStringLiteral("transport"), diff --git a/src/plugins/runner/routino/RoutinoRunner.h b/src/plugins/runner/routino/RoutinoRunner.h --- a/src/plugins/runner/routino/RoutinoRunner.h +++ b/src/plugins/runner/routino/RoutinoRunner.h @@ -25,10 +25,10 @@ public: explicit RoutinoRunner(QObject *parent = 0); - ~RoutinoRunner(); + ~RoutinoRunner() override; // Overriding MarbleAbstractRunner - virtual void retrieveRoute( const RouteRequest *request ); + void retrieveRoute( const RouteRequest *request ) override; private: RoutinoRunnerPrivate* const d; diff --git a/src/plugins/runner/yours/YoursPlugin.h b/src/plugins/runner/yours/YoursPlugin.h --- a/src/plugins/runner/yours/YoursPlugin.h +++ b/src/plugins/runner/yours/YoursPlugin.h @@ -27,27 +27,27 @@ public: explicit YoursPlugin( QObject *parent = 0 ); - QString name() const; + QString name() const override; - QString guiString() const; + QString guiString() const override; - QString nameId() const; + QString nameId() const override; - QString version() const; + QString version() const override; - QString description() const; + QString description() const override; - QString copyrightYears() const; + QString copyrightYears() const override; QVector pluginAuthors() const override; - virtual RoutingRunner *newRunner() const; + RoutingRunner *newRunner() const override; - ConfigWidget* configWidget(); + ConfigWidget* configWidget() override; - virtual bool supportsTemplate(RoutingProfilesModel::ProfileTemplate profileTemplate) const; + bool supportsTemplate(RoutingProfilesModel::ProfileTemplate profileTemplate) const override; - QHash< QString, QVariant > templateSettings(RoutingProfilesModel::ProfileTemplate profileTemplate) const; + QHash< QString, QVariant > templateSettings(RoutingProfilesModel::ProfileTemplate profileTemplate) const override; }; } diff --git a/src/plugins/runner/yours/YoursPlugin.cpp b/src/plugins/runner/yours/YoursPlugin.cpp --- a/src/plugins/runner/yours/YoursPlugin.cpp +++ b/src/plugins/runner/yours/YoursPlugin.cpp @@ -81,11 +81,11 @@ ui_configWidget->transport->addItem( tr( "Bicycle" ), "bicycle" ); ui_configWidget->transport->addItem( tr( "Motorcar" ), "motorcar" ); } - virtual ~YoursConfigWidget() + ~YoursConfigWidget() override { delete ui_configWidget; } - virtual void loadSettings( const QHash &settings_ ) + void loadSettings( const QHash &settings_ ) override { QHash settings = settings_; @@ -102,7 +102,7 @@ } } - virtual QHash settings() const + QHash settings() const override { QHash settings; settings.insert(QStringLiteral("transport"), diff --git a/src/plugins/runner/yours/YoursRunner.h b/src/plugins/runner/yours/YoursRunner.h --- a/src/plugins/runner/yours/YoursRunner.h +++ b/src/plugins/runner/yours/YoursRunner.h @@ -28,10 +28,10 @@ public: explicit YoursRunner( QObject *parent = 0 ); - ~YoursRunner(); + ~YoursRunner() override; // Overriding MarbleAbstractRunner - virtual void retrieveRoute( const RouteRequest *request ); + void retrieveRoute( const RouteRequest *request ) override; private Q_SLOTS: /** Route data was retrieved via http */ diff --git a/src/thumbnailer/thumbnailer.h b/src/thumbnailer/thumbnailer.h --- a/src/thumbnailer/thumbnailer.h +++ b/src/thumbnailer/thumbnailer.h @@ -39,11 +39,11 @@ public: GeoDataThumbnailer(); - virtual ~GeoDataThumbnailer(); + ~GeoDataThumbnailer() override; public: // ThumbCreator API - virtual bool create(const QString &path, int width, int height, QImage &image); - virtual Flags flags() const; + bool create(const QString &path, int width, int height, QImage &image) override; + Flags flags() const override; private Q_SLOTS: void onGeoDataObjectAdded(GeoDataObject *object); diff --git a/tests/AbstractDataPluginModelTest.cpp b/tests/AbstractDataPluginModelTest.cpp --- a/tests/AbstractDataPluginModelTest.cpp +++ b/tests/AbstractDataPluginModelTest.cpp @@ -33,8 +33,8 @@ void setInitialized( bool initialized ) { m_initialized = initialized; } - bool initialized() const { return m_initialized; } - bool operator<( const AbstractDataPluginItem *other ) const { return this < other; } + bool initialized() const override { return m_initialized; } + bool operator<( const AbstractDataPluginItem *other ) const override { return this < other; } private: bool m_initialized; @@ -50,7 +50,7 @@ {} protected: - void getAdditionalItems(const GeoDataLatLonAltBox &box, qint32 number) + void getAdditionalItems(const GeoDataLatLonAltBox &box, qint32 number) override { Q_UNUSED( box ) Q_UNUSED( number ) diff --git a/tests/AbstractFloatItemTest.cpp b/tests/AbstractFloatItemTest.cpp --- a/tests/AbstractFloatItemTest.cpp +++ b/tests/AbstractFloatItemTest.cpp @@ -30,21 +30,21 @@ AbstractFloatItem( model ) {} - QString name() const { return QStringLiteral("Null Float Item"); } - QString nameId() const { return QStringLiteral("null"); } - QString version() const { return QStringLiteral("0.0"); } - QString description() const { return QStringLiteral("A null float item just for testing."); } - QIcon icon() const { return QIcon(); } - QString copyrightYears() const { return QStringLiteral("2013"); } - QVector pluginAuthors() const + QString name() const override { return QStringLiteral("Null Float Item"); } + QString nameId() const override { return QStringLiteral("null"); } + QString version() const override { return QStringLiteral("0.0"); } + QString description() const override { return QStringLiteral("A null float item just for testing."); } + QIcon icon() const override { return QIcon(); } + QString copyrightYears() const override { return QStringLiteral("2013"); } + QVector pluginAuthors() const override { return QVector() << PluginAuthor(QStringLiteral("Bernhard Beschow"), QStringLiteral("bbeschow@cs.tu-berlin.de")); } - void initialize() {} - bool isInitialized() const { return true; } - QStringList backendTypes() const { return QStringList(QStringLiteral("null")); } - QString guiString() const { return QStringLiteral("Null"); } - RenderPlugin *newInstance( const MarbleModel * ) const { return 0; } + void initialize() override {} + bool isInitialized() const override { return true; } + QStringList backendTypes() const override { return QStringList(QStringLiteral("null")); } + QString guiString() const override { return QStringLiteral("Null"); } + RenderPlugin *newInstance( const MarbleModel * ) const override { return 0; } }; class AbstractFloatItemTest : public QObject diff --git a/tests/PositionTrackingTest.cpp b/tests/PositionTrackingTest.cpp --- a/tests/PositionTrackingTest.cpp +++ b/tests/PositionTrackingTest.cpp @@ -29,25 +29,25 @@ m_timestamp() {} - QString name() const { return "fake plugin"; } - QString guiString() const { return "fake"; } - QString nameId() const { return "fakeplugin"; } - QString version() const { return "1.0"; } - QString description() const { return "plugin for testing"; } - QIcon icon() const { return QIcon(); } - QString copyrightYears() const { return "2012"; } - QVector pluginAuthors() const { return QVector(); } - void initialize() {} - bool isInitialized() const { return true; } - - Marble::PositionProviderStatus status() const { return m_status; } - Marble::GeoDataCoordinates position() const { return m_position; } - Marble::GeoDataAccuracy accuracy() const { return m_accuracy; } - qreal speed() const { return m_speed; } - qreal direction() const { return m_direction; } - QDateTime timestamp() const { return m_timestamp; } - - Marble::PositionProviderPlugin *newInstance() const { return 0; } + QString name() const override { return "fake plugin"; } + QString guiString() const override { return "fake"; } + QString nameId() const override { return "fakeplugin"; } + QString version() const override { return "1.0"; } + QString description() const override { return "plugin for testing"; } + QIcon icon() const override { return QIcon(); } + QString copyrightYears() const override { return "2012"; } + QVector pluginAuthors() const override { return QVector(); } + void initialize() override {} + bool isInitialized() const override { return true; } + + Marble::PositionProviderStatus status() const override { return m_status; } + Marble::GeoDataCoordinates position() const override { return m_position; } + Marble::GeoDataAccuracy accuracy() const override { return m_accuracy; } + qreal speed() const override { return m_speed; } + qreal direction() const override { return m_direction; } + QDateTime timestamp() const override { return m_timestamp; } + + Marble::PositionProviderPlugin *newInstance() const override { return 0; } void setStatus( Marble::PositionProviderStatus status ); void setPosition( const Marble::GeoDataCoordinates &position, diff --git a/tests/TestGeoDataCoordinates.cpp b/tests/TestGeoDataCoordinates.cpp --- a/tests/TestGeoDataCoordinates.cpp +++ b/tests/TestGeoDataCoordinates.cpp @@ -961,9 +961,9 @@ {} public: // QTranslator API - virtual bool isEmpty() const { return false; } - virtual QString translate( const char* context, const char* sourceText, - const char* disambiguation = 0, int n = -1 ) const; + bool isEmpty() const override { return false; } + QString translate( const char* context, const char* sourceText, + const char* disambiguation = 0, int n = -1 ) const override; private: const QString degree; const QString minutes;