summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore 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
@@ -15,3 +15,3 @@ INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiecore2
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 @@
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
@@ -38,3 +38,3 @@
-using namespace Opie;
+using namespace Opie::Core;
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 @@
#include <qlist.h>
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
@@ -36,3 +36,2 @@ class QTimer;
-using namespace Opie;
@@ -63,3 +62,3 @@ private:
void edit ( buttoninfo *bi, bool hold );
- QString qcopToString ( const OQCopMessage &c );
+ QString qcopToString ( const Opie::Core::OQCopMessage &c );
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;
+using namespace Opie::Core;
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 @@
-#include <opie/odevicebutton.h>
+#include <opie2/odevicebutton.h>
@@ -53,3 +53,3 @@ public:
- qCopInfo messageToInfo ( const Opie::OQCopMessage & );
+ qCopInfo messageToInfo ( const Opie::Core::OQCopMessage & );
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 @@
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
@@ -29,4 +29,5 @@
-#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
@@ -7,4 +7,4 @@
-using namespace Opie;
+using namespace Opie::Core;
class NoSortItem : public QListViewItem {
@@ -44,3 +44,3 @@ 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 )
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 @@
-#include <opie/odevicebutton.h>
+#include <opie2/odevicebutton.h>
@@ -14,6 +14,6 @@ class RemapDlg : public RemapDlgBase {
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 ( );
@@ -27,4 +27,4 @@ private slots:
private:
- Opie::OQCopMessage m_msg;
- Opie::OQCopMessage m_msg_preset;
+ Opie::Core::OQCopMessage m_msg;
+ Opie::Core::OQCopMessage m_msg_preset;
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
@@ -3,2 +3,2 @@
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
@@ -23,2 +23,3 @@
+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
@@ -3,2 +3,2 @@
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
@@ -21,3 +21,3 @@ 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
@@ -30,3 +30,3 @@
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
@@ -39,2 +39,3 @@
+using namespace Opie::Ui;
LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags)
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
@@ -29,4 +29,5 @@
-#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
@@ -40,6 +40,6 @@
-#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>
@@ -48,2 +48,3 @@
+using namespace Opie::Ui;
class SampleItem : public QIconViewItem {
@@ -355,3 +356,3 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
- 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&)));
@@ -421,3 +422,3 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
- 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&)));
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
@@ -34,5 +34,5 @@
class QButtonGroup;
-class OFontSelector;
+namespace Opie {namespace Ui {class OFontSelector;}}
class SampleView;
-class OColorButton;
+namespace Opie {class OColorButton;}
class QPushButton;
@@ -68,5 +68,5 @@ private:
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;
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
@@ -3,2 +3,2 @@
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
@@ -50,3 +50,3 @@
-using namespace Opie;
+using namespace Opie::Core;
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
@@ -25,2 +25,3 @@
+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
@@ -37,3 +37,3 @@
-using namespace Opie;
+using namespace Opie::Core;
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
@@ -3,2 +3,2 @@
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
@@ -23,4 +23,5 @@
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_EXPORT_APP( OApplicationFactory<Security> )