9 files changed, 18 insertions, 17 deletions

diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro
index 817eac4..aa47f54 100644
--- a/core/settings/button/button.pro
+++ b/core/settings/button/button.pro
@@ -15,3 +15,3 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopie
+LIBS        += -lqpe -lopiecore2
         TARGET     = buttonsettings
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index d80e496..326554b 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -32,3 +32,3 @@
 
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
@@ -38,3 +38,3 @@
 
-using namespace Opie;
+using namespace Opie::Core;
 
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
@@ -32,3 +32,3 @@
 #include <qlist.h>
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
@@ -36,3 +36,2 @@ class QTimer;
 
-using namespace Opie;
 
@@ -63,3 +62,3 @@ private:
         void edit ( buttoninfo *bi, bool hold );
-        QString qcopToString ( const OQCopMessage &c );
+        QString qcopToString ( const Opie::Core::OQCopMessage &c );
 
diff --git a/core/settings/button/buttonutils.cpp b/core/settings/button/buttonutils.cpp
index 27a2f38..9bf4b53 100644
--- a/core/settings/button/buttonutils.cpp
+++ b/core/settings/button/buttonutils.cpp
@@ -12,2 +12,3 @@ using namespace Opie;
 
+using namespace Opie::Core;
 struct predef_qcop {
diff --git a/core/settings/button/buttonutils.h b/core/settings/button/buttonutils.h
index 5ea59bb..79eb8e3 100644
--- a/core/settings/button/buttonutils.h
+++ b/core/settings/button/buttonutils.h
@@ -30,3 +30,3 @@
 
-#include <opie/odevicebutton.h>
+#include <opie2/odevicebutton.h>
 
@@ -53,3 +53,3 @@ public:
         
-        qCopInfo messageToInfo ( const Opie::OQCopMessage & );
+        qCopInfo messageToInfo ( const Opie::Core::OQCopMessage & );
 
diff --git a/core/settings/button/config.in b/core/settings/button/config.in
index 3eb9155..834c375 100644
--- a/core/settings/button/config.in
+++ b/core/settings/button/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && !TARGET_RAMSES
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 && !TARGET_RAMSES
diff --git a/core/settings/button/main.cpp b/core/settings/button/main.cpp
index e7c5bf9..6c2539f 100644
--- a/core/settings/button/main.cpp
+++ b/core/settings/button/main.cpp
@@ -29,4 +29,5 @@
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<ButtonSettings> )
diff --git a/core/settings/button/remapdlg.cpp b/core/settings/button/remapdlg.cpp
index 121173a..4effebc 100644
--- a/core/settings/button/remapdlg.cpp
+++ b/core/settings/button/remapdlg.cpp
@@ -7,4 +7,4 @@
 
-using namespace Opie;
 
+using namespace Opie::Core;
 class NoSortItem : public QListViewItem {
@@ -44,3 +44,3 @@ private:
 
-RemapDlg::RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget *parent, const char *name )
+RemapDlg::RemapDlg ( const Opie::Core::ODeviceButton *b, bool hold, QWidget *parent, const char *name )
   : RemapDlgBase ( parent, name, true, WStyle_ContextHelp )
diff --git a/core/settings/button/remapdlg.h b/core/settings/button/remapdlg.h
index 046a22f..6cdd678 100644
--- a/core/settings/button/remapdlg.h
+++ b/core/settings/button/remapdlg.h
@@ -3,3 +3,3 @@
 
-#include <opie/odevicebutton.h>
+#include <opie2/odevicebutton.h>
 
@@ -14,6 +14,6 @@ class RemapDlg : public RemapDlgBase {
 public:
-    RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget* parent = 0, const char* name = 0 );
+    RemapDlg ( const Opie::Core::ODeviceButton *b, bool hold, QWidget* parent = 0, const char* name = 0 );
     ~RemapDlg ( );
 
-        Opie::OQCopMessage message ( );
+        Opie::Core::OQCopMessage message ( );
 
@@ -27,4 +27,4 @@ private slots:
 private:
-        Opie::OQCopMessage m_msg;
-        Opie::OQCopMessage m_msg_preset;
+        Opie::Core::OQCopMessage m_msg;
+        Opie::Core::OQCopMessage m_msg_preset;