- Fix a bug in the original liquid regarding slider handles and bg

  pixmaps (volume-applet, reported by Harlekin)
- Fix some "unused variable" compiler warnings
- Regenerated QPL diff

2 files changed, 95 insertions, 30 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 9a7d2dd..313d52c 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1829,4 +1829,4 @@ QSize LiquidStyle::exclusiveIndicatorSize() const
 
-void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int w,
-                                        int h, const QColorGroup &g, bool on,
+void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/,
+                                        int /*h*/, const QColorGroup &/*g*/, bool on,
                                         bool down, bool)
@@ -1872,4 +1872,4 @@ QSize LiquidStyle::indicatorSize() const
 
-void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h,
-                            const QColorGroup &g, int state, bool down, bool)
+void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/,
+                            const QColorGroup &/*g*/, int state, bool /*down*/, bool)
 {
@@ -1911,4 +1911,4 @@ void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h,
 
-void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h,
-                                   int state)
+void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
+                                   int /*state*/)
 {
@@ -1920,3 +1920,3 @@ void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h,
 void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
-                         const QColorGroup &g, Orientation orient,
+                         const QColorGroup &/*g*/, Orientation orient,
                          bool, bool)
@@ -1925,4 +1925,3 @@ void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
     p->setBrushOrigin(parent->pos());
-    p->fillRect(x, y, w, h,
-                QApplication::palette().active().brush(QColorGroup::Background));
+    parent->erase(x, y, w, h);
     p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) :
@@ -1931,3 +1930,3 @@ void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
 
-void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int w, int h,
+void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
                              Orientation orient, bool, bool)
