Skip to content

Commit

Permalink
Add missing overrides
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Feb 8, 2015
1 parent b67daf0 commit d6bfe7c
Show file tree
Hide file tree
Showing 15 changed files with 167 additions and 167 deletions.
14 changes: 7 additions & 7 deletions src/core/gps/qextserialport/qextserialport.h
View file
Expand Up @@ -245,13 +245,13 @@ class QextSerialPort: public QIODevice

void setTimeout(long);

bool open(OpenMode mode);
bool isSequential() const;
void close();
bool open(OpenMode mode) override;
bool isSequential() const override;
void close() override;
void flush();

qint64 size() const;
qint64 bytesAvailable() const;
qint64 size() const override;
qint64 bytesAvailable() const override;
QByteArray readAll();

void ungetChar(char c);
Expand Down Expand Up @@ -300,8 +300,8 @@ class QextSerialPort: public QIODevice
void construct(); // common construction
void platformSpecificDestruct();
void platformSpecificInit();
qint64 readData(char * data, qint64 maxSize);
qint64 writeData(const char * data, qint64 maxSize);
qint64 readData(char * data, qint64 maxSize) override;
qint64 writeData(const char * data, qint64 maxSize) override;

private slots:
void onWinEvent(HANDLE h);
Expand Down
20 changes: 10 additions & 10 deletions src/core/pal/internalexception.h
View file
Expand Up @@ -49,51 +49,51 @@ namespace pal
*/
class Full : public std::exception
{
const char* what() const throw()
const char* what() const throw() override
{
return "This set is full...";
}
}
};

/** \brief Thrown when trying to access an empty dada set
*/
class Empty : public std::exception
{
const char* what() const throw()
const char* what() const throw() override
{
return "This set is empty...";
}
}
};

/** \brief Thrown when a geometry type is not like expected
*/
class WrongGeometry : public std::exception
{
const char* what() const throw()
const char* what() const throw() override
{
return "GeometryTypeId is not expected...";
}
}
};

/** \brief Thrown when a geometry type is not like expected
*/
class UnknownGeometry : public std::exception
{
const char* what() const throw()
const char* what() const throw() override
{
return "Geometry Type is unknown";
}
}
};


/** \brief Throw an exception when it's impossible to compute labelPOsition
*/
class NoLabelPosition : public std::exception
{
const char * what() const throw()
const char * what() const throw() override
{
return "No way to compute positions";
}
}
};
};

Expand Down
24 changes: 12 additions & 12 deletions src/core/pal/palexception.h
View file
Expand Up @@ -50,50 +50,50 @@ namespace pal
*/
class NotImplemented : public std::exception
{
const char * what() const throw()
const char * what() const throw() override
{
return "Not yet implemented... sorry";
}
}
};

/** \brief Try to access an unknown feature
*/
class UnknownFeature : public std::exception
{
const char * what() const throw()
const char * what() const throw() override
{
return "Feature not found";
}
}
};

/** \brief Try to access an unknown layer
*/
class UnknownLayer : public std::exception
{
const char * what() const throw()
const char * what() const throw() override
{
return "Layer not found";
}
}
};

/** \brief layer already exists
*/
class LayerExists : public std::exception
{
const char * what() const throw()
const char * what() const throw() override
{
return "Layers names must be unique";
}
}
};

/** \brief features already exists
*/
class FeatureExists : public std::exception
{
const char * what() const throw()
const char * what() const throw() override
{
return "Features IDs must be unique within a layer";
}
}
};

/** \brief thrown when a value is not in the valid scale range
Expand All @@ -106,10 +106,10 @@ namespace pal
*/
class ValueNotInRange : public std::exception
{
const char * what() const throw()
const char * what() const throw() override
{
return "value not allowed";
}
}
};
};

Expand Down
22 changes: 11 additions & 11 deletions src/plugins/dxf2shp_converter/builder.h
View file
Expand Up @@ -38,17 +38,17 @@ class Builder: public DL_CreationAdapter

void FinalizeAnyPolyline();

