diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
| commit | fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch) | |
| tree | 9eda848e56fcb862fdfdf479adeccd95b6fe387a /kicker/libkicker/simplebutton.cpp | |
| parent | 02f67d0e1355b79b1806746efb0f2f640e57f13d (diff) | |
| download | tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/libkicker/simplebutton.cpp')
| -rw-r--r-- | kicker/libkicker/simplebutton.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index 5d928a6b6..4c28b2101 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -65,22 +65,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -TQSize SimpleButton::tqsizeHint() const +TQSize SimpleButton::sizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::tqsizeHint(); + return TQButton::sizeHint(); else return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN); } -TQSize SimpleButton::tqminimumSizeHint() const +TQSize SimpleButton::minimumSizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::tqminimumSizeHint(); + return TQButton::minimumSizeHint(); else return TQSize(pm->width(), pm->height()); } @@ -176,7 +176,7 @@ void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } @@ -184,7 +184,7 @@ void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } @@ -202,7 +202,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, cons _inside = false; } -TQSize SimpleArrowButton::tqsizeHint() const +TQSize SimpleArrowButton::sizeHint() const { return TQSize( 12, 12 ); } @@ -236,7 +236,7 @@ void SimpleArrowButton::drawButton( TQPainter *p ) int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - style().drawPrimitive(pe, p, r, tqcolorGroup(), flags); + style().drawPrimitive(pe, p, r, colorGroup(), flags); } void SimpleArrowButton::enterEvent( TQEvent *e ) |