From 2bc1d72869b62af05ae4feafd878203b526da8c5 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/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kpf/DESIGN | 2 +- kpf/src/ActiveMonitor.cpp | 4 ++-- kpf/src/ActiveMonitor.h | 2 +- kpf/src/ActiveMonitorItem.cpp | 4 ++-- kpf/src/ActiveMonitorItem.h | 2 +- kpf/src/ActiveMonitorWindow.cpp | 4 ++-- kpf/src/ActiveMonitorWindow.h | 2 +- kpf/src/Applet.cpp | 8 ++++---- kpf/src/AppletItem.cpp | 4 ++-- kpf/src/AppletItem.h | 2 +- kpf/src/BandwidthGraph.cpp | 4 ++-- kpf/src/BandwidthGraph.h | 2 +- kpf/src/ConfigDialogPage.cpp | 4 ++-- kpf/src/ConfigDialogPage.h | 2 +- kpf/src/DirSelectWidget.cpp | 6 +++--- kpf/src/ErrorMessageConfigDialog.cpp | 4 ++-- kpf/src/ErrorMessageConfigDialog.h | 2 +- kpf/src/PortValidator.cpp | 4 ++-- kpf/src/PortValidator.h | 2 +- kpf/src/PropertiesDialogPlugin.cpp | 8 ++++---- kpf/src/PropertiesDialogPlugin.h | 4 ++-- kpf/src/RootValidator.cpp | 4 ++-- kpf/src/RootValidator.h | 2 +- kpf/src/Server.cpp | 4 ++-- kpf/src/Server.h | 6 +++--- kpf/src/ServerSocket.cpp | 4 ++-- kpf/src/ServerSocket.h | 2 +- kpf/src/ServerWizard.cpp | 4 ++-- kpf/src/ServerWizard.h | 2 +- kpf/src/SingleServerConfigDialog.cpp | 4 ++-- kpf/src/SingleServerConfigDialog.h | 2 +- kpf/src/StartingKPFDialog.cpp | 4 ++-- kpf/src/StartingKPFDialog.h | 2 +- 33 files changed, 58 insertions(+), 58 deletions(-) (limited to 'kpf') diff --git a/kpf/DESIGN b/kpf/DESIGN index c8eac16b..bacfc82b 100644 --- a/kpf/DESIGN +++ b/kpf/DESIGN @@ -93,7 +93,7 @@ traffic is received by a Server object, it simply drops the connection. A WebServer object is responsible for bandwidth management. -A Server object may not send data until it is told to by its tqparent (WebServer) +A Server object may not send data until it is told to by its parent (WebServer) object. A Server object sends a readyToWrite(this) signal when it has data to send. diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp index 0f1134e4..d7f72ea1 100644 --- a/kpf/src/ActiveMonitor.cpp +++ b/kpf/src/ActiveMonitor.cpp @@ -38,10 +38,10 @@ namespace KPF ActiveMonitor::ActiveMonitor ( WebServer * server, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : TQWidget (tqparent, name), + : TQWidget (parent, name), server_ (server) { view_ = new TQListView(this); diff --git a/kpf/src/ActiveMonitor.h b/kpf/src/ActiveMonitor.h index 7beb7828..b3c792f2 100644 --- a/kpf/src/ActiveMonitor.h +++ b/kpf/src/ActiveMonitor.h @@ -58,7 +58,7 @@ namespace KPF ActiveMonitor ( WebServer * server, - TQWidget * tqparent = 0, + TQWidget * parent = 0, const char * name = 0 ); diff --git a/kpf/src/ActiveMonitorItem.cpp b/kpf/src/ActiveMonitorItem.cpp index 367ff768..04fe857d 100644 --- a/kpf/src/ActiveMonitorItem.cpp +++ b/kpf/src/ActiveMonitorItem.cpp @@ -31,8 +31,8 @@ namespace KPF { - ActiveMonitorItem::ActiveMonitorItem(Server * server, TQListView * tqparent) - : TQListViewItem (tqparent), + ActiveMonitorItem::ActiveMonitorItem(Server * server, TQListView * parent) + : TQListViewItem (parent), server_ (server), size_ (0), sent_ (0) diff --git a/kpf/src/ActiveMonitorItem.h b/kpf/src/ActiveMonitorItem.h index fe8b5aa3..8cc347e2 100644 --- a/kpf/src/ActiveMonitorItem.h +++ b/kpf/src/ActiveMonitorItem.h @@ -60,7 +60,7 @@ namespace KPF /** * @param server the associated Server object. */ - ActiveMonitorItem(Server * server, TQListView * tqparent); + ActiveMonitorItem(Server * server, TQListView * parent); virtual ~ActiveMonitorItem(); /** diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp index 1d4ef84b..238ddefa 100644 --- a/kpf/src/ActiveMonitorWindow.cpp +++ b/kpf/src/ActiveMonitorWindow.cpp @@ -34,10 +34,10 @@ namespace KPF ActiveMonitorWindow::ActiveMonitorWindow ( WebServer * server, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : KMainWindow(tqparent, name) + : KMainWindow(parent, name) { setCaption(i18n("Monitoring %1 - kpf").tqarg(server->root())); diff --git a/kpf/src/ActiveMonitorWindow.h b/kpf/src/ActiveMonitorWindow.h index 5db33194..9dc0a00c 100644 --- a/kpf/src/ActiveMonitorWindow.h +++ b/kpf/src/ActiveMonitorWindow.h @@ -53,7 +53,7 @@ namespace KPF ActiveMonitorWindow ( WebServer * server, - TQWidget * tqparent = 0, + TQWidget * parent = 0, const char * name = 0 ); diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp index 8311231c..983ae0c3 100644 --- a/kpf/src/Applet.cpp +++ b/kpf/src/Applet.cpp @@ -54,7 +54,7 @@ static const char kpfVersion[] = "1.0.1"; extern "C" { KDE_EXPORT KPanelApplet * - init(TQWidget * tqparent, const TQString & configFile) + init(TQWidget * parent, const TQString & configFile) { if (0 == kpf::userId() || 0 == kpf::effectiveUserId()) { @@ -79,7 +79,7 @@ extern "C" configFile, KPanelApplet::Normal, KPanelApplet::About|KPanelApplet::Help, - tqparent, + parent, "kpf" ); } @@ -93,10 +93,10 @@ namespace KPF const TQString & configFile, Type type, int actions, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : KPanelApplet (configFile, type, actions, tqparent, name), + : KPanelApplet (configFile, type, actions, parent, name), wizard_ (0L), popup_ (0L), dcopClient_ (0L) diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp index f6eb7dd4..e5d3dc51 100644 --- a/kpf/src/AppletItem.cpp +++ b/kpf/src/AppletItem.cpp @@ -43,8 +43,8 @@ namespace KPF { - AppletItem::AppletItem(WebServer * server, TQWidget * tqparent) - : TQWidget (tqparent, "KPF::AppletItem"), + AppletItem::AppletItem(WebServer * server, TQWidget * parent) + : TQWidget (parent, "KPF::AppletItem"), server_ (server), configDialog_ (0L), monitorWindow_ (0L), diff --git a/kpf/src/AppletItem.h b/kpf/src/AppletItem.h index 6381555b..22b21337 100644 --- a/kpf/src/AppletItem.h +++ b/kpf/src/AppletItem.h @@ -54,7 +54,7 @@ namespace KPF * @param server The WebServer object which will be monitored and * controlled by this object. */ - AppletItem(WebServer * server, TQWidget * tqparent); + AppletItem(WebServer * server, TQWidget * parent); ~AppletItem(); diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp index bc2f1ee8..546aa630 100644 --- a/kpf/src/BandwidthGraph.cpp +++ b/kpf/src/BandwidthGraph.cpp @@ -40,10 +40,10 @@ namespace KPF ( WebServer * server, OverlaySelect overlaySelect, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : TQWidget (tqparent, name, WRepaintNoErase), + : TQWidget (parent, name, WRepaintNoErase), server_ (server), max_ (0L), overlaySelect_ (overlaySelect) diff --git a/kpf/src/BandwidthGraph.h b/kpf/src/BandwidthGraph.h index ef72a3b8..8684c71f 100644 --- a/kpf/src/BandwidthGraph.h +++ b/kpf/src/BandwidthGraph.h @@ -62,7 +62,7 @@ namespace KPF ( WebServer * server, OverlaySelect overlaySelect, - TQWidget * tqparent = 0, + TQWidget * parent = 0, const char * name = 0 ); diff --git a/kpf/src/ConfigDialogPage.cpp b/kpf/src/ConfigDialogPage.cpp index 12872a0a..657e96f0 100644 --- a/kpf/src/ConfigDialogPage.cpp +++ b/kpf/src/ConfigDialogPage.cpp @@ -43,8 +43,8 @@ namespace KPF { - ConfigDialogPage::ConfigDialogPage(WebServer * server, TQWidget * tqparent) - : TQWidget (tqparent, "KPF::ConfigDialogPage"), + ConfigDialogPage::ConfigDialogPage(WebServer * server, TQWidget * parent) + : TQWidget (parent, "KPF::ConfigDialogPage"), server_ (server), errorMessageConfigDialog_ (0L) { diff --git a/kpf/src/ConfigDialogPage.h b/kpf/src/ConfigDialogPage.h index aef03cca..df6ab985 100644 --- a/kpf/src/ConfigDialogPage.h +++ b/kpf/src/ConfigDialogPage.h @@ -48,7 +48,7 @@ namespace KPF public: - ConfigDialogPage(WebServer *, TQWidget * tqparent); + ConfigDialogPage(WebServer *, TQWidget * parent); virtual ~ConfigDialogPage(); diff --git a/kpf/src/DirSelectWidget.cpp b/kpf/src/DirSelectWidget.cpp index 92b6ab0a..cda49a4a 100644 --- a/kpf/src/DirSelectWidget.cpp +++ b/kpf/src/DirSelectWidget.cpp @@ -39,10 +39,10 @@ namespace KPF DirSelectWidget::DirSelectWidget ( const TQString & pathToMakeVisible, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : KListView(tqparent, name) + : KListView(parent, name) { d = new Private; d->pathToMakeVisible = pathToMakeVisible; @@ -105,7 +105,7 @@ namespace KPF { TQString ret(item->text(0)); - while (0 != (item = item->tqparent())) + while (0 != (item = item->parent())) ret.prepend("/" + item->text(0)); return ret; diff --git a/kpf/src/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp index 1d913146..e53941e7 100644 --- a/kpf/src/ErrorMessageConfigDialog.cpp +++ b/kpf/src/ErrorMessageConfigDialog.cpp @@ -42,11 +42,11 @@ namespace KPF ErrorMessageConfigDialog::ErrorMessageConfigDialog ( WebServer * webServer, - TQWidget * tqparent + TQWidget * parent ) : KDialogBase ( - tqparent, + parent, "ErrorMessageConfigDialog", false, i18n("Configure error messages"), diff --git a/kpf/src/ErrorMessageConfigDialog.h b/kpf/src/ErrorMessageConfigDialog.h index 3c43f940..d485de31 100644 --- a/kpf/src/ErrorMessageConfigDialog.h +++ b/kpf/src/ErrorMessageConfigDialog.h @@ -43,7 +43,7 @@ namespace KPF public: - ErrorMessageConfigDialog(WebServer *, TQWidget * tqparent); + ErrorMessageConfigDialog(WebServer *, TQWidget * parent); virtual ~ErrorMessageConfigDialog(); diff --git a/kpf/src/PortValidator.cpp b/kpf/src/PortValidator.cpp index 538cd3bf..b841377c 100644 --- a/kpf/src/PortValidator.cpp +++ b/kpf/src/PortValidator.cpp @@ -27,8 +27,8 @@ namespace KPF { - PortValidator::PortValidator(TQObject * tqparent, const char * name) - : TQValidator(tqparent, name) + PortValidator::PortValidator(TQObject * parent, const char * name) + : TQValidator(parent, name) { // Empty. } diff --git a/kpf/src/PortValidator.h b/kpf/src/PortValidator.h index c252c6a2..ca9a34e0 100644 --- a/kpf/src/PortValidator.h +++ b/kpf/src/PortValidator.h @@ -36,7 +36,7 @@ namespace KPF { public: - PortValidator(TQObject * tqparent, const char * name = 0); + PortValidator(TQObject * parent, const char * name = 0); virtual State validate(TQString & input, int & pos) const; }; diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp index 57f7c994..028697d3 100644 --- a/kpf/src/PropertiesDialogPlugin.cpp +++ b/kpf/src/PropertiesDialogPlugin.cpp @@ -273,9 +273,9 @@ namespace KPF } TQWidget * - PropertiesDialogPlugin::createInitWidget(TQWidget * tqparent) + PropertiesDialogPlugin::createInitWidget(TQWidget * parent) { - TQWidget * w = new TQWidget(tqparent); + TQWidget * w = new TQWidget(parent); TQLabel * about = new TQLabel @@ -316,9 +316,9 @@ namespace KPF } TQWidget * - PropertiesDialogPlugin::createConfigWidget(TQWidget * tqparent) + PropertiesDialogPlugin::createConfigWidget(TQWidget * parent) { - TQWidget * w = new TQWidget(tqparent); + TQWidget * w = new TQWidget(parent); d->cb_share = new TQCheckBox(i18n("Share this directory on the &Web"), w); diff --git a/kpf/src/PropertiesDialogPlugin.h b/kpf/src/PropertiesDialogPlugin.h index fc46b77d..8b19df31 100644 --- a/kpf/src/PropertiesDialogPlugin.h +++ b/kpf/src/PropertiesDialogPlugin.h @@ -65,8 +65,8 @@ namespace KPF void updateGUIFromCurrentState(); void updateWantedStateFromGUI(); - TQWidget * createInitWidget(TQWidget * tqparent); - TQWidget * createConfigWidget(TQWidget * tqparent); + TQWidget * createInitWidget(TQWidget * parent); + TQWidget * createConfigWidget(TQWidget * parent); void readSettings(); void setControlsEnabled(bool); diff --git a/kpf/src/RootValidator.cpp b/kpf/src/RootValidator.cpp index 6e0ec172..00fae54d 100644 --- a/kpf/src/RootValidator.cpp +++ b/kpf/src/RootValidator.cpp @@ -29,8 +29,8 @@ namespace KPF { - RootValidator::RootValidator(TQObject * tqparent, const char * name) - : TQValidator(tqparent, name) + RootValidator::RootValidator(TQObject * parent, const char * name) + : TQValidator(parent, name) { } diff --git a/kpf/src/RootValidator.h b/kpf/src/RootValidator.h index 05d02757..a5b5727a 100644 --- a/kpf/src/RootValidator.h +++ b/kpf/src/RootValidator.h @@ -36,7 +36,7 @@ namespace KPF { public: - RootValidator(TQObject * tqparent, const char * name = 0); + RootValidator(TQObject * parent, const char * name = 0); virtual State validate(TQString & input, int & pos) const; }; diff --git a/kpf/src/Server.cpp b/kpf/src/Server.cpp index 62566b63..87d3c733 100644 --- a/kpf/src/Server.cpp +++ b/kpf/src/Server.cpp @@ -41,9 +41,9 @@ namespace KPF const TQString & dir, bool followSymlinks, int socket, - WebServer * tqparent + WebServer * parent ) - : TQObject(tqparent, "Server") + : TQObject(parent, "Server") { d = new Private; diff --git a/kpf/src/Server.h b/kpf/src/Server.h index 2e332801..97d75ed1 100644 --- a/kpf/src/Server.h +++ b/kpf/src/Server.h @@ -37,7 +37,7 @@ namespace KPF /** * Converses with a remote client. Handles requests and generates responses. - * Bandwidth is controlled by tqparent (WebServer). + * Bandwidth is controlled by parent (WebServer). */ class Server : public TQObject { @@ -61,14 +61,14 @@ namespace KPF * * @param socket The system's socket device, used for communication. * - * @param tqparent A WebServer, which will manage this Server. + * @param parent A WebServer, which will manage this Server. */ Server ( const TQString & dir, bool followSymlinks, int socket, - WebServer * tqparent + WebServer * parent ); /** diff --git a/kpf/src/ServerSocket.cpp b/kpf/src/ServerSocket.cpp index ffbab706..38d419a5 100644 --- a/kpf/src/ServerSocket.cpp +++ b/kpf/src/ServerSocket.cpp @@ -28,8 +28,8 @@ namespace KPF { - ServerSocket::ServerSocket(TQObject * tqparent, const char * name) - : TQSocket(tqparent, name) + ServerSocket::ServerSocket(TQObject * parent, const char * name) + : TQSocket(parent, name) { // Empty. } diff --git a/kpf/src/ServerSocket.h b/kpf/src/ServerSocket.h index 13016672..8dd7cc20 100644 --- a/kpf/src/ServerSocket.h +++ b/kpf/src/ServerSocket.h @@ -36,7 +36,7 @@ namespace KPF { public: - ServerSocket(TQObject * tqparent, const char * name = 0); + ServerSocket(TQObject * parent, const char * name = 0); uint outputBufferLeft(); }; diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp index 214b6003..b48a2bf2 100644 --- a/kpf/src/ServerWizard.cpp +++ b/kpf/src/ServerWizard.cpp @@ -46,8 +46,8 @@ namespace KPF { - ServerWizard::ServerWizard(TQWidget * tqparent) - : KWizard(tqparent, "KPF::ServerWizard", true) + ServerWizard::ServerWizard(TQWidget * parent) + : KWizard(parent, "KPF::ServerWizard", true) { setCaption(i18n("New Server - %1").tqarg("kpf")); diff --git a/kpf/src/ServerWizard.h b/kpf/src/ServerWizard.h index de4896cf..f3c4a0c4 100644 --- a/kpf/src/ServerWizard.h +++ b/kpf/src/ServerWizard.h @@ -42,7 +42,7 @@ namespace KPF public: - ServerWizard(TQWidget * tqparent = 0); + ServerWizard(TQWidget * parent = 0); virtual ~ServerWizard(); diff --git a/kpf/src/SingleServerConfigDialog.cpp b/kpf/src/SingleServerConfigDialog.cpp index f3a2c0eb..0dd907b3 100644 --- a/kpf/src/SingleServerConfigDialog.cpp +++ b/kpf/src/SingleServerConfigDialog.cpp @@ -33,11 +33,11 @@ namespace KPF SingleServerConfigDialog::SingleServerConfigDialog ( WebServer * server, - TQWidget * tqparent + TQWidget * parent ) : KDialogBase ( - tqparent, + parent, "KPF::SingleServerConfigDialog", false, i18n("Configuring Server %1 - kpf").tqarg(server->root()), diff --git a/kpf/src/SingleServerConfigDialog.h b/kpf/src/SingleServerConfigDialog.h index c5f6acc5..9e8d3dfe 100644 --- a/kpf/src/SingleServerConfigDialog.h +++ b/kpf/src/SingleServerConfigDialog.h @@ -41,7 +41,7 @@ namespace KPF public: - SingleServerConfigDialog(WebServer *, TQWidget * tqparent); + SingleServerConfigDialog(WebServer *, TQWidget * parent); virtual ~SingleServerConfigDialog(); diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp index 3daf1ec1..94709edc 100644 --- a/kpf/src/StartingKPFDialog.cpp +++ b/kpf/src/StartingKPFDialog.cpp @@ -47,11 +47,11 @@ namespace KPF TQTimer timer; }; - StartingKPFDialog::StartingKPFDialog(TQWidget * tqparent) + StartingKPFDialog::StartingKPFDialog(TQWidget * parent) : KDialogBase ( - tqparent, + parent, "StartingKPFDialog", true, /* modal */ i18n("Starting KDE public fileserver applet"), diff --git a/kpf/src/StartingKPFDialog.h b/kpf/src/StartingKPFDialog.h index 39571f60..a25fcda7 100644 --- a/kpf/src/StartingKPFDialog.h +++ b/kpf/src/StartingKPFDialog.h @@ -39,7 +39,7 @@ namespace KPF public: - StartingKPFDialog(TQWidget * tqparent); + StartingKPFDialog(TQWidget * parent); virtual ~StartingKPFDialog(); -- cgit v1.2.1