From 90363652674deb94cd07057428b24fcb1735dbce Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kicker-applets/kolourpicker/kolourpicker.cpp | 16 ++++++++-------- kicker-applets/kolourpicker/kolourpicker.h | 2 +- kicker-applets/kolourpicker/simplebutton.cpp | 8 ++++---- kicker-applets/kolourpicker/simplebutton.h | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kicker-applets/kolourpicker') diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index 101bd42..fbce8cf 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -48,18 +48,18 @@ $Id$ // Applet initialization function extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kolourpicker"); return new KolourPicker(configFile, KPanelApplet::Normal, KPanelApplet::About, - tqparent, "kolourpicker"); + parent, "kolourpicker"); } } KolourPicker::KolourPicker(const TQString& configFile, Type type, - int actions, TQWidget *tqparent, const char *name) - : KPanelApplet(configFile, type, actions, tqparent, name), + int actions, TQWidget *parent, const char *name) + : KPanelApplet(configFile, type, actions, parent, name), m_picking(0) { KAboutData *about = new KAboutData("kolourpicker", @@ -339,16 +339,16 @@ TQPixmap KolourPicker::colorPixmap(const TQColor &c) const img.setPixel(x, y, tqRgba(128, 128, 128, 255)); } - TQBitmap tqmask(16, 16); - tqmask.fill(TQt::color0); - TQPainter p(&tqmask); + TQBitmap mask(16, 16); + mask.fill(TQt::color0); + TQPainter p(&mask); p.setPen(TQt::NoPen); p.setBrush(TQt::color1); p.drawEllipse(0, 0, 15, 15); p.end(); TQPixmap pm = TQPixmap(img.smoothScale(16, 16)); - pm.setMask(tqmask); + pm.setMask(mask); return pm; } diff --git a/kicker-applets/kolourpicker/kolourpicker.h b/kicker-applets/kolourpicker/kolourpicker.h index c223339..c9870e2 100644 --- a/kicker-applets/kolourpicker/kolourpicker.h +++ b/kicker-applets/kolourpicker/kolourpicker.h @@ -37,7 +37,7 @@ class KolourPicker : public KPanelApplet TQ_OBJECT public: KolourPicker(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); ~KolourPicker(); virtual int heightForWidth(int) const; virtual int widthForHeight(int) const; diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index 8e6c8ec..f232377 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -32,8 +32,8 @@ #include #include -SimpleButton::SimpleButton(TQWidget *tqparent, const char *name) - : TQButton(tqparent, name), +SimpleButton::SimpleButton(TQWidget *parent, const char *name) + : TQButton(parent, name), m_highlight(false), m_orientation(Qt::Horizontal) { @@ -192,8 +192,8 @@ void SimpleButton::resizeEvent( TQResizeEvent * ) } -SimpleArrowButton::SimpleArrowButton(TQWidget *tqparent, TQt::ArrowType arrow, const char *name) - : SimpleButton(tqparent, name) +SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name) + : SimpleButton(parent, name) { setBackgroundOrigin(AncestorOrigin); _arrow = arrow; diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h index 9b4e231..0cf11e5 100644 --- a/kicker-applets/kolourpicker/simplebutton.h +++ b/kicker-applets/kolourpicker/simplebutton.h @@ -32,7 +32,7 @@ class KDE_EXPORT SimpleButton : public TQButton TQ_OBJECT public: - SimpleButton(TQWidget *tqparent, const char *name = 0); + SimpleButton(TQWidget *parent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); TQSize tqsizeHint() const; @@ -67,7 +67,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton TQ_OBJECT public: - SimpleArrowButton(TQWidget *tqparent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); + SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; TQSize tqsizeHint() const; -- cgit v1.2.1