6 files changed, 18 insertions, 15 deletions

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 @@
     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
@@ -20,5 +20,5 @@ 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
@@ -29,5 +29,5 @@
 #include <qlayout.h>
 
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
 
 #include "launchersettings.h"
@@ -38,4 +38,5 @@
 #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
@@ -28,6 +28,7 @@
 #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
@@ -39,12 +39,13 @@
 #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:
@@ -354,5 +355,5 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 	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 );
@@ -420,5 +421,5 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
 	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
@@ -33,7 +33,7 @@
 
 class QButtonGroup;
-class OFontSelector;
+namespace Opie {namespace Ui {class OFontSelector;}}
 class SampleView;
-class OColorButton;
+namespace Opie {class OColorButton;}
 class QPushButton;
 class QCheckBox;
@@ -67,7 +67,7 @@ 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;