virtual void addLayer( const DL_LayerData &data );
virtual void addPoint( const DL_PointData &data );
virtual void addLine( const DL_LineData &data );
virtual void addPolyline( const DL_PolylineData &data );
virtual void addArc( const DL_ArcData &data );
virtual void addCircle( const DL_CircleData &data );
virtual void addVertex( const DL_VertexData &data );
virtual void addBlock( const DL_BlockData &data );
virtual void endBlock();
virtual void endSequence();
virtual void addText( const DL_TextData &data );
virtual void addLayer( const DL_LayerData &data ) override;
virtual void addPoint( const DL_PointData &data ) override;
virtual void addLine( const DL_LineData &data ) override;
virtual void addPolyline( const DL_PolylineData &data ) override;
virtual void addArc( const DL_ArcData &data ) override;
virtual void addCircle( const DL_CircleData &data ) override;
virtual void addVertex( const DL_VertexData &data ) override;
virtual void addBlock( const DL_BlockData &data ) override;
virtual void endBlock() override;
virtual void endSequence() override;
virtual void addText( const DL_TextData &data ) override;

void print_shpObjects();

Expand Down
76 changes: 38 additions & 38 deletions src/plugins/dxf2shp_converter/dxflib/src/dl_creationadapter.h
View file
Expand Up @@ -45,59 +45,59 @@ class DL_CreationAdapter : public DL_CreationInterface
public:
DL_CreationAdapter() {}
virtual ~DL_CreationAdapter() {}
virtual void addLayer( const DL_LayerData& ) {}
virtual void addBlock( const DL_BlockData& ) {}
virtual void endBlock() {}
virtual void addPoint( const DL_PointData& ) {}
virtual void addLine( const DL_LineData& ) {}
virtual void addArc( const DL_ArcData& ) {}
virtual void addCircle( const DL_CircleData& ) {}
virtual void addEllipse( const DL_EllipseData& ) {}
virtual void addLayer( const DL_LayerData& ) override {}
virtual void addBlock( const DL_BlockData& ) override {}
virtual void endBlock() override {}
virtual void addPoint( const DL_PointData& ) override {}
virtual void addLine( const DL_LineData& ) override {}
virtual void addArc( const DL_ArcData& ) override {}
virtual void addCircle( const DL_CircleData& ) override {}
virtual void addEllipse( const DL_EllipseData& ) override {}

virtual void addPolyline( const DL_PolylineData& ) {}
virtual void addVertex( const DL_VertexData& ) {}
virtual void addPolyline( const DL_PolylineData& ) override {}
virtual void addVertex( const DL_VertexData& ) override {}

virtual void addSpline( const DL_SplineData& ) {}
virtual void addControlPoint( const DL_ControlPointData& ) {}
virtual void addKnot( const DL_KnotData& ) {}
virtual void addSpline( const DL_SplineData& ) override {}
virtual void addControlPoint( const DL_ControlPointData& ) override {}
virtual void addKnot( const DL_KnotData& ) override {}

virtual void addInsert( const DL_InsertData& ) {}
virtual void addInsert( const DL_InsertData& ) override {}

virtual void addMText( const DL_MTextData& ) {}
virtual void addMTextChunk( const char* ) {}
virtual void addText( const DL_TextData& ) {}
virtual void addMText( const DL_MTextData& ) override {}
virtual void addMTextChunk( const char* ) override {}
virtual void addText( const DL_TextData& ) override {}

virtual void addDimAlign( const DL_DimensionData&,
const DL_DimAlignedData& ) {}
const DL_DimAlignedData& ) override {}
virtual void addDimLinear( const DL_DimensionData&,
const DL_DimLinearData& ) {}
const DL_DimLinearData& ) override {}
virtual void addDimRadial( const DL_DimensionData&,
const DL_DimRadialData& ) {}
const DL_DimRadialData& ) override {}
virtual void addDimDiametric( const DL_DimensionData&,
const DL_DimDiametricData& ) {}
const DL_DimDiametricData& ) override {}
virtual void addDimAngular( const DL_DimensionData&,
const DL_DimAngularData& ) {}
const DL_DimAngularData& ) override {}
virtual void addDimAngular3P( const DL_DimensionData&,
const DL_DimAngular3PData& ) {}
virtual void addLeader( const DL_LeaderData& ) {}
virtual void addLeaderVertex( const DL_LeaderVertexData& ) {}
const DL_DimAngular3PData& ) override {}
virtual void addLeader( const DL_LeaderData& ) override {}
virtual void addLeaderVertex( const DL_LeaderVertexData& ) override {}

