summaryrefslogtreecommitdiffstats
path: root/kicker-applets/kolourpicker
diff options
context:
space:
mode:
Diffstat (limited to 'kicker-applets/kolourpicker')
-rw-r--r--kicker-applets/kolourpicker/simplebutton.cpp12
-rw-r--r--kicker-applets/kolourpicker/simplebutton.h6
2 files changed, 9 insertions, 9 deletions
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 );