Skip to content

Commit d6bfe7c

Browse files
nyalldawsonnyalldawson
committed
Add missing overrides
1 parent b67daf0 commit d6bfe7c

File tree

15 files changed

+167
-167
lines changed

15 files changed

+167
-167
lines changed

‎src/core/gps/qextserialport/qextserialport.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -245,13 +245,13 @@ class QextSerialPort: public QIODevice
245245

246246
void setTimeout(long);
247247

248-
bool open(OpenMode mode);
249-
bool isSequential() const;
250-
void close();
248+
bool open(OpenMode mode) override;
249+
bool isSequential() const override;
250+
void close() override;
251251
void flush();
252252

253-
qint64 size() const;
254-
qint64 bytesAvailable() const;
253+
qint64 size() const override;
254+
qint64 bytesAvailable() const override;
255255
QByteArray readAll();
256256

257257
void ungetChar(char c);
@@ -300,8 +300,8 @@ class QextSerialPort: public QIODevice
300300
void construct(); // common construction
301301
void platformSpecificDestruct();
302302
void platformSpecificInit();
303-
qint64 readData(char * data, qint64 maxSize);
304-
qint64 writeData(const char * data, qint64 maxSize);
303+
qint64 readData(char * data, qint64 maxSize) override;
304+
qint64 writeData(const char * data, qint64 maxSize) override;
305305

306306
private slots:
307307
void onWinEvent(HANDLE h);

‎src/core/pal/internalexception.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,51 +49,51 @@ namespace pal
4949
*/
5050
class Full : public std::exception
5151
{
52-
const char* what() const throw()
52+
const char* what() const throw() override
5353
{
5454
return "This set is full...";
55-
}
55+
}
5656
};
5757

5858
/** \brief Thrown when trying to access an empty dada set
5959
*/
6060
class Empty : public std::exception
6161
{
62-
const char* what() const throw()
62+
const char* what() const throw() override
6363
{
6464
return "This set is empty...";
65-
}
65+
}
6666
};
6767

6868
/** \brief Thrown when a geometry type is not like expected
6969
*/
7070
class WrongGeometry : public std::exception
7171
{
72-
const char* what() const throw()
72+
const char* what() const throw() override
7373
{
7474
return "GeometryTypeId is not expected...";
75-
}
75+
}
7676
};
7777

7878
/** \brief Thrown when a geometry type is not like expected
7979
*/
8080
class UnknownGeometry : public std::exception
8181
{
82-
const char* what() const throw()
82+
const char* what() const throw() override
8383
{
8484
return "Geometry Type is unknown";
85-
}
85+
}
8686
};
8787

8888

8989
/** \brief Throw an exception when it's impossible to compute labelPOsition
9090
*/
9191
class NoLabelPosition : public std::exception
9292
{
93-
const char * what() const throw()
93+
const char * what() const throw() override
9494
{
9595
return "No way to compute positions";
96-
}
96+
}
9797
};
9898
};
9999

‎src/core/pal/palexception.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,50 +50,50 @@ namespace pal
5050
*/
5151
class NotImplemented : public std::exception
5252
{
53-
const char * what() const throw()
53+
const char * what() const throw() override
5454
{
5555
return "Not yet implemented... sorry";
56-
}
56+
}
5757
};
5858

5959
/** \brief Try to access an unknown feature
6060
*/
6161
class UnknownFeature : public std::exception
6262
{
63-
const char * what() const throw()
63+
const char * what() const throw() override
6464
{
6565
return "Feature not found";
66-
}
66+
}
6767
};
6868

6969
/** \brief Try to access an unknown layer
7070
*/
7171
class UnknownLayer : public std::exception
7272
{
73-
const char * what() const throw()
73+
const char * what() const throw() override
7474
{
7575
return "Layer not found";
76-
}
76+
}
7777
};
7878

7979
/** \brief layer already exists
8080
*/
8181
class LayerExists : public std::exception
8282
{
83-
const char * what() const throw()
83+
const char * what() const throw() override
8484
{
8585
return "Layers names must be unique";
86-
}
86+
}
8787
};
8888

8989
/** \brief features already exists
9090
*/
9191
class FeatureExists : public std::exception
9292
{
93-
const char * what() const throw()
93+
const char * what() const throw() override
9494
{
9595
return "Features IDs must be unique within a layer";
96-
}
96+
}
9797
};
9898

9999
/** \brief thrown when a value is not in the valid scale range
@@ -106,10 +106,10 @@ namespace pal
106106
*/
107107
class ValueNotInRange : public std::exception
108108
{
109-
const char * what() const throw()
109+
const char * what() const throw() override
110110
{
111111
return "value not allowed";
112-
}
112+
}
113113
};
114114
};
115115

‎src/plugins/dxf2shp_converter/builder.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ class Builder: public DL_CreationAdapter
3838

3939
void FinalizeAnyPolyline();
4040

