From de80cac99f8e65d1b96927a0854cd5b7e2ba8c5a Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 8 Jun 2016 10:18:23 +0100
Subject: [PATCH] Fixed -Wextra warnings

---
 src/osgGA/CameraManipulator.cpp              | 4 +++-
 src/osgGA/EventHandler.cpp                   | 2 +-
 src/osgGA/FirstPersonManipulator.cpp         | 3 ++-
 src/osgGA/FlightManipulator.cpp              | 3 ++-
 src/osgGA/MultiTouchTrackballManipulator.cpp | 2 +-
 src/osgGA/NodeTrackerManipulator.cpp         | 3 ++-
 src/osgGA/OrbitManipulator.cpp               | 3 ++-
 src/osgGA/StandardManipulator.cpp            | 4 +++-
 src/osgGA/TerrainManipulator.cpp             | 3 ++-
 src/osgGA/TrackballManipulator.cpp           | 3 ++-
 src/osgGA/Widget.cpp                         | 4 ++--
 11 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/osgGA/CameraManipulator.cpp b/src/osgGA/CameraManipulator.cpp
index c957f880b..a206e0f12 100644
--- a/src/osgGA/CameraManipulator.cpp
+++ b/src/osgGA/CameraManipulator.cpp
@@ -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),
diff --git a/src/osgGA/EventHandler.cpp b/src/osgGA/EventHandler.cpp
index 9ab3f3fb5..84117cdff 100644
--- a/src/osgGA/EventHandler.cpp
+++ b/src/osgGA/EventHandler.cpp
@@ -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;
diff --git a/src/osgGA/FirstPersonManipulator.cpp b/src/osgGA/FirstPersonManipulator.cpp
index 1596928c1..84d47c0d0 100644
--- a/src/osgGA/FirstPersonManipulator.cpp
+++ b/src/osgGA/FirstPersonManipulator.cpp
@@ -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 ),
diff --git a/src/osgGA/FlightManipulator.cpp b/src/osgGA/FlightManipulator.cpp
index 1d5e81ba9..3974b37ce 100644
--- a/src/osgGA/FlightManipulator.cpp
+++ b/src/osgGA/FlightManipulator.cpp
@@ -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 )
 {
diff --git a/src/osgGA/MultiTouchTrackballManipulator.cpp b/src/osgGA/MultiTouchTrackballManipulator.cpp
index fa2c0ee5e..aefcf8938 100644
--- a/src/osgGA/MultiTouchTrackballManipulator.cpp
+++ b/src/osgGA/MultiTouchTrackballManipulator.cpp
@@ -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 )
 {
 }
 
diff --git a/src/osgGA/NodeTrackerManipulator.cpp b/src/osgGA/NodeTrackerManipulator.cpp
index 1088ec498..dd195b9b2 100644
--- a/src/osgGA/NodeTrackerManipulator.cpp
+++ b/src/osgGA/NodeTrackerManipulator.cpp
@@ -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 )
diff --git a/src/osgGA/OrbitManipulator.cpp b/src/osgGA/OrbitManipulator.cpp
index 3afb44ac7..bd886372a 100644
--- a/src/osgGA/OrbitManipulator.cpp
+++ b/src/osgGA/OrbitManipulator.cpp
@@ -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 ),
diff --git a/src/osgGA/StandardManipulator.cpp b/src/osgGA/StandardManipulator.cpp
index bdb8a5f7c..bc36d37e7 100644
--- a/src/osgGA/StandardManipulator.cpp
+++ b/src/osgGA/StandardManipulator.cpp
@@ -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),
diff --git a/src/osgGA/TerrainManipulator.cpp b/src/osgGA/TerrainManipulator.cpp
index 4c38e9605..9fd0f7860 100644
--- a/src/osgGA/TerrainManipulator.cpp
+++ b/src/osgGA/TerrainManipulator.cpp
@@ -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 )
 {
diff --git a/src/osgGA/TrackballManipulator.cpp b/src/osgGA/TrackballManipulator.cpp
index 408eaea33..d7763f960 100644
--- a/src/osgGA/TrackballManipulator.cpp
+++ b/src/osgGA/TrackballManipulator.cpp
@@ -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 )
 {
 }
diff --git a/src/osgGA/Widget.cpp b/src/osgGA/Widget.cpp
index 8d5594ce3..08917631e 100644
--- a/src/osgGA/Widget.cpp
+++ b/src/osgGA/Widget.cpp
@@ -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;
 }