virtual void addHatch( const DL_HatchData& ) {}
virtual void addHatch( const DL_HatchData& ) override {}

virtual void addTrace( const DL_TraceData& ) {}
virtual void addSolid( const DL_SolidData& ) {}
virtual void addTrace( const DL_TraceData& ) override {}
virtual void addSolid( const DL_SolidData& ) override {}

virtual void addImage( const DL_ImageData& ) {}
virtual void linkImage( const DL_ImageDefData& ) {}
virtual void addHatchLoop( const DL_HatchLoopData& ) {}
virtual void addHatchEdge( const DL_HatchEdgeData& ) {}
virtual void endEntity() {}
virtual void addImage( const DL_ImageData& ) override {}
virtual void linkImage( const DL_ImageDefData& ) override {}
virtual void addHatchLoop( const DL_HatchLoopData& ) override {}
virtual void addHatchEdge( const DL_HatchEdgeData& ) override {}
virtual void endEntity() override {}
virtual void setVariableVector( const char*,
double, double, double, int ) {}
virtual void setVariableString( const char*, const char*, int ) {}
virtual void setVariableInt( const char*, int, int ) {}
virtual void setVariableDouble( const char*, double, int ) {}
virtual void endSequence() {}
double, double, double, int ) override {}
virtual void setVariableString( const char*, const char*, int ) override {}
virtual void setVariableInt( const char*, int, int ) override {}
virtual void setVariableDouble( const char*, double, int ) override {}
virtual void endSequence() override {}
};

#endif
10 changes: 5 additions & 5 deletions src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.h
View file
Expand Up @@ -60,11 +60,11 @@ class DL_WriterA : public DL_Writer

bool openFailed() const;
void close() const;
void dxfReal( int gc, double value ) const;
void dxfInt( int gc, int value ) const;
void dxfHex( int gc, int value ) const;
void dxfString( int gc, const char* value ) const;
void dxfString( int gc, const string& value ) const;
void dxfReal( int gc, double value ) const override;
void dxfInt( int gc, int value ) const override;
void dxfHex( int gc, int value ) const override;
void dxfString( int gc, const char* value ) const override;
void dxfString( int gc, const string& value ) const override;

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

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/dxf2shp_converter/getInsertions.h
View file
Expand Up @@ -47,7 +47,7 @@ class InsertRetrClass: public DL_CreationAdapter
InsertRetrClass();
~InsertRetrClass();

virtual void addInsert( const DL_InsertData &data );
virtual void addInsert( const DL_InsertData &data ) override;

string *Names;
double *XVals;
Expand Down
12 changes: 6 additions & 6 deletions src/plugins/grass/qtermwidget/Filter.h
View file
Expand Up @@ -202,7 +202,7 @@ namespace Konsole
{
public:
HotSpot( int startLine, int startColumn, int endLine , int endColumn );
virtual void activate( QObject* object = 0 );
virtual void activate( QObject* object = 0 ) override;

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

protected:
/**
Expand Down Expand Up @@ -261,15 +261,15 @@ namespace Konsole
HotSpot( int startLine, int startColumn, int endLine, int endColumn );
virtual ~HotSpot();

virtual QList<QAction*> actions();
virtual QList<QAction*> actions() override;

/**
* Open a web browser at the current URL. The url itself can be determined using
* the capturedTexts() method.
*/
virtual void activate( QObject* object = 0 );
virtual void activate( QObject* object = 0 ) override;

virtual QString tooltip() const;
virtual QString tooltip() const override;
private:
enum UrlType
{
Expand All @@ -285,7 +285,7 @@ namespace Konsole
UrlFilter();

protected:
virtual RegExpFilter::HotSpot* newHotSpot( int, int, int, int );
virtual RegExpFilter::HotSpot* newHotSpot( int, int, int, int ) override;

private:

Expand Down

0 comments on commit d6bfe7c

Please sign in to comment.