Skip to content

Commit 0e35495

Browse files
nyalldawsonnyalldawson
committed
Add overrides pt 2
1 parent 908d6b3 commit 0e35495

File tree

70 files changed

+294
-294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+294
-294
lines changed

‎src/app/composer/qgsattributeselectiondialog.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ class QgsComposerColumnAlignmentDelegate : public QItemDelegate
4444

4545
public:
4646
QgsComposerColumnAlignmentDelegate( QObject *parent = 0 );
47-
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
48-
void setEditorData( QWidget *editor, const QModelIndex &index ) const;
49-
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const;
50-
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
47+
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
48+
void setEditorData( QWidget *editor, const QModelIndex &index ) const OVERRIDE;
49+
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const OVERRIDE;
50+
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
5151

5252
};
5353

@@ -61,10 +61,10 @@ class QgsComposerColumnSourceDelegate : public QItemDelegate
6161

6262
public:
6363
QgsComposerColumnSourceDelegate( QgsVectorLayer* vlayer, QObject *parent = 0 );
64-
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
65-
void setEditorData( QWidget *editor, const QModelIndex &index ) const;
66-
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const;
67-
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
64+
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
65+
void setEditorData( QWidget *editor, const QModelIndex &index ) const OVERRIDE;
66+
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const OVERRIDE;
67+
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
6868
public slots:
6969
void commitAndCloseEditor();
7070
private:
@@ -80,10 +80,10 @@ class QgsComposerColumnWidthDelegate : public QItemDelegate
8080

8181
public:
8282
QgsComposerColumnWidthDelegate( QObject *parent = 0 );
83-
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
84-
void setEditorData( QWidget *editor, const QModelIndex &index ) const;
85-
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const;
86-
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
83+
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
84+
void setEditorData( QWidget *editor, const QModelIndex &index ) const OVERRIDE;
85+
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const OVERRIDE;
86+
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
8787

8888
};
8989

@@ -97,10 +97,10 @@ class QgsComposerColumnSortOrderDelegate : public QItemDelegate
9797

9898
public:
9999
QgsComposerColumnSortOrderDelegate( QObject *parent = 0 );
100-
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
101-
void setEditorData( QWidget *editor, const QModelIndex &index ) const;
102-
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const;
103-
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
100+
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
101+
void setEditorData( QWidget *editor, const QModelIndex &index ) const OVERRIDE;
102+
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const OVERRIDE;
103+
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
104104

105105
};
106106

‎src/app/composer/qgscomposerattributetablewidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class QgsComposerAttributeTableWidget: public QgsComposerItemBaseWidget, private
3232
~QgsComposerAttributeTableWidget();
3333

3434
protected:
35-
void showEvent( QShowEvent * event );
35+
void showEvent( QShowEvent * event ) OVERRIDE;
3636

3737
private:
3838
QgsComposerAttributeTableV2* mComposerTable;

‎src/app/composer/qgscomposerhtmlwidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class QgsComposerHtmlWidget: public QgsComposerItemBaseWidget, private Ui::QgsCo
5555

5656
protected:
5757

58-
QgsComposerItem::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget );
58+
QgsComposerItem::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget ) OVERRIDE;
5959

6060
protected slots:
6161
/**Initializes data defined buttons to current atlas coverage layer*/

‎src/app/composer/qgscomposeritemwidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class QgsComposerItemWidget: public QgsComposerItemBaseWidget, private Ui::QgsCo
119119
void setValuesForGuiNonPositionElements();
120120

121121
protected:
122-
QgsComposerObject::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget );
122+
QgsComposerObject::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget ) OVERRIDE;
123123

124124
protected slots:
125125
/**Initializes data defined buttons to current atlas coverage layer*/

‎src/app/composer/qgscomposerlegendwidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class QgsComposerLegendWidget: public QgsComposerItemBaseWidget, private Ui::Qgs
8686
void setCurrentNodeStyleFromAction();
8787

8888
protected:
89-
void showEvent( QShowEvent * event );
89+
void showEvent( QShowEvent * event ) OVERRIDE;
9090

