-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 | |||
@@ -15,3 +15,3 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
15 | DEPENDPATH += $(OPIEDIR)/include | 15 | DEPENDPATH += $(OPIEDIR)/include |
16 | LIBS += -lqpe -lopie | 16 | LIBS += -lqpe -lopiecore2 |
17 | TARGET = buttonsettings | 17 | 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 @@ | |||
32 | 32 | ||
33 | #include <opie/odevice.h> | 33 | #include <opie2/odevice.h> |
34 | 34 | ||
@@ -38,3 +38,3 @@ | |||
38 | 38 | ||
39 | using namespace Opie; | 39 | using namespace Opie::Core; |
40 | 40 | ||
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 @@ | |||
32 | #include <qlist.h> | 32 | #include <qlist.h> |
33 | #include <opie/odevice.h> | 33 | #include <opie2/odevice.h> |
34 | 34 | ||
@@ -36,3 +36,2 @@ class QTimer; | |||
36 | 36 | ||
37 | using namespace Opie; | ||
38 | 37 | ||
@@ -63,3 +62,3 @@ private: | |||
63 | void edit ( buttoninfo *bi, bool hold ); | 62 | void edit ( buttoninfo *bi, bool hold ); |
64 | QString qcopToString ( const OQCopMessage &c ); | 63 | QString qcopToString ( const Opie::Core::OQCopMessage &c ); |
65 | 64 | ||
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; | |||
12 | 12 | ||
13 | using namespace Opie::Core; | ||
13 | struct predef_qcop { | 14 | 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 @@ | |||
30 | 30 | ||
31 | #include <opie/odevicebutton.h> | 31 | #include <opie2/odevicebutton.h> |
32 | 32 | ||
@@ -53,3 +53,3 @@ public: | |||
53 | 53 | ||
54 | qCopInfo messageToInfo ( const Opie::OQCopMessage & ); | 54 | qCopInfo messageToInfo ( const Opie::Core::OQCopMessage & ); |
55 | 55 | ||
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 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && !TARGET_RAMSES | 4 | 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 @@ | |||
29 | 29 | ||
30 | #include <opie/oapplicationfactory.h> | 30 | #include <opie2/oapplicationfactory.h> |
31 | 31 | ||
32 | using namespace Opie::Core; | ||
32 | OPIE_EXPORT_APP( OApplicationFactory<ButtonSettings> ) | 33 | 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 @@ | |||
7 | 7 | ||
8 | using namespace Opie; | ||
9 | 8 | ||
9 | using namespace Opie::Core; | ||
10 | class NoSortItem : public QListViewItem { | 10 | class NoSortItem : public QListViewItem { |
@@ -44,3 +44,3 @@ private: | |||
44 | 44 | ||
45 | RemapDlg::RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget *parent, const char *name ) | 45 | RemapDlg::RemapDlg ( const Opie::Core::ODeviceButton *b, bool hold, QWidget *parent, const char *name ) |
46 | : RemapDlgBase ( parent, name, true, WStyle_ContextHelp ) | 46 | : 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 @@ | |||
3 | 3 | ||
4 | #include <opie/odevicebutton.h> | 4 | #include <opie2/odevicebutton.h> |
5 | 5 | ||
@@ -14,6 +14,6 @@ class RemapDlg : public RemapDlgBase { | |||
14 | public: | 14 | public: |
15 | RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget* parent = 0, const char* name = 0 ); | 15 | RemapDlg ( const Opie::Core::ODeviceButton *b, bool hold, QWidget* parent = 0, const char* name = 0 ); |
16 | ~RemapDlg ( ); | 16 | ~RemapDlg ( ); |
17 | 17 | ||
18 | Opie::OQCopMessage message ( ); | 18 | Opie::Core::OQCopMessage message ( ); |
19 | 19 | ||
@@ -27,4 +27,4 @@ private slots: | |||
27 | private: | 27 | private: |
28 | Opie::OQCopMessage m_msg; | 28 | Opie::Core::OQCopMessage m_msg; |
29 | Opie::OQCopMessage m_msg_preset; | 29 | Opie::Core::OQCopMessage m_msg_preset; |
30 | 30 | ||