author | zecke <zecke> | 2004-03-14 18:42:05 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 18:42:05 (UTC) |
commit | 617e15d4cdbe7bc962388f9710bce834182bee24 (patch) (unidiff) | |
tree | 2c714b53d47c7421abc424b68c692dbe005bf598 /core/settings/button | |
parent | a3726e8ae25805d215d0fd5c249345aad9952ef3 (diff) | |
download | opie-617e15d4cdbe7bc962388f9710bce834182bee24.zip opie-617e15d4cdbe7bc962388f9710bce834182bee24.tar.gz opie-617e15d4cdbe7bc962388f9710bce834182bee24.tar.bz2 |
ODP change
-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 | |||
@@ -13,7 +13,7 @@ INTERFACES = remapdlgbase.ui | |||
13 | 13 | ||
14 | INCLUDEPATH += $(OPIEDIR)/include | 14 | 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 |
18 | 18 | ||
19 | include ( $(OPIEDIR)/include.pro ) | 19 | include ( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -30,13 +30,13 @@ | |||
30 | #include <qtimer.h> | 30 | #include <qtimer.h> |
31 | 31 | ||
32 | 32 | ||
33 | #include <opie/odevice.h> | 33 | #include <opie2/odevice.h> |
34 | 34 | ||
35 | #include "buttonsettings.h" | 35 | #include "buttonsettings.h" |
36 | #include "buttonutils.h" | 36 | #include "buttonutils.h" |
37 | #include "remapdlg.h" | 37 | #include "remapdlg.h" |
38 | 38 | ||
39 | using namespace Opie; | 39 | using namespace Opie::Core; |
40 | 40 | ||
41 | struct buttoninfo { | 41 | struct buttoninfo { |
42 | const ODeviceButton *m_button; | 42 | const ODeviceButton *m_button; |
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 | |||
@@ -30,11 +30,10 @@ | |||
30 | 30 | ||
31 | #include <qdialog.h> | 31 | #include <qdialog.h> |
32 | #include <qlist.h> | 32 | #include <qlist.h> |
33 | #include <opie/odevice.h> | 33 | #include <opie2/odevice.h> |
34 | 34 | ||
35 | class QTimer; | 35 | class QTimer; |
36 | 36 | ||
37 | using namespace Opie; | ||
38 | 37 | ||
39 | class buttoninfo; | 38 | class buttoninfo; |
40 | 39 | ||
@@ -61,7 +60,7 @@ private: | |||
61 | buttoninfo *buttonInfoForKeycode ( ushort key ); | 60 | buttoninfo *buttonInfoForKeycode ( ushort key ); |
62 | 61 | ||
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 | ||
66 | private: | 65 | private: |
67 | QTimer *m_timer; | 66 | QTimer *m_timer; |
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 | |||
@@ -10,6 +10,7 @@ | |||
10 | 10 | ||
11 | using namespace Opie; | 11 | using namespace Opie; |
12 | 12 | ||
13 | using namespace Opie::Core; | ||
13 | struct predef_qcop { | 14 | struct predef_qcop { |
14 | const char *m_text; | 15 | const char *m_text; |
15 | const char *m_pixmap; | 16 | const char *m_pixmap; |
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 | |||
@@ -28,7 +28,7 @@ | |||
28 | #ifndef __BUTTON_UTILS_H__ | 28 | #ifndef __BUTTON_UTILS_H__ |
29 | #define __BUTTON_UTILS_H__ | 29 | #define __BUTTON_UTILS_H__ |
30 | 30 | ||
31 | #include <opie/odevicebutton.h> | 31 | #include <opie2/odevicebutton.h> |
32 | 32 | ||
33 | class AppLnkSet; | 33 | class AppLnkSet; |
34 | class QListViewItem; | 34 | class QListViewItem; |
@@ -51,7 +51,7 @@ public: | |||
51 | 51 | ||
52 | static ButtonUtils *inst ( ); | 52 | static ButtonUtils *inst ( ); |
53 | 53 | ||
54 | qCopInfo messageToInfo ( const Opie::OQCopMessage & ); | 54 | qCopInfo messageToInfo ( const Opie::Core::OQCopMessage & ); |
55 | 55 | ||
56 | void insertActions ( QListViewItem *here ); | 56 | void insertActions ( QListViewItem *here ); |
57 | void insertAppLnks ( QListViewItem *here ); | 57 | void insertAppLnks ( 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | config BUTTON-SETTINGS | 1 | config BUTTON-SETTINGS |
2 | boolean "opie-button-settings (application buttons settings)" | 2 | boolean "opie-button-settings (application buttons settings)" |
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 | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | #include "buttonsettings.h" | 28 | #include "buttonsettings.h" |
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 | |||
@@ -5,8 +5,8 @@ | |||
5 | #include "remapdlg.h" | 5 | #include "remapdlg.h" |
6 | #include "buttonutils.h" | 6 | #include "buttonutils.h" |
7 | 7 | ||
8 | using namespace Opie; | ||
9 | 8 | ||
9 | using namespace Opie::Core; | ||
10 | class NoSortItem : public QListViewItem { | 10 | class NoSortItem : public QListViewItem { |
11 | public: | 11 | public: |
12 | NoSortItem ( QListView *lv, uint pos, const QString &str, const QCString &s1 = 0, const QCString &s2 = 0 ) | 12 | NoSortItem ( QListView *lv, uint pos, const QString &str, const QCString &s1 = 0, const QCString &s2 = 0 ) |
@@ -42,7 +42,7 @@ private: | |||
42 | }; | 42 | }; |
43 | 43 | ||
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 ) |
47 | { | 47 | { |
48 | setCaption ( tr( "%1 %2", "(hold|press) buttoname" ). arg( hold ? tr( "Held" ) : tr( "Pressed" )). arg ( b-> userText ( ))); | 48 | setCaption ( tr( "%1 %2", "(hold|press) buttoname" ). arg( hold ? tr( "Held" ) : tr( "Pressed" )). arg ( b-> userText ( ))); |
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 | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __REMAPDLG_H__ | 1 | #ifndef __REMAPDLG_H__ |
2 | #define __REMAPDLG_H__ | 2 | #define __REMAPDLG_H__ |
3 | 3 | ||
4 | #include <opie/odevicebutton.h> | 4 | #include <opie2/odevicebutton.h> |
5 | 5 | ||
6 | #include "remapdlgbase.h" | 6 | #include "remapdlgbase.h" |
7 | 7 | ||
@@ -12,10 +12,10 @@ class RemapDlg : public RemapDlgBase { | |||
12 | Q_OBJECT | 12 | Q_OBJECT |
13 | 13 | ||
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 | ||
20 | public slots: | 20 | public slots: |
21 | virtual void itemChanged ( QListViewItem * ); | 21 | virtual void itemChanged ( QListViewItem * ); |
@@ -25,8 +25,8 @@ private slots: | |||
25 | void delayedInit ( ); | 25 | void delayedInit ( ); |
26 | 26 | ||
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 | ||
31 | QListViewItem *m_current; | 31 | QListViewItem *m_current; |
32 | 32 | ||