Fix some Clang warnings

This commit is contained in:
James Turner
2019-11-25 11:35:07 +00:00
parent fb57fe9da7
commit c39a5fd8c0
4 changed files with 14 additions and 18 deletions

View File

@@ -68,8 +68,8 @@ namespace canvas
Element* parent = 0 );
virtual ~Window();
virtual void update(double delta_time_sec);
virtual void valueChanged(SGPropertyNode* node);
void update(double delta_time_sec) override;
void valueChanged(SGPropertyNode* node) override;
const SGVec2<float> getPosition() const;
const SGRect<float> getScreenRegion() const;
@@ -84,8 +84,8 @@ namespace canvas
bool isResizable() const;
bool isCapturingEvents() const;
virtual void setVisible(bool visible);
virtual bool isVisible() const;
void setVisible(bool visible) override;
bool isVisible() const override;
/**
* Moves window on top of all other windows with the same z-index.

View File

@@ -48,6 +48,8 @@ namespace simgear
assert(outer);
}
virtual ~ArchiveExtractorPrivate() = default;
typedef enum {
INVALID = 0,
READING_HEADER,
@@ -614,10 +616,7 @@ ArchiveExtractor::ArchiveExtractor(const SGPath& rootPath) :
{
}
ArchiveExtractor::~ArchiveExtractor()
{
}
ArchiveExtractor::~ArchiveExtractor() = default;
void ArchiveExtractor::extractBytes(const uint8_t* bytes, size_t count)
{

View File

@@ -34,7 +34,7 @@ class ArchiveExtractor
{
public:
ArchiveExtractor(const SGPath& rootPath);
~ArchiveExtractor();
virtual ~ArchiveExtractor();
enum DetermineResult
{

View File

@@ -615,9 +615,8 @@ public:
return false;
}
virtual void buttonReleased( int keyModState,
const osgGA::GUIEventAdapter&,
const Info* )
void buttonReleased( int keyModState, const osgGA::GUIEventAdapter&,
const Info* ) override
{
if (!_condition || _condition->test()) {
@@ -641,8 +640,7 @@ public:
return _dragDirection;
}
virtual void mouseMoved( const osgGA::GUIEventAdapter& ea,
const Info* )
void mouseMoved( const osgGA::GUIEventAdapter& ea, const Info* ) override
{
if (!_condition || _condition->test()) {
_mousePos = eventToWindowCoords(ea);
@@ -675,7 +673,7 @@ public:
}
}
virtual void update(double dt, int keyModState)
void update(double dt, int keyModState) override
{
if (_hasDragged) {
return;
@@ -688,8 +686,7 @@ public:
} // of repeat iteration
}
virtual bool hover( const osg::Vec2d& windowPos,
const Info& )
bool hover( const osg::Vec2d& windowPos, const Info& ) override
{
if (!_condition || _condition->test()) {
@@ -711,7 +708,7 @@ public:
_cursorName = aName;
}
virtual std::string getCursor() const
std::string getCursor() const override
{ return _cursorName; }
private: