From 67361b8947868405dafbbda1969c4d5d89363004 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 8 Jun 2016 13:28:18 +0100 Subject: [PATCH] Fixed unused parameter warning. --- .../osgwidgetaddremove/osgwidgetaddremove.cpp | 15 ++++++++------- examples/osgwidgetcanvas/osgwidgetcanvas.cpp | 17 +++++++++-------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/examples/osgwidgetaddremove/osgwidgetaddremove.cpp b/examples/osgwidgetaddremove/osgwidgetaddremove.cpp index 050263abe..49c0d2e54 100644 --- a/examples/osgwidgetaddremove/osgwidgetaddremove.cpp +++ b/examples/osgwidgetaddremove/osgwidgetaddremove.cpp @@ -41,13 +41,13 @@ public: virtual bool mousePush(double, double, const osgWidget::WindowManager*) { addColor(0.2f, 0.2f, 0.2f, 0.0f); - + return true; } virtual bool mouseRelease(double, double, const osgWidget::WindowManager*) { addColor(-0.2f, -0.2f, -0.2f, 0.0f); - + return true; } }; @@ -86,7 +86,7 @@ public: wm->addChild(_win1.get()); } - bool handlePressAdd(osgWidget::Event& ev) { + bool handlePressAdd(osgWidget::Event& /*ev*/) { static unsigned int num = 0; std::stringstream ss; @@ -100,10 +100,10 @@ public: return true; } - bool handlePressRemove(osgWidget::Event& ev) { + bool handlePressRemove(osgWidget::Event& /*ev*/) { // TODO: Temporary hack! const osgWidget::Box::Vector& v = _win1->getObjects(); - + if(!v.size()) return false; osgWidget::Widget* w = _win1->getObjects()[v.size() - 1].get(); @@ -114,7 +114,8 @@ public: } }; -int main(int argc, char** argv) { +int main(int, char**) +{ osgViewer::Viewer viewer; osgWidget::WindowManager* wm = new osgWidget::WindowManager( @@ -123,7 +124,7 @@ int main(int argc, char** argv) { 1024.0f, MASK_2D ); - + osgWidget::Box* buttons = new AddRemove(); wm->addChild(buttons); diff --git a/examples/osgwidgetcanvas/osgwidgetcanvas.cpp b/examples/osgwidgetcanvas/osgwidgetcanvas.cpp index 553266127..b62d90525 100644 --- a/examples/osgwidgetcanvas/osgwidgetcanvas.cpp +++ b/examples/osgwidgetcanvas/osgwidgetcanvas.cpp @@ -11,7 +11,7 @@ bool colorWidgetEnter(osgWidget::Event& event) { event.getWidget()->addColor(0.5f, 0.2f, 0.3f, 0.0f); // osgWidget::warn() << "WIDGET mouseEnter " << event.getWidget()->getName() << std::endl; - + return false; } @@ -19,7 +19,7 @@ bool colorWidgetLeave(osgWidget::Event& event) { event.getWidget()->addColor(-0.5f, -0.2f, -0.3f, 0.0f); // osgWidget::warn() << "WIDGET mouseLeave" << std::endl; - + return true; } @@ -52,11 +52,12 @@ osgWidget::Widget* createWidget( widget->addCallback(new osgWidget::Callback(&widgetMouseOver, osgWidget::EVENT_MOUSE_OVER)); widget->setColor(col, col, col, 0.5f); widget->setLayer(layer); - + return widget; } -int main(int argc, char** argv) { +int main(int, char**) +{ osgViewer::Viewer viewer; osgWidget::WindowManager* wm = new osgWidget::WindowManager( @@ -66,7 +67,7 @@ int main(int argc, char** argv) { MASK_2D, osgWidget::WindowManager::WM_PICK_DEBUG ); - + osgWidget::Canvas* canvas = new osgWidget::Canvas("canvas"); canvas->addCallback(new osgWidget::Callback(&windowMouseOver, osgWidget::EVENT_MOUSE_OVER)); @@ -79,7 +80,7 @@ int main(int argc, char** argv) { 0.0f, 0.0f ); - + canvas->addWidget( createWidget("w2", 0.4f, osgWidget::Widget::LAYER_MIDDLE), 200.0f, @@ -103,7 +104,7 @@ int main(int argc, char** argv) { osgWidget::warn() << canvas->getWidth() << std::endl; canvas->addWidget(relWidget, 0.4f, 0.4f); - + relWidget->addOrigin(0.1f, 0.1f); relWidget->addSize(0.2f, 0.2f); @@ -126,7 +127,7 @@ int main(int argc, char** argv) { MASK_2D, osgWidget::WindowManager::WM_PICK_DEBUG ); - + osgWidget::Canvas* canvas = new osgWidget::Canvas("canvas"); canvas->addWidget(new osgWidget::Widget("spacer", 2.0f, 300.0f), 1280.0f, 0.0f);