ODP changes for the Styles

8 files changed, 11 insertions, 10 deletions

diff --git a/noncore/styles/flat/config.in b/noncore/styles/flat/config.in
index a577320..63ef72c 100644
--- a/noncore/styles/flat/config.in
+++ b/noncore/styles/flat/config.in
@@ -1,4 +1,4 @@
   config FLAT
     boolean "opie-style-flat (Simple, flat widget style)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/noncore/styles/fresh/config.in b/noncore/styles/fresh/config.in
index f8f5318..456a63f 100644
--- a/noncore/styles/fresh/config.in
+++ b/noncore/styles/fresh/config.in
@@ -1,4 +1,4 @@
   config FRESH
     boolean "opie-style-fresh (Simple widget style)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
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
@@ -10,7 +10,7 @@ HEADERS     =  liquid.h \
                liquidset.h \
                plugin.h
                
-LIBS       += -lqpe -lopie
+LIBS       += -lqpe -lqtaux2
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/plugins/styles
 TARGET       = liquid
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
@@ -35,9 +35,10 @@
 
 #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 )
 {
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
@@ -5,7 +5,7 @@
 #include <qcolor.h>
 
 class QLabel;
-class OColorButton;
+namespace Opie {class OColorButton;}
 class QSlider;
 
 class LiquidSettings : public QWidget {
@@ -31,7 +31,7 @@ private:
 	QLabel *      m_menulbl;
 	QLabel *      m_textlbl;
 	QLabel *      m_opaclbl;
-	OColorButton *m_menubtn;
-	OColorButton *m_textbtn;
+	Opie::OColorButton *m_menubtn;
+	Opie::OColorButton *m_textbtn;
 };
 #endif
diff --git a/noncore/styles/metal/config.in b/noncore/styles/metal/config.in
index 413902b..800ca38 100644
--- a/noncore/styles/metal/config.in
+++ b/noncore/styles/metal/config.in
@@ -1,4 +1,4 @@
   config METAL
     boolean "opie-metal (Metal style)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/noncore/styles/theme/config.in b/noncore/styles/theme/config.in
index 37fa5b6..68452c8 100644
--- a/noncore/styles/theme/config.in
+++ b/noncore/styles/theme/config.in
@@ -1,4 +1,4 @@
   config THEME
     boolean "opie-theme (theme support including opie-theme-luna)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 )