summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 18:42:05 (UTC)
committer zecke <zecke>2004-03-14 18:42:05 (UTC)
commit617e15d4cdbe7bc962388f9710bce834182bee24 (patch) (unidiff)
tree2c714b53d47c7421abc424b68c692dbe005bf598
parenta3726e8ae25805d215d0fd5c249345aad9952ef3 (diff)
downloadopie-617e15d4cdbe7bc962388f9710bce834182bee24.zip
opie-617e15d4cdbe7bc962388f9710bce834182bee24.tar.gz
opie-617e15d4cdbe7bc962388f9710bce834182bee24.tar.bz2
ODP change
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/settings/button/button.pro2
-rw-r--r--core/settings/button/buttonsettings.cpp4
-rw-r--r--core/settings/button/buttonsettings.h5
-rw-r--r--core/settings/button/buttonutils.cpp1
-rw-r--r--core/settings/button/buttonutils.h4
-rw-r--r--core/settings/button/config.in2
-rw-r--r--core/settings/button/main.cpp3
-rw-r--r--core/settings/button/remapdlg.cpp4
-rw-r--r--core/settings/button/remapdlg.h10
-rw-r--r--core/settings/citytime/config.in2
-rw-r--r--core/settings/citytime/main.cpp1
-rw-r--r--core/settings/launcher/config.in2
-rw-r--r--core/settings/launcher/launcher.pro2
-rw-r--r--core/settings/launcher/launchersettings.cpp3
-rw-r--r--core/settings/launcher/main.cpp3
-rw-r--r--core/settings/launcher/tabdialog.cpp13
-rw-r--r--core/settings/launcher/tabdialog.h10
-rw-r--r--core/settings/light-and-power/config.in2
-rw-r--r--core/settings/light-and-power/light.cpp2
-rw-r--r--core/settings/light-and-power/main.cpp1
-rw-r--r--core/settings/light-and-power/sensor.cpp2
-rw-r--r--core/settings/security/config.in2
-rw-r--r--core/settings/security/main.cpp3
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
@@ -13,7 +13,7 @@ INTERFACES = remapdlgbase.ui
13 13
14INCLUDEPATH += $(OPIEDIR)/include 14INCLUDEPATH += $(OPIEDIR)/include
15DEPENDPATH += $(OPIEDIR)/include 15DEPENDPATH += $(OPIEDIR)/include
16LIBS += -lqpe -lopie 16LIBS += -lqpe -lopiecore2
17 TARGET = buttonsettings 17 TARGET = buttonsettings
18 18
19include ( $(OPIEDIR)/include.pro ) 19include ( $(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
39using namespace Opie; 39using namespace Opie::Core;
40 40
41struct buttoninfo { 41struct 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
35class QTimer; 35class QTimer;
36 36
37using namespace Opie;
38 37
39class buttoninfo; 38class 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
11using namespace Opie; 11using namespace Opie;
12 12
13using namespace Opie::Core;
13struct predef_qcop { 14struct 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
33class AppLnkSet; 33class AppLnkSet;
34class QListViewItem; 34class 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
32using namespace Opie::Core;
32OPIE_EXPORT_APP( OApplicationFactory<ButtonSettings> ) 33OPIE_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
8using namespace Opie;
9 8
9using namespace Opie::Core;
10class NoSortItem : public QListViewItem { 10class NoSortItem : public QListViewItem {
11public: 11public:
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
45RemapDlg::RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget *parent, const char *name ) 45RemapDlg::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
14public: 14public:
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
20public slots: 20public 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
27private: 27private:
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
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
@@ -1,4 +1,4 @@
1 config CITYTIME 1 config CITYTIME
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
@@ -21,4 +21,5 @@
21#include "citytime.h" 21#include "citytime.h"
22#include <opie2/oapplicationfactory.h> 22#include <opie2/oapplicationfactory.h>
23 23
24using namespace Opie::Core;
24OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<CityTime> ) 25OPIE_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
@@ -1,4 +1,4 @@
1 config LAUNCHER-SETTINGS 1 config LAUNCHER-SETTINGS
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
@@ -19,7 +19,7 @@ SOURCES = main.cpp \
19 19
20INCLUDEPATH += $(OPIEDIR)/include 20INCLUDEPATH += $(OPIEDIR)/include
21DEPENDPATH += $(OPIEDIR)/include 21DEPENDPATH += $(OPIEDIR)/include
22LIBS += -lqpe -lopie 22LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2
23TARGET = launchersettings 23TARGET = launchersettings
24 24
25 25
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
@@ -28,7 +28,7 @@
28 28
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"
34#include "tabssettings.h" 34#include "tabssettings.h"
@@ -37,6 +37,7 @@
37#include "inputmethodsettings.h" 37#include "inputmethodsettings.h"
38#include "doctabsettings.h" 38#include "doctabsettings.h"
39 39
40using namespace Opie::Ui;
40LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) 41LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags)
41 : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) 42 : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp )
42{ 43{
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
@@ -27,8 +27,9 @@
27 27
28#include "launchersettings.h" 28#include "launchersettings.h"
29 29
30#include <opie/oapplicationfactory.h> 30#include <opie2/oapplicationfactory.h>
31 31
32using namespace Opie::Core;
32OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> ) 33OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> )
33 34
34 35
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
@@ -38,14 +38,15 @@
38#include <qwhatsthis.h> 38#include <qwhatsthis.h>
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
49using namespace Opie::Ui;
49class SampleItem : public QIconViewItem { 50class SampleItem : public QIconViewItem {
50public: 51public:
51 SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) 52 SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text )
@@ -353,7 +354,7 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
353 hb-> addWidget ( rb ); 354 hb-> addWidget ( rb );
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 );
359 hb-> addStretch ( 10 ); 360 hb-> addStretch ( 10 );
@@ -419,7 +420,7 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
419 label = new QLabel ( tr( "Color:" ), tab ); 420 label = new QLabel ( tr( "Color:" ), tab );
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 );
425 426
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
@@ -32,9 +32,9 @@
32#include "tabconfig.h" 32#include "tabconfig.h"
33 33
34class QButtonGroup; 34class QButtonGroup;
35class OFontSelector; 35namespace Opie {namespace Ui {class OFontSelector;}}
36class SampleView; 36class SampleView;
37class OColorButton; 37namespace Opie {class OColorButton;}
38class QPushButton; 38class QPushButton;
39class QCheckBox; 39class QCheckBox;
40 40
@@ -66,9 +66,9 @@ private:
66private: 66private:
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;
74 QButtonGroup *m_bgtype; 74 QButtonGroup *m_bgtype;
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
@@ -1,4 +1,4 @@
1 config LIGHT-AND-POWER 1 config LIGHT-AND-POWER
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
@@ -48,7 +48,7 @@
48 48
49 49
50 50
51using namespace Opie; 51using namespace Opie::Core;
52 52
53LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) 53LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
54 : LightSettingsBase( parent, name, false, WStyle_ContextHelp ) 54 : LightSettingsBase( parent, name, false, WStyle_ContextHelp )
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
@@ -23,4 +23,5 @@
23#include <opie2/oapplicationfactory.h> 23#include <opie2/oapplicationfactory.h>
24 24
25 25
26using namespace Opie::Core;
26OPIE_EXPORT_APP( OApplicationFactory<LightSettings> ) 27OPIE_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
@@ -35,7 +35,7 @@
35#include <qslider.h> 35#include <qslider.h>
36#include <qspinbox.h> 36#include <qspinbox.h>
37 37
38using namespace Opie; 38using namespace Opie::Core;
39 39
40Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name ) 40Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
41 : SensorBase ( parent, name, true, WStyle_ContextHelp ), m_params ( params ) 41 : SensorBase ( parent, name, true, WStyle_ContextHelp ), m_params ( params )
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
@@ -1,4 +1,4 @@
1 config SECURITY 1 config SECURITY
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
@@ -21,8 +21,9 @@
21 21
22#include "security.h" 22#include "security.h"
23 23
24#include <opie/oapplicationfactory.h> 24#include <opie2/oapplicationfactory.h>
25 25
26using namespace Opie::Core;
26OPIE_EXPORT_APP( OApplicationFactory<Security> ) 27OPIE_EXPORT_APP( OApplicationFactory<Security> )
27 28
28 29