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
@@ -30,22 +30,28 @@
 #include <qpixmap.h>
 #include <qstring.h>
 
 #include <qpe/qcopenvelope_qws.h>
 #include <opie2/odevicebutton.h>
 
-using namespace Opie;
+
+namespace Opie {
+namespace Core {
+namespace Private {
 
 class OQCopMessageData
 {
   public:
     QCString m_channel;
     QCString m_message;
     QByteArray m_data;
 };
+}
 
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 
 OQCopMessage::OQCopMessage()
         : d ( 0 )
 {
     init ( QCString(), QCString(), QByteArray());
 }
@@ -121,14 +127,14 @@ void OQCopMessage::setMessage ( const QCString &m )
 
 void OQCopMessage::setData ( const QByteArray &data )
 {
     d->m_data = 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.
  
     This class represents a physical button on a Qtopia device.    A
     device may have "user programmable" buttons.
     The location and number of buttons will vary from device to
     device.    userText() and pixmap() may be used to describe this button
     to the user in help documentation.
@@ -241,6 +247,9 @@ void ODeviceButton::setFactoryPresetHeldAction(const OQCopMessage& action)
 }
 
 void ODeviceButton::setHeldAction(const OQCopMessage& action)
 {
     m_HeldAction = action;
 }
+
+}
+}