From b88830e9111dc4375bc1461c3f7b3e7b3e73f733 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:28:11 -0600 Subject: Rename old tq methods that no longer need a unique name --- kicker-applets/kolourpicker/simplebutton.cpp | 12 ++++++------ kicker-applets/kolourpicker/simplebutton.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'kicker-applets/kolourpicker') diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index f232377..f5239bd 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -63,22 +63,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() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint()); } -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()); } @@ -200,7 +200,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, con _inside = false; } -TQSize SimpleArrowButton::tqsizeHint() const +TQSize SimpleArrowButton::sizeHint() const { return TQSize( 12, 12 ); } @@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p ) int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); + tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags); } void SimpleArrowButton::enterEvent( TQEvent *e ) diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h index 0cf11e5..9c66f85 100644 --- a/kicker-applets/kolourpicker/simplebutton.h +++ b/kicker-applets/kolourpicker/simplebutton.h @@ -35,8 +35,8 @@ class KDE_EXPORT SimpleButton : public TQButton SimpleButton(TQWidget *parent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; protected: void drawButton( TQPainter *p ); @@ -69,7 +69,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton public: SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: virtual void enterEvent( TQEvent *e ); -- cgit v1.2.1