From 65fafc86459142678b3f616d78bd22da80479134 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/kpowersave@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/blacklisteditdialog.cpp | 4 ++-- src/blacklisteditdialog.h | 2 +- src/configuredialog.cpp | 4 ++-- src/configuredialog.h | 2 +- src/countdowndialog.cpp | 4 ++-- src/countdowndialog.h | 2 +- src/detaileddialog.cpp | 4 ++-- src/detaileddialog.h | 2 +- src/infodialog.cpp | 4 ++-- src/infodialog.h | 2 +- src/logviewer.cpp | 4 ++-- src/logviewer.h | 2 +- src/screen.cpp | 4 ++-- src/suspenddialog.cpp | 4 ++-- src/suspenddialog.h | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/blacklisteditdialog.cpp b/src/blacklisteditdialog.cpp index e2f33ad..d319ae5 100644 --- a/src/blacklisteditdialog.cpp +++ b/src/blacklisteditdialog.cpp @@ -44,8 +44,8 @@ /*! This is the default constructor of class blacklistEditDialog . */ blacklistEditDialog::blacklistEditDialog( TQStringList blacklisted, TQString captionName, - bool initImport, TQWidget *tqparent, const char *name) - :blacklistedit_Dialog(tqparent, name, false, WDestructiveClose ) + bool initImport, TQWidget *parent, const char *name) + :blacklistedit_Dialog(parent, name, false, WDestructiveClose ) { blacklist = blacklisted; diff --git a/src/blacklisteditdialog.h b/src/blacklisteditdialog.h index 57b2d4b..2e2faec 100644 --- a/src/blacklisteditdialog.h +++ b/src/blacklisteditdialog.h @@ -43,7 +43,7 @@ public: //! default constructor blacklistEditDialog(TQStringList blacklisted, TQString captionName, bool initImport = false, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); //! default destructor ~blacklistEditDialog(); diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp index 7091b11..892c380 100644 --- a/src/configuredialog.cpp +++ b/src/configuredialog.cpp @@ -55,8 +55,8 @@ /*! This is the default constructor of the class ConfigureDialog. */ ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Settings *_settings, - TQWidget *tqparent, const char *name) - :configure_Dialog(tqparent, name, false, WDestructiveClose ) + TQWidget *parent, const char *name) + :configure_Dialog(parent, name, false, WDestructiveClose ) { kdDebugFuncIn(trace); diff --git a/src/configuredialog.h b/src/configuredialog.h index 1ec8c68..c968cd3 100644 --- a/src/configuredialog.h +++ b/src/configuredialog.h @@ -47,7 +47,7 @@ class ConfigureDialog: public configure_Dialog { public: //! default constructor ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Settings *_settings, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); //! default destructor ~ConfigureDialog(); diff --git a/src/countdowndialog.cpp b/src/countdowndialog.cpp index 0e22b36..6abaf90 100644 --- a/src/countdowndialog.cpp +++ b/src/countdowndialog.cpp @@ -41,8 +41,8 @@ #include /*! This is the default constructor of class countDownDialog . */ -countDownDialog::countDownDialog( int timeout, TQWidget *tqparent, const char *name) - :countdown_Dialog(tqparent, name, false, TQt::WStyle_StaysOnTop | TQt::WDestructiveClose ) +countDownDialog::countDownDialog( int timeout, TQWidget *parent, const char *name) + :countdown_Dialog(parent, name, false, TQt::WStyle_StaysOnTop | TQt::WDestructiveClose ) { kdDebugFuncIn(trace); chancel = false; diff --git a/src/countdowndialog.h b/src/countdowndialog.h index f23cae4..91027d6 100644 --- a/src/countdowndialog.h +++ b/src/countdowndialog.h @@ -41,7 +41,7 @@ class countDownDialog: public countdown_Dialog { public: //! default constructor - countDownDialog(int timeout, TQWidget *tqparent = 0, const char *name = 0); + countDownDialog(int timeout, TQWidget *parent = 0, const char *name = 0); //! default destructor ~countDownDialog(); diff --git a/src/detaileddialog.cpp b/src/detaileddialog.cpp index 2925062..56910b1 100644 --- a/src/detaileddialog.cpp +++ b/src/detaileddialog.cpp @@ -46,8 +46,8 @@ * This is the default constructor of the class detaileddialog. */ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settings *_set, - TQWidget* tqparent, const char* name ) - : detailed_Dialog( tqparent, name, false, WDestructiveClose ) { + TQWidget* parent, const char* name ) + : detailed_Dialog( parent, name, false, WDestructiveClose ) { kdDebugFuncIn(trace); hwinfo = _hwinfo; config = _set; diff --git a/src/detaileddialog.h b/src/detaileddialog.h index 59220cd..f914c0c 100644 --- a/src/detaileddialog.h +++ b/src/detaileddialog.h @@ -55,7 +55,7 @@ class detaileddialog: public detailed_Dialog { public: //! default constructor - detaileddialog(HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settings *_set, TQWidget *tqparent = 0, const char *name = 0); + detaileddialog(HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settings *_set, TQWidget *parent = 0, const char *name = 0); //! default destructor ~detaileddialog(); diff --git a/src/infodialog.cpp b/src/infodialog.cpp index 7948bdd..57b1efa 100644 --- a/src/infodialog.cpp +++ b/src/infodialog.cpp @@ -43,8 +43,8 @@ /*! This is the default constructor of class infoDialog . */ infoDialog::infoDialog( KConfig *config, TQString captionName, TQString message, TQString dontShowAgainMsg, TQString settingsEntryName, - TQWidget *tqparent, const char *name) - :info_Dialog( tqparent, name, false, TQt::WStyle_StaysOnTop | WDestructiveClose ) + TQWidget *parent, const char *name) + :info_Dialog( parent, name, false, TQt::WStyle_StaysOnTop | WDestructiveClose ) { if ( message.isEmpty() || (!dontShowAgainMsg.isEmpty() && settingsEntryName.isEmpty()) || (!dontShowAgainMsg.isEmpty() && (config == 0))) diff --git a/src/infodialog.h b/src/infodialog.h index d24acb3..379b377 100644 --- a/src/infodialog.h +++ b/src/infodialog.h @@ -45,7 +45,7 @@ public: //! default constructor infoDialog( KConfig *config = 0, TQString captionName = TQString(), TQString message = TQString(), TQString dontShowAgainMsg = TQString(), TQString settingsEntryName = TQString(), - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); //! default destructor ~infoDialog(); diff --git a/src/logviewer.cpp b/src/logviewer.cpp index 6e09db4..f63e797 100644 --- a/src/logviewer.cpp +++ b/src/logviewer.cpp @@ -38,8 +38,8 @@ #include "logviewer.h" /*! This is the default constructor of the class LogViewer. */ -LogViewer::LogViewer( TQString filename, TQWidget *tqparent, const char *name) - :log_viewer(tqparent, name, false, WDestructiveClose ) { +LogViewer::LogViewer( TQString filename, TQWidget *parent, const char *name) + :log_viewer(parent, name, false, WDestructiveClose ) { this->setCaption(i18n("KPowersave Logfile Viewer: %1").tqarg(filename)); diff --git a/src/logviewer.h b/src/logviewer.h index c04bbfd..4b518d9 100644 --- a/src/logviewer.h +++ b/src/logviewer.h @@ -42,7 +42,7 @@ class LogViewer: public log_viewer { public: //! default constructor - LogViewer( TQString filename, TQWidget *tqparent = 0, const char *name = 0); + LogViewer( TQString filename, TQWidget *parent = 0, const char *name = 0); //! default destructor ~LogViewer(); diff --git a/src/screen.cpp b/src/screen.cpp index 6bc9c0b..877583a 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -150,7 +150,7 @@ static Window find_xscreensaver_window(Display * dpy) { kdDebugFuncIn(trace); Window root = RootWindowOfScreen(DefaultScreenOfDisplay(dpy)); - Window root2, tqparent, *kids; + Window root2, parent, *kids; Window retval = 0; Atom xs_version; unsigned int i; @@ -158,7 +158,7 @@ static Window find_xscreensaver_window(Display * dpy) { xs_version = XInternAtom(dpy, "_SCREENSAVER_VERSION", True); - if (!(xs_version != None && XQueryTree(dpy, root, &root2, &tqparent, &kids, &nkids) + if (!(xs_version != None && XQueryTree(dpy, root, &root2, &parent, &kids, &nkids) && kids && nkids)) { kdDebugFuncOut(trace); return 0; diff --git a/src/suspenddialog.cpp b/src/suspenddialog.cpp index e76f887..8be599b 100644 --- a/src/suspenddialog.cpp +++ b/src/suspenddialog.cpp @@ -38,8 +38,8 @@ #include "suspenddialog.h" /*! This is the default constructor of the class. */ -suspendDialog::suspendDialog(TQWidget *tqparent, const char *name) - :suspend_Dialog(tqparent, name, true, TQt::WStyle_StaysOnTop | TQt::WDestructiveClose ) +suspendDialog::suspendDialog(TQWidget *parent, const char *name) + :suspend_Dialog(parent, name, true, TQt::WStyle_StaysOnTop | TQt::WDestructiveClose ) { this->setIcon(SmallIcon("kpowersave", TQIconSet::Automatic)); } diff --git a/src/suspenddialog.h b/src/suspenddialog.h index f5b2de0..2dfbcae 100644 --- a/src/suspenddialog.h +++ b/src/suspenddialog.h @@ -41,7 +41,7 @@ class suspendDialog: public suspend_Dialog { public: //! default constructor - suspendDialog(TQWidget *tqparent = 0, const char *name = 0); + suspendDialog(TQWidget *parent = 0, const char *name = 0); //! default destructor ~suspendDialog();