Skip to content

Commit

Permalink
Add overrides pt 2
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jan 15, 2015
1 parent 908d6b3 commit 0e35495
Show file tree
Hide file tree
Showing 70 changed files with 294 additions and 294 deletions.
32 changes: 16 additions & 16 deletions src/app/composer/qgsattributeselectiondialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ class QgsComposerColumnAlignmentDelegate : public QItemDelegate

public:
QgsComposerColumnAlignmentDelegate( QObject *parent = 0 );
QWidget *createEditor( QWidget *parent, 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 updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
QWidget *createEditor( QWidget *parent, 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 updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;

};

Expand All @@ -61,10 +61,10 @@ class QgsComposerColumnSourceDelegate : public QItemDelegate

public:
QgsComposerColumnSourceDelegate( QgsVectorLayer* vlayer, QObject *parent = 0 );
QWidget *createEditor( QWidget *parent, 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 updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
QWidget *createEditor( QWidget *parent, 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 updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
public slots:
void commitAndCloseEditor();
private:
Expand All @@ -80,10 +80,10 @@ class QgsComposerColumnWidthDelegate : public QItemDelegate

public:
QgsComposerColumnWidthDelegate( QObject *parent = 0 );
QWidget *createEditor( QWidget *parent, 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 updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
QWidget *createEditor( QWidget *parent, 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 updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;

};

Expand All @@ -97,10 +97,10 @@ class QgsComposerColumnSortOrderDelegate : public QItemDelegate

public:
QgsComposerColumnSortOrderDelegate( QObject *parent = 0 );
QWidget *createEditor( QWidget *parent, 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 updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
QWidget *createEditor( QWidget *parent, 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 updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;

};

Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposerattributetablewidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class QgsComposerAttributeTableWidget: public QgsComposerItemBaseWidget, private
~QgsComposerAttributeTableWidget();

protected:
void showEvent( QShowEvent * event );
void showEvent( QShowEvent * event ) OVERRIDE;

private:
QgsComposerAttributeTableV2* mComposerTable;
Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposerhtmlwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class QgsComposerHtmlWidget: public QgsComposerItemBaseWidget, private Ui::QgsCo

protected:

QgsComposerItem::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget );
QgsComposerItem::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget ) OVERRIDE;

protected slots:
/**Initializes data defined buttons to current atlas coverage layer*/
Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposeritemwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class QgsComposerItemWidget: public QgsComposerItemBaseWidget, private Ui::QgsCo
void setValuesForGuiNonPositionElements();

protected:
QgsComposerObject::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget );
QgsComposerObject::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget ) OVERRIDE;

protected slots:
/**Initializes data defined buttons to current atlas coverage layer*/
Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposerlegendwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class QgsComposerLegendWidget: public QgsComposerItemBaseWidget, private Ui::Qgs
void setCurrentNodeStyleFromAction();

protected:
void showEvent( QShowEvent * event );
void showEvent( QShowEvent * event ) OVERRIDE;

private slots:
/**Sets GUI according to state of mLegend*/
Expand Down
4 changes: 2 additions & 2 deletions src/app/composer/qgscomposermapwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,14 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
void blockOverviewItemsSignals( bool block );

protected:
void showEvent( QShowEvent * event );
void showEvent( QShowEvent * event ) OVERRIDE;

void addPageToToolbox( QWidget * widget, const QString& name );

/**Sets the current composer map values to the GUI elements*/
virtual void updateGuiElements();

QgsComposerObject::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget );
QgsComposerObject::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget ) OVERRIDE;

protected slots:
/**Initializes data defined buttons to current atlas coverage layer*/
Expand Down
6 changes: 3 additions & 3 deletions src/app/composer/qgscomposerpicturewidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ class QgsComposerPictureWidget: public QgsComposerItemBaseWidget, private Ui::Qg
void on_mAnchorPointComboBox_currentIndexChanged( int index );

protected:
void showEvent( QShowEvent * event );
void resizeEvent( QResizeEvent * event );
void showEvent( QShowEvent * event ) OVERRIDE;
void resizeEvent( QResizeEvent * event ) OVERRIDE;

QgsComposerObject::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget );
QgsComposerObject::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget ) OVERRIDE;

protected slots:
/**Initializes data defined buttons to current atlas coverage layer*/
Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposerscalebarwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class QgsComposerScaleBarWidget: public QgsComposerItemBaseWidget, private Ui::Q
void setGuiElements();

protected:
void showEvent( QShowEvent * event );
void showEvent( QShowEvent * event ) OVERRIDE;

private:
QgsComposerScaleBar* mComposerScaleBar;
Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposertablewidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class QgsComposerTableWidget: public QgsComposerItemBaseWidget, private Ui::QgsC
~QgsComposerTableWidget();

