From 4924cd9ceb4a4dbc0a81c212d2bc50c48d4a87b0 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 25 Aug 2003 14:03:49 +0000 Subject: [PATCH] Added osgProducer:: in front of KeyboardMouseCallback. --- include/osgProducer/Viewer | 6 +++--- src/osgProducer/Viewer.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/osgProducer/Viewer b/include/osgProducer/Viewer index c92081a71..2d8cbedf3 100644 --- a/include/osgProducer/Viewer +++ b/include/osgProducer/Viewer @@ -120,9 +120,9 @@ class OSGPRODUCER_EXPORT Viewer : public OsgCameraGroup, public osgGA::GUIAction Producer::KeyboardMouse* getKeyboardMouse() { return _kbm.get(); } const Producer::KeyboardMouse* getKeyboardMouse() const { return _kbm.get(); } - void setKeyboardMouseCallback(KeyboardMouseCallback* kbmcb); - KeyboardMouseCallback* getKeyboardMouseCallback() { return _kbmcb.get(); } - const KeyboardMouseCallback* getKeyboardMouseCallback() const { return _kbmcb.get(); } + void setKeyboardMouseCallback(osgProducer::KeyboardMouseCallback* kbmcb); + osgProducer::KeyboardMouseCallback* getKeyboardMouseCallback() { return _kbmcb.get(); } + const osgProducer::KeyboardMouseCallback* getKeyboardMouseCallback() const { return _kbmcb.get(); } diff --git a/src/osgProducer/Viewer.cpp b/src/osgProducer/Viewer.cpp index 3790f3cd7..bb52d576d 100644 --- a/src/osgProducer/Viewer.cpp +++ b/src/osgProducer/Viewer.cpp @@ -188,7 +188,7 @@ void Viewer::setKeyboardMouse(Producer::KeyboardMouse* kbm) if (_kbm.valid() && _kbmcb.valid()) _kbm->setCallback(_kbmcb.get()); } -void Viewer::setKeyboardMouseCallback(KeyboardMouseCallback* kbmcb) +void Viewer::setKeyboardMouseCallback(osgProducer::KeyboardMouseCallback* kbmcb) { _kbmcb = kbmcb; if (_kbm.valid() && _kbmcb.valid()) _kbm->setCallback(_kbmcb.get());