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 | |
parent | a3726e8ae25805d215d0fd5c249345aad9952ef3 (diff) | |
download | opie-617e15d4cdbe7bc962388f9710bce834182bee24.zip opie-617e15d4cdbe7bc962388f9710bce834182bee24.tar.gz opie-617e15d4cdbe7bc962388f9710bce834182bee24.tar.bz2 |
ODP change
23 files changed, 45 insertions, 38 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 | |||
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 | ||
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 @@ | |||
31 | 31 | ||
32 | 32 | ||
33 | #include <opie/odevice.h> | 33 | #include <opie2/odevice.h> |
34 | 34 | ||
35 | #include "buttonsettings.h" | 35 | #include "buttonsettings.h" |
@@ -37,5 +37,5 @@ | |||
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 { |
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 @@ | |||
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; |
@@ -62,5 +61,5 @@ private: | |||
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: |
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 @@ | |||
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; |
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 @@ | |||
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; |
@@ -52,5 +52,5 @@ public: | |||
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 ); |
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 @@ | |||
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 | |||
@@ -28,5 +28,6 @@ | |||
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 | |||
@@ -6,6 +6,6 @@ | |||
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: |
@@ -43,5 +43,5 @@ private: | |||
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 | { |
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 @@ | |||
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" |
@@ -13,8 +13,8 @@ class RemapDlg : public RemapDlgBase { | |||
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: |
@@ -26,6 +26,6 @@ private slots: | |||
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; |
diff --git a/core/settings/citytime/config.in b/core/settings/citytime/config.in index 295b8b8..be1bb71 100644 --- a/core/settings/citytime/config.in +++ b/core/settings/citytime/config.in | |||
@@ -2,3 +2,3 @@ | |||
2 | boolean "opie-citytime (Time-zone / world clock settings)" | 2 | boolean "opie-citytime (Time-zone / world clock settings)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |
diff --git a/core/settings/citytime/main.cpp b/core/settings/citytime/main.cpp index 7fb76ec..3f22621 100644 --- a/core/settings/citytime/main.cpp +++ b/core/settings/citytime/main.cpp | |||
@@ -22,3 +22,4 @@ | |||
22 | #include <opie2/oapplicationfactory.h> | 22 | #include <opie2/oapplicationfactory.h> |
23 | 23 | ||
24 | using namespace Opie::Core; | ||
24 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<CityTime> ) | 25 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<CityTime> ) |
diff --git a/core/settings/launcher/config.in b/core/settings/launcher/config.in index e167313..226da3c 100644 --- a/core/settings/launcher/config.in +++ b/core/settings/launcher/config.in | |||
@@ -2,3 +2,3 @@ | |||
2 | boolean "opie-launcher-settings (Opie taskbar settings)" | 2 | boolean "opie-launcher-settings (Opie taskbar settings)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBQTAUX |
diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro index 3261ee8..e3f1060 100644 --- a/core/settings/launcher/launcher.pro +++ b/core/settings/launcher/launcher.pro | |||
@@ -20,5 +20,5 @@ SOURCES = main.cpp \ | |||
20 | INCLUDEPATH += $(OPIEDIR)/include | 20 | INCLUDEPATH += $(OPIEDIR)/include |
21 | DEPENDPATH += $(OPIEDIR)/include | 21 | DEPENDPATH += $(OPIEDIR)/include |
22 | LIBS += -lqpe -lopie | 22 | LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2 |
23 | TARGET = launchersettings | 23 | TARGET = launchersettings |
24 | 24 | ||
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp index 5c11cc8..5efd297 100644 --- a/core/settings/launcher/launchersettings.cpp +++ b/core/settings/launcher/launchersettings.cpp | |||
@@ -29,5 +29,5 @@ | |||
29 | #include <qlayout.h> | 29 | #include <qlayout.h> |
30 | 30 | ||
31 | #include <opie/otabwidget.h> | 31 | #include <opie2/otabwidget.h> |
32 | 32 | ||
33 | #include "launchersettings.h" | 33 | #include "launchersettings.h" |
@@ -38,4 +38,5 @@ | |||
38 | #include "doctabsettings.h" | 38 | #include "doctabsettings.h" |
39 | 39 | ||
40 | using namespace Opie::Ui; | ||
40 | LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) | 41 | LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) |
41 | : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) | 42 | : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) |
diff --git a/core/settings/launcher/main.cpp b/core/settings/launcher/main.cpp index bcfdcf6..b27381a 100644 --- a/core/settings/launcher/main.cpp +++ b/core/settings/launcher/main.cpp | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "launchersettings.h" | 28 | #include "launchersettings.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<LauncherSettings> ) | 33 | OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> ) |
33 | 34 | ||
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index c0d1cf2..763b360 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp | |||
@@ -39,12 +39,13 @@ | |||
39 | #include <qcheckbox.h> | 39 | #include <qcheckbox.h> |
40 | 40 | ||
41 | #include <opie/ofontselector.h> | 41 | #include <opie2/ofontselector.h> |
42 | #include <opie/otabwidget.h> | 42 | #include <opie2/otabwidget.h> |
43 | #include <opie/ocolorbutton.h> | 43 | #include <opie2/ocolorbutton.h> |
44 | #include <opie/ofiledialog.h> | 44 | #include <opie2/ofiledialog.h> |
45 | 45 | ||
46 | #include "tabdialog.h" | 46 | #include "tabdialog.h" |
47 | 47 | ||
48 | 48 | ||
49 | using namespace Opie::Ui; | ||
49 | class SampleItem : public QIconViewItem { | 50 | class SampleItem : public QIconViewItem { |
50 | public: | 51 | public: |
@@ -354,5 +355,5 @@ QWidget *TabDialog::createBgTab ( QWidget *parent ) | |||
354 | hb-> addSpacing ( 10 ); | 355 | hb-> addSpacing ( 10 ); |
355 | 356 | ||
356 | m_solidcolor = new OColorButton ( tab, QColor ( m_tc. m_bg_color ) ); | 357 | m_solidcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_bg_color ) ); |
357 | connect ( m_solidcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( bgColorClicked(const QColor&))); | 358 | connect ( m_solidcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( bgColorClicked(const QColor&))); |
358 | hb-> addWidget ( m_solidcolor ); | 359 | hb-> addWidget ( m_solidcolor ); |
@@ -420,5 +421,5 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) | |||
420 | gridLayout-> addWidget ( label, 3, 0 ); | 421 | gridLayout-> addWidget ( label, 3, 0 ); |
421 | 422 | ||
422 | m_iconcolor = new OColorButton ( tab, QColor ( m_tc. m_text_color ) ); | 423 | m_iconcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_text_color ) ); |
423 | connect ( m_iconcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( iconColorClicked(const QColor&))); | 424 | connect ( m_iconcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( iconColorClicked(const QColor&))); |
424 | gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); | 425 | gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); |
diff --git a/core/settings/launcher/tabdialog.h b/core/settings/launcher/tabdialog.h index 4f99d5d..46b7ae9 100644 --- a/core/settings/launcher/tabdialog.h +++ b/core/settings/launcher/tabdialog.h | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | class QButtonGroup; | 34 | class QButtonGroup; |
35 | class OFontSelector; | 35 | namespace Opie {namespace Ui {class OFontSelector;}} |
36 | class SampleView; | 36 | class SampleView; |
37 | class OColorButton; | 37 | namespace Opie {class OColorButton;} |
38 | class QPushButton; | 38 | class QPushButton; |
39 | class QCheckBox; | 39 | class QCheckBox; |
@@ -67,7 +67,7 @@ private: | |||
67 | SampleView *m_sample; | 67 | SampleView *m_sample; |
68 | QButtonGroup *m_iconsize; | 68 | QButtonGroup *m_iconsize; |
69 | OFontSelector *m_fontselect; | 69 | Opie::Ui::OFontSelector *m_fontselect; |
70 | OColorButton *m_solidcolor; | 70 | Opie::OColorButton *m_solidcolor; |
71 | OColorButton *m_iconcolor; | 71 | Opie::OColorButton *m_iconcolor; |
72 | QPushButton *m_imagebrowse; | 72 | QPushButton *m_imagebrowse; |
73 | QString m_bgimage; | 73 | QString m_bgimage; |
diff --git a/core/settings/light-and-power/config.in b/core/settings/light-and-power/config.in index 96346bb..ef2a42f 100644 --- a/core/settings/light-and-power/config.in +++ b/core/settings/light-and-power/config.in | |||
@@ -2,3 +2,3 @@ | |||
2 | boolean "opie-light-and-power (apm and energy saving settings)" | 2 | boolean "opie-light-and-power (apm and energy saving settings)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index 09fb767..ebcc25c 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp | |||
@@ -49,5 +49,5 @@ | |||
49 | 49 | ||
50 | 50 | ||
51 | using namespace Opie; | 51 | using namespace Opie::Core; |
52 | 52 | ||
53 | LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | 53 | LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) |
diff --git a/core/settings/light-and-power/main.cpp b/core/settings/light-and-power/main.cpp index 7a47b0b..1fc167d 100644 --- a/core/settings/light-and-power/main.cpp +++ b/core/settings/light-and-power/main.cpp | |||
@@ -24,3 +24,4 @@ | |||
24 | 24 | ||
25 | 25 | ||
26 | using namespace Opie::Core; | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<LightSettings> ) | 27 | OPIE_EXPORT_APP( OApplicationFactory<LightSettings> ) |
diff --git a/core/settings/light-and-power/sensor.cpp b/core/settings/light-and-power/sensor.cpp index 53c3aed..a700a64 100644 --- a/core/settings/light-and-power/sensor.cpp +++ b/core/settings/light-and-power/sensor.cpp | |||
@@ -36,5 +36,5 @@ | |||
36 | #include <qspinbox.h> | 36 | #include <qspinbox.h> |
37 | 37 | ||
38 | using namespace Opie; | 38 | using namespace Opie::Core; |
39 | 39 | ||
40 | Sensor::Sensor ( QStringList ¶ms, QWidget *parent, const char *name ) | 40 | Sensor::Sensor ( QStringList ¶ms, QWidget *parent, const char *name ) |
diff --git a/core/settings/security/config.in b/core/settings/security/config.in index 0973349..14876da 100644 --- a/core/settings/security/config.in +++ b/core/settings/security/config.in | |||
@@ -2,3 +2,3 @@ | |||
2 | boolean "opie-security (to set a pin for PDA usage protection)" | 2 | boolean "opie-security (to set a pin for PDA usage protection)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/settings/security/main.cpp b/core/settings/security/main.cpp index aed8ab2..200a541 100644 --- a/core/settings/security/main.cpp +++ b/core/settings/security/main.cpp | |||
@@ -22,6 +22,7 @@ | |||
22 | #include "security.h" | 22 | #include "security.h" |
23 | 23 | ||
24 | #include <opie/oapplicationfactory.h> | 24 | #include <opie2/oapplicationfactory.h> |
25 | 25 | ||
26 | using namespace Opie::Core; | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<Security> ) | 27 | OPIE_EXPORT_APP( OApplicationFactory<Security> ) |
27 | 28 | ||