protected:
void showEvent( QShowEvent * event );
void showEvent( QShowEvent * event ) OVERRIDE;

private:
QgsComposerAttributeTable* mComposerTable;
Expand Down
2 changes: 1 addition & 1 deletion src/app/ogr/qgsnewogrconnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class QgsNewOgrConnection : public QDialog, private Ui::QgsNewOgrConnectionBase
//! Tests the connection using the parameters supplied
void testConnection();
public slots:
void accept();
void accept() OVERRIDE;
void on_btnConnect_clicked();
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }

Expand Down
4 changes: 2 additions & 2 deletions src/app/pluginmanager/qgspluginitemdelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ class QgsPluginItemDelegate : public QStyledItemDelegate
Q_OBJECT
public:
QgsPluginItemDelegate( QObject * parent = 0 );
QSize sizeHint( const QStyleOptionViewItem & theOption, const QModelIndex & theIndex ) const;
void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
QSize sizeHint( const QStyleOptionViewItem & theOption, const QModelIndex & theIndex ) const OVERRIDE;
void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
};

#endif //QGSPLUGINITEMDELEGATE_H
2 changes: 1 addition & 1 deletion src/app/qgsattributetabledialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class QgsAttributeTableDock : public QDockWidget
setObjectName( "AttributeTable" ); // set object name so the position can be saved
}

