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
@@ -1,19 +1,19 @@
 TEMPLATE    =  lib
 CONFIG       = qt plugin embedded release warn_on
 SOURCES     =  liquid.cpp \
                effects.cpp \
                liquidset.cpp \
                plugin.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
@@ -14,51 +14,52 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 
 
 #include "liquidset.h"
 #include "liquid.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
 
 #include <qslider.h>
 #include <qcombobox.h>
 #include <qradiobutton.h>
 #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" );
     config. setGroup ( "Liquid-Style" );
 
         m_type       = config. readNumEntry ( "Type", TransStippleBg );
         QColor mcol  = QColor ( config. readEntry ( "Color",  QApplication::palette ( ). active ( ). button ( ). name ( )));
         QColor tcol  = QColor ( config. readEntry ( "TextColor", QApplication::palette ( ). active ( ). text ( ). name ( )));
         int opacity  = config. readNumEntry ( "Opacity", 10 );
         m_shadow     = config. readBoolEntry ( "ShadowText", true );
         int contrast = config. readNumEntry ( "StippleContrast", 5 );
         m_flat       = config. readBoolEntry ( "FlatToolButtons", false );
 
         QVBoxLayout *vbox = new QVBoxLayout ( this );
         vbox-> setSpacing ( 3 );
         vbox-> setMargin ( 4 );
 
         QComboBox *cb = new QComboBox ( this );
         cb-> insertItem ( tr( "No translucency" ), None );
         cb-> insertItem ( tr( "Stippled, background color" ), StippledBg );
         cb-> insertItem ( tr( "Stippled, button color" ), StippledBtn );
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
@@ -1,37 +1,37 @@
 #ifndef __OPIE_LIQUID_SET_H__
 #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:
         LiquidSettings ( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
 
 public slots:
         void changeType ( int t );
         void changeShadow ( bool b );
         void changeFlat ( bool b );
 
         virtual bool writeConfig ( );
         
 private:
         int    m_type;
         bool   m_shadow;
         bool   m_flat;
         
         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
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 )