9191
private slots:
9292
/**Sets GUI according to state of mLegend*/

‎src/app/composer/qgscomposermapwidget.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
144144
void blockOverviewItemsSignals( bool block );
145145

146146
protected:
147-
void showEvent( QShowEvent * event );
147+
void showEvent( QShowEvent * event ) OVERRIDE;
148148

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

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

154-
QgsComposerObject::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget );
154+
QgsComposerObject::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget ) OVERRIDE;
155155

156156
protected slots:
157157
/**Initializes data defined buttons to current atlas coverage layer*/

‎src/app/composer/qgscomposerpicturewidget.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ class QgsComposerPictureWidget: public QgsComposerItemBaseWidget, private Ui::Qg
5151
void on_mAnchorPointComboBox_currentIndexChanged( int index );
5252

5353
protected:
54-
void showEvent( QShowEvent * event );
55-
void resizeEvent( QResizeEvent * event );
54+
void showEvent( QShowEvent * event ) OVERRIDE;
55+
void resizeEvent( QResizeEvent * event ) OVERRIDE;
5656

57-
QgsComposerObject::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget );
57+
QgsComposerObject::DataDefinedProperty ddPropertyForWidget( QgsDataDefinedButton *widget ) OVERRIDE;
5858

5959
protected slots:
6060
/**Initializes data defined buttons to current atlas coverage layer*/

‎src/app/composer/qgscomposerscalebarwidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class QgsComposerScaleBarWidget: public QgsComposerItemBaseWidget, private Ui::Q
5959
void setGuiElements();
6060

6161
protected:
62-
void showEvent( QShowEvent * event );
62+
void showEvent( QShowEvent * event ) OVERRIDE;
6363

6464
private:
6565
QgsComposerScaleBar* mComposerScaleBar;

‎src/app/composer/qgscomposertablewidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class QgsComposerTableWidget: public QgsComposerItemBaseWidget, private Ui::QgsC
3131
~QgsComposerTableWidget();
3232

3333
protected:
34-
void showEvent( QShowEvent * event );
34+
void showEvent( QShowEvent * event ) OVERRIDE;
3535

3636
private:
3737
QgsComposerAttributeTable* mComposerTable;

‎src/app/ogr/qgsnewogrconnection.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class QgsNewOgrConnection : public QDialog, private Ui::QgsNewOgrConnectionBase
3737
//! Tests the connection using the parameters supplied
3838
void testConnection();
3939
public slots:
40-
void accept();
40+
void accept() OVERRIDE;
4141
void on_btnConnect_clicked();
4242
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
4343

‎src/app/pluginmanager/qgspluginitemdelegate.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class QgsPluginItemDelegate : public QStyledItemDelegate
2727
Q_OBJECT
2828
public:
2929
QgsPluginItemDelegate( QObject * parent = 0 );
30-
QSize sizeHint( const QStyleOptionViewItem & theOption, const QModelIndex & theIndex ) const;
31-
void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
30+
QSize sizeHint( const QStyleOptionViewItem & theOption, const QModelIndex & theIndex ) const OVERRIDE;
31+
void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
3232
};
3333

3434
#endif //QGSPLUGINITEMDELEGATE_H

‎src/app/qgsattributetabledialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class QgsAttributeTableDock : public QDockWidget
5252
setObjectName( "AttributeTable" ); // set object name so the position can be saved
5353
}
5454