41-
virtual void addLayer( const DL_LayerData &data );
42-
virtual void addPoint( const DL_PointData &data );
43-
virtual void addLine( const DL_LineData &data );
44-
virtual void addPolyline( const DL_PolylineData &data );
45-
virtual void addArc( const DL_ArcData &data );
46-
virtual void addCircle( const DL_CircleData &data );
47-
virtual void addVertex( const DL_VertexData &data );
48-
virtual void addBlock( const DL_BlockData &data );
49-
virtual void endBlock();
50-
virtual void endSequence();
51-
virtual void addText( const DL_TextData &data );
41+
virtual void addLayer( const DL_LayerData &data ) override;
42+
virtual void addPoint( const DL_PointData &data ) override;
43+
virtual void addLine( const DL_LineData &data ) override;
44+
virtual void addPolyline( const DL_PolylineData &data ) override;
45+
virtual void addArc( const DL_ArcData &data ) override;
46+
virtual void addCircle( const DL_CircleData &data ) override;
47+
virtual void addVertex( const DL_VertexData &data ) override;
48+
virtual void addBlock( const DL_BlockData &data ) override;
49+
virtual void endBlock() override;
50+
virtual void endSequence() override;
51+
virtual void addText( const DL_TextData &data ) override;
5252

5353
void print_shpObjects();
5454

‎src/plugins/dxf2shp_converter/dxflib/src/dl_creationadapter.h‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -45,59 +45,59 @@ class DL_CreationAdapter : public DL_CreationInterface
4545
public:
4646
DL_CreationAdapter() {}
4747
virtual ~DL_CreationAdapter() {}
48-
virtual void addLayer( const DL_LayerData& ) {}
49-
virtual void addBlock( const DL_BlockData& ) {}
50-
virtual void endBlock() {}
51-
virtual void addPoint( const DL_PointData& ) {}
52-
virtual void addLine( const DL_LineData& ) {}
53-
virtual void addArc( const DL_ArcData& ) {}
54-
virtual void addCircle( const DL_CircleData& ) {}
55-
virtual void addEllipse( const DL_EllipseData& ) {}
48+
virtual void addLayer( const DL_LayerData& ) override {}
49+
virtual void addBlock( const DL_BlockData& ) override {}
50+
virtual void endBlock() override {}
51+
virtual void addPoint( const DL_PointData& ) override {}
52+
virtual void addLine( const DL_LineData& ) override {}
53+
virtual void addArc( const DL_ArcData& ) override {}
54+
virtual void addCircle( const DL_CircleData& ) override {}
55+
virtual void addEllipse( const DL_EllipseData& ) override {}
5656

57-
virtual void addPolyline( const DL_PolylineData& ) {}
58-
virtual void addVertex( const DL_VertexData& ) {}
57+
virtual void addPolyline( const DL_PolylineData& ) override {}
58+
virtual void addVertex( const DL_VertexData& ) override {}
5959

60-
virtual void addSpline( const DL_SplineData& ) {}
61-
virtual void addControlPoint( const DL_ControlPointData& ) {}
62-
virtual void addKnot( const DL_KnotData& ) {}
60+
virtual void addSpline( const DL_SplineData& ) override {}
61+
virtual void addControlPoint( const DL_ControlPointData& ) override {}
62+
virtual void addKnot( const DL_KnotData& ) override {}
6363

64-
virtual void addInsert( const DL_InsertData& ) {}
64+
virtual void addInsert( const DL_InsertData& ) override {}
6565

66-
virtual void addMText( const DL_MTextData& ) {}
67-
virtual void addMTextChunk( const char* ) {}
68-
virtual void addText( const DL_TextData& ) {}
66+
virtual void addMText( const DL_MTextData& ) override {}
67+
virtual void addMTextChunk( const char* ) override {}
68+
virtual void addText( const DL_TextData& ) override {}
6969

7070
virtual void addDimAlign( const DL_DimensionData&,
71-
const DL_DimAlignedData& ) {}
71+
const DL_DimAlignedData& ) override {}
7272
virtual void addDimLinear( const DL_DimensionData&,
73-
const DL_DimLinearData& ) {}
73+
const DL_DimLinearData& ) override {}
7474
virtual void addDimRadial( const DL_DimensionData&,
75-
const DL_DimRadialData& ) {}
75+
const DL_DimRadialData& ) override {}
7676
virtual void addDimDiametric( const DL_DimensionData&,
77-
const DL_DimDiametricData& ) {}
77+
const DL_DimDiametricData& ) override {}
7878
virtual void addDimAngular( const DL_DimensionData&,
79-
const DL_DimAngularData& ) {}
79+
const DL_DimAngularData& ) override {}
8080
virtual void addDimAngular3P( const DL_DimensionData&,
81-
const DL_DimAngular3PData& ) {}
82-
virtual void addLeader( const DL_LeaderData& ) {}
83-
virtual void addLeaderVertex( const DL_LeaderVertexData& ) {}
81+
const DL_DimAngular3PData& ) override {}
82+
virtual void addLeader( const DL_LeaderData& ) override {}
83+
virtual void addLeaderVertex( const DL_LeaderVertexData& ) override {}
8484

