| -rw-r--r-- | noncore/styles/liquid/config.in | 2 | ||||
| -rw-r--r-- | noncore/styles/liquid/liquid.cpp | 27 | ||||
| -rw-r--r-- | noncore/styles/liquid/liquid.pro | 6 |
3 files changed, 20 insertions, 15 deletions
diff --git a/noncore/styles/liquid/config.in b/noncore/styles/liquid/config.in index 23f8637..cffdb39 100644 --- a/noncore/styles/liquid/config.in +++ b/noncore/styles/liquid/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBQTAUX + depends ( LIBQPE || LIBQPE-X11 ) && LIBQTAUX && LIBOPIE2CORE diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index bac882c..51814e7 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp @@ -13,8 +13,15 @@ -#include <qmenudata.h> #include "liquid.h" -//#include "liquiddeco.h" -#include <qapplication.h> +#include "effects.h" +#include "htmlmasks.h" +#include "embeddata.h" + +/* OPIE */ +#include <opie2/odebug.h> #include <qpe/config.h> -#include "effects.h" +using namespace Opie::Core; + +/* QT */ +#include <qmenudata.h> +#include <qapplication.h> #include <qpalette.h> @@ -33,3 +40,2 @@ #include <qheader.h> -#include <unistd.h> #include <qmenubar.h> @@ -39,7 +45,6 @@ +/* STD */ +#include <unistd.h> #include <stdio.h> -#include "htmlmasks.h" -#include "embeddata.h" - @@ -151,3 +156,3 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev) type == Custom){ -// qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width()); +// owarn << "Deleting menu pixmap, width " << pixDict.find(p->winId())->width() << "" << oendl; @@ -496,3 +501,3 @@ QPixmap* LiquidStyle::processEmbedded(const char *label, int h, int s, int v, if(img.isNull()){ // shouldn't happen, been tested - qWarning("Invalid embedded label %s", label); + owarn << "Invalid embedded label " << label << "" << oendl; return(NULL); @@ -862,3 +867,3 @@ void LiquidStyle::polish(QWidget *w) palette().active().brush(QColorGroup::Background).pixmap()){ - qWarning("No parent pixmap for child widget %s", w->className()); + owarn << "No parent pixmap for child widget " << w->className() << "" << oendl; return; diff --git a/noncore/styles/liquid/liquid.pro b/noncore/styles/liquid/liquid.pro index 7fe2829..767007f 100644 --- a/noncore/styles/liquid/liquid.pro +++ b/noncore/styles/liquid/liquid.pro @@ -1,3 +1,3 @@ TEMPLATE = lib -CONFIG = qt plugin embedded warn_on +CONFIG = qt plugin embedded warn_on SOURCES = liquid.cpp \ @@ -12,3 +12,3 @@ HEADERS = liquid.h \ -LIBS += -lqpe -lqtaux2 +LIBS += -lqpe -lqtaux2 -lopiecore2 INCLUDEPATH += $(OPIEDIR)/include @@ -16,3 +16,3 @@ DESTDIR = $(OPIEDIR)/plugins/styles TARGET = liquid -VERSION = 1.0.0 +VERSION = 1.0.1 |