Fixed -Wextra warnings
This commit is contained in:
@@ -21,7 +21,9 @@ CameraManipulator::CameraManipulator()
|
||||
|
||||
|
||||
CameraManipulator::CameraManipulator(const CameraManipulator& mm, const CopyOp& copyOp)
|
||||
: inherited(mm, copyOp),
|
||||
: osg::Object(mm, copyOp),
|
||||
osg::Callback(mm, copyOp),
|
||||
inherited(mm, copyOp),
|
||||
_intersectTraversalMask(mm._intersectTraversalMask),
|
||||
_autoComputeHomePosition(mm._autoComputeHomePosition),
|
||||
_homeEye(mm._homeEye),
|
||||
|
||||
@@ -45,7 +45,7 @@ void EventHandler::event(osg::NodeVisitor* nv, osg::Drawable* drawable)
|
||||
}
|
||||
}
|
||||
|
||||
bool EventHandler::handle(osgGA::Event* event, osg::Object* object, osg::NodeVisitor* nv)
|
||||
bool EventHandler::handle(osgGA::Event* event, osg::Object* /*object*/, osg::NodeVisitor* /*nv*/)
|
||||
{
|
||||
OSG_NOTICE<<"Handle event "<<event<<std::endl;
|
||||
return false;
|
||||
|
||||
@@ -44,7 +44,8 @@ FirstPersonManipulator::FirstPersonManipulator( int flags )
|
||||
|
||||
/// Constructor.
|
||||
FirstPersonManipulator::FirstPersonManipulator( const FirstPersonManipulator& fpm, const CopyOp& copyOp )
|
||||
: osg::Callback(fpm, copyOp),
|
||||
: osg::Object(fpm, copyOp),
|
||||
osg::Callback(fpm, copyOp),
|
||||
inherited( fpm, copyOp ),
|
||||
_eye( fpm._eye ),
|
||||
_rotation( fpm._rotation ),
|
||||
|
||||
@@ -28,7 +28,8 @@ FlightManipulator::FlightManipulator( int flags )
|
||||
|
||||
/// Constructor.
|
||||
FlightManipulator::FlightManipulator( const FlightManipulator& fm, const CopyOp& copyOp )
|
||||
: osg::Callback(fm, copyOp),
|
||||
: osg::Object(fm, copyOp),
|
||||
osg::Callback(fm, copyOp),
|
||||
inherited( fm, copyOp ),
|
||||
_yawMode( fm._yawMode )
|
||||
{
|
||||
|
||||
@@ -30,7 +30,7 @@ MultiTouchTrackballManipulator::MultiTouchTrackballManipulator( int flags )
|
||||
|
||||
/// Constructor.
|
||||
MultiTouchTrackballManipulator::MultiTouchTrackballManipulator( const MultiTouchTrackballManipulator& tm, const CopyOp& copyOp )
|
||||
: osg::Callback(tm, copyOp), inherited( tm, copyOp )
|
||||
: osg::Object(tm, copyOp), osg::Callback(tm, copyOp), inherited( tm, copyOp )
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,8 @@ NodeTrackerManipulator::NodeTrackerManipulator( int flags )
|
||||
|
||||
|
||||
NodeTrackerManipulator::NodeTrackerManipulator( const NodeTrackerManipulator& m, const CopyOp& copyOp )
|
||||
: osg::Callback(m, copyOp),
|
||||
: osg::Object(m, copyOp),
|
||||
osg::Callback(m, copyOp),
|
||||
inherited( m, copyOp ),
|
||||
_trackNodePath( m._trackNodePath ),
|
||||
_trackerMode( m._trackerMode )
|
||||
|
||||
@@ -43,7 +43,8 @@ OrbitManipulator::OrbitManipulator( int flags )
|
||||
|
||||
/// Constructor.
|
||||
OrbitManipulator::OrbitManipulator( const OrbitManipulator& om, const CopyOp& copyOp )
|
||||
: osg::Callback(om, copyOp),
|
||||
: osg::Object(om, copyOp),
|
||||
osg::Callback(om, copyOp),
|
||||
inherited( om, copyOp ),
|
||||
_center( om._center ),
|
||||
_rotation( om._rotation ),
|
||||
|
||||
@@ -48,7 +48,9 @@ StandardManipulator::StandardManipulator( int flags )
|
||||
|
||||
/// Constructor.
|
||||
StandardManipulator::StandardManipulator( const StandardManipulator& uim, const CopyOp& copyOp )
|
||||
: inherited( uim, copyOp ),
|
||||
: osg::Object(uim, copyOp),
|
||||
osg::Callback(uim, copyOp),
|
||||
inherited( uim, copyOp ),
|
||||
_thrown( uim._thrown ),
|
||||
_allowThrow( uim._allowThrow ),
|
||||
_mouseCenterX(0.0f), _mouseCenterY(0.0f),
|
||||
|
||||
@@ -29,7 +29,8 @@ TerrainManipulator::TerrainManipulator( int flags )
|
||||
|
||||
/// Constructor.
|
||||
TerrainManipulator::TerrainManipulator( const TerrainManipulator& tm, const CopyOp& copyOp )
|
||||
: osg::Callback(tm, copyOp),
|
||||
: osg::Object(tm, copyOp),
|
||||
osg::Callback(tm, copyOp),
|
||||
inherited( tm, copyOp ),
|
||||
_previousUp( tm._previousUp )
|
||||
{
|
||||
|
||||
@@ -28,7 +28,8 @@ TrackballManipulator::TrackballManipulator( int flags )
|
||||
|
||||
/// Constructor.
|
||||
TrackballManipulator::TrackballManipulator( const TrackballManipulator& tm, const CopyOp& copyOp )
|
||||
: osg::Callback(tm, copyOp),
|
||||
: osg::Object(tm, copyOp),
|
||||
osg::Callback(tm, copyOp),
|
||||
inherited( tm, copyOp )
|
||||
{
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ Widget::Widget():
|
||||
}
|
||||
|
||||
Widget::Widget(const Widget& widget, const osg::CopyOp& copyop):
|
||||
osg::Group(),
|
||||
osg::Group(widget, copyop),
|
||||
_focusBehaviour(widget._focusBehaviour),
|
||||
_hasEventFocus(false),
|
||||
_graphicsInitialized(false)
|
||||
@@ -277,7 +277,7 @@ bool Widget::handle(osgGA::EventVisitor* ev, osgGA::Event* event)
|
||||
}
|
||||
}
|
||||
|
||||
bool Widget::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
|
||||
bool Widget::handleImplementation(osgGA::EventVisitor* /*ev*/, osgGA::Event* /*event*/)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user