Diffstat (limited to 'noncore/styles/liquid/liquid.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/styles/liquid/liquid.cpp | 25 |
1 files changed, 12 insertions, 13 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 | |||
@@ -1827,8 +1827,8 @@ QSize LiquidStyle::exclusiveIndicatorSize() const | |||
1827 | return(QSize(16, 16)); | 1827 | return(QSize(16, 16)); |
1828 | } | 1828 | } |
1829 | 1829 | ||
1830 | void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int w, | 1830 | void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/, |
1831 | int h, const QColorGroup &g, bool on, | 1831 | int /*h*/, const QColorGroup &/*g*/, bool on, |
1832 | bool down, bool) | 1832 | bool down, bool) |
1833 | { | 1833 | { |
1834 | bool isHover = highlightWidget == p->device(); | 1834 | bool isHover = highlightWidget == p->device(); |
@@ -1870,8 +1870,8 @@ QSize LiquidStyle::indicatorSize() const | |||
1870 | return(QSize(20, 22)); | 1870 | return(QSize(20, 22)); |
1871 | } | 1871 | } |
1872 | 1872 | ||
1873 | void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h, | 1873 | void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/, |
1874 | const QColorGroup &g, int state, bool down, bool) | 1874 | const QColorGroup &/*g*/, int state, bool /*down*/, bool) |
1875 | { | 1875 | { |
1876 | bool isHover = highlightWidget == p->device(); | 1876 | bool isHover = highlightWidget == p->device(); |
1877 | bool isMasked = p->device() && p->device()->devType() == QInternal::Widget | 1877 | bool isMasked = p->device() && p->device()->devType() == QInternal::Widget |
@@ -1909,8 +1909,8 @@ void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h, | |||
1909 | } | 1909 | } |
1910 | } | 1910 | } |
1911 | 1911 | ||
1912 | void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h, | 1912 | void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/, |
1913 | int state) | 1913 | int /*state*/) |
1914 | { | 1914 | { |
1915 | // needed for some reason by KHtml, even tho it's all filled ;P | 1915 | // needed for some reason by KHtml, even tho it's all filled ;P |
1916 | p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask()); | 1916 | p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask()); |
@@ -1918,18 +1918,17 @@ void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h, | |||
1918 | } | 1918 | } |
1919 | 1919 | ||
1920 | void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h, | 1920 | void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h, |
1921 | const QColorGroup &g, Orientation orient, | 1921 | const QColorGroup &/*g*/, Orientation orient, |
1922 | bool, bool) | 1922 | bool, bool) |
1923 | { | 1923 | { |
1924 | QWidget *parent = (QWidget *)p->device(); | 1924 | QWidget *parent = (QWidget *)p->device(); |
1925 | p->setBrushOrigin(parent->pos()); | 1925 | p->setBrushOrigin(parent->pos()); |
1926 | p->fillRect(x, y, w, h, | 1926 | parent->erase(x, y, w, h); |
1927 | QApplication::palette().active().brush(QColorGroup::Background)); | ||
1928 | p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) : | 1927 | p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) : |
1929 | *getPixmap(VSlider)); | 1928 | *getPixmap(VSlider)); |
1930 | } | 1929 | } |
1931 | 1930 | ||
1932 | void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int w, int h, | 1931 | void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/, |
1933 | Orientation orient, bool, bool) | 1932 | Orientation orient, bool, bool) |
1934 | { | 1933 | { |
1935 | p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() : | 1934 | p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() : |
@@ -1980,7 +1979,7 @@ void LiquidStyle::drawArrow(QPainter *p, Qt::ArrowType type, bool on, int x, | |||
1980 | 1979 | ||
1981 | 1980 | ||
1982 | void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | 1981 | void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, |
1983 | QMenuItem *mi, QColorGroup &g, bool enabled, bool active ) | 1982 | QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active ) |
1984 | { | 1983 | { |
1985 | x -= 2; // Bug in Qt/E | 1984 | x -= 2; // Bug in Qt/E |
1986 | y -= 2; | 1985 | y -= 2; |
@@ -2034,8 +2033,8 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | |||
2034 | } | 2033 | } |
2035 | 2034 | ||
2036 | void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h, | 2035 | void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h, |
2037 | const QColorGroup &g, int lineWidth, | 2036 | const QColorGroup &g, int /*lineWidth*/, |
2038 | const QBrush * fill) | 2037 | const QBrush * /*fill*/) |
2039 | { | 2038 | { |
2040 | QColor c; | 2039 | QColor c; |
2041 | switch(menuHandler->transType()){ | 2040 | switch(menuHandler->transType()){ |