From 9abdf0551e3660f55791ce3720d5f7035c06aa19 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/kpilot@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- conduits/abbrowserconduit/resolutionDialog.cc | 20 ++++++------- conduits/abbrowserconduit/resolutionDialog.h | 2 +- conduits/docconduit/DOC-converter.cc | 2 +- conduits/docconduit/DOC-converter.h | 2 +- conduits/docconduit/doc-conflictdialog.cc | 4 +-- conduits/docconduit/doc-conflictdialog.h | 2 +- conduits/docconduit/doc-factory.cc | 4 +-- conduits/docconduit/doc-factory.h | 2 +- conduits/docconduit/kpalmdoc_dlg.cc | 4 +-- conduits/docconduit/kpalmdoc_dlg.h | 2 +- conduits/knotes/knotes-factory.cc | 2 +- conduits/knotes/knotes-factory.h | 2 +- conduits/knotes/knotes-setup.h | 2 +- conduits/malconduit/mal-factory.cc | 4 +-- conduits/malconduit/mal-factory.h | 2 +- conduits/memofileconduit/memofile-factory.cc | 2 +- conduits/notepadconduit/notepad-conduit.cc | 4 +-- conduits/notepadconduit/notepad-conduit.h | 2 +- conduits/notepadconduit/notepad-factory.cc | 2 +- conduits/null/null-factory.cc | 2 +- conduits/recordconduit/factory.cc | 2 +- conduits/sysinfoconduit/sysinfo-setup.h | 2 +- conduits/timeconduit/time-setup.h | 2 +- kpilot/addressEditor.cc | 6 ++-- kpilot/addressEditor.h | 2 +- kpilot/addressWidget.cc | 4 +-- kpilot/addressWidget.h | 2 +- kpilot/conduitConfigDialog.cc | 30 +++++++++---------- kpilot/datebookWidget.cc | 4 +-- kpilot/datebookWidget.h | 2 +- kpilot/dbAppInfoEditor.cc | 4 +-- kpilot/dbAppInfoEditor.h | 2 +- kpilot/dbFlagsEditor.cc | 4 +-- kpilot/dbFlagsEditor.h | 2 +- kpilot/dbRecordEditor.cc | 4 +-- kpilot/dbRecordEditor.h | 2 +- kpilot/dbviewerWidget.cc | 4 +-- kpilot/dbviewerWidget.h | 2 +- kpilot/fileInstallWidget.cc | 4 +-- kpilot/fileInstallWidget.h | 2 +- kpilot/hotSync.cc | 6 ++-- kpilot/kpilot.cc | 22 +++++++------- kpilot/kpilotConfigWizard.cc | 4 +-- kpilot/kpilotProbeDialog.cc | 4 +-- kpilot/listCat.cc | 12 ++++---- kpilot/listCat.h | 8 ++--- kpilot/listItems.cc | 8 ++--- kpilot/listItems.h | 4 +-- kpilot/logWidget.cc | 4 +-- kpilot/memoWidget.cc | 6 ++-- kpilot/memoWidget.h | 2 +- kpilot/pilotComponent.cc | 10 +++---- kpilot/pilotComponent.h | 2 +- kpilot/todoEditor.cc | 6 ++-- kpilot/todoEditor.h | 2 +- kpilot/todoWidget.cc | 8 ++--- kpilot/todoWidget.h | 6 ++-- lib/kpilotdevicelink.cc | 4 +-- lib/kpilotdevicelink.h | 4 +-- lib/kpilotdevicelinkPrivate.h | 4 +-- lib/kpilotlink.cc | 4 +-- lib/kpilotlink.h | 2 +- lib/kpilotlocallink.cc | 4 +-- lib/kpilotlocallink.h | 2 +- lib/plugin.cc | 8 ++--- lib/plugin.h | 10 +++---- lib/pluginfactory.h | 18 +++++------ lib/syncAction.cc | 4 +-- lib/syncAction.h | 2 +- 69 files changed, 167 insertions(+), 167 deletions(-) diff --git a/conduits/abbrowserconduit/resolutionDialog.cc b/conduits/abbrowserconduit/resolutionDialog.cc index ca61afe..34e1fb4 100644 --- a/conduits/abbrowserconduit/resolutionDialog.cc +++ b/conduits/abbrowserconduit/resolutionDialog.cc @@ -43,15 +43,15 @@ * as well as its child radio buttons. There are two different constructors * for them. * Each controller has three child radio buttons, and if any of them is - * activated (stateChange), it sets the text of its tqparent (which is the + * activated (stateChange), it sets the text of its parent (which is the * controller, which is an instance of ResolutionCheckListItem, too). **/ class ResolutionCheckListItem : TQCheckListItem { public: ResolutionCheckListItem(ResolutionItem*it, ResolutionTable*tb, - TQListView*tqparent); + TQListView*parent); ResolutionCheckListItem(TQString header, TQString text, - ResolutionCheckListItem*tqparent); + ResolutionCheckListItem*parent); ~ResolutionCheckListItem() {}; virtual void stateChange(bool newstate); virtual void setValue(TQString text); @@ -73,8 +73,8 @@ protected: ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it, - ResolutionTable*tb, TQListView*tqparent) : - TQCheckListItem(tqparent, TQString(), TQCheckListItem::Controller), + ResolutionTable*tb, TQListView*parent) : + TQCheckListItem(parent, TQString(), TQCheckListItem::Controller), fResItem(it), isController(true), fCaption(it?(it->fName):(TQString())), @@ -119,8 +119,8 @@ ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it, } ResolutionCheckListItem::ResolutionCheckListItem(TQString text, TQString header, - ResolutionCheckListItem*tqparent) : - TQCheckListItem(tqparent, TQString(), TQCheckListItem::RadioButton), + ResolutionCheckListItem*parent) : + TQCheckListItem(parent, TQString(), TQCheckListItem::RadioButton), fResItem(0L), isController(false), fCaption(header), @@ -133,7 +133,7 @@ void ResolutionCheckListItem::stateChange(bool newstate) { if (newstate && !isController) { - ResolutionCheckListItem*par=static_cast(tqparent()); + ResolutionCheckListItem*par=static_cast(parent()); { par->setValue(fText); } @@ -171,9 +171,9 @@ void ResolutionCheckListItem::updateText() * *****************************************************************/ -ResolutionDlg::ResolutionDlg( TQWidget* tqparent, KPilotLink*fH, +ResolutionDlg::ResolutionDlg( TQWidget* parent, KPilotLink*fH, const TQString &caption, const TQString &helpText, ResolutionTable*tab) : - KDialogBase( tqparent, "ResolutionDlg", false, caption, Apply|Cancel, Apply), + KDialogBase( parent, "ResolutionDlg", false, caption, Apply|Cancel, Apply), tickleTimer(0L), fHandle(fH), fTable(tab) diff --git a/conduits/abbrowserconduit/resolutionDialog.h b/conduits/abbrowserconduit/resolutionDialog.h index 68a1d58..9f0edeb 100644 --- a/conduits/abbrowserconduit/resolutionDialog.h +++ b/conduits/abbrowserconduit/resolutionDialog.h @@ -43,7 +43,7 @@ class ResolutionDlg : public KDialogBase TQ_OBJECT public: - ResolutionDlg( TQWidget* tqparent=0, + ResolutionDlg( TQWidget* parent=0, KPilotLink*fH=0L, const TQString &caption=TQString(), const TQString &helpText=TQString(), diff --git a/conduits/docconduit/DOC-converter.cc b/conduits/docconduit/DOC-converter.cc index 2e25b61..cff8f19 100644 --- a/conduits/docconduit/DOC-converter.cc +++ b/conduits/docconduit/DOC-converter.cc @@ -145,7 +145,7 @@ int docRegExpBookmark::findMatches(TQString doctext, bmkList &fBookmarks) *********************************************************************/ -DOCConverter::DOCConverter(TQObject *tqparent, const char *name):TQObject(tqparent,name) { +DOCConverter::DOCConverter(TQObject *parent, const char *name):TQObject(parent,name) { FUNCTIONSETUP; docdb=0L; eSortBookmarks=eSortNone; diff --git a/conduits/docconduit/DOC-converter.h b/conduits/docconduit/DOC-converter.h index 27198cb..68eca2b 100644 --- a/conduits/docconduit/DOC-converter.h +++ b/conduits/docconduit/DOC-converter.h @@ -122,7 +122,7 @@ public: } eSortBookmarks; public: - DOCConverter(TQObject *tqparent=0L, const char *name=0L); + DOCConverter(TQObject *parent=0L, const char *name=0L); virtual ~ DOCConverter(); TQString readText(); diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc index 5ea646b..8d1e211 100644 --- a/conduits/docconduit/doc-conflictdialog.cc +++ b/conduits/docconduit/doc-conflictdialog.cc @@ -39,8 +39,8 @@ #include -ResolutionDialog::ResolutionDialog( TQWidget* tqparent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk ) - : KDialogBase( tqparent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) { +ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk ) + : KDialogBase( parent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) { FUNCTIONSETUP; syncInfo=sinfo; hasConflicts=false; diff --git a/conduits/docconduit/doc-conflictdialog.h b/conduits/docconduit/doc-conflictdialog.h index 83cb8d4..e59c17c 100644 --- a/conduits/docconduit/doc-conflictdialog.h +++ b/conduits/docconduit/doc-conflictdialog.h @@ -57,7 +57,7 @@ class ResolutionDialog : public KDialogBase TQ_OBJECT public: - ResolutionDialog( TQWidget* tqparent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L); + ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L); ~ResolutionDialog(); bool hasConflicts; diff --git a/conduits/docconduit/doc-factory.cc b/conduits/docconduit/doc-factory.cc index 47e1d40..cfab20f4d 100644 --- a/conduits/docconduit/doc-factory.cc +++ b/conduits/docconduit/doc-factory.cc @@ -94,7 +94,7 @@ DOCConduitFactory::~DOCConduitFactory() } else { - WARNINGKPILOT << "Couldn't cast tqparent to widget." << endl; + WARNINGKPILOT << "Couldn't cast parent to widget." << endl; return 0L; } } @@ -107,7 +107,7 @@ DOCConduitFactory::~DOCConduitFactory() } else { - WARNINGKPILOT << "Couldn't cast tqparent to KPilotLink" <setFrameShape(TQLabel::NoFrame); @@ -202,12 +202,12 @@ static void addDescriptionPage(TQWidgetStack *tqparent, l = new TQLabel(v); } - tqparent->addWidget(v,pageno); + parent->addWidget(v,pageno); } -ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *tqparent, const char *n) : - KCModule(tqparent, n), +ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n) : + KCModule(parent, n), fConduitList(0L), fStack(0L), fConfigureButton(0L), @@ -300,9 +300,9 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *tqparent, const char fStack->addWidget(ConduitConfigBase::aboutPage(fStack,0L),GENERAL_ABOUT); } -ConduitConfigWidget::ConduitConfigWidget(TQWidget *tqparent, const char *n, +ConduitConfigWidget::ConduitConfigWidget(TQWidget *parent, const char *n, bool) : - ConduitConfigWidgetBase(tqparent,n), + ConduitConfigWidgetBase(parent,n), fConfigure(0L), fCurrentConduit(0L), fGeneralPage(0L), @@ -716,7 +716,7 @@ void ConduitConfigWidget::selected(TQListViewItem *p) #endif // set the dialog title to the selected item - TQListViewItem *pParent = p->tqparent(); + TQListViewItem *pParent = p->parent(); TQString title; title = pParent ? pParent->text(CONDUIT_NAME) + CSL1(" - ") : TQString() ; title += p ? p->text(CONDUIT_NAME) : i18n("KPilot Setup"); diff --git a/kpilot/datebookWidget.cc b/kpilot/datebookWidget.cc index 7d8c851..8b76942 100644 --- a/kpilot/datebookWidget.cc +++ b/kpilot/datebookWidget.cc @@ -41,8 +41,8 @@ #include "datebookWidget.moc" -DatebookWidget::DatebookWidget(TQWidget *tqparent, const TQString &dbpath) : - PilotComponent(tqparent,"component_generic",dbpath) +DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) : + PilotComponent(parent,"component_generic",dbpath) { FUNCTIONSETUP; diff --git a/kpilot/datebookWidget.h b/kpilot/datebookWidget.h index 4acfbb3..5933c7c 100644 --- a/kpilot/datebookWidget.h +++ b/kpilot/datebookWidget.h @@ -42,7 +42,7 @@ Q_OBJECT TQ_OBJECT public: - DatebookWidget(TQWidget* tqparent, const TQString& dbpath); + DatebookWidget(TQWidget* parent, const TQString& dbpath); virtual ~DatebookWidget(); // Pilot component methods diff --git a/kpilot/dbAppInfoEditor.cc b/kpilot/dbAppInfoEditor.cc index f0ddb1e..0011ff1 100644 --- a/kpilot/dbAppInfoEditor.cc +++ b/kpilot/dbAppInfoEditor.cc @@ -41,8 +41,8 @@ using namespace KHE; /************************************************* **************************************************/ -DBAppInfoEditor::DBAppInfoEditor(char*appInfoData, int l, TQWidget *tqparent) : - KDialogBase(tqparent, "AppBlock Editor",false, +DBAppInfoEditor::DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent) : + KDialogBase(parent, "AppBlock Editor",false, i18n("Edit AppInfo Block"), Ok|Cancel), appInfo(appInfoData), diff --git a/kpilot/dbAppInfoEditor.h b/kpilot/dbAppInfoEditor.h index 8ac9cf3..bb1111c 100644 --- a/kpilot/dbAppInfoEditor.h +++ b/kpilot/dbAppInfoEditor.h @@ -37,7 +37,7 @@ class DBAppInfoEditor : public KDialogBase Q_OBJECT TQ_OBJECT public: - DBAppInfoEditor(char*appInfoData, int l, TQWidget *tqparent = 0); + DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent = 0); ~DBAppInfoEditor(); char*appInfo; int len; diff --git a/kpilot/dbFlagsEditor.cc b/kpilot/dbFlagsEditor.cc index 7b366f9..eafbe58 100644 --- a/kpilot/dbFlagsEditor.cc +++ b/kpilot/dbFlagsEditor.cc @@ -40,8 +40,8 @@ #include "dbFlagsEditor_base.h" -DBFlagsEditor::DBFlagsEditor(DBInfo*dbinfo, TQWidget *tqparent) : - KDialogBase(tqparent, "FlagsEditor",false, +DBFlagsEditor::DBFlagsEditor(DBInfo*dbinfo, TQWidget *parent) : + KDialogBase(parent, "FlagsEditor",false, i18n("Edit Database Flags"), Ok|Cancel), dbi(dbinfo) { diff --git a/kpilot/dbFlagsEditor.h b/kpilot/dbFlagsEditor.h index c88daf0..be58d5c 100644 --- a/kpilot/dbFlagsEditor.h +++ b/kpilot/dbFlagsEditor.h @@ -40,7 +40,7 @@ class DBFlagsEditor : public KDialogBase Q_OBJECT TQ_OBJECT public: - DBFlagsEditor(DBInfo*dbinfo=0L, TQWidget *tqparent = 0); + DBFlagsEditor(DBInfo*dbinfo=0L, TQWidget *parent = 0); ~DBFlagsEditor(); protected: diff --git a/kpilot/dbRecordEditor.cc b/kpilot/dbRecordEditor.cc index 447d3df..ec31e26 100644 --- a/kpilot/dbRecordEditor.cc +++ b/kpilot/dbRecordEditor.cc @@ -49,8 +49,8 @@ using namespace KHE; -DBRecordEditor::DBRecordEditor(PilotRecord*r, int n, TQWidget *tqparent) - : KDialogBase(tqparent, "RecordEditor",false,i18n("Edit Record"), +DBRecordEditor::DBRecordEditor(PilotRecord*r, int n, TQWidget *parent) + : KDialogBase(parent, "RecordEditor",false,i18n("Edit Record"), Ok|Cancel), rec(r), nr(n) { // fWidget=new DBRecordEditorBase(this); diff --git a/kpilot/dbRecordEditor.h b/kpilot/dbRecordEditor.h index 338113c..aa61a92 100644 --- a/kpilot/dbRecordEditor.h +++ b/kpilot/dbRecordEditor.h @@ -56,7 +56,7 @@ class DBRecordEditor : public KDialogBase Q_OBJECT TQ_OBJECT public: - DBRecordEditor(PilotRecord*r=0L, int n=-1, TQWidget *tqparent = 0); + DBRecordEditor(PilotRecord*r=0L, int n=-1, TQWidget *parent = 0); ~DBRecordEditor(); protected: diff --git a/kpilot/dbviewerWidget.cc b/kpilot/dbviewerWidget.cc index ff7fad1..6332760 100644 --- a/kpilot/dbviewerWidget.cc +++ b/kpilot/dbviewerWidget.cc @@ -64,8 +64,8 @@ #include "dbviewerWidget.moc" -GenericDBWidget::GenericDBWidget(TQWidget *tqparent, const TQString &dbpath) : - PilotComponent(tqparent,"component_generic",dbpath), fDB(0L) +GenericDBWidget::GenericDBWidget(TQWidget *parent, const TQString &dbpath) : + PilotComponent(parent,"component_generic",dbpath), fDB(0L) { FUNCTIONSETUP; setupWidget(); diff --git a/kpilot/dbviewerWidget.h b/kpilot/dbviewerWidget.h index 0a5f2d1..760ac45 100644 --- a/kpilot/dbviewerWidget.h +++ b/kpilot/dbviewerWidget.h @@ -46,7 +46,7 @@ Q_OBJECT TQ_OBJECT public: - GenericDBWidget(TQWidget* tqparent, const TQString& dbpath); + GenericDBWidget(TQWidget* parent, const TQString& dbpath); virtual ~GenericDBWidget(); // Pilot component methods diff --git a/kpilot/fileInstallWidget.cc b/kpilot/fileInstallWidget.cc index c9ce561..5e11c46 100644 --- a/kpilot/fileInstallWidget.cc +++ b/kpilot/fileInstallWidget.cc @@ -58,9 +58,9 @@ #include "fileInstallWidget.moc" -FileInstallWidget::FileInstallWidget(TQWidget * tqparent, +FileInstallWidget::FileInstallWidget(TQWidget * parent, const TQString & path) : - PilotComponent(tqparent, "component_files", path), + PilotComponent(parent, "component_files", path), fSaveFileList(false), fInstaller(0L) { diff --git a/kpilot/fileInstallWidget.h b/kpilot/fileInstallWidget.h index b12fd00..29e3daa 100644 --- a/kpilot/fileInstallWidget.h +++ b/kpilot/fileInstallWidget.h @@ -48,7 +48,7 @@ Q_OBJECT TQ_OBJECT public: - FileInstallWidget(TQWidget* tqparent, const TQString& dbPath); + FileInstallWidget(TQWidget* parent, const TQString& dbPath); virtual ~FileInstallWidget(); // Pilot Component Methods: diff --git a/kpilot/hotSync.cc b/kpilot/hotSync.cc index 96e006c..7689f32 100644 --- a/kpilot/hotSync.cc +++ b/kpilot/hotSync.cc @@ -68,7 +68,7 @@ class BackupAction::Thread : public TQThread { public: - Thread( BackupAction *tqparent, + Thread( BackupAction *parent, KPilotLink *link, const TQString &filename, const DBInfo *info ); @@ -1128,12 +1128,12 @@ void RestoreAction::setDirectory( const TQString &path ) -BackupAction::Thread::Thread( BackupAction *tqparent, +BackupAction::Thread::Thread( BackupAction *parent, KPilotLink *link, const TQString &filename, const DBInfo *info ) { - fParent = tqparent; + fParent = parent; fLink = link; fFilename = filename; memcpy(&fDBInfo,info,sizeof(DBInfo)); diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc index 328029f..246fd9a 100644 --- a/kpilot/kpilot.cc +++ b/kpilot/kpilot.cc @@ -320,21 +320,21 @@ void KPilotInstaller::slotSelectComponent(PilotComponent *c) return; } - TQObject *o = c->tqparent(); + TQObject *o = c->parent(); if (!o) { - WARNINGKPILOT << "Widget has no tqparent." << endl; + WARNINGKPILOT << "Widget has no parent." << endl; return; } - TQWidget *tqparent = dynamic_cast(o); - if (!tqparent) + TQWidget *parent = dynamic_cast(o); + if (!parent) { - WARNINGKPILOT << "Widget's tqparent is not a widget." << endl; + WARNINGKPILOT << "Widget's parent is not a widget." << endl; return; } - int index = fManagingWidget->pageIndex(tqparent); + int index = fManagingWidget->pageIndex(parent); if (index < 0) { @@ -741,7 +741,7 @@ void KPilotInstaller::slotResetLink() /* ** Can't be a member function because it needs to be called even with no KPilotInstaller. */ -static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *tqparent) +static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *parent) { FUNCTIONSETUP; bool ret = false; @@ -754,7 +754,7 @@ static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *tqparent) KPilotSettings::self()->readConfig(); - KCMultiDialog *options = new KCMultiDialog( KDialogBase::Plain, i18n("Configuration"), tqparent, "KPilotPreferences", true ); + KCMultiDialog *options = new KCMultiDialog( KDialogBase::Plain, i18n("Configuration"), parent, "KPilotPreferences", true ); options->addModule( CSL1("kpilot_config.desktop") ); if (!options) @@ -796,7 +796,7 @@ static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *tqparent) * canceled, though). */ typedef enum { Failed, OK, Cancel } WizardResult; -static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *tqparent) +static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *parent) { FUNCTIONSETUP; WizardResult ret = Failed ; @@ -826,7 +826,7 @@ static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *tqparent) goto sorry; } - w = f(tqparent,ConfigWizard::Standalone); + w = f(parent,ConfigWizard::Standalone); if (!w) { WARNINGKPILOT << "Can't create wizard." << endl; @@ -847,7 +847,7 @@ static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *tqparent) sorry: if (Failed == ret) { - KMessageBox::sorry(tqparent, + KMessageBox::sorry(parent, i18n("The library containing the configuration wizard for KPilot " "could not be loaded, and the wizard is not available. " "Please try to use the regular configuration dialog."), diff --git a/kpilot/kpilotConfigWizard.cc b/kpilot/kpilotConfigWizard.cc index fd6036d..0b5b881 100644 --- a/kpilot/kpilotConfigWizard.cc +++ b/kpilot/kpilotConfigWizard.cc @@ -52,8 +52,8 @@ #include "kpilotProbeDialog.h" -ConfigWizard::ConfigWizard(TQWidget *tqparent, const char *n, int m) : - KWizard(tqparent, n), +ConfigWizard::ConfigWizard(TQWidget *parent, const char *n, int m) : + KWizard(parent, n), fMode((Mode)m) { // page1=new ConfigWizard_base1(this); diff --git a/kpilot/kpilotProbeDialog.cc b/kpilot/kpilotProbeDialog.cc index db62f9d..67da0e6 100644 --- a/kpilot/kpilotProbeDialog.cc +++ b/kpilot/kpilotProbeDialog.cc @@ -86,8 +86,8 @@ and the module can't be unloaded. */ -ProbeDialog::ProbeDialog(TQWidget *tqparent, const char *n) : - KDialogBase(tqparent, n, true, i18n("Autodetecting Your Handheld"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Cancel, true, i18n("Restart Detection")), +ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) : + KDialogBase(parent, n, true, i18n("Autodetecting Your Handheld"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Cancel, true, i18n("Restart Detection")), mDetected(false), mUserName(), mDevice() { FUNCTIONSETUP; diff --git a/kpilot/listCat.cc b/kpilot/listCat.cc index a5b2966..a5bf4f2 100644 --- a/kpilot/listCat.cc +++ b/kpilot/listCat.cc @@ -36,9 +36,9 @@ #include "listCat.moc" -ListCategorizer::ListCategorizer(TQWidget * tqparent, +ListCategorizer::ListCategorizer(TQWidget * parent, const char *name) : - KListView(tqparent, name), + KListView(parent, name), fStartOpen(false) { FUNCTIONSETUP; @@ -47,9 +47,9 @@ ListCategorizer::ListCategorizer(TQWidget * tqparent, ListCategorizer::ListCategorizer(const TQStringList & i, bool startOpen, - TQWidget * tqparent, + TQWidget * parent, const char *name) : - KListView(tqparent, name), + KListView(parent, name), fStartOpen(startOpen) { FUNCTIONSETUP; @@ -121,7 +121,7 @@ void ListCategorizer::setupWidget() return; } - TQListViewItem *category = p->tqparent(); + TQListViewItem *category = p->parent(); if (!category) { @@ -136,7 +136,7 @@ void ListCategorizer::setupWidget() FUNCTIONSETUP; TQListViewItem *p = currentItem(); - if (!p || !p->tqparent()) + if (!p || !p->parent()) return; KListView::startDrag(); diff --git a/kpilot/listCat.h b/kpilot/listCat.h index 9f094e0..b90a5e6 100644 --- a/kpilot/listCat.h +++ b/kpilot/listCat.h @@ -72,9 +72,9 @@ public: * * This creates a new empty ListCategorizer with * startOpen set to false. The parameters - * @p tqparent and @p name are the usual TQt ones. + * @p parent and @p name are the usual TQt ones. */ - ListCategorizer(TQWidget *tqparent, + ListCategorizer(TQWidget *parent, const char *name = 0); /** * Constructor. @@ -85,7 +85,7 @@ public: */ ListCategorizer(const TQStringList& categories, bool startOpen, - TQWidget *tqparent, + TQWidget *parent, const char *name = 0); /** @@ -201,7 +201,7 @@ private: class RichListViewItem : public TQListViewItem { public: - RichListViewItem(TQListViewItem *tqparent, + RichListViewItem(TQListViewItem *parent, TQString, int); virtual ~RichListViewItem(); diff --git a/kpilot/listItems.cc b/kpilot/listItems.cc index 2b5b98e..7db37cc 100644 --- a/kpilot/listItems.cc +++ b/kpilot/listItems.cc @@ -94,8 +94,8 @@ PilotListItem::~PilotListItem() } #endif -PilotCheckListItem::PilotCheckListItem(TQListView * tqparent, const TQString & text, recordid_t pilotid, void *r) : - TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox), +PilotCheckListItem::PilotCheckListItem(TQListView * parent, const TQString & text, recordid_t pilotid, void *r) : + TQCheckListItem(parent, text, TQCheckListItem::CheckBox), fid(pilotid), fr(r) { @@ -142,10 +142,10 @@ void PilotCheckListItem::stateChange ( bool on) } #endif -PilotListViewItem::PilotListViewItem( TQListView * tqparent, +PilotListViewItem::PilotListViewItem( TQListView * parent, TQString label1, TQString label2, TQString label3, TQString label4, recordid_t pilotid, void *r): - TQListViewItem(tqparent, label1, label2, label3, label4, + TQListViewItem(parent, label1, label2, label3, label4, TQString(), TQString(), TQString(), TQString()), fid(pilotid), fr(r), diff --git a/kpilot/listItems.h b/kpilot/listItems.h index b08cade..f676b01 100644 --- a/kpilot/listItems.h +++ b/kpilot/listItems.h @@ -59,7 +59,7 @@ private: class PilotCheckListItem : public TQCheckListItem { public: - PilotCheckListItem( TQListView * tqparent, const TQString & text, recordid_t pilotid=0, void *r=0); + PilotCheckListItem( TQListView * parent, const TQString & text, recordid_t pilotid=0, void *r=0); virtual ~PilotCheckListItem(); recordid_t id() const {return fid;}; const void *rec() const {return fr;}; @@ -85,7 +85,7 @@ struct PilotListViewItemData class PilotListViewItem : public TQListViewItem { public: - PilotListViewItem( TQListView * tqparent, + PilotListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), recordid_t pilotid=0, void *r=0); diff --git a/kpilot/logWidget.cc b/kpilot/logWidget.cc index 5d7fb2d..1ff7ae9 100644 --- a/kpilot/logWidget.cc +++ b/kpilot/logWidget.cc @@ -59,9 +59,9 @@ #define TE_EOL "\n" -LogWidget::LogWidget(TQWidget * tqparent) : +LogWidget::LogWidget(TQWidget * parent) : DCOPObject("LogIface"), - PilotComponent(tqparent, "component_log", TQString()), + PilotComponent(parent, "component_log", TQString()), fLog(0L), fShowTime(false), fSplash(0L), diff --git a/kpilot/memoWidget.cc b/kpilot/memoWidget.cc index 6d95ec9..c471719 100644 --- a/kpilot/memoWidget.cc +++ b/kpilot/memoWidget.cc @@ -74,9 +74,9 @@ public: } ; -MemoWidget::MemoWidget(TQWidget * tqparent, +MemoWidget::MemoWidget(TQWidget * parent, const TQString & path) : - PilotComponent(tqparent, "component_memo", path), + PilotComponent(parent, "component_memo", path), fTextWidget(0L), d(new Private()), lastSelectedMemo(-1) @@ -84,7 +84,7 @@ MemoWidget::MemoWidget(TQWidget * tqparent, FUNCTIONSETUP; setGeometry(0, 0, - tqparent->tqgeometry().width(), tqparent->tqgeometry().height()); + parent->tqgeometry().width(), parent->tqgeometry().height()); setupWidget(); d->fMemoList.setAutoDelete(true); slotUpdateButtons(); diff --git a/kpilot/memoWidget.h b/kpilot/memoWidget.h index a260b67..c979d5d 100644 --- a/kpilot/memoWidget.h +++ b/kpilot/memoWidget.h @@ -45,7 +45,7 @@ Q_OBJECT TQ_OBJECT public: - MemoWidget(TQWidget* tqparent, const TQString& dbpath); + MemoWidget(TQWidget* parent, const TQString& dbpath); virtual ~MemoWidget(); // Pilot Component Methods: diff --git a/kpilot/pilotComponent.cc b/kpilot/pilotComponent.cc index dcc8b34..5908479 100644 --- a/kpilot/pilotComponent.cc +++ b/kpilot/pilotComponent.cc @@ -46,19 +46,19 @@ #include "pilotComponent.moc" -PilotComponent::PilotComponent(TQWidget * tqparent, +PilotComponent::PilotComponent(TQWidget * parent, const char *id, const TQString & path) : - TQWidget(tqparent, id), + TQWidget(parent, id), fDBPath(path), shown(false) { FUNCTIONSETUP; - if (tqparent) + if (parent) { - resize(tqparent->tqgeometry().width(), - tqparent->tqgeometry().height()); + resize(parent->tqgeometry().width(), + parent->tqgeometry().height()); } } diff --git a/kpilot/pilotComponent.h b/kpilot/pilotComponent.h index 30a7845..8e64792 100644 --- a/kpilot/pilotComponent.h +++ b/kpilot/pilotComponent.h @@ -45,7 +45,7 @@ Q_OBJECT friend class KPilotInstaller; public: - PilotComponent(TQWidget* tqparent, + PilotComponent(TQWidget* parent, const char *id, const TQString& dbPath); diff --git a/kpilot/todoEditor.cc b/kpilot/todoEditor.cc index 9ba89f1..d7017bb 100644 --- a/kpilot/todoEditor.cc +++ b/kpilot/todoEditor.cc @@ -45,8 +45,8 @@ TodoEditor::TodoEditor(PilotTodoEntry * p, struct ToDoAppInfo *appInfo, - TQWidget * tqparent, const char *name) : - KDialogBase(tqparent, name, false, i18n("To-do Editor"), Ok|Cancel), + TQWidget * parent, const char *name) : + KDialogBase(parent, name, false, i18n("To-do Editor"), Ok|Cancel), fDeleteOnCancel(p == 0L), fTodo(p), fAppInfo(appInfo) @@ -57,7 +57,7 @@ TodoEditor::TodoEditor(PilotTodoEntry * p, struct ToDoAppInfo *appInfo, setMainWidget(fWidget); fillFields(); - connect(tqparent, TQT_SIGNAL(recordChanged(PilotTodoEntry *)), + connect(parent, TQT_SIGNAL(recordChanged(PilotTodoEntry *)), this, TQT_SLOT(updateRecord(PilotTodoEntry *))); } diff --git a/kpilot/todoEditor.h b/kpilot/todoEditor.h index 523e1bb..1a0d017 100644 --- a/kpilot/todoEditor.h +++ b/kpilot/todoEditor.h @@ -50,7 +50,7 @@ class TodoEditor : public KDialogBase public: TodoEditor(PilotTodoEntry *todo, struct ToDoAppInfo *appInfo, - TQWidget *tqparent, const char *name=0L); + TQWidget *parent, const char *name=0L); ~TodoEditor(); diff --git a/kpilot/todoWidget.cc b/kpilot/todoWidget.cc index cb09911..a095685 100644 --- a/kpilot/todoWidget.cc +++ b/kpilot/todoWidget.cc @@ -49,8 +49,8 @@ -TodoCheckListItem::TodoCheckListItem(TQListView*tqparent, const TQString&text, - recordid_t pilotid, void*r):PilotCheckListItem(tqparent, text, pilotid, r) +TodoCheckListItem::TodoCheckListItem(TQListView*parent, const TQString&text, + recordid_t pilotid, void*r):PilotCheckListItem(parent, text, pilotid, r) { } @@ -63,9 +63,9 @@ void TodoCheckListItem::stateChange(bool state) -TodoWidget::TodoWidget(TQWidget * tqparent, +TodoWidget::TodoWidget(TQWidget * parent, const TQString & path) : - PilotComponent(tqparent, "component_todo", path), + PilotComponent(parent, "component_todo", path), fTodoInfo(0L), fTodoAppInfo(0L), fTodoDB(0L), diff --git a/kpilot/todoWidget.h b/kpilot/todoWidget.h index d4b5276..9a8259d 100644 --- a/kpilot/todoWidget.h +++ b/kpilot/todoWidget.h @@ -43,7 +43,7 @@ class TodoListView : public KListView Q_OBJECT TQ_OBJECT public: - TodoListView(TQWidget * tqparent = 0, const char * name = 0 ):KListView(tqparent, name){}; + TodoListView(TQWidget * parent = 0, const char * name = 0 ):KListView(parent, name){}; ~TodoListView() {}; signals: void itemChecked(TQCheckListItem*item); @@ -59,7 +59,7 @@ public: class TodoCheckListItem : public PilotCheckListItem { public: - TodoCheckListItem(TQListView*tqparent, const TQString&text, recordid_t pilotid, void*r); + TodoCheckListItem(TQListView*parent, const TQString&text, recordid_t pilotid, void*r); ~TodoCheckListItem() {}; virtual void stateChange(bool state); }; @@ -70,7 +70,7 @@ Q_OBJECT TQ_OBJECT public: - TodoWidget(TQWidget* tqparent,const TQString& dbpath); + TodoWidget(TQWidget* parent,const TQString& dbpath); ~TodoWidget(); // Pilot Component Methods: diff --git a/lib/kpilotdevicelink.cc b/lib/kpilotdevicelink.cc index e211eab..0cea610 100644 --- a/lib/kpilotdevicelink.cc +++ b/lib/kpilotdevicelink.cc @@ -527,9 +527,9 @@ void DeviceCommThread::run() DEBUGKPILOT << fname << ": comm thread now done..." << endl; } -KPilotDeviceLink::KPilotDeviceLink(TQObject * tqparent, const char *name, +KPilotDeviceLink::KPilotDeviceLink(TQObject * parent, const char *name, const TQString &tempDevice) : - KPilotLink(tqparent, name), fLinktqStatus(Init), fWorkaroundUSB(false), + KPilotLink(parent, name), fLinktqStatus(Init), fWorkaroundUSB(false), fPilotSocket(-1), fTempDevice(tempDevice), fMessages(new Messages(this)), fDeviceCommThread(0L) { FUNCTIONSETUP; diff --git a/lib/kpilotdevicelink.h b/lib/kpilotdevicelink.h index b912c19..c4fb9f3 100644 --- a/lib/kpilotdevicelink.h +++ b/lib/kpilotdevicelink.h @@ -82,12 +82,12 @@ public: * Constructor. Creates a link that can sync to a physical handheld. * Call reset() on it to start looking for a device. * - * @param tqparent Parent object. + * @param parent Parent object. * @param name Name of this object. * @param tempDevice Path to device node to use as an alternative * to the "normal" one set by KPilot. */ - KPilotDeviceLink( TQObject *tqparent = 0, + KPilotDeviceLink( TQObject *parent = 0, const char *name = 0, const TQString &tempDevice = TQString() ); diff --git a/lib/kpilotdevicelinkPrivate.h b/lib/kpilotdevicelinkPrivate.h index e945295..defdb86 100644 --- a/lib/kpilotdevicelinkPrivate.h +++ b/lib/kpilotdevicelinkPrivate.h @@ -109,8 +109,8 @@ private: class Messages { public: - Messages(KPilotDeviceLink *tqparent) : - fDeviceLink(tqparent) + Messages(KPilotDeviceLink *parent) : + fDeviceLink(parent) { reset(); } diff --git a/lib/kpilotlink.cc b/lib/kpilotlink.cc index 9ba4288..42e78ed 100644 --- a/lib/kpilotlink.cc +++ b/lib/kpilotlink.cc @@ -137,8 +137,8 @@ void TickleThread::run() -KPilotLink::KPilotLink( TQObject *tqparent, const char *name ) : - TQObject( tqparent, name ), +KPilotLink::KPilotLink( TQObject *parent, const char *name ) : + TQObject( parent, name ), fPilotPath(TQString()), fPilotUser(0L), fPilotSysInfo(0L), diff --git a/lib/kpilotlink.h b/lib/kpilotlink.h index 3816094..7b00669 100644 --- a/lib/kpilotlink.h +++ b/lib/kpilotlink.h @@ -178,7 +178,7 @@ public: typedef TQValueList DBInfoList; /** Constructor. Use reset() to start looking for a device. */ - KPilotLink( TQObject *tqparent = 0, const char *name = 0 ); + KPilotLink( TQObject *parent = 0, const char *name = 0 ); /** Destructor. This rudely interrupts any communication in progress. * It is best to call endOfSync() or finishSync() before destroying diff --git a/lib/kpilotlocallink.cc b/lib/kpilotlocallink.cc index 30c2fe9..c944a53 100644 --- a/lib/kpilotlocallink.cc +++ b/lib/kpilotlocallink.cc @@ -118,8 +118,8 @@ unsigned int KPilotLocalLink::findAvailableDatabases( KPilotLocalLink::Private & } -KPilotLocalLink::KPilotLocalLink( TQObject *tqparent, const char *name ) : - KPilotLink(tqparent,name), +KPilotLocalLink::KPilotLocalLink( TQObject *parent, const char *name ) : + KPilotLink(parent,name), fReady(false), d( new Private ) { diff --git a/lib/kpilotlocallink.h b/lib/kpilotlocallink.h index 99df9b9..05efdd5 100644 --- a/lib/kpilotlocallink.h +++ b/lib/kpilotlocallink.h @@ -45,7 +45,7 @@ class KDE_EXPORT KPilotLocalLink : public KPilotLink Q_OBJECT TQ_OBJECT public: - KPilotLocalLink( TQObject *tqparent=0L, const char *name=0L ); + KPilotLocalLink( TQObject *parent=0L, const char *name=0L ); virtual ~KPilotLocalLink(); virtual TQString statusString() const; diff --git a/lib/plugin.cc b/lib/plugin.cc index 0149a85..c16f9a4 100644 --- a/lib/plugin.cc +++ b/lib/plugin.cc @@ -65,9 +65,9 @@ #include "plugin.moc" -ConduitConfigBase::ConduitConfigBase(TQWidget *tqparent, +ConduitConfigBase::ConduitConfigBase(TQWidget *parent, const char *name) : - TQObject(tqparent,name), + TQObject(parent,name), fModified(false), fWidget(0L), fConduitName(i18n("Unnamed")) @@ -108,11 +108,11 @@ ConduitConfigBase::~ConduitConfigBase() return true; } -TQWidget *ConduitConfigBase::aboutPage(TQWidget *tqparent, KAboutData *ad) +TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) { FUNCTIONSETUP; - TQWidget *w = new TQWidget(tqparent, "aboutpage"); + TQWidget *w = new TQWidget(parent, "aboutpage"); TQString s; TQLabel *text; diff --git a/lib/plugin.h b/lib/plugin.h index 59322ac..b4eb59f 100644 --- a/lib/plugin.h +++ b/lib/plugin.h @@ -82,9 +82,9 @@ Q_OBJECT public: /** * Constructor. Creates a conduit configuration support object - * with the given tqparent @p tqparent and name (optional) @p n. + * with the given parent @p parent and name (optional) @p n. */ - ConduitConfigBase(TQWidget *tqparent=0L, const char *n=0L); + ConduitConfigBase(TQWidget *parent=0L, const char *n=0L); /** Destructor. */ virtual ~ConduitConfigBase(); @@ -152,10 +152,10 @@ public: * application's icon. This widget can be used pretty much * anywhere. Copied from KAboutDialog, mostly. * - * @param tqparent The widget that holds the about widget. + * @param parent The widget that holds the about widget. * @param data The KAboutData that is used to populate the widget. */ - static TQWidget *aboutPage(TQWidget *tqparent, KAboutData *data=0L); + static TQWidget *aboutPage(TQWidget *parent, KAboutData *data=0L); protected: /** @@ -444,7 +444,7 @@ namespace PluginUtility * * 
 * protected:
-* 	virtual TQObject* createObject( TQObject* tqparent = 0,
+* 	virtual TQObject* createObject( TQObject* parent = 0,
 * 		const char* name = 0,
 * 		const char* classname = TQOBJECT_OBJECT_NAME_STRING,
 * 		const TQStringList &args = TQStringList() );
diff --git a/lib/pluginfactory.h b/lib/pluginfactory.h
index 4fa2d6f..dbbe2ec 100644
--- a/lib/pluginfactory.h
+++ b/lib/pluginfactory.h
@@ -45,26 +45,26 @@ class KPilotLink;
 template  class ConduitFactory : public KLibFactory
 {
 public:
-	ConduitFactory(TQObject *tqparent = 0, const char *name = 0) :
-		KLibFactory(tqparent,name)
+	ConduitFactory(TQObject *parent = 0, const char *name = 0) :
+		KLibFactory(parent,name)
 		{ fInstance = new KInstance(name); } ;
 	virtual ~ConduitFactory()
 		{ delete fInstance; } ;
 
 protected:
 	virtual TQObject *createObject(
-		TQObject* tqparent = 0,
+		TQObject* parent = 0,
 		const char* name = 0,
 		const char* classname = TQOBJECT_OBJECT_NAME_STRING,
 		const TQStringList &args = TQStringList() )
 	{
 		if (qstrcmp(classname,"ConduitConfigBase")==0)
 		{
-			TQWidget *w = dynamic_cast(tqparent);
+			TQWidget *w = dynamic_cast(parent);
 			if (w) return new Widget(w,name);
 			else
 			{
-				WARNINGKPILOT << "Could not cast tqparent to widget." << endl;
+				WARNINGKPILOT << "Could not cast parent to widget." << endl;
 				return 0L;
 			}
 		}
@@ -72,11 +72,11 @@ protected:
 		if (qstrcmp(classname,"SyncAction")==0)
 		{
 			KPilotLink *d = 0L;
-			if (tqparent) d = dynamic_cast(tqparent);
+			if (parent) d = dynamic_cast(parent);
 
-			if (d || !tqparent)
+			if (d || !parent)
 			{
-				if (!tqparent)
+				if (!parent)
 				{
 					kdDebug() << k_funcinfo << ": Using NULL device." << endl;
 				}
@@ -84,7 +84,7 @@ protected:
 			}
 			else
 			{
-				WARNINGKPILOT << "Could not cast tqparent to KPilotLink" << endl;
+				WARNINGKPILOT << "Could not cast parent to KPilotLink" << endl;
 				return 0L;
 			}
 		}
diff --git a/lib/syncAction.cc b/lib/syncAction.cc
index 6134b30..55278a1 100644
--- a/lib/syncAction.cc
+++ b/lib/syncAction.cc
@@ -65,11 +65,11 @@ SyncAction::SyncAction(KPilotLink  *p,
 }
 
 SyncAction::SyncAction(KPilotLink *p,
-	TQWidget * visibletqparent,
+	TQWidget * visibleparent,
 	const char *name) :
 	TQObject(p, name),
 	fHandle(p),
-	fParent(visibletqparent)
+	fParent(visibleparent)
 {
 	FUNCTIONSETUP;
 }
diff --git a/lib/syncAction.h b/lib/syncAction.h
index 5f493f4..42b1854 100644
--- a/lib/syncAction.h
+++ b/lib/syncAction.h
@@ -56,7 +56,7 @@ public:
 	SyncAction(KPilotLink *p,
 		const char *name=0L);
 	SyncAction(KPilotLink *p,
-		TQWidget *visibletqparent,
+		TQWidget *visibleparent,
 		const char *name=0L);
 	~SyncAction();