Skip to content

Commit

Permalink
override specifications
Browse files Browse the repository at this point in the history
  • Loading branch information
dardok committed Jul 28, 2017
1 parent f30a31a commit 4549360
Show file tree
Hide file tree
Showing 13 changed files with 50 additions and 50 deletions.
4 changes: 2 additions & 2 deletions callbacks.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct SkyUpdateCallback : public osg::NodeCallback
{
SkyUpdateCallback( ) : _lastSec( -1 ) { }

void operator( )( osg::Node* node, osg::NodeVisitor* nv )
void operator( )( osg::Node* node, osg::NodeVisitor* nv ) override
{
if( osg::NodeVisitor::UPDATE_VISITOR == nv->getVisitorType( ))
{
Expand Down Expand Up @@ -47,7 +47,7 @@ struct ControlUpdateCallback : public osg::NodeCallback
ControlUpdateCallback( View* view, LonLatLabelControl* ll )
: _view( view ), _ll( ll ), _last_lat( 0. ), _last_lon( 0. ) { }

void operator( )( osg::Node* node, osg::NodeVisitor* nv )
void operator( )( osg::Node* node, osg::NodeVisitor* nv ) override
{
lunchbox::ScopedWrite _mutex( _update_lock );

Expand Down
14 changes: 7 additions & 7 deletions channel.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class Channel final : public eq::Channel
protected:
const FrameData& getFrameData( ) const;

virtual bool configInit( const eq::uint128_t& initID );
virtual bool configExit( );
virtual bool configInit( const eq::uint128_t& initID ) override;
virtual bool configExit( ) override;

#if 0
virtual void frameStart( const eq::uint128_t& frameID,
Expand All @@ -40,10 +40,10 @@ class Channel final : public eq::Channel
virtual void frameDrawFinish( const eq::uint128_t& frameID,
const uint32_t frameNumber );
#endif
virtual void frameClear( const eq::uint128_t& frameID );
virtual void frameDraw( const eq::uint128_t& frameID );
virtual void frameViewStart( const eq::uint128_t& frameID );
virtual void frameViewFinish( const eq::uint128_t& frameID );
virtual void frameClear( const eq::uint128_t& frameID ) override;
virtual void frameDraw( const eq::uint128_t& frameID ) override;
virtual void frameViewStart( const eq::uint128_t& frameID ) override;
virtual void frameViewFinish( const eq::uint128_t& frameID ) override;
/*
virtual void frameAssemble( const eq::uint128_t& frameID );
virtual void frameReadback( const eq::uint128_t& frameID );
Expand All @@ -52,7 +52,7 @@ class Channel final : public eq::Channel
virtual bool processEvent( eq::EventType type, eq::PointerEvent& event ) override;
virtual bool processEvent( eq::EventType type, eq::KeyEvent& event ) override;

virtual bool useOrtho( ) const { return false; }
virtual bool useOrtho( ) const override { return false; }

protected:
eq::uint128_t _sceneID;
Expand Down
8 changes: 4 additions & 4 deletions config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ class Config final : public eq::Config
virtual ~Config( );

public:
virtual bool init( );
virtual bool exit( );
bool init( );
virtual bool exit( ) override;

virtual uint32_t startFrame( );
virtual uint32_t finishFrame( );
uint32_t startFrame( );
uint32_t finishFrame( );

void setInitData( const InitData& initData ) { _initData = initData; }
const InitData& getInitData( ) const { return _initData; }
Expand Down
2 changes: 1 addition & 1 deletion configEvent.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ enum Type
INTERSECTION = eq::Event::USER
};

explicit ConfigEvent( )
ConfigEvent( )
{
size = sizeof( ConfigEvent );
}
Expand Down
6 changes: 3 additions & 3 deletions frameData.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class FrameData : public co::Serializable
float getZValue( ) const { return _zvalue; }

protected:
virtual void serialize( co::DataOStream& os, const uint64_t dirtyBits );
virtual void deserialize( co::DataIStream& is, const uint64_t dirtyBits );
virtual void serialize( co::DataOStream& os, const uint64_t dirtyBits ) override;
virtual void deserialize( co::DataIStream& is, const uint64_t dirtyBits ) override;

enum DirtyBits
{
Expand All @@ -40,7 +40,7 @@ class FrameData : public co::Serializable
DIRTY_ZVALUE = co::Serializable::DIRTY_CUSTOM << 4
};

virtual ChangeType getChangeType( ) const { return DELTA; }
virtual ChangeType getChangeType( ) const override { return DELTA; }

private:
double _simulationTime;
Expand Down
4 changes: 2 additions & 2 deletions initData.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class InitData : public co::Object
std::string getKMLFileName( ) const { return _kmlFileName; }

protected:
virtual void getInstanceData( co::DataOStream& stream );
virtual void applyInstanceData( co::DataIStream& stream );
virtual void getInstanceData( co::DataOStream& stream ) override;
virtual void applyInstanceData( co::DataIStream& stream ) override;

public:
bool parseCommandLine( char **argv, int argc );
Expand Down
10 changes: 5 additions & 5 deletions node.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ class Node final : public eq::Node
#endif

protected:
virtual bool configInit( const eq::uint128_t& initID );
virtual bool configExit( );
virtual bool configInit( const eq::uint128_t& initID ) override;
virtual bool configExit( ) override;

virtual void frameStart( const eq::uint128_t& frameID,
const uint32_t frameNumber );
const uint32_t frameNumber ) override;
virtual void frameFinish( const eq::uint128_t& frameID,
const uint32_t frameNumber );
const uint32_t frameNumber ) override;
virtual void frameDrawFinish( const eq::uint128_t& frameID,
const uint32_t frameNumber );
const uint32_t frameNumber ) override;

private:
void cleanup( );
Expand Down
20 changes: 10 additions & 10 deletions nodeFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,30 @@ namespace eqEarth
class NodeFactory : public eq::NodeFactory
{
public:
virtual eq::Config* createConfig( eq::ServerPtr parent )
virtual eq::Config* createConfig( eq::ServerPtr parent ) override
{ return new Config( parent ); }

virtual eq::Node* createNode( eq::Config* parent )
virtual eq::Node* createNode( eq::Config* parent ) override
{ return new Node( parent ); }

virtual eq::Pipe* createPipe( eq::Node* parent )
virtual eq::Pipe* createPipe( eq::Node* parent ) override
{ return new Pipe( parent ); }

virtual eq::Window* createWindow( eq::Pipe* parent )
virtual eq::Window* createWindow( eq::Pipe* parent ) override
{ return new Window( parent ); }

virtual eq::Channel* createChannel( eq::Window* parent )
virtual eq::Channel* createChannel( eq::Window* parent ) override
{ return new Channel( parent ); }

//virtual Observer* createObserver( Config* parent )
//virtual Observer* createObserver( Config* parent ) override;

//virtual Layout* createLayout( Config* parent )
//virtual Layout* createLayout( Config* parent ) override;

virtual eq::View* createView( eq::Layout* parent )
virtual eq::View* createView( eq::Layout* parent ) override
{ return new View( parent ); }

//virtual Canvas* createCanvas( Config* parent )
//virtual Canvas* createCanvas( Config* parent ) override;

//virtual Segment* createSegment( Canvas* parent )
//virtual Segment* createSegment( Canvas* parent ) override;
};
}
10 changes: 5 additions & 5 deletions pipe.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ class Pipe final : public eq::Pipe
virtual ~Pipe( );

protected:
virtual bool configInit( const eq::uint128_t& initID );
virtual bool configExit( );
virtual bool configInit( const eq::uint128_t& initID ) override;
virtual bool configExit( ) override;

virtual void frameStart( const eq::uint128_t& frameID,
const uint32_t frameNumber );
const uint32_t frameNumber ) override;
virtual void frameFinish( const eq::uint128_t& frameID,
const uint32_t frameNumber );
const uint32_t frameNumber ) override;
virtual void frameDrawFinish( const eq::uint128_t& frameID,
const uint32_t frameNumber );
const uint32_t frameNumber ) override;

private:
void cleanup( );
Expand Down
2 changes: 1 addition & 1 deletion renderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ class Renderer : public osgViewer::Renderer
public:
explicit Renderer( osg::Camera* camera );

virtual void operator( )( osg::GraphicsContext* context );
virtual void operator( )( osg::GraphicsContext* context ) override;
};
}
2 changes: 1 addition & 1 deletion sceneView.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ namespace eqEarth
class SceneView : public osgUtil::SceneView
{
protected:
virtual void draw();
virtual void draw() override;
};
}
4 changes: 2 additions & 2 deletions viewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class CompositeViewer : public osgViewer::CompositeViewer
void frameDrawFinish( );

// AppNode only
virtual void renderingTraversals( bool needMakeCurrentInThisThread );
virtual void realize( );
void renderingTraversals( bool needMakeCurrentInThisThread );
virtual void realize( ) override;
};
}
14 changes: 7 additions & 7 deletions window.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ class Window final : public eq::Window
static void initCapabilities( osg::GraphicsContext* context );

protected:
virtual bool configInit( const eq::uint128_t& initID );
virtual bool configInitGL( const eq::uint128_t& initID );
virtual bool configExitGL( );
virtual bool configInit( const eq::uint128_t& initID ) override;
virtual bool configInitGL( const eq::uint128_t& initID ) override;
virtual bool configExitGL( ) override;
virtual void frameStart( const eq::uint128_t& frameID,
const uint32_t frameNumber );
const uint32_t frameNumber ) override;
virtual void frameFinish( const eq::uint128_t& frameID,
const uint32_t frameNumber );
const uint32_t frameNumber ) override;
virtual void frameDrawFinish( const eq::uint128_t& frameID,
const uint32_t frameNumber );
virtual void swapBuffers( );
const uint32_t frameNumber ) override;
virtual void swapBuffers( ) override;

private:
struct ClearChannels;
Expand Down

0 comments on commit 4549360

Please sign in to comment.