virtual void closeEvent( QCloseEvent * ev )
virtual void closeEvent( QCloseEvent * ev ) OVERRIDE
{
Q_UNUSED( ev );
deleteLater();
Expand Down
4 changes: 2 additions & 2 deletions src/browser/qgsbrowser.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ class QgsBrowser : public QMainWindow, private Ui::QgsBrowserBase
void refresh( const QModelIndex& index = QModelIndex() );

protected:
void keyPressEvent( QKeyEvent * e );
void keyReleaseEvent( QKeyEvent * e );
void keyPressEvent( QKeyEvent * e ) OVERRIDE;
void keyReleaseEvent( QKeyEvent * e ) OVERRIDE;

bool layerClicked( QgsLayerItem* ptr );

Expand Down
2 changes: 1 addition & 1 deletion src/core/qgspluginlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class QgsPluginLayerRenderer : public QgsMapLayerRenderer
, mRendererContext( rendererContext )
{}

virtual bool render()
virtual bool render() OVERRIDE
{
return mLayer->draw( mRendererContext );
}
Expand Down
6 changes: 3 additions & 3 deletions src/helpviewer/qgshelpviewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class QgsReaderThread : public QThread
public:
QgsReaderThread();

virtual void run();
virtual void run() OVERRIDE;

signals:
void helpRead( QString help );
Expand All @@ -50,8 +50,8 @@ class QgsHelpViewer : public QDialog, private Ui::QgsHelpViewerBase
void showHelp( QString );
void fileExit();
protected:
void moveEvent( QMoveEvent *event );
void resizeEvent( QResizeEvent *event );
void moveEvent( QMoveEvent *event ) OVERRIDE;
void resizeEvent( QResizeEvent *event ) OVERRIDE;
private:
void restorePosition();
void saveWindowLocation();
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/coordinate_capture/coordinatecapture.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ class CoordinateCapture: public QObject, public QgisPlugin

public slots:
//! init the gui
virtual void initGui();
virtual void initGui() OVERRIDE;
//! Show the dialog box
void run();
//! unload the plugin
void unload();
void unload() OVERRIDE;
//! Show/hide the dockwidget
void showOrHide();
//! show the help document
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/coordinate_capture/coordinatecapturemaptool.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ class CoordinateCaptureMapTool : public QgsMapTool
~CoordinateCaptureMapTool();

//! Overridden mouse move event
virtual void canvasMoveEvent( QMouseEvent * e );
virtual void canvasMoveEvent( QMouseEvent * e ) OVERRIDE;

//! Overridden mouse press event
virtual void canvasPressEvent( QMouseEvent * e );
virtual void canvasPressEvent( QMouseEvent * e ) OVERRIDE;

//! Overridden mouse release event
virtual void canvasReleaseEvent( QMouseEvent * e );
virtual void canvasReleaseEvent( QMouseEvent * e ) OVERRIDE;

//! called when map tool is being deactivated
virtual void deactivate();
virtual void deactivate() OVERRIDE;

public slots:

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/dxf2shp_converter/dxf2shpconverter.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ class dxf2shpConverter: public QObject, public QgisPlugin

public slots:
//! init the gui
virtual void initGui();
virtual void initGui() OVERRIDE;
//! Show the dialog box
void run();
//! unload the plugin
void unload();
void unload() OVERRIDE;
//! show the help document
void help();
//! update the plugins theme when the app tells us its theme is changed
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class eVisGenericEventBrowserGui : public QDialog, private Ui::eVisGenericEventB
~eVisGenericEventBrowserGui();

protected:
void closeEvent( QCloseEvent *event );
void closeEvent( QCloseEvent *event ) OVERRIDE;

private:
//Variables
Expand Down Expand Up @@ -126,7 +126,7 @@ class eVisGenericEventBrowserGui : public QDialog, private Ui::eVisGenericEventB

//Methods
/** \brief Applies parameters on the Options tabs and saves the configuration */
void accept();
void accept() OVERRIDE;

/** \brief Modifies the Event Image Path according to the local and global settings */
void buildEventImagePath();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/evis/eventbrowser/evisimagedisplaywidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class eVisImageDisplayWidget : public QWidget
void setZoomSteps( int steps ) { ZOOM_STEPS = steps; }

protected:
void resizeEvent( QResizeEvent *event );
void resizeEvent( QResizeEvent *event ) OVERRIDE;

private:

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/evis/evis.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ class eVis: public QObject, public QgisPlugin

public slots:
//! init the gui
virtual void initGui();
virtual void initGui() OVERRIDE;

//! Main button actions
void launchDatabaseConnection();
void launchEventIdTool();
void launchEventBrowser();

//! unload the plugin
void unload();
void unload() OVERRIDE;

//! show the help document
void help();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/evis/idtool/eviseventidtool.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class eVisEventIdTool : public QgsMapTool
eVisEventIdTool( QgsMapCanvas* );

/** \brief Method to handle mouse release, i.e., select, event */
void canvasReleaseEvent( QMouseEvent* );
void canvasReleaseEvent( QMouseEvent* ) OVERRIDE;

private:

Expand Down
8 changes: 4 additions & 4 deletions src/plugins/georeferencer/qgsgcpcanvasitem.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ class QgsGCPCanvasItem : public QgsMapCanvasItem
QgsGCPCanvasItem( QgsMapCanvas* mapCanvas, const QgsGeorefDataPoint* dataPoint, bool isGCPSource/* = true*/ );

//! draws point information
void paint( QPainter* p );
void paint( QPainter* p ) OVERRIDE;

//! handler for manual updating of position and size
QRectF boundingRect() const;
QRectF boundingRect() const OVERRIDE;

QPainterPath shape() const;
QPainterPath shape() const OVERRIDE;

void updatePosition();
void updatePosition() OVERRIDE;

/**Calls prepareGeometryChange()*/
void checkBoundingRectChange();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/georeferencer/qgsgeorefconfigdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class QgsGeorefConfigDialog : public QDialog, private Ui::QgsGeorefConfigDialogB
QgsGeorefConfigDialog( QWidget *parent = 0 );

protected:
void changeEvent( QEvent *e );
void changeEvent( QEvent *e ) OVERRIDE;

private slots:
void on_buttonBox_accepted();
Expand Down
14 changes: 7 additions & 7 deletions src/plugins/georeferencer/qgsgeorefdelegates.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ class QgsNonEditableDelegate : public QStyledItemDelegate
QgsNonEditableDelegate( QWidget *parent = 0 );

QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option,
const QModelIndex &index ) const
const QModelIndex &index ) const OVERRIDE
{
Q_UNUSED( parent );
Q_UNUSED( option );
Q_UNUSED( index );
return 0;
}
}
};

class QgsDmsAndDdDelegate : public QStyledItemDelegate
Expand All @@ -42,14 +42,14 @@ class QgsDmsAndDdDelegate : public QStyledItemDelegate
QgsDmsAndDdDelegate( QWidget *parent = 0 );

QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option,
const QModelIndex &index ) const;
const QModelIndex &index ) const OVERRIDE;

void setEditorData( QWidget *editor, const QModelIndex &index ) const;
void setEditorData( QWidget *editor, const QModelIndex &index ) const OVERRIDE;
void setModelData( QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index ) const;
const QModelIndex &index ) const OVERRIDE;

void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option,
const QModelIndex &index ) const;
const QModelIndex &index ) const OVERRIDE;

private:
QString dmsToDD( QString dms ) const;
Expand All @@ -63,7 +63,7 @@ class QgsCoordDelegate : public QStyledItemDelegate
QgsCoordDelegate( QWidget *parent = 0 );

QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option,
const QModelIndex &index ) const;
const QModelIndex &index ) const OVERRIDE;

// void setEditorData(QWidget *editor, const QModelIndex &index);
// void setModelData(QWidget *editor, QAbstractItemModel *model,
Expand Down
Loading

0 comments on commit 0e35495

Please sign in to comment.