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
@@ -13,7 +13,7 @@ INTERFACES   = remapdlgbase.ui
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopie
+LIBS        += -lqpe -lopiecore2
         TARGET     = buttonsettings
 
 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 @@
 #include <qtimer.h>
 
 
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
 #include "buttonsettings.h"
 #include "buttonutils.h"
 #include "remapdlg.h"
 
-using namespace Opie;
+using namespace Opie::Core;
 
 struct buttoninfo {
         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 @@
 
 #include <qdialog.h>
 #include <qlist.h>
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
 class QTimer;
 
-using namespace Opie;
 
 class buttoninfo;
 
@@ -61,7 +60,7 @@ private:
         buttoninfo *buttonInfoForKeycode ( ushort key );
         
         void edit ( buttoninfo *bi, bool hold );
-        QString qcopToString ( const OQCopMessage &c );
+        QString qcopToString ( const Opie::Core::OQCopMessage &c );
 
         private:
         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 @@
 
 using namespace Opie;
 
+using namespace Opie::Core;
 struct predef_qcop {
         const char *m_text;
         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 @@
 #ifndef __BUTTON_UTILS_H__
 #define __BUTTON_UTILS_H__
 
-#include <opie/odevicebutton.h>
+#include <opie2/odevicebutton.h>
 
 class AppLnkSet;
 class QListViewItem;
@@ -51,7 +51,7 @@ public:
 
         static ButtonUtils *inst ( );
         
-        qCopInfo messageToInfo ( const Opie::OQCopMessage & );
+        qCopInfo messageToInfo ( const Opie::Core::OQCopMessage & );
 
         void insertActions ( QListViewItem *here );
         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 @@
   config BUTTON-SETTINGS
     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
@@ -27,6 +27,7 @@
 
 #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
@@ -5,8 +5,8 @@
 #include "remapdlg.h"
 #include "buttonutils.h"
 
-using namespace Opie;
 
+using namespace Opie::Core;
 class NoSortItem : public QListViewItem {
 public:
   NoSortItem ( QListView *lv, uint pos, const QString &str, const QCString &s1 = 0, const QCString &s2 = 0 )
@@ -42,7 +42,7 @@ 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 )
 {
   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 @@
 #ifndef __REMAPDLG_H__
 #define __REMAPDLG_H__
 
-#include <opie/odevicebutton.h>
+#include <opie2/odevicebutton.h>
 
 #include "remapdlgbase.h"
 
@@ -12,10 +12,10 @@ class RemapDlg : public RemapDlgBase {
     Q_OBJECT
 
 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:
         virtual void itemChanged ( QListViewItem * );
@@ -25,8 +25,8 @@ private slots:
         void delayedInit ( );
 
 private:
-        Opie::OQCopMessage m_msg;
-        Opie::OQCopMessage m_msg_preset;
+        Opie::Core::OQCopMessage m_msg;
+        Opie::Core::OQCopMessage m_msg_preset;
         
         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
@@ -1,4 +1,4 @@
   config CITYTIME
     boolean "opie-citytime (Time-zone / world clock settings)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    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 @@
 #include "citytime.h"
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 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
@@ -1,4 +1,4 @@
   config LAUNCHER-SETTINGS
     boolean "opie-launcher-settings (Opie taskbar settings)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    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 \
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopie
+LIBS        += -lqpe -lopiecore2 -lopieui2 -lqtaux2
 TARGET       = launchersettings
 
 
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 @@
 
 #include <qlayout.h>
 
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
 
 #include "launchersettings.h"
 #include "tabssettings.h"
@@ -37,6 +37,7 @@
 #include "inputmethodsettings.h"
 #include "doctabsettings.h"
 
+using namespace Opie::Ui;
 LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) 
     : 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
@@ -27,8 +27,9 @@
 
 #include "launchersettings.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> )
 
 
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 @@
 #include <qwhatsthis.h>
 #include <qcheckbox.h>
 
-#include <opie/ofontselector.h>
-#include <opie/otabwidget.h>
-#include <opie/ocolorbutton.h>
-#include <opie/ofiledialog.h>
+#include <opie2/ofontselector.h>
+#include <opie2/otabwidget.h>
+#include <opie2/ocolorbutton.h>
+#include <opie2/ofiledialog.h>
 
 #include "tabdialog.h"
 
 
+using namespace Opie::Ui;
 class SampleItem : public QIconViewItem {
 public:
         SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text )
@@ -353,7 +354,7 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
     hb-> addWidget ( rb );
         hb-> addSpacing ( 10 );
 
-        m_solidcolor = new OColorButton ( tab, QColor ( m_tc. m_bg_color ) );
+        m_solidcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_bg_color ) );
         connect ( m_solidcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( bgColorClicked(const QColor&)));
         hb-> addWidget ( m_solidcolor );
         hb-> addStretch ( 10 );
@@ -419,7 +420,7 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
         label = new QLabel ( tr( "Color:" ), tab );
         gridLayout-> addWidget ( label, 3, 0 );
 
-        m_iconcolor = new OColorButton ( tab, QColor ( m_tc. m_text_color ) );
+        m_iconcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_text_color ) );
         connect ( m_iconcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( iconColorClicked(const QColor&)));
         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
@@ -32,9 +32,9 @@
 #include "tabconfig.h"
 
 class QButtonGroup;
-class OFontSelector;
+namespace Opie {namespace Ui {class OFontSelector;}}
 class SampleView;
-class OColorButton;
+namespace Opie {class OColorButton;}
 class QPushButton;
 class QCheckBox;
 
@@ -66,9 +66,9 @@ private:
 private:
         SampleView *m_sample;
         QButtonGroup *m_iconsize;
-        OFontSelector *m_fontselect;
-        OColorButton *m_solidcolor;
-        OColorButton *m_iconcolor;
+        Opie::Ui::OFontSelector *m_fontselect;
+        Opie::OColorButton *m_solidcolor;
+        Opie::OColorButton *m_iconcolor;
         QPushButton *m_imagebrowse;
                 QString m_bgimage;
         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 @@
   config LIGHT-AND-POWER
     boolean "opie-light-and-power (apm and energy saving settings)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    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 @@
 
 
 
-using namespace Opie;
+using namespace Opie::Core;
 
 LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
         : 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 @@
 #include <opie2/oapplicationfactory.h>
 
 
+using namespace Opie::Core;
 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
@@ -35,7 +35,7 @@
 #include <qslider.h>
 #include <qspinbox.h>
 
-using namespace Opie;
+using namespace Opie::Core;
 
 Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
         : 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 @@
   config SECURITY
     boolean "opie-security (to set a pin for PDA usage protection)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    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 @@
 
 #include "security.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<Security> )