Fixed -Wextra warningsw

This commit is contained in:
Robert Osfield
2016-06-08 09:05:34 +01:00
parent b19c879485
commit ee30c7d0a5
7 changed files with 17 additions and 10 deletions

View File

@@ -27,7 +27,10 @@ CloseCallback::CloseCallback(const std::string& callbackName, osgUI::Widget* clo
setName(callbackName);
}
CloseCallback::CloseCallback(const CloseCallback& hc, const osg::CopyOp& copyop)
CloseCallback::CloseCallback(const CloseCallback& hc, const osg::CopyOp& copyop):
osg::Object(hc, copyop),
osg::Callback(hc, copyop),
osg::CallbackObject(hc, copyop)
{
}
@@ -70,11 +73,13 @@ HandleCallback::HandleCallback()
}
HandleCallback::HandleCallback(const HandleCallback& hc, const osg::CopyOp& copyop):
osg::Object(hc, copyop),
osg::Callback(hc, copyop),
osg::CallbackObject(hc, copyop)
{
}
bool HandleCallback::run(osg::Object* object, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const
bool HandleCallback::run(osg::Object* /*object*/, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const
{
if (inputParameters.size()>=2)
{
@@ -89,7 +94,7 @@ bool HandleCallback::run(osg::Object* object, osg::Parameters& inputParameters,
return false;
}
bool HandleCallback::handle(osgGA::EventVisitor* ev, osgGA::Event* event) const
bool HandleCallback::handle(osgGA::EventVisitor* /*ev*/, osgGA::Event* /*event*/) const
{
return false;
}
@@ -101,6 +106,8 @@ DragCallback::DragCallback():
}
DragCallback::DragCallback(const DragCallback& hc, const osg::CopyOp& copyop):
osg::Object(hc, copyop),
osg::Callback(hc, copyop),
HandleCallback(hc, copyop)
{
}

View File

@@ -34,7 +34,7 @@ Dialog::Dialog(const osgUI::Dialog& dialog, const osg::CopyOp& copyop):
{
}
bool Dialog::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
bool Dialog::handleImplementation(osgGA::EventVisitor* /*ev*/, osgGA::Event* event)
{
osgGA::GUIEventAdapter* ea = event->asGUIEventAdapter();
if (!ea) return false;

View File

@@ -31,7 +31,7 @@ LineEdit::LineEdit(const osgUI::LineEdit& label, const osg::CopyOp& copyop):
{
}
bool LineEdit::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
bool LineEdit::handleImplementation(osgGA::EventVisitor* /*ev*/, osgGA::Event* event)
{
if (!getHasEventFocus()) return false;

View File

@@ -30,7 +30,7 @@ Popup::Popup(const osgUI::Popup& dialog, const osg::CopyOp& copyop):
{
}
bool Popup::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
bool Popup::handleImplementation(osgGA::EventVisitor* /*ev*/, osgGA::Event* event)
{
// OSG_NOTICE<<"Popup::handleImplementation"<<std::endl;

View File

@@ -30,7 +30,7 @@ PushButton::PushButton(const osgUI::PushButton& pb, const osg::CopyOp& copyop):
{
}
bool PushButton::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
bool PushButton::handleImplementation(osgGA::EventVisitor* /*ev*/, osgGA::Event* event)
{
if (!getHasEventFocus()) return false;

View File

@@ -121,7 +121,7 @@ IntValidator::IntValidator(const IntValidator& validator, const osg::CopyOp& cop
{
}
IntValidator::State IntValidator::validateImplementation(std::string& str, int& cursorpos) const
IntValidator::State IntValidator::validateImplementation(std::string& str, int& /*cursorpos*/) const
{
std::string newstring;
bool canBeNegative = _bottom<0.0;
@@ -205,7 +205,7 @@ DoubleValidator::DoubleValidator(const DoubleValidator& validator, const osg::Co
{
}
DoubleValidator::State DoubleValidator::validateImplementation(std::string& str, int& cursorpos) const
DoubleValidator::State DoubleValidator::validateImplementation(std::string& str, int& /*cursorpos*/) const
{
std::string newstring;
bool canBeNegative = _bottom<0.0;

View File

@@ -299,7 +299,7 @@ bool Widget::handle(osgGA::EventVisitor* ev, osgGA::Event* event)
return handleImplementation(ev, event);
}
bool Widget::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
bool Widget::handleImplementation(osgGA::EventVisitor* /*ev*/, osgGA::Event* /*event*/)
{
return false;
}