1 files changed, 12 insertions, 3 deletions

diff --git a/libopie2/opiecore/device/odevicebutton.cpp b/libopie2/opiecore/device/odevicebutton.cpp
index 0b593d5..a081b7f 100644
--- a/libopie2/opiecore/device/odevicebutton.cpp
+++ b/libopie2/opiecore/device/odevicebutton.cpp
@@ -35,3 +35,6 @@
 
-using namespace Opie;
+
+namespace Opie {
+namespace Core {
+namespace Private {
 
@@ -44,3 +47,6 @@ class OQCopMessageData
 };
+}
 
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 
@@ -126,4 +132,4 @@ void OQCopMessage::setData ( const QByteArray &data )
 
-/*! \class Opie::ODeviceButton
-    \brief The Opie::ODeviceButton class represents a physical user mappable button on a Qtopia device.
+/*! \class Opie::Core::ODeviceButton
+    \brief The Opie::Core::ODeviceButton class represents a physical user mappable button on a Qtopia device.
  
@@ -246 +252,4 @@ void ODeviceButton::setHeldAction(const OQCopMessage& action)
 }
+
+}
+}