| author | zecke <zecke> | 2004-03-14 15:25:30 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-03-14 15:25:30 (UTC) |
| commit | 13aeeabab5f2a6262b33de83cc9559a49365e325 (patch) (side-by-side diff) | |
| tree | b82e8e4c4da0f867c9d4b4970226891087a52273 /noncore/styles | |
| parent | cf2499b03c783851e56049182c5e872d6dda3b63 (diff) | |
| download | opie-13aeeabab5f2a6262b33de83cc9559a49365e325.zip opie-13aeeabab5f2a6262b33de83cc9559a49365e325.tar.gz opie-13aeeabab5f2a6262b33de83cc9559a49365e325.tar.bz2 | |
ODP changes for the Styles
| -rw-r--r-- | noncore/styles/flat/config.in | 2 | ||||
| -rw-r--r-- | noncore/styles/fresh/config.in | 2 | ||||
| -rw-r--r-- | noncore/styles/liquid/config.in | 2 | ||||
| -rw-r--r-- | noncore/styles/liquid/liquid.pro | 2 | ||||
| -rw-r--r-- | noncore/styles/liquid/liquidset.cpp | 3 | ||||
| -rw-r--r-- | noncore/styles/liquid/liquidset.h | 6 | ||||
| -rw-r--r-- | noncore/styles/metal/config.in | 2 | ||||
| -rw-r--r-- | noncore/styles/theme/config.in | 2 |
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 @@ -3,2 +3,2 @@ 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 @@ -3,2 +3,2 @@ 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 @@ -3,2 +3,2 @@ 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 @@ -12,3 +12,3 @@ HEADERS = liquid.h \ -LIBS += -lqpe -lopie +LIBS += -lqpe -lqtaux2 INCLUDEPATH += $(OPIEDIR)/include 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 @@ -37,5 +37,6 @@ -#include <opie/ocolorbutton.h> +#include <opie2/ocolorbutton.h> +using namespace Opie; LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags 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 @@ -7,3 +7,3 @@ class QLabel; -class OColorButton; +namespace Opie {class OColorButton;} class QSlider; @@ -33,4 +33,4 @@ private: QLabel * m_opaclbl; - OColorButton *m_menubtn; - OColorButton *m_textbtn; + Opie::OColorButton *m_menubtn; + Opie::OColorButton *m_textbtn; }; 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 @@ -3,2 +3,2 @@ 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 @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) |