85-
virtual void addHatch( const DL_HatchData& ) {}
85+
virtual void addHatch( const DL_HatchData& ) override {}
8686

87-
virtual void addTrace( const DL_TraceData& ) {}
88-
virtual void addSolid( const DL_SolidData& ) {}
87+
virtual void addTrace( const DL_TraceData& ) override {}
88+
virtual void addSolid( const DL_SolidData& ) override {}
8989

90-
virtual void addImage( const DL_ImageData& ) {}
91-
virtual void linkImage( const DL_ImageDefData& ) {}
92-
virtual void addHatchLoop( const DL_HatchLoopData& ) {}
93-
virtual void addHatchEdge( const DL_HatchEdgeData& ) {}
94-
virtual void endEntity() {}
90+
virtual void addImage( const DL_ImageData& ) override {}
91+
virtual void linkImage( const DL_ImageDefData& ) override {}
92+
virtual void addHatchLoop( const DL_HatchLoopData& ) override {}
93+
virtual void addHatchEdge( const DL_HatchEdgeData& ) override {}
94+
virtual void endEntity() override {}
9595
virtual void setVariableVector( const char*,
96-
double, double, double, int ) {}
97-
virtual void setVariableString( const char*, const char*, int ) {}
98-
virtual void setVariableInt( const char*, int, int ) {}
99-
virtual void setVariableDouble( const char*, double, int ) {}
100-
virtual void endSequence() {}
96+
double, double, double, int ) override {}
97+
virtual void setVariableString( const char*, const char*, int ) override {}
98+
virtual void setVariableInt( const char*, int, int ) override {}
99+
virtual void setVariableDouble( const char*, double, int ) override {}
100+
virtual void endSequence() override {}
101101
};
102102

103103
#endif

‎src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ class DL_WriterA : public DL_Writer
6060

6161
bool openFailed() const;
6262
void close() const;
63-
void dxfReal( int gc, double value ) const;
64-
void dxfInt( int gc, int value ) const;
65-
void dxfHex( int gc, int value ) const;
66-
void dxfString( int gc, const char* value ) const;
67-
void dxfString( int gc, const string& value ) const;
63+
void dxfReal( int gc, double value ) const override;
64+
void dxfInt( int gc, int value ) const override;
65+
void dxfHex( int gc, int value ) const override;
66+
void dxfString( int gc, const char* value ) const override;
67+
void dxfString( int gc, const string& value ) const override;
6868

6969
static void strReplace( char* str, char src, char dest );
7070

‎src/plugins/dxf2shp_converter/getInsertions.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class InsertRetrClass: public DL_CreationAdapter
4747
InsertRetrClass();
4848
~InsertRetrClass();
4949

50-
virtual void addInsert( const DL_InsertData &data );
50+
virtual void addInsert( const DL_InsertData &data ) override;
5151

5252
string *Names;
5353
double *XVals;

‎src/plugins/grass/qtermwidget/Filter.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ namespace Konsole
202202
{
203203
public:
204204
HotSpot( int startLine, int startColumn, int endLine , int endColumn );
205-
virtual void activate( QObject* object = 0 );
205+
virtual void activate( QObject* object = 0 ) override;
206206

207207
/** Sets the captured texts associated with this hotspot */
208208
void setCapturedTexts( const QStringList& texts );
@@ -231,7 +231,7 @@ namespace Konsole
231231
* If regexp matches the empty string, then process() will return immediately
232232
* without finding results.
233233
*/
234-
virtual void process();
234+
virtual void process() override;
235235

236236
protected:
237237
/**
@@ -261,15 +261,15 @@ namespace Konsole
261261
HotSpot( int startLine, int startColumn, int endLine, int endColumn );
262262
virtual ~HotSpot();
263263

264-
virtual QList<QAction*> actions();
264+
virtual QList<QAction*> actions() override;
265265

266266
/**
267267
* Open a web browser at the current URL. The url itself can be determined using
268268
* the capturedTexts() method.
269269
*/
270-
virtual void activate( QObject* object = 0 );
270+
virtual void activate( QObject* object = 0 ) override;
271271

272-
virtual QString tooltip() const;
272+
virtual QString tooltip() const override;
273273
private:
274274
enum UrlType
275275
{
@@ -285,7 +285,7 @@ namespace Konsole
285285
UrlFilter();
286286

287287
protected:
288-
virtual RegExpFilter::HotSpot* newHotSpot( int, int, int, int );
288+
virtual RegExpFilter::HotSpot* newHotSpot( int, int, int, int ) override;
289289

290290
private:
291291

0 commit comments

Comments
 (0)