From bb47e67812ec1592018526b7a3e62af9a8738586 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: [PATCH] rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/knetload@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knetload/devicedialog.cpp | 4 ++-- knetload/devicedialog.h | 2 +- knetload/icontoggleaction.cpp | 16 ++++++++-------- knetload/icontoggleaction.h | 8 ++++---- knetload/knetdock.cpp | 4 ++-- knetload/knetdock.h | 2 +- knetload/knetload.cpp | 4 ++-- knetload/knetload.h | 2 +- knetload/scaledialog.cpp | 4 ++-- knetload/scaledialog.h | 2 +- knetload/speeddialog.cpp | 4 ++-- knetload/speeddialog.h | 2 +- knetload/statdock.cpp | 6 +++--- knetload/statdock.h | 8 ++++---- knetload/statpopup.cpp | 4 ++-- knetload/statpopup.h | 2 +- 16 files changed, 37 insertions(+), 37 deletions(-) diff --git a/knetload/devicedialog.cpp b/knetload/devicedialog.cpp index ab00fdb..37a4cb2 100644 --- a/knetload/devicedialog.cpp +++ b/knetload/devicedialog.cpp @@ -27,8 +27,8 @@ #define MAX_NET_DEV_LINE 512 -DeviceDialog::DeviceDialog(const TQString& defaultDevice, TQWidget* tqparent) : - KDialogBase(tqparent, "device dialog", true, +DeviceDialog::DeviceDialog(const TQString& defaultDevice, TQWidget* parent) : + KDialogBase(parent, "device dialog", true, i18n("Select Network Device"), Ok|Cancel, Ok), device(defaultDevice) { TQHBox* page = makeHBoxMainWidget(); diff --git a/knetload/devicedialog.h b/knetload/devicedialog.h index fcaa7cf..ee67835 100644 --- a/knetload/devicedialog.h +++ b/knetload/devicedialog.h @@ -28,7 +28,7 @@ class DeviceDialog : public KDialogBase { /** * Constructor. */ - DeviceDialog(const TQString& defaultDevice, TQWidget* tqparent); + DeviceDialog(const TQString& defaultDevice, TQWidget* parent); /** * Returns the device currently selected in the dialog. diff --git a/knetload/icontoggleaction.cpp b/knetload/icontoggleaction.cpp index 3c39554..a7d7625 100644 --- a/knetload/icontoggleaction.cpp +++ b/knetload/icontoggleaction.cpp @@ -17,9 +17,9 @@ IconToggleAction::IconToggleAction( const TQString& useTextUnchecked, const TQString& useIconUnchecked, const TQString& useTextChecked, const TQString& useIconChecked, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name) : + TQObject* parent, const char* name) : KToggleAction(useTextUnchecked, useIconUnchecked, cut, receiver, - slot, tqparent, name), + slot, parent, name), textChecked(useTextChecked), textUnchecked(useTextUnchecked), iconChecked(useIconChecked), iconUnchecked(useIconUnchecked) { } @@ -27,9 +27,9 @@ IconToggleAction::IconToggleAction( IconToggleAction::IconToggleAction(const TQString& useText, const TQString& useIconUnchecked, const TQString& useIconChecked, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name) : + TQObject* parent, const char* name) : KToggleAction(useText, useIconUnchecked, cut, receiver, - slot, tqparent, name), + slot, parent, name), textChecked(useText), textUnchecked(useText), iconChecked(useIconChecked), iconUnchecked(useIconUnchecked) { } @@ -37,16 +37,16 @@ IconToggleAction::IconToggleAction(const TQString& useText, IconToggleAction::IconToggleAction( const TQString& useTextUnchecked, const TQString& useIconUnchecked, const TQString& useTextChecked, const TQString& useIconChecked, - const KShortcut& cut, TQObject* tqparent, const char* name) : - KToggleAction(useTextUnchecked, useIconUnchecked, cut, tqparent, name), + const KShortcut& cut, TQObject* parent, const char* name) : + KToggleAction(useTextUnchecked, useIconUnchecked, cut, parent, name), textChecked(useTextChecked), textUnchecked(useTextUnchecked), iconChecked(useIconChecked), iconUnchecked(useIconUnchecked) { } IconToggleAction::IconToggleAction(const TQString& useText, const TQString& useIconUnchecked, const TQString& useIconChecked, - const KShortcut& cut, TQObject* tqparent, const char* name) : - KToggleAction(useText, useIconUnchecked, cut, tqparent, name), + const KShortcut& cut, TQObject* parent, const char* name) : + KToggleAction(useText, useIconUnchecked, cut, parent, name), textChecked(useText), textUnchecked(useText), iconChecked(useIconChecked), iconUnchecked(useIconUnchecked) { } diff --git a/knetload/icontoggleaction.h b/knetload/icontoggleaction.h index 9758291..169fc6b 100644 --- a/knetload/icontoggleaction.h +++ b/knetload/icontoggleaction.h @@ -32,19 +32,19 @@ class IconToggleAction : public KToggleAction { const TQString& useTextUnchecked, const TQString& useIconUnchecked, const TQString& useTextChecked, const TQString& useIconChecked, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name = 0); + TQObject* parent, const char* name = 0); IconToggleAction(const TQString& useText, const TQString& useIconUnchecked, const TQString& useIconChecked, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name = 0); + TQObject* parent, const char* name = 0); IconToggleAction( const TQString& useTextUnchecked, const TQString& useIconUnchecked, const TQString& useTextChecked, const TQString& useIconChecked, - const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, + const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0); IconToggleAction(const TQString& useText, const TQString& useIconUnchecked, const TQString& useIconChecked, - const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, + const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0); /** diff --git a/knetload/knetdock.cpp b/knetload/knetdock.cpp index 81bc96e..05cf192 100644 --- a/knetload/knetdock.cpp +++ b/knetload/knetdock.cpp @@ -15,8 +15,8 @@ #include -KNetDock::KNetDock(int whichDock, bool dirIn, StatPopup* tqparent, +KNetDock::KNetDock(int whichDock, bool dirIn, StatPopup* parent, const char* name) : - StatDock(whichDock, dirIn ? i18n("IN").utf8() : i18n("OUT").utf8(), tqparent, name) { + StatDock(whichDock, dirIn ? i18n("IN").utf8() : i18n("OUT").utf8(), parent, name) { } diff --git a/knetload/knetdock.h b/knetload/knetdock.h index 230ccf0..0ebe26f 100644 --- a/knetload/knetdock.h +++ b/knetload/knetdock.h @@ -29,7 +29,7 @@ public: * incoming traffic and \c false if this diagram represents outgoing * traffic. */ - KNetDock(int whichDock, bool dirIn, StatPopup *tqparent = 0, + KNetDock(int whichDock, bool dirIn, StatPopup *parent = 0, const char* name = 0); }; diff --git a/knetload/knetload.cpp b/knetload/knetload.cpp index 5b61bd8..aaec347 100644 --- a/knetload/knetload.cpp +++ b/knetload/knetload.cpp @@ -28,8 +28,8 @@ #define DEFAULT_SCALE 128000 #define MAX_NET_DEV_LINE 512 -KNetLoad::KNetLoad(TQWidget *tqparent, const char *name) : - StatPopup(false, tqparent, name) { +KNetLoad::KNetLoad(TQWidget *parent, const char *name) : + StatPopup(false, parent, name) { // Create the raw network data reader. proc = new KNetProc(); diff --git a/knetload/knetload.h b/knetload/knetload.h index e3c6ab8..e5420c3 100644 --- a/knetload/knetload.h +++ b/knetload/knetload.h @@ -33,7 +33,7 @@ public: /** * Constructor and destructor. */ - KNetLoad(TQWidget *tqparent = 0, const char *name = 0); + KNetLoad(TQWidget *parent = 0, const char *name = 0); ~KNetLoad(); public slots: diff --git a/knetload/scaledialog.cpp b/knetload/scaledialog.cpp index d74ada7..99a5e97 100644 --- a/knetload/scaledialog.cpp +++ b/knetload/scaledialog.cpp @@ -21,8 +21,8 @@ #include ScaleDialog::ScaleDialog(int defaultScale, const TQString &title, - TQWidget* tqparent) : - KDialogBase(tqparent, "scale dialog", true, title, Ok|Cancel, Ok), + TQWidget* parent) : + KDialogBase(parent, "scale dialog", true, title, Ok|Cancel, Ok), scale(defaultScale) { TQHBox* page = makeHBoxMainWidget(); diff --git a/knetload/scaledialog.h b/knetload/scaledialog.h index 0db9af4..3fed800 100644 --- a/knetload/scaledialog.h +++ b/knetload/scaledialog.h @@ -27,7 +27,7 @@ class ScaleDialog : public KDialogBase { /** * Constructor. */ - ScaleDialog(int defaultScale, const TQString & title, TQWidget* tqparent); + ScaleDialog(int defaultScale, const TQString & title, TQWidget* parent); /** * Returns the scale currently selected in the dialog. diff --git a/knetload/speeddialog.cpp b/knetload/speeddialog.cpp index 8326b08..1b14c96 100644 --- a/knetload/speeddialog.cpp +++ b/knetload/speeddialog.cpp @@ -25,8 +25,8 @@ static int stockSpeed[] = { 3000, 4000, 5000, 0 }; -SpeedDialog::SpeedDialog(int defaultSpeed, TQWidget* tqparent) : - KDialogBase(tqparent, "speed dialog", true, +SpeedDialog::SpeedDialog(int defaultSpeed, TQWidget* parent) : + KDialogBase(parent, "speed dialog", true, i18n("Select Speed"), Ok|Cancel, Ok), speed(defaultSpeed) { TQHBox* page = makeHBoxMainWidget(); diff --git a/knetload/speeddialog.h b/knetload/speeddialog.h index aade140..e2132d1 100644 --- a/knetload/speeddialog.h +++ b/knetload/speeddialog.h @@ -27,7 +27,7 @@ class SpeedDialog : public KDialogBase { /** * Constructor. */ - SpeedDialog(int defaultSpeed, TQWidget* tqparent); + SpeedDialog(int defaultSpeed, TQWidget* parent); /** * Returns the speed currently selected in the dialog. diff --git a/knetload/statdock.cpp b/knetload/statdock.cpp index 50f2cf9..e8e4f37 100644 --- a/knetload/statdock.cpp +++ b/knetload/statdock.cpp @@ -33,8 +33,8 @@ const TQColor StatDock::colorBlack(0, 0, 0); #define SOFT_STEP 3 StatDock::StatDock(int whichDock, const char* useLabel, - StatPopup *tqparent, const char *name) : - KSystemTray(tqparent,name), + StatPopup *parent, const char *name) : + KSystemTray(parent,name), label(TQString::fromUtf8(useLabel)), bufUpper(0), bufLower(0), @@ -48,7 +48,7 @@ StatDock::StatDock(int whichDock, const char* useLabel, bufUpper[i] = bufLower[i] = 0; // Initialise the display. - tqparent->initDock(this, contextMenu(), whichDock); + parent->initDock(this, contextMenu(), whichDock); setBackgroundColor(colorBlack); resize(DOCK_SIZE, DOCK_SIZE); show(); diff --git a/knetload/statdock.h b/knetload/statdock.h index 013de98..4d49425 100644 --- a/knetload/statdock.h +++ b/knetload/statdock.h @@ -29,7 +29,7 @@ class StatPopup; * with the upper readings shown above the lower readings. When diagram * splitting is switched off, only the upper readings will be displayed. * - * The tqparent window of a StatDock must be a StatPopup, which provides + * The parent window of a StatDock must be a StatPopup, which provides * all of the actions in this window's context menu. */ class StatDock : public KSystemTray { @@ -59,14 +59,14 @@ public: /** * Constructor and destructor. * - * Note that the constructor will call tqparent->initDock(). + * Note that the constructor will call parent->initDock(). * * Parameter whichDock must be 0 or 1 to specify whether this dock - * will become dock[0] or dock[1] in the given StatPopup tqparent. + * will become dock[0] or dock[1] in the given StatPopup parent. * Parameter useLabel should contain the label that will be drawn on * the diagram if labelling is enabled. */ - StatDock(int whichDock, const char* useLabel, StatPopup *tqparent, + StatDock(int whichDock, const char* useLabel, StatPopup *parent, const char *name = 0); ~StatDock(); diff --git a/knetload/statpopup.cpp b/knetload/statpopup.cpp index 2ce8c4f..4bbf363 100644 --- a/knetload/statpopup.cpp +++ b/knetload/statpopup.cpp @@ -35,8 +35,8 @@ const TQColor StatPopup::colorBorder(0, 0, 0); -StatPopup::StatPopup(bool useSupportSplit, TQWidget *tqparent, const char *name) : - TQWidget(tqparent, name, TQt::WStyle_Customize | TQt::WStyle_NoBorder | +StatPopup::StatPopup(bool useSupportSplit, TQWidget *parent, const char *name) : + TQWidget(parent, name, TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | TQt::WDestructiveClose | TQt::WType_TopLevel), supportSplit(useSupportSplit) { // Window management. diff --git a/knetload/statpopup.h b/knetload/statpopup.h index 7c5f358..132cdcc 100644 --- a/knetload/statpopup.h +++ b/knetload/statpopup.h @@ -65,7 +65,7 @@ public: * any configuration information. See the general class notes also * for a list of other routines this constructor will not call. */ - StatPopup(bool useSupportSplit, TQWidget *tqparent = 0, const char *name = 0); + StatPopup(bool useSupportSplit, TQWidget *parent = 0, const char *name = 0); ~StatPopup(); /**