diff options
| author |  Elvio Basello | 2008-05-27 22:02:08 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-05-27 22:02:08 +0000 |
| commit | 0d92fd30b2715d0230856f60f681a80c3c485a3d (patch) | |
| tree | fe7a44b2ebb8b6ff9a9ad24c63f59eb57081a80e | |
| parent | fixed styled widgets + more QT4 port (diff) | |
| download | KVIrc-0d92fd30b2715d0230856f60f681a80c3c485a3d.tar.gz KVIrc-0d92fd30b2715d0230856f60f681a80c3c485a3d.tar.bz2 KVIrc-0d92fd30b2715d0230856f60f681a80c3c485a3d.zip | |
compilation fix against Noldor's huge commit
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1860 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvirc/ui/kvi_styled_controls.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp index 345c4cf48..8163894b9 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -32,7 +32,6 @@ #include "kvi_doublebuffer.h" #include "kvi_tal_toolbar.h" -#include "kvi_styled_controls.h" #include <QPainter> #include <QImage> #include <QEvent> @@ -227,7 +226,7 @@ void KviStyledCheckBox::paintEvent ( QPaintEvent * event) p.drawText(pix.width()+3,0,width(),height(),0,szText); // bitBlt(this, rect.x(), rect.y(), pDoubleBufferPixmap, 0, 0, rect.width(), rect.height()); //debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); - } else { + } else { QCheckBox::paintEvent(event); } } else @@ -282,9 +281,9 @@ void KviStyledToolButton::paintEvent ( QPaintEvent * event) colorGroup().background() ); */ - QPainter p(this); - p.setPen(bActive ? QColor(206,215,223) :palette().background().color()); - p.setBrush(bActive ? QColor(206,215,223) :palette().background()); + QPainter p(this); + p.setPen(bActive ? QColor(206,215,223) : palette().background().color()); + p.setBrush(bActive ? QBrush(QColor(206,215,223)) : palette().background()); p.drawRect(event->rect()); if(bActive) @@ -295,11 +294,9 @@ void KviStyledToolButton::paintEvent ( QPaintEvent * event) p.translate(-rect.x(), -rect.y()); QPixmap pix=iconSet().pixmap( - usesBigPixmap() ? QIconSet::Large : QIconSet::Small, - isEnabled() ? QIcon::Normal : - QIconSet::Disabled, - isChecked() ? QIcon::On : - QIcon::Off); + usesBigPixmap() ? QIconSet::Large : QIconSet::Small, + isEnabled() ? QIcon::Normal : QIconSet::Disabled, + isChecked() ? QIcon::On : QIcon::Off); QPoint pos((iWidth-iPixWidth-pix.width())/2,(height()-pix.height())/2); if(!pix.isNull()) { |