From 625904bd3097f9749450428904ca14ff2531824d 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/kdeutils@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmilo/asus/asus.cpp | 2 +- kmilo/asus/asus.h | 2 +- kmilo/delli8k/delli8k.cpp | 4 ++-- kmilo/delli8k/delli8k.h | 2 +- kmilo/demo/demo.cpp | 4 ++-- kmilo/demo/demo.h | 2 +- kmilo/generic/generic_monitor.cpp | 4 ++-- kmilo/generic/generic_monitor.h | 2 +- kmilo/kmilo_kvaio/kcmkvaio/main.cpp | 4 ++-- kmilo/kmilo_kvaio/kcmkvaio/main.h | 2 +- kmilo/kmilo_kvaio/kmilo_kvaio.cpp | 4 ++-- kmilo/kmilo_kvaio/kmilo_kvaio.h | 2 +- kmilo/kmilo_kvaio/kvaio.cpp | 10 +++++----- kmilo/kmilo_kvaio/kvaio.h | 6 +++--- kmilo/kmilo_kvaio/kvaiodriverinterface.cpp | 4 ++-- kmilo/kmilo_kvaio/kvaiodriverinterface.h | 2 +- kmilo/kmilod/monitor.cpp | 4 ++-- kmilo/kmilod/monitor.h | 2 +- kmilo/powerbook/pb_monitor.cpp | 4 ++-- kmilo/powerbook/pb_monitor.h | 2 +- kmilo/powerbook2/pb_monitor.cpp | 4 ++-- kmilo/powerbook2/pb_monitor.h | 2 +- kmilo/thinkpad/kcmthinkpad/main.cpp | 4 ++-- kmilo/thinkpad/kcmthinkpad/main.h | 2 +- kmilo/thinkpad/thinkpad.cpp | 2 +- kmilo/thinkpad/thinkpad.h | 2 +- 26 files changed, 42 insertions(+), 42 deletions(-) (limited to 'kmilo') diff --git a/kmilo/asus/asus.cpp b/kmilo/asus/asus.cpp index 12690f1..a83235d 100644 --- a/kmilo/asus/asus.cpp +++ b/kmilo/asus/asus.cpp @@ -42,7 +42,7 @@ namespace KMilo { -AsusMonitor::AsusMonitor(TQObject* tqparent, const char* name, const TQStringList& args): Monitor(tqparent, name, args) +AsusMonitor::AsusMonitor(TQObject* parent, const char* name, const TQStringList& args): Monitor(parent, name, args) { } diff --git a/kmilo/asus/asus.h b/kmilo/asus/asus.h index 1d1132d..c809eea 100644 --- a/kmilo/asus/asus.h +++ b/kmilo/asus/asus.h @@ -42,7 +42,7 @@ typedef struct */ class AsusMonitor: public Monitor { public: - AsusMonitor(TQObject *tqparent, const char *name, const TQStringList&); + AsusMonitor(TQObject *parent, const char *name, const TQStringList&); virtual ~AsusMonitor(); /** diff --git a/kmilo/delli8k/delli8k.cpp b/kmilo/delli8k/delli8k.cpp index 063fa74..d63c8c7 100644 --- a/kmilo/delli8k/delli8k.cpp +++ b/kmilo/delli8k/delli8k.cpp @@ -43,8 +43,8 @@ namespace KMilo { -DellI8kMonitor::DellI8kMonitor( TQObject* tqparent, const char* name, const TQStringList& args ) - : Monitor( tqparent, name, args ) +DellI8kMonitor::DellI8kMonitor( TQObject* parent, const char* name, const TQStringList& args ) + : Monitor( parent, name, args ) { } diff --git a/kmilo/delli8k/delli8k.h b/kmilo/delli8k/delli8k.h index 1d3ead8..424f80a 100644 --- a/kmilo/delli8k/delli8k.h +++ b/kmilo/delli8k/delli8k.h @@ -45,7 +45,7 @@ namespace KMilo { class DellI8kMonitor: public Monitor { public: - DellI8kMonitor( TQObject *tqparent, const char *name, const TQStringList& ); + DellI8kMonitor( TQObject *parent, const char *name, const TQStringList& ); virtual ~DellI8kMonitor(); /** diff --git a/kmilo/demo/demo.cpp b/kmilo/demo/demo.cpp index a2875f6..c985e08 100644 --- a/kmilo/demo/demo.cpp +++ b/kmilo/demo/demo.cpp @@ -26,8 +26,8 @@ namespace KMilo { -Demo::Demo(TQObject *tqparent, const char *name, const TQStringList& args) -: Monitor(tqparent, name, args) { +Demo::Demo(TQObject *parent, const char *name, const TQStringList& args) +: Monitor(parent, name, args) { } diff --git a/kmilo/demo/demo.h b/kmilo/demo/demo.h index 5a1aabe..a1d02d4 100644 --- a/kmilo/demo/demo.h +++ b/kmilo/demo/demo.h @@ -26,7 +26,7 @@ class Demo : public KMilo::Monitor { public: - Demo(TQObject *tqparent, const char *name, const TQStringList&); + Demo(TQObject *parent, const char *name, const TQStringList&); virtual ~Demo(); virtual bool init(); diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp index 6a4e1d2..4e13be1 100644 --- a/kmilo/generic/generic_monitor.cpp +++ b/kmilo/generic/generic_monitor.cpp @@ -42,8 +42,8 @@ using namespace KMilo; -GenericMonitor::GenericMonitor(TQObject *tqparent, const char *name, const TQStringList& args) -: Monitor(tqparent, name, args) +GenericMonitor::GenericMonitor(TQObject *parent, const char *name, const TQStringList& args) +: Monitor(parent, name, args) { _poll = false; m_displayType = Monitor::None; diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h index 5c35b61..c94606d 100644 --- a/kmilo/generic/generic_monitor.h +++ b/kmilo/generic/generic_monitor.h @@ -51,7 +51,7 @@ class GenericMonitor : public Monitor TQ_OBJECT public: - GenericMonitor(TQObject *tqparent, const char *name, const TQStringList&); + GenericMonitor(TQObject *parent, const char *name, const TQStringList&); virtual ~GenericMonitor(); virtual bool init(); diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index e8a05e2..5f8ac0e 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -46,8 +46,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kvaio, KVaioModuleFactory("kcmkvaio")) #define CONFIG_FILE "kmilodrc" -KVaioModule::KVaioModule(TQWidget *tqparent, const char *name, const TQStringList &) - : KCModule(KVaioModuleFactory::instance(), tqparent, name) +KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList &) + : KCModule(KVaioModuleFactory::instance(), parent, name) { KAboutData *about = new KAboutData(I18N_NOOP("kcmkvaio"), diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.h b/kmilo/kmilo_kvaio/kcmkvaio/main.h index b7dbade..20e0b64 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.h +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.h @@ -34,7 +34,7 @@ class KVaioModule : public KCModule TQ_OBJECT public: - KVaioModule(TQWidget *tqparent, const char *name, const TQStringList &); + KVaioModule(TQWidget *parent, const char *name, const TQStringList &); void save(); void load(); diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp index fa22f0b..7ecf253 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp @@ -26,9 +26,9 @@ #include "kvaio.h" #include "kmilointerface.h" -KMiloKVaio::KMiloKVaio(TQObject *tqparent, const char *name, +KMiloKVaio::KMiloKVaio(TQObject *parent, const char *name, const TQStringList& args) - : Monitor(tqparent, name, args), + : Monitor(parent, name, args), m_kvaio(0) { _poll = false; diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h index b351f58..28780af 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.h +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h @@ -38,7 +38,7 @@ class KMiloKVaio : public KMilo::Monitor { TQ_OBJECT public: - KMiloKVaio(TQObject *tqparent, + KMiloKVaio(TQObject *parent, const char *name, const TQStringList&); virtual ~KMiloKVaio(); diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index ed853f0..d527970 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -55,12 +55,12 @@ extern "C" { } -KVaio::KVaio(KMiloKVaio *tqparent, const char* name) - : TQObject(tqparent, name), +KVaio::KVaio(KMiloKVaio *parent, const char* name) + : TQObject(parent, name), mDisp(0), mTimer (new TQTimer (this) ) { - mytqparent = tqparent; + myparent = parent; mDriver = new KVaioDriverInterface(this); @@ -176,7 +176,7 @@ void KVaio::slotVaioEvent(int event) bool KVaio::showTextMsg(const TQString& msg) { - return mytqparent->showTextMsg(msg); + return myparent->showTextMsg(msg); } @@ -184,7 +184,7 @@ bool KVaio::showTextMsg(const TQString& msg) bool KVaio::showProgressMsg(const TQString& msg, int value) { m_progress = value; - return mytqparent->showProgressMsg(msg,value); + return myparent->showProgressMsg(msg,value); } void KVaio::blankScreen() diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h index 2e2d723..c012c66 100644 --- a/kmilo/kmilo_kvaio/kvaio.h +++ b/kmilo/kmilo_kvaio/kvaio.h @@ -58,8 +58,8 @@ class KVaio : public TQObject Q_OBJECT TQ_OBJECT public: -// KVaio(TQObject *tqparent = 0, const char *name =0); - KVaio(KMiloKVaio *tqparent = 0, const char *name =0); +// KVaio(TQObject *parent = 0, const char *name =0); + KVaio(KMiloKVaio *parent = 0, const char *name =0); virtual ~KVaio(); const KVaioDriverInterface *driver(); @@ -91,7 +91,7 @@ private: bool retrieveVolume(); void displayVolume(); - KMiloKVaio *mytqparent; + KMiloKVaio *myparent; DCOPRef *kmixClient, *kmixWindow; diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp index 873633d..a08ccff 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp @@ -64,8 +64,8 @@ extern "C" { #define SONYPI_IOCGBLUE _IOR('v', 8, __u8) #define SONYPI_IOCSBLUE _IOW('v', 9, __u8) -KVaioDriverInterface::KVaioDriverInterface(TQObject *tqparent) - : TQObject(tqparent), +KVaioDriverInterface::KVaioDriverInterface(TQObject *parent) + : TQObject(parent), mFd(0), mNotifier(0) { diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h index 6087b93..2cf7fee 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h @@ -36,7 +36,7 @@ class KVaioDriverInterface : public TQObject Q_OBJECT TQ_OBJECT public: - KVaioDriverInterface(TQObject *tqparent=0); + KVaioDriverInterface(TQObject *parent=0); bool connectToDriver(bool listen = true); void disconnectFromDriver(); /** Return the current display brightness, a value between 0 and diff --git a/kmilo/kmilod/monitor.cpp b/kmilo/kmilod/monitor.cpp index 955fccd..7f37aaa 100644 --- a/kmilo/kmilod/monitor.cpp +++ b/kmilo/kmilod/monitor.cpp @@ -22,8 +22,8 @@ #include "monitor.h" -KMilo::Monitor::Monitor(TQObject *tqparent, const char *name, const TQStringList&) -: TQObject(tqparent, name) { +KMilo::Monitor::Monitor(TQObject *parent, const char *name, const TQStringList&) +: TQObject(parent, name) { _poll = true; } diff --git a/kmilo/kmilod/monitor.h b/kmilo/kmilod/monitor.h index 7053752..d50045b 100644 --- a/kmilo/kmilod/monitor.h +++ b/kmilo/kmilod/monitor.h @@ -37,7 +37,7 @@ class KMiloInterface; class KDE_EXPORT Monitor : public TQObject { public: - Monitor(TQObject *tqparent, const char *name, const TQStringList&); + Monitor(TQObject *parent, const char *name, const TQStringList&); virtual ~Monitor(); /** diff --git a/kmilo/powerbook/pb_monitor.cpp b/kmilo/powerbook/pb_monitor.cpp index 516992e..5b1fae2 100644 --- a/kmilo/powerbook/pb_monitor.cpp +++ b/kmilo/powerbook/pb_monitor.cpp @@ -33,8 +33,8 @@ extern "C" { namespace KMilo { -PowerBookMonitor::PowerBookMonitor(TQObject *tqparent, const char *name, const TQStringList& args) -: Monitor(tqparent, name, args) { +PowerBookMonitor::PowerBookMonitor(TQObject *parent, const char *name, const TQStringList& args) +: Monitor(parent, name, args) { _serverPort = -1; _clientPort = -1; _progress = 0; diff --git a/kmilo/powerbook/pb_monitor.h b/kmilo/powerbook/pb_monitor.h index b4e4c85..13b9885 100644 --- a/kmilo/powerbook/pb_monitor.h +++ b/kmilo/powerbook/pb_monitor.h @@ -26,7 +26,7 @@ class PowerBookMonitor : public KMilo::Monitor { public: - PowerBookMonitor(TQObject *tqparent, const char *name, const TQStringList&); + PowerBookMonitor(TQObject *parent, const char *name, const TQStringList&); virtual ~PowerBookMonitor(); virtual bool init(); diff --git a/kmilo/powerbook2/pb_monitor.cpp b/kmilo/powerbook2/pb_monitor.cpp index 20ba17b..cf3b927 100644 --- a/kmilo/powerbook2/pb_monitor.cpp +++ b/kmilo/powerbook2/pb_monitor.cpp @@ -49,9 +49,9 @@ const TQString tpmodes[] = { I18N_NOOP("No Tap"), I18N_NOOP("Tap"), I18N_NOOP("D namespace KMilo { -PowerBookMonitor::PowerBookMonitor(TQObject *tqparent, const char *name, +PowerBookMonitor::PowerBookMonitor(TQObject *parent, const char *name, const TQStringList& args) - : Monitor(tqparent, name, args), + : Monitor(parent, name, args), m_progress( 0 ) { init_libpbb(); diff --git a/kmilo/powerbook2/pb_monitor.h b/kmilo/powerbook2/pb_monitor.h index 2adb4d8..e9dfb71 100644 --- a/kmilo/powerbook2/pb_monitor.h +++ b/kmilo/powerbook2/pb_monitor.h @@ -34,7 +34,7 @@ namespace KMilo { class PowerBookMonitor : public KMilo::Monitor { public: - PowerBookMonitor(TQObject *tqparent, const char *name, const TQStringList&); + PowerBookMonitor(TQObject *parent, const char *name, const TQStringList&); virtual ~PowerBookMonitor(); virtual bool init(); diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index 2d31b0b..7ad2b08 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_thinkpad, KCMThinkpadModuleFactory("kcmthinkpad" #define CONFIG_FILE "kmilodrc" -KCMThinkpadModule::KCMThinkpadModule(TQWidget* tqparent, const char* name, const TQStringList&) - : KCModule(KCMThinkpadModuleFactory::instance(), tqparent, name) { +KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&) + : KCModule(KCMThinkpadModuleFactory::instance(), parent, name) { KAboutData* about = new KAboutData(I18N_NOOP("kcmthinkpad"), I18N_NOOP("KDE Control Module for IBM Thinkpad " diff --git a/kmilo/thinkpad/kcmthinkpad/main.h b/kmilo/thinkpad/kcmthinkpad/main.h index 5719185..cda78c5 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.h +++ b/kmilo/thinkpad/kcmthinkpad/main.h @@ -34,7 +34,7 @@ class KCMThinkpadModule : public KCModule { TQ_OBJECT public: - KCMThinkpadModule(TQWidget* tqparent, const char* name, const TQStringList&); + KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&); void save(); void load(); diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp index 1625c69..034c6bd 100644 --- a/kmilo/thinkpad/thinkpad.cpp +++ b/kmilo/thinkpad/thinkpad.cpp @@ -43,7 +43,7 @@ namespace KMilo { -ThinkPadMonitor::ThinkPadMonitor(TQObject* tqparent, const char* name, const TQStringList& args): Monitor(tqparent, name, args) { +ThinkPadMonitor::ThinkPadMonitor(TQObject* parent, const char* name, const TQStringList& args): Monitor(parent, name, args) { m_progress = 0; m_volume = 50; //set in retrieveVolume() } diff --git a/kmilo/thinkpad/thinkpad.h b/kmilo/thinkpad/thinkpad.h index e4cd952..dc843ca 100644 --- a/kmilo/thinkpad/thinkpad.h +++ b/kmilo/thinkpad/thinkpad.h @@ -83,7 +83,7 @@ typedef struct { */ class ThinkPadMonitor : public Monitor { public: - ThinkPadMonitor(TQObject *tqparent, const char *name, const TQStringList&); + ThinkPadMonitor(TQObject *parent, const char *name, const TQStringList&); virtual ~ThinkPadMonitor(); /** -- cgit v1.2.1