@@ -1982,3 +1981,3 @@ void LiquidStyle::drawArrow(QPainter *p, Qt::ArrowType type, bool on, int x,
 void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
-                            QMenuItem *mi, QColorGroup &g, bool enabled, bool active )
+                            QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active )
         {
@@ -2036,4 +2035,4 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
 void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h,
-                                 const QColorGroup &g, int lineWidth,
-                                 const QBrush * fill)
+                                 const QColorGroup &g, int /*lineWidth*/,
+                                 const QBrush * /*fill*/)
 {
diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff
index ef7300d..bcbdc8d 100644
--- a/noncore/styles/liquid/opie-liquid.diff
+++ b/noncore/styles/liquid/opie-liquid.diff
@@ -5,3 +5,3 @@ Features:
  
-        --- -Sun Jun 30 22:38:02 2002
+        --- -Mon Jul  1 11:38:05 2002
         +++ liquid.hMon Jun 24 19:07:45 2002
@@ -104,4 +104,4 @@ Features:
      void drawSliderGroove(QPainter * p, int x, int y, int w,  int h,
-        --- -Sun Jun 30 22:38:02 2002
-        +++ liquid.cppSun Jun 30 22:37:56 2002
+        --- -Mon Jul  1 11:38:05 2002
+        +++ liquid.cppMon Jul  1 03:45:28 2002
 @@ -10,12 +10,10 @@
@@ -654,3 +654,58 @@ Features:
          QColor c = btn->hasFocus() ? g.button().light(110) : g.background();
-@@ -2065,203 +1978,24 @@
+@@ -1914,8 +1827,8 @@
+     return(QSize(16, 16));
+ }
+ 
+-void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int w,
+-                                        int h, const QColorGroup &g, bool on,
++void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/,
++                                        int /*h*/, const QColorGroup &/*g*/, bool on,
+                                         bool down, bool)
+ {
+     bool isHover = highlightWidget == p->device();
+@@ -1957,8 +1870,8 @@
+     return(QSize(20, 22));
+ }
+ 
+-void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h,
+-                            const QColorGroup &g, int state, bool down, bool)
++void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/,
++                            const QColorGroup &/*g*/, int state, bool /*down*/, bool)
+ {
+     bool isHover = highlightWidget == p->device();
+     bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
+@@ -1996,8 +1909,8 @@
+     }
+ }
+ 
+-void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h,
+-                                   int state)
++void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
++                                   int /*state*/)
+ {
+     // needed for some reason by KHtml, even tho it's all filled ;P
+     p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask());
+@@ -2005,18 +1918,17 @@
+ }
+ 
+ void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
+-                         const QColorGroup &g, Orientation orient,
++                         const QColorGroup &/*g*/, Orientation orient,
+                          bool, bool)
+ {
+     QWidget *parent = (QWidget *)p->device();
+     p->setBrushOrigin(parent->pos());
+-    p->fillRect(x, y, w, h,
+-                QApplication::palette().active().brush(QColorGroup::Background));
++    parent->erase(x, y, w, h);
+     p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) :
+                   *getPixmap(VSlider));
+ }
+ 
+-void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int w, int h,
++void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
+                              Orientation orient, bool, bool)
+ {
+     p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() :
+@@ -2065,203 +1977,24 @@
      p->drawLineSegments(a);
@@ -721,3 +776,3 @@ Features:
 +void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
-+                            QMenuItem *mi, QColorGroup &g, bool enabled, bool active )
++                            QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active )
  {
@@ -868,3 +923,14 @@ Features:
          else
-@@ -2336,8 +2070,6 @@
+@@ -2300,8 +2033,8 @@
+ }
+ 
+ void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h,
+-                                 const QColorGroup &g, int lineWidth,
+-                                 const QBrush * fill)
++                                 const QColorGroup &g, int /*lineWidth*/,
++                                 const QBrush * /*fill*/)
+ {
+     QColor c;
+     switch(menuHandler->transType()){
+@@ -2336,8 +2069,6 @@
  
@@ -877,3 +943,3 @@ Features:
      QColorGroup itemg = dis ? pal.disabled() : pal.active();
-@@ -2363,7 +2095,7 @@
+@@ -2363,7 +2094,7 @@
              p->fillRect(x, y, w, h, menuBrush);
@@ -886,3 +952,3 @@ Features:
          }
-@@ -2508,25 +2240,6 @@
+@@ -2508,25 +2239,6 @@
      return h;
@@ -912,3 +978,3 @@ Features:
                              const QColorGroup &g, const QColor *c,
-@@ -2540,25 +2253,25 @@
+@@ -2540,25 +2252,25 @@
              return;
@@ -942,3 +1008,3 @@ Features:
      QPixmap tilePix;
-@@ -2671,7 +2384,7 @@
+@@ -2671,7 +2383,7 @@
          vFrame = 8; // was 10
@@ -951,3 +1017,3 @@ Features:
  
-@@ -2699,7 +2412,7 @@
+@@ -2699,7 +2411,7 @@
          p->drawLine(x+1, y+1, x+1, y2-1);
@@ -960,3 +1026,3 @@ Features:
          int x2 = x+w-1;
-@@ -2726,105 +2439,6 @@
+@@ -2726,105 +2438,6 @@
      }
@@ -1066,3 +1132,3 @@ Features:
  {
-@@ -2998,22 +2612,22 @@
+@@ -2998,22 +2611,22 @@
      customBtnIconList.clear();
@@ -1096,3 +1162,3 @@ Features:
          c->setNamedColor(QString(colorStr));
-@@ -3022,7 +2636,7 @@
+@@ -3022,7 +2635,7 @@
          QString tmpStr(iconStr);
@@ -1105,3 +1171,3 @@ Features:
                  customBtnIconList.append(NULL);
-@@ -3037,7 +2651,6 @@
+@@ -3037,7 +2650,6 @@
          colorStr = colorList.next();
@@ -1113,3 +1179,3 @@ Features:
  void LiquidStyle::applyCustomAttributes(QPushButton *btn)
-@@ -3087,7 +2700,7 @@
+@@ -3087,7 +2699,7 @@
      }
@@ -1122,3 +1188,3 @@ Features:
  
-        --- -Sun Jun 30 22:38:02 2002
+        --- -Mon Jul  1 11:38:05 2002
         +++ plugin.cppFri Jun 28 13:25:25 2002