55-
virtual void closeEvent( QCloseEvent * ev )
55+
virtual void closeEvent( QCloseEvent * ev ) OVERRIDE
5656
{
5757
Q_UNUSED( ev );
5858
deleteLater();

‎src/browser/qgsbrowser.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ class QgsBrowser : public QMainWindow, private Ui::QgsBrowserBase
5858
void refresh( const QModelIndex& index = QModelIndex() );
5959

6060
protected:
61-
void keyPressEvent( QKeyEvent * e );
62-
void keyReleaseEvent( QKeyEvent * e );
61+
void keyPressEvent( QKeyEvent * e ) OVERRIDE;
62+
void keyReleaseEvent( QKeyEvent * e ) OVERRIDE;
6363

6464
bool layerClicked( QgsLayerItem* ptr );
6565

‎src/core/qgspluginlayer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class QgsPluginLayerRenderer : public QgsMapLayerRenderer
5252
, mRendererContext( rendererContext )
5353
{}
5454

55-
virtual bool render()
55+
virtual bool render() OVERRIDE
5656
{
5757
return mLayer->draw( mRendererContext );
5858
}

‎src/helpviewer/qgshelpviewer.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class QgsReaderThread : public QThread
3333
public:
3434
QgsReaderThread();
3535

36-
virtual void run();
36+
virtual void run() OVERRIDE;
3737

3838
signals:
3939
void helpRead( QString help );
@@ -50,8 +50,8 @@ class QgsHelpViewer : public QDialog, private Ui::QgsHelpViewerBase
5050
void showHelp( QString );
5151
void fileExit();
5252
protected:
53-
void moveEvent( QMoveEvent *event );
54-
void resizeEvent( QResizeEvent *event );
53+
void moveEvent( QMoveEvent *event ) OVERRIDE;
54+
void resizeEvent( QResizeEvent *event ) OVERRIDE;
5555
private:
5656
void restorePosition();
5757
void saveWindowLocation();

‎src/plugins/coordinate_capture/coordinatecapture.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ class CoordinateCapture: public QObject, public QgisPlugin
8585

8686
public slots:
8787
//! init the gui
88-
virtual void initGui();
88+
virtual void initGui() OVERRIDE;
8989
//! Show the dialog box
9090
void run();
9191
//! unload the plugin
92-
void unload();
92+
void unload() OVERRIDE;
9393
//! Show/hide the dockwidget
9494
void showOrHide();
9595
//! show the help document

‎src/plugins/coordinate_capture/coordinatecapturemaptool.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ class CoordinateCaptureMapTool : public QgsMapTool
3737
~CoordinateCaptureMapTool();
3838

3939
//! Overridden mouse move event
40-
virtual void canvasMoveEvent( QMouseEvent * e );
40+
virtual void canvasMoveEvent( QMouseEvent * e ) OVERRIDE;
4141

4242
//! Overridden mouse press event
43-
virtual void canvasPressEvent( QMouseEvent * e );
43+
virtual void canvasPressEvent( QMouseEvent * e ) OVERRIDE;
4444

4545
//! Overridden mouse release event
46-
virtual void canvasReleaseEvent( QMouseEvent * e );
46+
virtual void canvasReleaseEvent( QMouseEvent * e ) OVERRIDE;
4747

4848
//! called when map tool is being deactivated
49-
virtual void deactivate();
49+
virtual void deactivate() OVERRIDE;
5050

5151
public slots:
5252

‎src/plugins/dxf2shp_converter/dxf2shpconverter.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ class dxf2shpConverter: public QObject, public QgisPlugin
5353

5454
public slots:
5555
//! init the gui
56-
virtual void initGui();
56+
virtual void initGui() OVERRIDE;
5757
//! Show the dialog box
5858
void run();
5959
//! unload the plugin
60-
void unload();
60+
void unload() OVERRIDE;
6161
//! show the help document
6262
void help();
6363
//! update the plugins theme when the app tells us its theme is changed

‎src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class eVisGenericEventBrowserGui : public QDialog, private Ui::eVisGenericEventB
6666
~eVisGenericEventBrowserGui();
6767

6868
protected:
69-
void closeEvent( QCloseEvent *event );
69+
void closeEvent( QCloseEvent *event ) OVERRIDE;
7070

7171
private:
7272
//Variables
@@ -126,7 +126,7 @@ class eVisGenericEventBrowserGui : public QDialog, private Ui::eVisGenericEventB
126126

127127
//Methods
128128
/** \brief Applies parameters on the Options tabs and saves the configuration */
129-
void accept();
129+
void accept() OVERRIDE;
130130

131131
/** \brief Modifies the Event Image Path according to the local and global settings */
132132
void buildEventImagePath();

‎src/plugins/evis/eventbrowser/evisimagedisplaywidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class eVisImageDisplayWidget : public QWidget
7575
void setZoomSteps( int steps ) { ZOOM_STEPS = steps; }
7676

7777
protected:
78-
void resizeEvent( QResizeEvent *event );
78+
void resizeEvent( QResizeEvent *event ) OVERRIDE;
7979

8080
private:
8181

‎src/plugins/evis/evis.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ class eVis: public QObject, public QgisPlugin
9999

100100
public slots:
101101
//! init the gui
102-
virtual void initGui();
102+
virtual void initGui() OVERRIDE;
103103

104104
//! Main button actions
105105
void launchDatabaseConnection();
106106
void launchEventIdTool();
107107
void launchEventBrowser();
108108

109109
//! unload the plugin
110-
void unload();
110+
void unload() OVERRIDE;
111111

112112
//! show the help document
113113
void help();

‎src/plugins/evis/idtool/eviseventidtool.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class eVisEventIdTool : public QgsMapTool
5151
eVisEventIdTool( QgsMapCanvas* );
5252

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

5656
private:
5757

‎src/plugins/georeferencer/qgsgcpcanvasitem.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ class QgsGCPCanvasItem : public QgsMapCanvasItem
2727
QgsGCPCanvasItem( QgsMapCanvas* mapCanvas, const QgsGeorefDataPoint* dataPoint, bool isGCPSource/* = true*/ );
2828

2929
//! draws point information
30-
void paint( QPainter* p );
30+
void paint( QPainter* p ) OVERRIDE;
3131

3232
//! handler for manual updating of position and size
33-
QRectF boundingRect() const;
33+
QRectF boundingRect() const OVERRIDE;
3434

35-
QPainterPath shape() const;
35+
QPainterPath shape() const OVERRIDE;
3636

37-
void updatePosition();
37+
void updatePosition() OVERRIDE;
3838

3939
/**Calls prepareGeometryChange()*/
4040
void checkBoundingRectChange();

‎src/plugins/georeferencer/qgsgeorefconfigdialog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class QgsGeorefConfigDialog : public QDialog, private Ui::QgsGeorefConfigDialogB
2525
QgsGeorefConfigDialog( QWidget *parent = 0 );
2626

2727
protected:
28-
void changeEvent( QEvent *e );
28+
void changeEvent( QEvent *e ) OVERRIDE;
2929

3030
private slots:
3131
void on_buttonBox_accepted();

‎src/plugins/georeferencer/qgsgeorefdelegates.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ class QgsNonEditableDelegate : public QStyledItemDelegate
2525
QgsNonEditableDelegate( QWidget *parent = 0 );
2626

2727
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option,
28-
const QModelIndex &index ) const
28+
const QModelIndex &index ) const OVERRIDE
2929
{
3030
Q_UNUSED( parent );
3131
Q_UNUSED( option );
3232
Q_UNUSED( index );
3333
return 0;
34-
}
34+
}
3535
};
3636

3737
class QgsDmsAndDdDelegate : public QStyledItemDelegate
@@ -42,14 +42,14 @@ class QgsDmsAndDdDelegate : public QStyledItemDelegate
4242
QgsDmsAndDdDelegate( QWidget *parent = 0 );
4343

4444
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option,
45-
const QModelIndex &index ) const;
45+
const QModelIndex &index ) const OVERRIDE;
4646

47-
void setEditorData( QWidget *editor, const QModelIndex &index ) const;
47+
void setEditorData( QWidget *editor, const QModelIndex &index ) const OVERRIDE;
4848
void setModelData( QWidget *editor, QAbstractItemModel *model,
49-
const QModelIndex &index ) const;
49+
const QModelIndex &index ) const OVERRIDE;
5050

5151
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option,
52-
const QModelIndex &index ) const;
52+
const QModelIndex &index ) const OVERRIDE;
5353

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

6565
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option,
66-
const QModelIndex &index ) const;
66+
const QModelIndex &index ) const OVERRIDE;
6767

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

0 commit comments

Comments
 (0)