summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 15:25:30 (UTC)
committer zecke <zecke>2004-03-14 15:25:30 (UTC)
commit13aeeabab5f2a6262b33de83cc9559a49365e325 (patch) (side-by-side diff)
treeb82e8e4c4da0f867c9d4b4970226891087a52273
parentcf2499b03c783851e56049182c5e872d6dda3b63 (diff)
downloadopie-13aeeabab5f2a6262b33de83cc9559a49365e325.zip
opie-13aeeabab5f2a6262b33de83cc9559a49365e325.tar.gz
opie-13aeeabab5f2a6262b33de83cc9559a49365e325.tar.bz2
ODP changes for the Styles
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/flat/config.in2
-rw-r--r--noncore/styles/fresh/config.in2
-rw-r--r--noncore/styles/liquid/config.in2
-rw-r--r--noncore/styles/liquid/liquid.pro2
-rw-r--r--noncore/styles/liquid/liquidset.cpp3
-rw-r--r--noncore/styles/liquid/liquidset.h6
-rw-r--r--noncore/styles/metal/config.in2
-rw-r--r--noncore/styles/theme/config.in2
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
@@ -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
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 )