1 files changed, 2 insertions, 3 deletions

diff --git a/core/settings/button/buttonsettings.h b/core/settings/button/buttonsettings.h
index 67694d3..1127e7c 100644
--- a/core/settings/button/buttonsettings.h
+++ b/core/settings/button/buttonsettings.h
@@ -21,29 +21,28 @@
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef __BUTTON_SETTINGS_H__
 #define __BUTTON_SETTINGS_H__
 
 #include <qdialog.h>
 #include <qlist.h>
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
 class QTimer;
 
-using namespace Opie;
 
 class buttoninfo;
 
 class ButtonSettings : public QDialog {
         Q_OBJECT
 
 public:
         ButtonSettings ( QWidget *parent = 0, const char *name = 0,  bool modal = FALSE,WFlags f = 0 );
         ~ButtonSettings ( );
 
         static QString appName() { return QString::fromLatin1("buttonsettings"); }
         virtual void accept ( );
@@ -52,25 +51,25 @@ public:
 private slots:
         void keyTimeout ( );
         void updateLabels ( );
 
 protected:
         virtual void keyPressEvent ( QKeyEvent *e );
         virtual void keyReleaseEvent ( QKeyEvent *e );
 
 private:
         buttoninfo *buttonInfoForKeycode ( ushort key );
         
         void edit ( buttoninfo *bi, bool hold );
-        QString qcopToString ( const OQCopMessage &c );
+        QString qcopToString ( const Opie::Core::OQCopMessage &c );
 
         private:
         QTimer *m_timer;
         buttoninfo *m_last_button;
 
         QList <buttoninfo> m_infos;
         bool m_lock;
 };
 
 #endif