-rw-r--r-- | core/settings/button/button.pro | 2 | ||||
-rw-r--r-- | core/settings/button/buttonsettings.cpp | 4 | ||||
-rw-r--r-- | core/settings/button/buttonsettings.h | 5 | ||||
-rw-r--r-- | core/settings/button/buttonutils.cpp | 1 | ||||
-rw-r--r-- | core/settings/button/buttonutils.h | 4 | ||||
-rw-r--r-- | core/settings/button/config.in | 2 | ||||
-rw-r--r-- | core/settings/button/main.cpp | 3 | ||||
-rw-r--r-- | core/settings/button/remapdlg.cpp | 4 | ||||
-rw-r--r-- | core/settings/button/remapdlg.h | 10 |
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 @@ -14,5 +14,5 @@ INTERFACES = remapdlgbase.ui 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 @@ -31,5 +31,5 @@ -#include <opie/odevice.h> +#include <opie2/odevice.h> #include "buttonsettings.h" @@ -37,5 +37,5 @@ #include "remapdlg.h" -using namespace Opie; +using namespace Opie::Core; struct buttoninfo { 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 @@ -31,9 +31,8 @@ #include <qdialog.h> #include <qlist.h> -#include <opie/odevice.h> +#include <opie2/odevice.h> class QTimer; -using namespace Opie; class buttoninfo; @@ -62,5 +61,5 @@ private: void edit ( buttoninfo *bi, bool hold ); - QString qcopToString ( const OQCopMessage &c ); + QString qcopToString ( const Opie::Core::OQCopMessage &c ); private: 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 @@ -11,4 +11,5 @@ using namespace Opie; +using namespace Opie::Core; struct predef_qcop { const char *m_text; 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 @@ -29,5 +29,5 @@ #define __BUTTON_UTILS_H__ -#include <opie/odevicebutton.h> +#include <opie2/odevicebutton.h> class AppLnkSet; @@ -52,5 +52,5 @@ public: static ButtonUtils *inst ( ); - qCopInfo messageToInfo ( const Opie::OQCopMessage & ); + qCopInfo messageToInfo ( const Opie::Core::OQCopMessage & ); void insertActions ( QListViewItem *here ); 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 @@ -2,3 +2,3 @@ boolean "opie-button-settings (application buttons settings)" 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 @@ -28,5 +28,6 @@ #include "buttonsettings.h" -#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 @@ -6,6 +6,6 @@ #include "buttonutils.h" -using namespace Opie; +using namespace Opie::Core; class NoSortItem : public QListViewItem { public: @@ -43,5 +43,5 @@ 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 @@ -2,5 +2,5 @@ #define __REMAPDLG_H__ -#include <opie/odevicebutton.h> +#include <opie2/odevicebutton.h> #include "remapdlgbase.h" @@ -13,8 +13,8 @@ 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 ( ); public slots: @@ -26,6 +26,6 @@ private slots: private: - Opie::OQCopMessage m_msg; - Opie::OQCopMessage m_msg_preset; + Opie::Core::OQCopMessage m_msg; + Opie::Core::OQCopMessage m_msg_preset; QListViewItem *m_current; |