ODP changes for the Styles

4 files changed, 7 insertions, 6 deletions

diff --git a/noncore/styles/liquid/config.in b/noncore/styles/liquid/config.in
index c0ad4cd..23f8637 100644
--- a/noncore/styles/liquid/config.in
+++ b/noncore/styles/liquid/config.in
@@ -1,4 +1,4 @@
   config LIQUID
     boolean "opie-liquid (Mosfet's well known Liquid GUI style from KDE)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBQTAUX
diff --git a/noncore/styles/liquid/liquid.pro b/noncore/styles/liquid/liquid.pro
index 4c4aaf4..c7d785d 100644
--- a/noncore/styles/liquid/liquid.pro
+++ b/noncore/styles/liquid/liquid.pro
@@ -7,13 +7,13 @@ SOURCES     =  liquid.cpp \
                
 HEADERS     =  liquid.h \
                effects.h \
                liquidset.h \
                plugin.h
                
-LIBS       += -lqpe -lopie
+LIBS       += -lqpe -lqtaux2
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = liquid
 VERSION      = 1.0.0
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/liquid/liquidset.cpp b/noncore/styles/liquid/liquidset.cpp
index a7cfccc..1bf60de 100644
--- a/noncore/styles/liquid/liquidset.cpp
+++ b/noncore/styles/liquid/liquidset.cpp
@@ -32,15 +32,16 @@
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 
 #include <qpe/config.h>
 
-#include <opie/ocolorbutton.h>
+#include <opie2/ocolorbutton.h>
 
 
+using namespace Opie;
 LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
 		: QWidget ( parent, name, fl )
 {
 	setCaption ( tr( "Liquid Style" ) );
 
 	Config config ( "qpe" );
diff --git a/noncore/styles/liquid/liquidset.h b/noncore/styles/liquid/liquidset.h
index 6d9555a..a54cc13 100644
--- a/noncore/styles/liquid/liquidset.h
+++ b/noncore/styles/liquid/liquidset.h
@@ -2,13 +2,13 @@
 #define __OPIE_LIQUID_SET_H__
 
 #include <qdialog.h>
 #include <qcolor.h>
 
 class QLabel;
-class OColorButton;
+namespace Opie {class OColorButton;}
 class QSlider;
 
 class LiquidSettings : public QWidget {
 	Q_OBJECT
 	
 public:
@@ -28,10 +28,10 @@ private:
 	
 	QSlider *     m_opacsld;
 	QSlider *     m_contsld;
 	QLabel *      m_menulbl;
 	QLabel *      m_textlbl;
 	QLabel *      m_opaclbl;
-	OColorButton *m_menubtn;
-	OColorButton *m_textbtn;
+	Opie::OColorButton *m_menubtn;
+	Opie::OColorButton *m_textbtn;
 };
 #endif