diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 32b67ac0690de411b26b1d5e715b188c27442248 (patch) | |
| tree | 43167816a3df6b3a877d71c9a7963ed270dcc8c9 | |
| parent | 330c33ab6f97b279737bf9527c9add7bb1475450 (diff) | |
| download | tdevelop-32b67ac0690de411b26b1d5e715b188c27442248.tar.gz tdevelop-32b67ac0690de411b26b1d5e715b188c27442248.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
1020 files changed, 3426 insertions, 3426 deletions
diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp index d91d165c..2e788896 100644 --- a/buildtools/ada/adaglobaloptionsdlg.cpp +++ b/buildtools/ada/adaglobaloptionsdlg.cpp @@ -21,8 +21,8 @@ #include "adaproject_part.h" #include "adaglobaloptionsdlg.h" -AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl) - :AdaProjectOptionsDlgBase(tqparent,name,fl), m_part(part) +AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl) + :AdaProjectOptionsDlgBase(parent,name,fl), m_part(part) { delete config_label; delete config_combo; diff --git a/buildtools/ada/adaglobaloptionsdlg.h b/buildtools/ada/adaglobaloptionsdlg.h index e72a1941..3a1f1eb6 100644 --- a/buildtools/ada/adaglobaloptionsdlg.h +++ b/buildtools/ada/adaglobaloptionsdlg.h @@ -23,7 +23,7 @@ class AdaGlobalOptionsDlg : public AdaProjectOptionsDlgBase TQ_OBJECT public: - AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~AdaGlobalOptionsDlg(); public slots: diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index 427f7505..00d7b68c 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -46,8 +46,8 @@ typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory; static const KDevPluginInfo data("kdevadaproject"); K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) ) -AdaProjectPart::AdaProjectPart(TQObject *tqparent, const char *name, const TQStringList& ) - :KDevBuildTool(&data, tqparent, name ? name : "AdaProjectPart" ) +AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& ) + :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" ) { setInstance(AdaProjectFactory::instance()); setXMLFile("kdevadaproject.rc"); diff --git a/buildtools/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h index d92205df..23d2b59a 100644 --- a/buildtools/ada/adaproject_part.h +++ b/buildtools/ada/adaproject_part.h @@ -22,7 +22,7 @@ class AdaProjectPart : public KDevBuildTool Q_OBJECT TQ_OBJECT public: - AdaProjectPart(TQObject *tqparent, const char *name, const TQStringList &); + AdaProjectPart(TQObject *parent, const char *name, const TQStringList &); ~AdaProjectPart(); virtual void openProject(const TQString &dirName, const TQString &projectName); diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp index 1b32c5e8..15bb0498 100644 --- a/buildtools/ada/adaprojectoptionsdlg.cpp +++ b/buildtools/ada/adaprojectoptionsdlg.cpp @@ -24,8 +24,8 @@ #include "adaproject_part.h" #include "adaprojectoptionsdlg.h" -AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl) - : AdaProjectOptionsDlgBase(tqparent,name, fl), m_part(part) +AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl) + : AdaProjectOptionsDlgBase(parent,name, fl), m_part(part) { config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); diff --git a/buildtools/ada/adaprojectoptionsdlg.h b/buildtools/ada/adaprojectoptionsdlg.h index e9f404f0..418d22be 100644 --- a/buildtools/ada/adaprojectoptionsdlg.h +++ b/buildtools/ada/adaprojectoptionsdlg.h @@ -22,7 +22,7 @@ class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase TQ_OBJECT public: - AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~AdaProjectOptionsDlg(); public slots: diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index 4d95f523..06f78651 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -45,8 +45,8 @@ AntOptions::AntOptions() } -AntProjectPart::AntProjectPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevBuildTool(&data, tqparent, name ? name : "AntProjectPart") +AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &) + : KDevBuildTool(&data, parent, name ? name : "AntProjectPart") { setInstance(AntProjectFactory::instance()); diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h index 411579e2..5831b0ee 100644 --- a/buildtools/ant/antprojectpart.h +++ b/buildtools/ant/antprojectpart.h @@ -47,7 +47,7 @@ class AntProjectPart : public KDevBuildTool public: - AntProjectPart(TQObject *tqparent, const char *name, const TQStringList &args); + AntProjectPart(TQObject *parent, const char *name, const TQStringList &args); ~AntProjectPart(); TQStringList distFiles() const; diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp index d70dc2d5..f0cd3693 100644 --- a/buildtools/autotools/addapplicationdlg.cpp +++ b/buildtools/autotools/addapplicationdlg.cpp @@ -33,8 +33,8 @@ AddApplicationDialog::AddApplicationDialog(AutoProjectWidget *widget, SubprojectItem *spitem, - TQWidget *tqparent, const char *name) - : AddApplicationDialogBase(tqparent, name, true) + TQWidget *parent, const char *name) + : AddApplicationDialogBase(parent, name, true) { filename_edit->setText(".desktop"); filename_edit->home(false); diff --git a/buildtools/autotools/addapplicationdlg.h b/buildtools/autotools/addapplicationdlg.h index 05314582..3e2645ea 100644 --- a/buildtools/autotools/addapplicationdlg.h +++ b/buildtools/autotools/addapplicationdlg.h @@ -26,7 +26,7 @@ class AddApplicationDialog : public AddApplicationDialogBase public: AddApplicationDialog( AutoProjectWidget *widget, SubprojectItem *spitem, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddApplicationDialog(); protected: diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index eaca2161..341953e0 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -34,8 +34,8 @@ #include "addexistingdirectoriesdlg.h" -AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : AddExistingDlgBase ( tqparent, name, modal, fl ) +AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : AddExistingDlgBase ( parent, name, modal, fl ) { setIcon ( SmallIcon ( "fileimport.png" ) ); diff --git a/buildtools/autotools/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h index 1db1f328..950bab3e 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.h +++ b/buildtools/autotools/addexistingdirectoriesdlg.h @@ -40,7 +40,7 @@ class AddExistingDirectoriesDialog : public AddExistingDlgBase public: AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, - SubprojectItem* spitem, TQWidget* tqparent = 0, + SubprojectItem* spitem, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddExistingDirectoriesDialog(); diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index 519acb33..55533a3d 100644 --- a/buildtools/autotools/addexistingfilesdlg.cpp +++ b/buildtools/autotools/addexistingfilesdlg.cpp @@ -49,15 +49,15 @@ #include "addexistingfilesdlg.h" /* - * Constructs a AddExistingFilesDialog which is a child of 'tqparent', with the + * Constructs a AddExistingFilesDialog which is a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : AddExistingDlgBase ( tqparent, name, modal, fl ) +AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : AddExistingDlgBase ( parent, name, modal, fl ) { m_spitem = spitem; m_titem = titem; diff --git a/buildtools/autotools/addexistingfilesdlg.h b/buildtools/autotools/addexistingfilesdlg.h index 6cf69364..0151a039 100644 --- a/buildtools/autotools/addexistingfilesdlg.h +++ b/buildtools/autotools/addexistingfilesdlg.h @@ -43,7 +43,7 @@ class AddExistingFilesDialog : public AddExistingDlgBase public: AddExistingFilesDialog( AutoProjectPart* part, AutoProjectWidget *widget, - SubprojectItem* spitem, TargetItem* titem, TQWidget* tqparent = 0, + SubprojectItem* spitem, TargetItem* titem, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddExistingFilesDialog(); diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp index 99e75ebf..56df4998 100644 --- a/buildtools/autotools/addfiledlg.cpp +++ b/buildtools/autotools/addfiledlg.cpp @@ -40,8 +40,8 @@ AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *item, - TQWidget *tqparent, const char *name) - : AddFileDlgBase(tqparent, name, true) + TQWidget *parent, const char *name) + : AddFileDlgBase(parent, name, true) { connect ( createButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); diff --git a/buildtools/autotools/addfiledlg.h b/buildtools/autotools/addfiledlg.h index e4a6ead4..7cbfecec 100644 --- a/buildtools/autotools/addfiledlg.h +++ b/buildtools/autotools/addfiledlg.h @@ -32,7 +32,7 @@ class AddFileDialog : public AddFileDlgBase public: AddFileDialog( AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *item, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddFileDialog(); protected: diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp index 79aaab0e..509a913b 100644 --- a/buildtools/autotools/addicondlg.cpp +++ b/buildtools/autotools/addicondlg.cpp @@ -39,8 +39,8 @@ const char *size_map[] = { AddIconDialog::AddIconDialog(AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *titem, - TQWidget *tqparent, const char *name) - : AddIconDialogBase(tqparent, name, true) + TQWidget *parent, const char *name) + : AddIconDialogBase(parent, name, true) { type_combo->insertItem(i18n("Application")); type_combo->insertItem(i18n("Action")); diff --git a/buildtools/autotools/addicondlg.h b/buildtools/autotools/addicondlg.h index 94dd8306..bfbe1576 100644 --- a/buildtools/autotools/addicondlg.h +++ b/buildtools/autotools/addicondlg.h @@ -28,7 +28,7 @@ class AddIconDialog : public AddIconDialogBase public: AddIconDialog( AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *titem, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddIconDialog(); diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp index 105c1457..e4fc3cf1 100644 --- a/buildtools/autotools/addprefixdlg.cpp +++ b/buildtools/autotools/addprefixdlg.cpp @@ -21,8 +21,8 @@ #include <kdeversion.h> AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& pathEdit, - TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, true) + TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("Add Prefix")); diff --git a/buildtools/autotools/addprefixdlg.h b/buildtools/autotools/addprefixdlg.h index 48dc09b4..99244eac 100644 --- a/buildtools/autotools/addprefixdlg.h +++ b/buildtools/autotools/addprefixdlg.h @@ -23,7 +23,7 @@ class AddPrefixDialog : public TQDialog public: AddPrefixDialog( const TQString& nameEdit = "", const TQString& pathEdit = "", - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddPrefixDialog(); TQString name() const diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp index 67903ebe..67a9f213 100644 --- a/buildtools/autotools/addservicedlg.cpp +++ b/buildtools/autotools/addservicedlg.cpp @@ -32,8 +32,8 @@ AddServiceDialog::AddServiceDialog(AutoProjectWidget *widget, SubprojectItem *spitem, - TQWidget *tqparent, const char *name) - : AddServiceDialogBase(tqparent, name, true) + TQWidget *parent, const char *name) + : AddServiceDialogBase(parent, name, true) { filename_edit->setText(".desktop"); filename_edit->home(false); diff --git a/buildtools/autotools/addservicedlg.h b/buildtools/autotools/addservicedlg.h index 7799a184..c72a624f 100644 --- a/buildtools/autotools/addservicedlg.h +++ b/buildtools/autotools/addservicedlg.h @@ -26,7 +26,7 @@ class AddServiceDialog : public AddServiceDialogBase public: AddServiceDialog( AutoProjectWidget *widget, SubprojectItem *spitem, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddServiceDialog(); protected: diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index d9913af7..80cc5040 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -32,8 +32,8 @@ AddSubprojectDialog::AddSubprojectDialog(AutoProjectPart *part, AutoSubprojectView *view, - SubprojectItem *item, TQWidget *tqparent, const char *name) - : AddSubprojectDlgBase(tqparent, name, true) + SubprojectItem *item, TQWidget *parent, const char *name) + : AddSubprojectDlgBase(parent, name, true) { setIcon(SmallIcon("folder_new.png")); diff --git a/buildtools/autotools/addsubprojectdlg.h b/buildtools/autotools/addsubprojectdlg.h index 9ccd1373..18c0f739 100644 --- a/buildtools/autotools/addsubprojectdlg.h +++ b/buildtools/autotools/addsubprojectdlg.h @@ -29,7 +29,7 @@ class AddSubprojectDialog : public AddSubprojectDlgBase public: AddSubprojectDialog( AutoProjectPart *part, AutoSubprojectView *widget, - SubprojectItem *item, TQWidget *tqparent = 0, const char *name = 0 ); + SubprojectItem *item, TQWidget *parent = 0, const char *name = 0 ); ~AddSubprojectDialog(); private: diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp index 8a0c400c..01cb0a21 100644 --- a/buildtools/autotools/addtargetdlg.cpp +++ b/buildtools/autotools/addtargetdlg.cpp @@ -29,8 +29,8 @@ AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item, - TQWidget *tqparent, const char *name) - : AddTargetDialogBase(tqparent, name, true) + TQWidget *parent, const char *name) + : AddTargetDialogBase(parent, name, true) { m_subproject = item; m_widget = widget; diff --git a/buildtools/autotools/addtargetdlg.h b/buildtools/autotools/addtargetdlg.h index f05cdb94..5661651d 100644 --- a/buildtools/autotools/addtargetdlg.h +++ b/buildtools/autotools/addtargetdlg.h @@ -26,7 +26,7 @@ class AddTargetDialog : public AddTargetDialogBase public: AddTargetDialog( AutoProjectWidget *widget, SubprojectItem *item, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~AddTargetDialog(); protected slots: diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp index 6057bb65..11bf9a86 100644 --- a/buildtools/autotools/addtranslationdlg.cpp +++ b/buildtools/autotools/addtranslationdlg.cpp @@ -31,8 +31,8 @@ #include "autoprojectpart.h" -AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, true) +AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("Add Translation")); diff --git a/buildtools/autotools/addtranslationdlg.h b/buildtools/autotools/addtranslationdlg.h index 5fb8b288..954288ba 100644 --- a/buildtools/autotools/addtranslationdlg.h +++ b/buildtools/autotools/addtranslationdlg.h @@ -24,7 +24,7 @@ class AddTranslationDialog : public TQDialog TQ_OBJECT public: - AddTranslationDialog( AutoProjectPart *part, TQWidget *tqparent = 0, const char *name = 0 ); + AddTranslationDialog( AutoProjectPart *part, TQWidget *parent = 0, const char *name = 0 ); ~AddTranslationDialog(); private: diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 6f1f56e8..4408a6b6 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -57,8 +57,8 @@ #include "subclassesdlg.h" -AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name) - : AutoProjectViewBase(tqparent, name) +AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name) + : AutoProjectViewBase(parent, name) { m_widget = widget; m_part = part; @@ -126,7 +126,7 @@ void AutoDetailsView::slotSelectionChanged( TQListViewItem* item ) if ( pvitem->type() == ProjectItem::File ) { - titem = static_cast <TargetItem*> ( pvitem->tqparent() ); + titem = static_cast <TargetItem*> ( pvitem->parent() ); TQString primary = titem->primary; if ( primary == "PROGRAMS" || primary == "LIBRARIES" || @@ -365,7 +365,7 @@ void AutoDetailsView::slotBuildTarget() TargetItem* titem = 0; if ( pvitem->type() == ProjectItem::File ) - titem = static_cast <TargetItem*> ( pvitem->tqparent() ); + titem = static_cast <TargetItem*> ( pvitem->parent() ); else titem = static_cast <TargetItem*> ( m_listView->selectedItem() ); @@ -383,7 +383,7 @@ void AutoDetailsView::slotExecuteTarget() TargetItem* titem = 0; if ( pvitem->type() == ProjectItem::File ) - titem = static_cast <TargetItem*> ( pvitem->tqparent() ); + titem = static_cast <TargetItem*> ( pvitem->parent() ); else titem = static_cast <TargetItem*> ( m_listView->selectedItem() ); @@ -409,7 +409,7 @@ void AutoDetailsView::slotRemoveDetail() if ( !fitem ) return; - TargetItem *titem = static_cast<TargetItem*>( fitem->tqparent() ); + TargetItem *titem = static_cast<TargetItem*>( fitem->parent() ); RemoveFileDialog dlg( m_widget, m_part, m_widget->selectedSubproject(), titem, fitem->text( 0 ), this, "remove file dialog" ); diff --git a/buildtools/autotools/autodetailsview.h b/buildtools/autotools/autodetailsview.h index 0c649b95..2c76d6c4 100644 --- a/buildtools/autotools/autodetailsview.h +++ b/buildtools/autotools/autodetailsview.h @@ -35,7 +35,7 @@ class AutoDetailsView : protected AutoProjectViewBase TQ_OBJECT public: - AutoDetailsView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name ); + AutoDetailsView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name ); virtual ~AutoDetailsView(); TQString getUiFileLink( const TQString &path, const TQString& filename ); diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp index 6e96bd4f..f9860490 100644 --- a/buildtools/autotools/autolistviewitems.cpp +++ b/buildtools/autotools/autolistviewitems.cpp @@ -27,15 +27,15 @@ * Class ProjectItem */ -ProjectItem::ProjectItem( Type type, TQListView *tqparent, const TQString &text ) - : TQListViewItem( tqparent, text ), typ( type ) +ProjectItem::ProjectItem( Type type, TQListView *parent, const TQString &text ) + : TQListViewItem( parent, text ), typ( type ) { bld = false; } -ProjectItem::ProjectItem( Type type, ProjectItem *tqparent, const TQString &text ) - : TQListViewItem( tqparent, text ), typ( type ) +ProjectItem::ProjectItem( Type type, ProjectItem *parent, const TQString &text ) + : TQListViewItem( parent, text ), typ( type ) { bld = false; } @@ -58,15 +58,15 @@ void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg, * Class SubprojectItem */ -SubprojectItem::SubprojectItem( TQListView *tqparent, const TQString &text ) - : ProjectItem( Subproject, tqparent, text ) +SubprojectItem::SubprojectItem( TQListView *parent, const TQString &text ) + : ProjectItem( Subproject, parent, text ) { init(); } -SubprojectItem::SubprojectItem( SubprojectItem *tqparent, const TQString &text ) - : ProjectItem( Subproject, tqparent, text ) +SubprojectItem::SubprojectItem( SubprojectItem *parent, const TQString &text ) + : ProjectItem( Subproject, parent, text ) { init(); } @@ -84,7 +84,7 @@ TQString SubprojectItem::relativePath() TQString relpath = subdir; SubprojectItem *it = this; - while ( (it= dynamic_cast<SubprojectItem*>(it->tqparent())) ) + while ( (it= dynamic_cast<SubprojectItem*>(it->parent())) ) { relpath.prepend(it->subdir + "/"); } @@ -152,7 +152,7 @@ return; void FileItem::changeMakefileEntry(const TQString& new_name) { - TargetItem* target = dynamic_cast<TargetItem*>(tqparent()); + TargetItem* target = dynamic_cast<TargetItem*>(parent()); TQMap<TQString,TQString> replaceMap; diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h index 5f61fef0..116d316c 100644 --- a/buildtools/autotools/autolistviewitems.h +++ b/buildtools/autotools/autolistviewitems.h @@ -31,8 +31,8 @@ class ProjectItem : public TQListViewItem public: enum Type { Subproject, Target, File }; - ProjectItem( Type type, TQListView *tqparent, const TQString &text ); - ProjectItem( Type type, ProjectItem *tqparent, const TQString &text ); + ProjectItem( Type type, TQListView *parent, const TQString &text ); + ProjectItem( Type type, ProjectItem *parent, const TQString &text ); void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ); @@ -62,8 +62,8 @@ private: class SubprojectItem : public ProjectItem { public: - SubprojectItem( TQListView *tqparent, const TQString &text ); - SubprojectItem( SubprojectItem *tqparent, const TQString &text ); + SubprojectItem( TQListView *parent, const TQString &text ); + SubprojectItem( SubprojectItem *parent, const TQString &text ); /** name of the directory */ TQString subdir; diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 15d6bc45..e6e2e272 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -65,8 +65,8 @@ static const KDevPluginInfo data("kdevautoproject"); K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) ) -AutoProjectPart::AutoProjectPart(TQObject *tqparent, const char *name, const TQStringList &args) - : KDevBuildTool(&data, tqparent, name ? name : "AutoProjectPart") +AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args) + : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart") , m_lastCompilationFailed(false) { setInstance(AutoProjectFactory::instance()); diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h index 16be5886..7c0585fc 100644 --- a/buildtools/autotools/autoprojectpart.h +++ b/buildtools/autotools/autoprojectpart.h @@ -37,7 +37,7 @@ class AutoProjectPart : public KDevBuildTool TQ_OBJECT public: - AutoProjectPart( TQObject *tqparent, const char *name, const TQStringList &args ); + AutoProjectPart( TQObject *parent, const char *name, const TQStringList &args ); virtual ~AutoProjectPart(); /** diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index ff89fe35..56a80dfc 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -101,14 +101,14 @@ AutoProjectWidget::~AutoProjectWidget() delete m_makefileHandler; } -void AutoProjectWidget::initOverview ( TQWidget* tqparent ) +void AutoProjectWidget::initOverview ( TQWidget* parent ) { - m_subprojectView = new AutoSubprojectView( this, m_part, tqparent, "project overview widget" ); + m_subprojectView = new AutoSubprojectView( this, m_part, parent, "project overview widget" ); } -void AutoProjectWidget::initDetailview ( TQWidget* tqparent ) +void AutoProjectWidget::initDetailview ( TQWidget* parent ) { - m_detailView = new AutoDetailsView( this, m_part, tqparent, "project details widget" ); + m_detailView = new AutoDetailsView( this, m_part, parent, "project details widget" ); } void AutoProjectWidget::initActions() diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h index 7d21fd55..554a90f7 100644 --- a/buildtools/autotools/autoprojectwidget.h +++ b/buildtools/autotools/autoprojectwidget.h @@ -133,13 +133,13 @@ public: SubprojectItem* selectedSubproject(); /** - * Creates a TargetItem instance without a tqparent item. + * Creates a TargetItem instance without a parent item. */ TargetItem *createTargetItem( const TQString &name, const TQString &prefix, const TQString &primary, bool take = true ); /** - * Creates a FileItem instance without a tqparent item. + * Creates a FileItem instance without a parent item. */ FileItem *createFileItem( const TQString &name, SubprojectItem *subproject ); @@ -203,8 +203,8 @@ public slots: void slotOverviewSelectionChanged( TQListViewItem *item ); protected: - void initOverview ( TQWidget* tqparent ); - void initDetailview ( TQWidget* tqparent ); + void initOverview ( TQWidget* parent ); + void initDetailview ( TQWidget* parent ); void initActions (); virtual void focusInEvent( TQFocusEvent *e ); diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index f6d22a77..3bd53803 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -107,8 +107,8 @@ static void removeDir( const TQString& dirName ) } -AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name) -: AutoProjectViewBase(tqparent, name) +AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name) +: AutoProjectViewBase(parent, name) { m_widget = widget; @@ -433,18 +433,18 @@ void AutoSubprojectView::slotRemoveSubproject() if( !spitem ) return; - SubprojectItem* tqparent = static_cast<SubprojectItem*>( spitem->tqparent() ); - if( !tqparent || !tqparent->listView() || spitem->childCount() != 0 ){ + SubprojectItem* parent = static_cast<SubprojectItem*>( spitem->parent() ); + if( !parent || !parent->listView() || spitem->childCount() != 0 ){ KMessageBox::error( 0, i18n("This item cannot be removed"), i18n("Automake Manager") ); return; } - TQStringList list = TQStringList::split( TQRegExp("[ \t]"), tqparent->variables["SUBDIRS"] ); + TQStringList list = TQStringList::split( TQRegExp("[ \t]"), parent->variables["SUBDIRS"] ); TQStringList::Iterator it = list.find( spitem->subdir ); TQString subdirToRemove = spitem->subdir; bool topsubdirs = true; - if ((tqparent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") == -1) - && (tqparent->variables["SUBDIRS"].find("$(AUTODIRS)") == -1)) + if ((parent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") == -1) + && (parent->variables["SUBDIRS"].find("$(AUTODIRS)") == -1)) { topsubdirs = false; if( it == list.end() ){ @@ -462,10 +462,10 @@ void AutoSubprojectView::slotRemoveSubproject() if (!topsubdirs) { list.remove( it ); - tqparent->variables[ "SUBDIRS" ] = list.join( " " ); + parent->variables[ "SUBDIRS" ] = list.join( " " ); } - tqparent->listView()->setSelected( tqparent, true ); + parent->listView()->setSelected( parent, true ); kapp->tqprocessEvents( 500 ); @@ -511,9 +511,9 @@ void AutoSubprojectView::slotRemoveSubproject() // Adjust SUBDIRS variable in containing Makefile.am - if (tqparent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) + if (parent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) { - TQFile subdirsfile( tqparent->path + "/subdirs" ); + TQFile subdirsfile( parent->path + "/subdirs" ); TQStringList topdirs; if ( subdirsfile.open( IO_ReadOnly ) ) { @@ -534,9 +534,9 @@ void AutoSubprojectView::slotRemoveSubproject() TQMap<TQString,TQString> replaceMap; replaceMap.insert( "SUBDIRS", subdirToRemove ); - AutoProjectTool::removeFromMakefileam( tqparent->path + "/Makefile.am", replaceMap ); + AutoProjectTool::removeFromMakefileam( parent->path + "/Makefile.am", replaceMap ); - TQString relmakefile = ( tqparent->path + "/Makefile" ).mid( m_part->projectDirectory().length()+1 ); + TQString relmakefile = ( parent->path + "/Makefile" ).mid( m_part->projectDirectory().length()+1 ); kdDebug(9020) << "Relative makefile path: " << relmakefile << endl; // check for config.status @@ -879,14 +879,14 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, open = false; if ( newitem->subdir == "pics" ) open = false; - if ( newitem && static_cast<SubprojectItem*>( newitem->tqparent() ) + if ( newitem && static_cast<SubprojectItem*>( newitem->parent() ) ->subdir == "doc" ) open = false; if ( newitem && static_cast<SubprojectItem*> - ( newitem->tqparent() ) ->subdir == "po" ) + ( newitem->parent() ) ->subdir == "po" ) open = false; if ( newitem && static_cast<SubprojectItem*> - ( newitem->tqparent() ) ->subdir == "pics" ) + ( newitem->parent() ) ->subdir == "pics" ) open = false; newitem->setOpen( open ); diff --git a/buildtools/autotools/autosubprojectview.h b/buildtools/autotools/autosubprojectview.h index f7a6b6e6..8a3d8ea4 100644 --- a/buildtools/autotools/autosubprojectview.h +++ b/buildtools/autotools/autosubprojectview.h @@ -44,7 +44,7 @@ class AutoSubprojectView : public AutoProjectViewBase TQ_OBJECT public: - AutoSubprojectView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name ); + AutoSubprojectView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name ); virtual ~AutoSubprojectView(); public: diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index 2d336c9b..a1deae2c 100644 --- a/buildtools/autotools/autotoolsaction.cpp +++ b/buildtools/autotools/autotoolsaction.cpp @@ -26,73 +26,73 @@ AutoToolsAction::~AutoToolsAction() AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* tqparent, const char* name ) -: KAction( text, cut, receiver, slot, tqparent, name ) + KActionCollection* parent, const char* name ) +: KAction( text, cut, receiver, slot, parent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* tqparent, const char* name ) -: KAction( text, pix, cut, receiver, slot, tqparent, name ) + KActionCollection* parent, const char* name ) +: KAction( text, pix, cut, receiver, slot, parent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* tqparent, const char* name ) -: KAction( text, pix, cut, receiver, slot, tqparent, name ) + KActionCollection* parent, const char* name ) +: KAction( text, pix, cut, receiver, slot, parent, name ) { } AutoToolsAction::AutoToolsAction( const KGuiItem& item, const KShortcut & cut, const TQObject* receiver, const char* slot, - KActionCollection* tqparent, const char* name ) -: KAction( item, cut, receiver, slot, tqparent, name ) + KActionCollection* parent, const char* name ) +: KAction( item, cut, receiver, slot, parent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, - TQObject* tqparent, const char* name ) -: KAction( text, cut, tqparent, name ) + TQObject* parent, const char* name ) +: KAction( text, cut, parent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name ) -: KAction( text, cut, receiver, slot, tqparent, name ) + TQObject* parent, const char* name ) +: KAction( text, cut, receiver, slot, parent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut, TQObject* tqparent, const char* name ) -: KAction( text, pix, cut, tqparent, name ) + const KShortcut& cut, TQObject* parent, const char* name ) +: KAction( text, pix, cut, parent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, - const KShortcut& cut, TQObject* tqparent, const char* name ) -: KAction( text, pix, cut, tqparent, name ) + const KShortcut& cut, TQObject* parent, const char* name ) +: KAction( text, pix, cut, parent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, const TQObject* receiver, - const char* slot, TQObject* tqparent, const char * name ) -: KAction( text, pix, cut, receiver, slot, tqparent, name ) + const char* slot, TQObject* parent, const char * name ) +: KAction( text, pix, cut, receiver, slot, parent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut & cut, const TQObject* receiver, - const char* slot, TQObject* tqparent, const char * name ) -: KAction( text, pix, cut, receiver, slot, tqparent, name ) + const char* slot, TQObject* parent, const char * name ) +: KAction( text, pix, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( TQObject * tqparent, const char * name ) -: KAction( tqparent, name ) +AutoToolsAction::AutoToolsAction( TQObject * parent, const char * name ) +: KAction( parent, name ) { } diff --git a/buildtools/autotools/autotoolsaction.h b/buildtools/autotools/autotoolsaction.h index 990102f1..9315e53c 100644 --- a/buildtools/autotools/autotoolsaction.h +++ b/buildtools/autotools/autotoolsaction.h @@ -32,33 +32,33 @@ public: AutoToolsAction( const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* tqparent, const char* name ); + KActionCollection* parent, const char* name ); AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* tqparent, const char* name ); + KActionCollection* parent, const char* name ); AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* tqparent, const char* name ); + KActionCollection* parent, const char* name ); AutoToolsAction( const KGuiItem& item, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* tqparent, const char* name ); + KActionCollection* parent, const char* name ); - AutoToolsAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0 ); + AutoToolsAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); AutoToolsAction( const TQString& text, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(), - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(), - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* tqparent, + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - AutoToolsAction( TQObject* tqparent = 0, const char* name = 0 ); + AutoToolsAction( TQObject* parent = 0, const char* name = 0 ); virtual int plug( TQWidget *widget, int index = -1 ); diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index 154b72b4..526a4ce7 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -58,12 +58,12 @@ public: }; ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectPart* part, - TQStringList fileList, TQWidget* tqparent, const char* name ) -: KDialogBase( tqparent, name, false, i18n("Automake Manager - Choose Target"), + TQStringList fileList, TQWidget* parent, const char* name ) +: KDialogBase( parent, name, false, i18n("Automake Manager - Choose Target"), Ok | Cancel, KDialogBase::Ok, true /* seperator */ ) { - Q_UNUSED( tqparent ); + Q_UNUSED( parent ); Q_UNUSED( name ); d = new ChooseTargetDialog::Private; d->widget = widget; diff --git a/buildtools/autotools/choosetargetdialog.h b/buildtools/autotools/choosetargetdialog.h index d1ebdab6..66549eca 100644 --- a/buildtools/autotools/choosetargetdialog.h +++ b/buildtools/autotools/choosetargetdialog.h @@ -32,7 +32,7 @@ Q_OBJECT TQ_OBJECT public: ChooseTargetDialog( AutoProjectWidget* widget, AutoProjectPart* part, - TQStringList fileList, TQWidget* tqparent = 0, + TQStringList fileList, TQWidget* parent = 0, const char* name = 0 ); ~ChooseTargetDialog(); diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index afb6f9b4..ad35329a 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -69,8 +69,8 @@ public: }; -ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *tqparent, const char *name) - : ConfigureOptionsWidgetBase(tqparent, name) +ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *parent, const char *name) + : ConfigureOptionsWidgetBase(parent, name) { config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h index fd8afade..35cd5688 100644 --- a/buildtools/autotools/configureoptionswidget.h +++ b/buildtools/autotools/configureoptionswidget.h @@ -28,7 +28,7 @@ class ConfigureOptionsWidget : public ConfigureOptionsWidgetBase TQ_OBJECT public: - ConfigureOptionsWidget( AutoProjectPart *part, TQWidget *tqparent = 0, const char *name = 0 ); + ConfigureOptionsWidget( AutoProjectPart *part, TQWidget *parent = 0, const char *name = 0 ); ~ConfigureOptionsWidget(); public slots: diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index 2a199c3a..a403337d 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -48,20 +48,20 @@ #include "kfilednddetailview.h" #include "kfiledndiconview.h" -KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, TQWidget* tqparent, const char* name ) : KDirOperator ( urlName, tqparent, name ) +KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, TQWidget* parent, const char* name ) : KDirOperator ( urlName, parent, name ) { } -KFileView* KDnDDirOperator::createView( TQWidget* tqparent, KFile::FileView view ) +KFileView* KDnDDirOperator::createView( TQWidget* parent, KFile::FileView view ) { KFileView* new_view = 0L; if( (view & KFile::Detail) == KFile::Detail ) { - new_view = new KFileDnDDetailView( tqparent, "detail view"); + new_view = new KFileDnDDetailView( parent, "detail view"); } else if ((view & KFile::Simple) == KFile::Simple ) { - new_view = new KFileDnDIconView( tqparent, "simple view"); + new_view = new KFileDnDIconView( parent, "simple view"); new_view->setViewName( i18n("Short View") ); } @@ -69,7 +69,7 @@ KFileView* KDnDDirOperator::createView( TQWidget* tqparent, KFile::FileView view } -FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, TQWidget* tqparent, const char* name ) : TQWidget(tqparent, name) +FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, TQWidget* parent, const char* name ) : TQWidget(parent, name) { m_part = part; diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h index 187348fa..e3c73a5e 100644 --- a/buildtools/autotools/fileselectorwidget.h +++ b/buildtools/autotools/fileselectorwidget.h @@ -43,10 +43,10 @@ class KDnDDirOperator : public KDirOperator TQ_OBJECT public: - KDnDDirOperator ( const KURL& urlName = KURL(), TQWidget *tqparent = 0, const char* name = 0 ); + KDnDDirOperator ( const KURL& urlName = KURL(), TQWidget *parent = 0, const char* name = 0 ); protected: - virtual KFileView* createView( TQWidget* tqparent, KFile::FileView view ); + virtual KFileView* createView( TQWidget* parent, KFile::FileView view ); }; class FileSelectorWidget : public TQWidget @@ -55,7 +55,7 @@ class FileSelectorWidget : public TQWidget TQ_OBJECT public: - FileSelectorWidget( AutoProjectPart* part, KFile::Mode, TQWidget* tqparent = 0, const char* name = 0 ); + FileSelectorWidget( AutoProjectPart* part, KFile::Mode, TQWidget* parent = 0, const char* name = 0 ); ~FileSelectorWidget(); KDnDDirOperator * dirOperator() diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/kfilednddetailview.cpp index d98e7a81..d3e86b33 100644 --- a/buildtools/autotools/kfilednddetailview.cpp +++ b/buildtools/autotools/kfilednddetailview.cpp @@ -33,8 +33,8 @@ static int autoOpenTime = 750; #endif //----------------------------------------------- -KFileDnDDetailView::KFileDnDDetailView(TQWidget *tqparent, const char *name ) - : KFileDetailView(tqparent,name), m_autoOpenTimer( this ), +KFileDnDDetailView::KFileDnDDetailView(TQWidget *parent, const char *name ) + : KFileDetailView(parent,name), m_autoOpenTimer( this ), m_autoOpenTime( autoOpenTime ), m_useAutoOpenTimer( true ), m_dropItem(0), m_dndEnabled( true ) { diff --git a/buildtools/autotools/kfilednddetailview.h b/buildtools/autotools/kfilednddetailview.h index 762d6921..147e1298 100644 --- a/buildtools/autotools/kfilednddetailview.h +++ b/buildtools/autotools/kfilednddetailview.h @@ -43,7 +43,7 @@ class KFileDnDDetailView : public KFileDetailView TQ_OBJECT public: /** */ - KFileDnDDetailView( TQWidget *tqparent = 0, const char *name = 0 ); + KFileDnDDetailView( TQWidget *parent = 0, const char *name = 0 ); /** */ virtual ~KFileDnDDetailView(); /** diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp index b59031df..d4cccdb8 100644 --- a/buildtools/autotools/kfiledndiconview.cpp +++ b/buildtools/autotools/kfiledndiconview.cpp @@ -33,8 +33,8 @@ static int autoOpenTime = 750; #endif //----------------------------------------------- -KFileDnDIconView::KFileDnDIconView( TQWidget *tqparent, const char *name ) - : KFileIconView(tqparent,name), m_autoOpenTimer( this ), +KFileDnDIconView::KFileDnDIconView( TQWidget *parent, const char *name ) + : KFileIconView(parent,name), m_autoOpenTimer( this ), m_autoOpenTime( autoOpenTime ), m_useAutoOpenTimer( true ), m_dropItem(0), m_dndEnabled( true ) { diff --git a/buildtools/autotools/kfiledndiconview.h b/buildtools/autotools/kfiledndiconview.h index e58062b3..b8f37cb6 100644 --- a/buildtools/autotools/kfiledndiconview.h +++ b/buildtools/autotools/kfiledndiconview.h @@ -38,7 +38,7 @@ class KFileDnDIconView : public KFileIconView TQ_OBJECT public: // Public methods - KFileDnDIconView( TQWidget *tqparent = 0, const char *name = 0 ); + KFileDnDIconView( TQWidget *parent = 0, const char *name = 0 ); virtual ~KFileDnDIconView(); /** diff --git a/buildtools/autotools/kimporticonview.cpp b/buildtools/autotools/kimporticonview.cpp index 87c0d19f..3634886a 100644 --- a/buildtools/autotools/kimporticonview.cpp +++ b/buildtools/autotools/kimporticonview.cpp @@ -26,8 +26,8 @@ #include "kimporticonview.h" -KImportIconView::KImportIconView(const TQString& strIntro, TQWidget *tqparent, const char *name) - : KFileDnDIconView(tqparent, name) +KImportIconView::KImportIconView(const TQString& strIntro, TQWidget *parent, const char *name) + : KFileDnDIconView(parent, name) { m_strIntro = strIntro; m_bDropped = false; diff --git a/buildtools/autotools/kimporticonview.h b/buildtools/autotools/kimporticonview.h index c0674eb7..893e7a16 100644 --- a/buildtools/autotools/kimporticonview.h +++ b/buildtools/autotools/kimporticonview.h @@ -27,7 +27,7 @@ class KImportIconView : public KFileDnDIconView TQ_OBJECT public: - KImportIconView( const TQString& strIntro, TQWidget *tqparent, const char *name ); + KImportIconView( const TQString& strIntro, TQWidget *parent, const char *name ); virtual ~KImportIconView(); void somethingDropped ( bool dropped ); diff --git a/buildtools/autotools/managecustomcommand.cpp b/buildtools/autotools/managecustomcommand.cpp index 92db0620..a602a3a9 100644 --- a/buildtools/autotools/managecustomcommand.cpp +++ b/buildtools/autotools/managecustomcommand.cpp @@ -22,8 +22,8 @@ #include <klocale.h> -ManageCustomCommand::ManageCustomCommand(TQWidget *tqparent, const char *name) - :ManageCustomBuildCommandsBase(tqparent, name) +ManageCustomCommand::ManageCustomCommand(TQWidget *parent, const char *name) + :ManageCustomBuildCommandsBase(parent, name) { } diff --git a/buildtools/autotools/managecustomcommand.h b/buildtools/autotools/managecustomcommand.h index 22f78431..8b1ae9d4 100644 --- a/buildtools/autotools/managecustomcommand.h +++ b/buildtools/autotools/managecustomcommand.h @@ -26,7 +26,7 @@ class ManageCustomCommand: public ManageCustomBuildCommandsBase Q_OBJECT TQ_OBJECT public: - ManageCustomCommand( TQWidget *tqparent = 0, const char *name = 0 ); + ManageCustomCommand( TQWidget *parent = 0, const char *name = 0 ); void setRowProperties( int row ); public slots: diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index a4162a40..31dad76a 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -24,7 +24,7 @@ #include "kdevcompileroptions.h" -static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *tqparent ) +static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) @@ -47,7 +47,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec if (prop.isValid()) args = TQStringList::split(" ", prop.toString()); - TQObject *obj = factory->create(tqparent, service->name().latin1(), + TQObject *obj = factory->create(parent, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { @@ -65,18 +65,18 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec args = TQStringList::split( " ", prop.toString() ); return KParts::ComponentFactory - ::createInstanceFromService<KDevCompilerOptions>( service, tqparent, + ::createInstanceFromService<KDevCompilerOptions>( service, parent, service->name().latin1(), args );*/ } -TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *tqparent ) +TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ) { - KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(tqparent) ); + KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) ); if ( plugin ) { - TQString newflags = plugin->exec( tqparent, flags ); + TQString newflags = plugin->exec( parent, flags ); delete plugin; return newflags; } diff --git a/buildtools/autotools/misc.h b/buildtools/autotools/misc.h index 26bb0e83..def8ce20 100644 --- a/buildtools/autotools/misc.h +++ b/buildtools/autotools/misc.h @@ -27,7 +27,7 @@ public: * Loads the compiler options plugin for the given compiler, executes the dialog * with some initial flags, and returns the new flags. */ - static TQString execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *tqparent ); + static TQString execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ); /** * Returns the canonicalized version of a file name, i.e. diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp index a650fd53..fef4b2df 100644 --- a/buildtools/autotools/removefiledlg.cpp +++ b/buildtools/autotools/removefiledlg.cpp @@ -43,8 +43,8 @@ static bool fileListContains(const TQPtrList<FileItem> &list, const TQString &na RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, TargetItem *item, const TQString &filename, - TQWidget *tqparent, const char *name) - : RemoveFileDlgBase(tqparent, name, true) + TQWidget *parent, const char *name) + : RemoveFileDlgBase(parent, name, true) { removeFromTargetsCheckBox = 0; diff --git a/buildtools/autotools/removefiledlg.h b/buildtools/autotools/removefiledlg.h index 36e1c2bd..fdb94ff0 100644 --- a/buildtools/autotools/removefiledlg.h +++ b/buildtools/autotools/removefiledlg.h @@ -31,7 +31,7 @@ class RemoveFileDialog : public RemoveFileDlgBase public: RemoveFileDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, TargetItem *item, const TQString &filename, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~RemoveFileDialog(); protected: diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp index f40452c9..12847dff 100644 --- a/buildtools/autotools/removetargetdlg.cpp +++ b/buildtools/autotools/removetargetdlg.cpp @@ -42,8 +42,8 @@ RemoveTargetDialog::RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *titem, TQWidget* tqparent, const char* name ) - : RemoveTargetDlgBase ( tqparent, name, true, 0 ) + TargetItem *titem, TQWidget* parent, const char* name ) + : RemoveTargetDlgBase ( parent, name, true, 0 ) { removeLabel->setText ( i18n ( "Do you really want to remove <b>%1</b><br>with <b>all files</b> that are attached to it<br>and <b>all dependencies</b>?" ).arg ( titem->name ) ); directoryLabel->setText ( spitem->path ); diff --git a/buildtools/autotools/removetargetdlg.h b/buildtools/autotools/removetargetdlg.h index 8a376678..a9981007 100644 --- a/buildtools/autotools/removetargetdlg.h +++ b/buildtools/autotools/removetargetdlg.h @@ -35,7 +35,7 @@ class RemoveTargetDialog : public RemoveTargetDlgBase public: RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *titem, TQWidget* tqparent = 0, const char* name = 0 ); + TargetItem *titem, TQWidget* parent = 0, const char* name = 0 ); ~RemoveTargetDialog(); private: diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp index 314fc710..f3e1c6f1 100644 --- a/buildtools/autotools/subprojectoptionsdlg.cpp +++ b/buildtools/autotools/subprojectoptionsdlg.cpp @@ -42,8 +42,8 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProjectWidget *widget, - SubprojectItem *item, TQWidget *tqparent, const char *name) - : SubprojectOptionsDialogBase(tqparent, name, true) + SubprojectItem *item, TQWidget *parent, const char *name) + : SubprojectOptionsDialogBase(parent, name, true) { setCaption(i18n("Subproject Options for '%1'").tqarg(item->subdir)); diff --git a/buildtools/autotools/subprojectoptionsdlg.h b/buildtools/autotools/subprojectoptionsdlg.h index 2e54af32..aea70658 100644 --- a/buildtools/autotools/subprojectoptionsdlg.h +++ b/buildtools/autotools/subprojectoptionsdlg.h @@ -26,7 +26,7 @@ class SubprojectOptionsDialog : public SubprojectOptionsDialogBase public: SubprojectOptionsDialog( AutoProjectPart *part, AutoProjectWidget *widget, - SubprojectItem *item, TQWidget *tqparent = 0, const char *name = 0 ); + SubprojectItem *item, TQWidget *parent = 0, const char *name = 0 ); ~SubprojectOptionsDialog(); private: diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp index 02673c0c..da9ade0c 100644 --- a/buildtools/autotools/targetoptionsdlg.cpp +++ b/buildtools/autotools/targetoptionsdlg.cpp @@ -34,8 +34,8 @@ #include "urlutil.h" TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem *item, - TQWidget *tqparent, const char *name) - : TargetOptionsDialogBase(tqparent, name, true) + TQWidget *parent, const char *name) + : TargetOptionsDialogBase(parent, name, true) { setCaption( i18n("Target Options for '%1'").tqarg(item->name) ); setIcon( SmallIcon("configure") ); diff --git a/buildtools/autotools/targetoptionsdlg.h b/buildtools/autotools/targetoptionsdlg.h index 7e64ca96..ea74c717 100644 --- a/buildtools/autotools/targetoptionsdlg.h +++ b/buildtools/autotools/targetoptionsdlg.h @@ -25,7 +25,7 @@ class TargetOptionsDialog : public TargetOptionsDialogBase public: TargetOptionsDialog( AutoProjectWidget *widget, TargetItem *item, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~TargetOptionsDialog(); private: diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp index f3111d86..e979df61 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.cpp +++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp @@ -22,8 +22,8 @@ CustomBuildOptionsWidget::CustomBuildOptionsWidget(TQDomDocument &dom, - TQWidget *tqparent, const char *name) - : CustomBuildOptionsWidgetBase(tqparent, name), + TQWidget *parent, const char *name) + : CustomBuildOptionsWidgetBase(parent, name), m_dom(dom) { ant_button->setChecked(DomUtil::readEntry(dom, "/kdevcustomproject/build/buildtool") == "ant"); diff --git a/buildtools/custommakefiles/custombuildoptionswidget.h b/buildtools/custommakefiles/custombuildoptionswidget.h index 40384f4a..2c5c0568 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.h +++ b/buildtools/custommakefiles/custombuildoptionswidget.h @@ -24,7 +24,7 @@ class CustomBuildOptionsWidget : public CustomBuildOptionsWidgetBase TQ_OBJECT public: - CustomBuildOptionsWidget( TQDomDocument &dom, TQWidget *tqparent=0, const char *name=0 ); + CustomBuildOptionsWidget( TQDomDocument &dom, TQWidget *parent=0, const char *name=0 ); ~CustomBuildOptionsWidget(); void setMakeOptionsWidget(TQTabWidget *tw, TQWidget *mow, TQWidget *oow); diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp index d07e6dbe..354e8777 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.cpp +++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp @@ -28,8 +28,8 @@ #include <environmentvariableswidget.h> -CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent) - : CustomMakeConfigWidgetBase(tqparent), +CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent) + : CustomMakeConfigWidgetBase(parent), m_part(part), m_configGroup(configGroup), m_dom( *part->projectDom() ) { abort_box->setChecked(DomUtil::readBoolEntry(m_dom, m_configGroup + "/make/abortonerror")); diff --git a/buildtools/custommakefiles/custommakeconfigwidget.h b/buildtools/custommakefiles/custommakeconfigwidget.h index 42cd310e..4a0dbfed 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.h +++ b/buildtools/custommakefiles/custommakeconfigwidget.h @@ -27,7 +27,7 @@ class CustomMakeConfigWidget : public CustomMakeConfigWidgetBase TQ_OBJECT public: - CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent); + CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent); ~CustomMakeConfigWidget(); diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp index 55115a69..7062ab18 100644 --- a/buildtools/custommakefiles/custommanagerwidget.cpp +++ b/buildtools/custommakefiles/custommanagerwidget.cpp @@ -28,8 +28,8 @@ #include "customprojectpart.h" #include "domutil.h" -CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, TQWidget* tqparent ) - : CustomManagerWidgetBase( tqparent ), m_part( part), m_dom( *part->projectDom() ) +CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, TQWidget* parent ) + : CustomManagerWidgetBase( parent ), m_part( part), m_dom( *part->projectDom() ) { m_filetypes->insertStringList( DomUtil::readListEntry( m_dom, "kdevcustomproject/filetypes", "filetype" ) ); KURLRequester* urlselector = new KURLRequester( ); diff --git a/buildtools/custommakefiles/custommanagerwidget.h b/buildtools/custommakefiles/custommanagerwidget.h index 696f06fe..9d0de848 100644 --- a/buildtools/custommakefiles/custommanagerwidget.h +++ b/buildtools/custommakefiles/custommanagerwidget.h @@ -26,7 +26,7 @@ Q_OBJECT TQ_OBJECT public: - CustomManagerWidget( CustomProjectPart* part, TQWidget* tqparent ); + CustomManagerWidget( CustomProjectPart* part, TQWidget* parent ); ~CustomManagerWidget(); public slots: void checkUrl(const TQString& url); diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp index 3f6ca0dc..67f168c2 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.cpp +++ b/buildtools/custommakefiles/customotherconfigwidget.cpp @@ -29,8 +29,8 @@ #include <environmentvariableswidget.h> -CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent) - : CustomOtherConfigWidgetBase(tqparent), +CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent) + : CustomOtherConfigWidgetBase(parent), m_part(part), m_configGroup(configGroup), m_dom( *part->projectDom() ) { prio_box->setValue(DomUtil::readIntEntry(m_dom, m_configGroup + "/other/prio")); diff --git a/buildtools/custommakefiles/customotherconfigwidget.h b/buildtools/custommakefiles/customotherconfigwidget.h index 8338e05e..3bb6da0e 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.h +++ b/buildtools/custommakefiles/customotherconfigwidget.h @@ -27,7 +27,7 @@ class CustomOtherConfigWidget : public CustomOtherConfigWidgetBase TQ_OBJECT public: - CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent); + CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent); ~CustomOtherConfigWidget(); diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index 67a56ce0..50d69800 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -65,8 +65,8 @@ typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory; static const KDevPluginInfo data( "kdevcustomproject" ); K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) ) -CustomProjectPart::CustomProjectPart( TQObject *tqparent, const char *name, const TQStringList & ) - : KDevBuildTool( &data, tqparent, name ? name : "CustomProjectPart" ) +CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ) + : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" ) , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false ) { setInstance( CustomProjectFactory::instance() ); @@ -512,7 +512,7 @@ void CustomProjectPart::findNewFiles( const TQString& dir, TQStringList& filelis // If the entry is blacklisted, proceed to next one. // Note that by using generic isInBlacklist(), // we are actually wasting resources, - // because it also tests whether any tqparent directory of relativeEntry is blacklisted. + // because it also tests whether any parent directory of relativeEntry is blacklisted. // But by the order we are traversing and processing the directories, // we know it is not the case, ever. if ( isInBlacklist( relativeEntry ) ) diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h index 7f4775ad..7bbedb5e 100644 --- a/buildtools/custommakefiles/customprojectpart.h +++ b/buildtools/custommakefiles/customprojectpart.h @@ -36,7 +36,7 @@ class CustomProjectPart : public KDevBuildTool TQ_OBJECT public: - CustomProjectPart( TQObject *tqparent, const char *name, const TQStringList & ); + CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ); ~CustomProjectPart(); TQStringList allMakeEnvironments() const; diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp index 988bae07..a4c0db99 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.cpp +++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp @@ -20,8 +20,8 @@ #include <kdebug.h> #include "selectnewfilesdialogbase.h" -SelectNewFilesDialog::SelectNewFilesDialog( TQStringList paths, TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n("Add newly created files to project"), KDialogBase::Ok|KDialogBase::Cancel ) +SelectNewFilesDialog::SelectNewFilesDialog( TQStringList paths, TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n("Add newly created files to project"), KDialogBase::Ok|KDialogBase::Cancel ) { m_widget = new SelectNewFilesDialogBase(this); m_widget->fileView->header()->hide(); @@ -87,13 +87,13 @@ void SelectNewFilesDialog::addPath( TQCheckListItem* item, const TQString& path addPath(i, parts.join("/") ); } -TQCheckListItem* SelectNewFilesDialog::createItem( TQCheckListItem* tqparent, const TQString& name, int count ) +TQCheckListItem* SelectNewFilesDialog::createItem( TQCheckListItem* parent, const TQString& name, int count ) { TQCheckListItem::Type t = TQCheckListItem::CheckBox; if( count > 0 ) t = TQCheckListItem::CheckBoxController; - if( tqparent == 0 ) + if( parent == 0 ) { TQListViewItem* item = m_widget->fileView->firstChild(); while( item ) @@ -105,14 +105,14 @@ TQCheckListItem* SelectNewFilesDialog::createItem( TQCheckListItem* tqparent, co return new TQCheckListItem( m_widget->fileView, name, t ); }else { - TQListViewItem* item = tqparent->firstChild(); + TQListViewItem* item = parent->firstChild(); while( item ) { if( item->text( 0 ) == name ) return static_cast<TQCheckListItem*>(item); item = item->nextSibling(); } - return new TQCheckListItem( tqparent, name, t ); + return new TQCheckListItem( parent, name, t ); } } diff --git a/buildtools/custommakefiles/selectnewfilesdialog.h b/buildtools/custommakefiles/selectnewfilesdialog.h index c38fd761..531a79c0 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.h +++ b/buildtools/custommakefiles/selectnewfilesdialog.h @@ -24,7 +24,7 @@ Q_OBJECT TQ_OBJECT public: - SelectNewFilesDialog( TQStringList paths, TQWidget* tqparent = 0, const char* name = 0 ); + SelectNewFilesDialog( TQStringList paths, TQWidget* parent = 0, const char* name = 0 ); ~SelectNewFilesDialog(); TQStringList excludedPaths() const; diff --git a/buildtools/lib/base/kdevbuildtool.cpp b/buildtools/lib/base/kdevbuildtool.cpp index aee38261..2dfc3d84 100644 --- a/buildtools/lib/base/kdevbuildtool.cpp +++ b/buildtools/lib/base/kdevbuildtool.cpp @@ -21,8 +21,8 @@ #include <kdevmakefrontend.h> #include <kdevappfrontend.h> -KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* tqparent, const char* name) - :KDevProject(info, tqparent, name) +KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name) + :KDevProject(info, parent, name) { } diff --git a/buildtools/lib/base/kdevbuildtool.h b/buildtools/lib/base/kdevbuildtool.h index f1276f4a..ff1abcc0 100644 --- a/buildtools/lib/base/kdevbuildtool.h +++ b/buildtools/lib/base/kdevbuildtool.h @@ -29,7 +29,7 @@ class KDevAppFrontend; class KDevBuildTool: public KDevProject { public: - KDevBuildTool(const KDevPluginInfo* info, TQObject* tqparent, const char* name); + KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name); /**@return The make frontend.*/ KDevMakeFrontend *makeFrontend(); diff --git a/buildtools/lib/parsers/autotools/autotools.yy b/buildtools/lib/parsers/autotools/autotools.yy index 350fbd77..d76cc5fe 100644 --- a/buildtools/lib/parsers/autotools/autotools.yy +++ b/buildtools/lib/parsers/autotools/autotools.yy @@ -89,7 +89,7 @@ currently on the top in the stack. When a scope or function scope statement is parsed, the child ProjectAST is created and pushed onto the stack. Therefore all statements which belong to the scope -or function scope are added as childs to their direct tqparent (scope or function scope). +or function scope are added as childs to their direct parent (scope or function scope). */ QValueStack<ProjectAST*> projects; diff --git a/buildtools/lib/parsers/autotools/autotools_yacc.cpp b/buildtools/lib/parsers/autotools/autotools_yacc.cpp index e0b92999..93cdb733 100644 --- a/buildtools/lib/parsers/autotools/autotools_yacc.cpp +++ b/buildtools/lib/parsers/autotools/autotools_yacc.cpp @@ -204,7 +204,7 @@ currently on the top in the stack. When a scope or function scope statement is parsed, the child ProjectAST is created and pushed onto the stack. Therefore all statements which belong to the scope -or function scope are added as childs to their direct tqparent (scope or function scope). +or function scope are added as childs to their direct parent (scope or function scope). */ TQValueStack<ProjectAST*> projects; diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp index 293c5817..0625ae11 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp @@ -34,8 +34,8 @@ using namespace AutoTools; -Viewer::Viewer(TQWidget *tqparent, const char *name) - :ViewerBase(tqparent, name) +Viewer::Viewer(TQWidget *parent, const char *name) + :ViewerBase(parent, name) { if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist")) { diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h index 7665368e..1e0b7b0f 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.h +++ b/buildtools/lib/parsers/autotools/tests/viewer.h @@ -32,7 +32,7 @@ class Viewer: public ViewerBase { Q_OBJECT TQ_OBJECT public: - Viewer(TQWidget *tqparent = 0, const char *name = 0); + Viewer(TQWidget *parent = 0, const char *name = 0); void processAST(AutoTools::ProjectAST *projectAST, TQListViewItem *globAfter = 0); public slots: virtual void tabWidget2_selected(const TQString&); diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy index a9c0e745..e11c086d 100644 --- a/buildtools/lib/parsers/qmake/qmake.yy +++ b/buildtools/lib/parsers/qmake/qmake.yy @@ -90,7 +90,7 @@ currently on the top in the stack. When a scope or function scope statement is parsed, the child ProjectAST is created and pushed onto the stack. Therefore all statements which belong to the scope -or function scope are added as childs to their direct tqparent (scope or function scope). +or function scope are added as childs to their direct parent (scope or function scope). */ //QValueStack<ProjectAST*> projects; diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.hpp index 9ca20a08..6b810683 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.hpp @@ -141,7 +141,7 @@ currently on the top in the stack. When a scope or function scope statement is parsed, the child ProjectAST is created and pushed onto the stack. Therefore all statements which belong to the scope -or function scope are added as childs to their direct tqparent (scope or function scope). +or function scope are added as childs to their direct parent (scope or function scope). */ //TQValueStack<ProjectAST*> projects; diff --git a/buildtools/lib/parsers/qmake/tests/viewer.cpp b/buildtools/lib/parsers/qmake/tests/viewer.cpp index a10df338..94bf8ac2 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer.cpp @@ -35,8 +35,8 @@ using namespace TQMake; -Viewer::Viewer(TQWidget *tqparent, const char *name) - :ViewerBase(tqparent, name), projectAST(0) +Viewer::Viewer(TQWidget *parent, const char *name) + :ViewerBase(parent, name), projectAST(0) { if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist")) { diff --git a/buildtools/lib/parsers/qmake/tests/viewer.h b/buildtools/lib/parsers/qmake/tests/viewer.h index 28a7613c..29e8474f 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.h +++ b/buildtools/lib/parsers/qmake/tests/viewer.h @@ -34,7 +34,7 @@ class Viewer: public ViewerBase { Q_OBJECT TQ_OBJECT public: - Viewer(TQWidget *tqparent = 0, const char *name = 0); + Viewer(TQWidget *parent = 0, const char *name = 0); void processAST(TQMake::ProjectAST *projectAST, TQListViewItem *globAfter = 0); public slots: virtual void tabWidget2_selected(const TQString&); diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp index 333cf78d..43033d97 100644 --- a/buildtools/lib/widgets/addenvvardlg.cpp +++ b/buildtools/lib/widgets/addenvvardlg.cpp @@ -28,8 +28,8 @@ #include "addenvvardlg.h" -AddEnvvarDialog::AddEnvvarDialog(TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, true) +AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("Add Environment Variable")); diff --git a/buildtools/lib/widgets/addenvvardlg.h b/buildtools/lib/widgets/addenvvardlg.h index af2abf54..8571d889 100644 --- a/buildtools/lib/widgets/addenvvardlg.h +++ b/buildtools/lib/widgets/addenvvardlg.h @@ -33,7 +33,7 @@ class AddEnvvarDialog : public TQDialog TQ_OBJECT public: - AddEnvvarDialog( TQWidget *tqparent=0, const char *name=0 ); + AddEnvvarDialog( TQWidget *parent=0, const char *name=0 ); ~AddEnvvarDialog(); TQString varname() const diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp index d7489a56..f5a1fa92 100644 --- a/buildtools/lib/widgets/addfilesdialog.cpp +++ b/buildtools/lib/widgets/addfilesdialog.cpp @@ -25,8 +25,8 @@ #include "addfilesdialog.moc" AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, - TQWidget *tqparent, const char *name, bool modal): - KFileDialog(startDir, filter, tqparent, name, modal) + TQWidget *parent, const char *name, bool modal): + KFileDialog(startDir, filter, parent, name, modal) { KConfig *config = kapp->config(); config->setGroup("Add Files Dialog"); @@ -45,8 +45,8 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, - TQWidget *tqparent, const char *name, bool modal, TQComboBox *extraWidget): - KFileDialog(startDir, filter, tqparent, name, modal, extraWidget), m_extraWidget(extraWidget) + TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget): + KFileDialog(startDir, filter, parent, name, modal, extraWidget), m_extraWidget(extraWidget) { KConfig *config = kapp->config(); config->setGroup("Add Files Dialog"); diff --git a/buildtools/lib/widgets/addfilesdialog.h b/buildtools/lib/widgets/addfilesdialog.h index c81abd23..8cdc913f 100644 --- a/buildtools/lib/widgets/addfilesdialog.h +++ b/buildtools/lib/widgets/addfilesdialog.h @@ -39,10 +39,10 @@ public: enum Mode { Copy, Link, Relative }; AddFilesDialog(const TQString& startDir, const TQString& filter, - TQWidget *tqparent, const char *name, bool modal); + TQWidget *parent, const char *name, bool modal); AddFilesDialog(const TQString& startDir, const TQString& filter, - TQWidget *tqparent, const char *name, bool modal, TQComboBox *extraWidget); + TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget); virtual ~AddFilesDialog(); diff --git a/buildtools/lib/widgets/environmentdisplaydialog.cpp b/buildtools/lib/widgets/environmentdisplaydialog.cpp index f23d7602..1a809459 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.cpp +++ b/buildtools/lib/widgets/environmentdisplaydialog.cpp @@ -25,8 +25,8 @@ extern char **environ; -EnvironmentDisplayDialog::EnvironmentDisplayDialog(TQWidget* tqparent, const char* name, bool modal, WFlags fl) -: EnvironmentDisplayDialogBase(tqparent,name, modal,fl) +EnvironmentDisplayDialog::EnvironmentDisplayDialog(TQWidget* parent, const char* name, bool modal, WFlags fl) +: EnvironmentDisplayDialogBase(parent,name, modal,fl) { TQStringList environment; char ** e = ::environ; diff --git a/buildtools/lib/widgets/environmentdisplaydialog.h b/buildtools/lib/widgets/environmentdisplaydialog.h index 0e0ce5a3..c992efb9 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.h +++ b/buildtools/lib/widgets/environmentdisplaydialog.h @@ -29,7 +29,7 @@ Q_OBJECT TQ_OBJECT public: - EnvironmentDisplayDialog(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + EnvironmentDisplayDialog(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); }; #endif diff --git a/buildtools/lib/widgets/environmentvariableswidget.cpp b/buildtools/lib/widgets/environmentvariableswidget.cpp index 2e2be1f3..3c3e448f 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.cpp +++ b/buildtools/lib/widgets/environmentvariableswidget.cpp @@ -67,8 +67,8 @@ void EnvironmentVariablesWidget::removeVarClicked() EnvironmentVariablesWidget::EnvironmentVariablesWidget(TQDomDocument &dom, const TQString &configGroup, - TQWidget *tqparent, const char *name) - : EnvironmentVariablesWidgetBase(tqparent, name), + TQWidget *parent, const char *name) + : EnvironmentVariablesWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { readEnvironment(dom, configGroup); diff --git a/buildtools/lib/widgets/environmentvariableswidget.h b/buildtools/lib/widgets/environmentvariableswidget.h index c70aa81f..c5218d5c 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.h +++ b/buildtools/lib/widgets/environmentvariableswidget.h @@ -35,7 +35,7 @@ class EnvironmentVariablesWidget : public EnvironmentVariablesWidgetBase public: EnvironmentVariablesWidget( TQDomDocument &dom, const TQString &configGroup, - TQWidget *tqparent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); ~EnvironmentVariablesWidget(); /// read in a set of environment variables from the DOM document diff --git a/buildtools/lib/widgets/makeoptionswidget.cpp b/buildtools/lib/widgets/makeoptionswidget.cpp index 2058152e..ef901cc8 100644 --- a/buildtools/lib/widgets/makeoptionswidget.cpp +++ b/buildtools/lib/widgets/makeoptionswidget.cpp @@ -29,8 +29,8 @@ #include "environmentvariableswidget.h" MakeOptionsWidget::MakeOptionsWidget(TQDomDocument &dom, const TQString &configGroup, - TQWidget *tqparent, const char *name) - : MakeOptionsWidgetBase(tqparent, name), + TQWidget *parent, const char *name) + : MakeOptionsWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { env_var_group->setColumnLayout( 1, Qt::Vertical ); diff --git a/buildtools/lib/widgets/makeoptionswidget.h b/buildtools/lib/widgets/makeoptionswidget.h index 14635b49..abbc29d6 100644 --- a/buildtools/lib/widgets/makeoptionswidget.h +++ b/buildtools/lib/widgets/makeoptionswidget.h @@ -36,7 +36,7 @@ class MakeOptionsWidget : public MakeOptionsWidgetBase public: MakeOptionsWidget( TQDomDocument &dom, const TQString &configGroup, - TQWidget *tqparent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); ~MakeOptionsWidget(); public slots: diff --git a/buildtools/lib/widgets/removesubprojectdialog.cpp b/buildtools/lib/widgets/removesubprojectdialog.cpp index 8de6d45c..4a41ff88 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.cpp +++ b/buildtools/lib/widgets/removesubprojectdialog.cpp @@ -20,8 +20,8 @@ #include <tqlabel.h> #include "removesubprojectdialog.h" -RemoveSubprojectDialog::RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* tqparent, const char* name, bool modal, WFlags fl) - : RemoveSubprojectDlgBase(tqparent,name, modal,fl) +RemoveSubprojectDialog::RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent, const char* name, bool modal, WFlags fl) + : RemoveSubprojectDlgBase(parent,name, modal,fl) { setCaption(caption); removeLabel->setText(question); diff --git a/buildtools/lib/widgets/removesubprojectdialog.h b/buildtools/lib/widgets/removesubprojectdialog.h index 49be23b8..8bca253a 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.h +++ b/buildtools/lib/widgets/removesubprojectdialog.h @@ -31,7 +31,7 @@ class RemoveSubprojectDialog : public RemoveSubprojectDlgBase TQ_OBJECT public: - RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~RemoveSubprojectDialog(); /*$PUBLIC_FUNCTIONS$*/ bool removeFromDisk(); diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp index 03c75586..9aecbe17 100644 --- a/buildtools/lib/widgets/runoptionswidget.cpp +++ b/buildtools/lib/widgets/runoptionswidget.cpp @@ -39,8 +39,8 @@ RunOptionsWidget::RunOptionsWidget(TQDomDocument &dom, const TQString &configGroup, - const TQString &buildDirectory, TQWidget *tqparent, const char *name) - : RunOptionsWidgetBase(tqparent, name), + const TQString &buildDirectory, TQWidget *parent, const char *name) + : RunOptionsWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { // Create the "Environment Variables" GUI diff --git a/buildtools/lib/widgets/runoptionswidget.h b/buildtools/lib/widgets/runoptionswidget.h index 304ce870..9b246742 100644 --- a/buildtools/lib/widgets/runoptionswidget.h +++ b/buildtools/lib/widgets/runoptionswidget.h @@ -39,7 +39,7 @@ public: RunOptionsWidget( TQDomDocument &dom, //!< document DOM const TQString &configGroup, //!< configuration group const TQString &buildDirectory, //!< project build directory - TQWidget *tqparent=0, //!< tqparent widget + TQWidget *parent=0, //!< parent widget const char *name=0 //!< widget's name ); ~RunOptionsWidget(); diff --git a/buildtools/lib/widgets/subclassesdlg.cpp b/buildtools/lib/widgets/subclassesdlg.cpp index a17f5b20..4dde898b 100644 --- a/buildtools/lib/widgets/subclassesdlg.cpp +++ b/buildtools/lib/widgets/subclassesdlg.cpp @@ -21,8 +21,8 @@ #include "subclassesdlg.h" #include "subclassesdlg.moc" -SubclassesDlg::SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* tqparent, const char* name, bool modal, WFlags fl) -: SubclassesDlgBase(tqparent,name, modal,fl), m_form(form), m_config(config), m_projectDir(projectDir) +SubclassesDlg::SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent, const char* name, bool modal, WFlags fl) +: SubclassesDlgBase(parent,name, modal,fl), m_form(form), m_config(config), m_projectDir(projectDir) { subclass_url->setEnabled(false); diff --git a/buildtools/lib/widgets/subclassesdlg.h b/buildtools/lib/widgets/subclassesdlg.h index 0b73e269..5c269529 100644 --- a/buildtools/lib/widgets/subclassesdlg.h +++ b/buildtools/lib/widgets/subclassesdlg.h @@ -31,7 +31,7 @@ class SubclassesDlg : public SubclassesDlgBase TQ_OBJECT public: - SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SubclassesDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index d0ec682d..a88e901c 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -23,8 +23,8 @@ #include "pascalproject_part.h" #include "pascalglobaloptionsdlg.h" -PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl) - :PascalProjectOptionsDlgBase(tqparent,name,fl), m_part(part) +PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl) + :PascalProjectOptionsDlgBase(parent,name,fl), m_part(part) { delete config_label; delete config_combo; diff --git a/buildtools/pascal/pascalglobaloptionsdlg.h b/buildtools/pascal/pascalglobaloptionsdlg.h index 295958fc..352e893e 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.h +++ b/buildtools/pascal/pascalglobaloptionsdlg.h @@ -25,7 +25,7 @@ class PascalGlobalOptionsDlg : public PascalProjectOptionsDlgBase TQ_OBJECT public: - PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~PascalGlobalOptionsDlg(); public slots: diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index bbc5037a..8a67a023 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -52,8 +52,8 @@ typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory; static const KDevPluginInfo data("kdevpascalproject"); K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) ) -PascalProjectPart::PascalProjectPart(TQObject *tqparent, const char *name, const TQStringList& ) - :KDevBuildTool(&data, tqparent, name ? name : "PascalProjectPart" ) +PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& ) + :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" ) { setInstance(PascalProjectFactory::instance()); setXMLFile("kdevpascalproject.rc"); diff --git a/buildtools/pascal/pascalproject_part.h b/buildtools/pascal/pascalproject_part.h index 81565cc4..a064f3a7 100644 --- a/buildtools/pascal/pascalproject_part.h +++ b/buildtools/pascal/pascalproject_part.h @@ -24,7 +24,7 @@ class PascalProjectPart : public KDevBuildTool Q_OBJECT TQ_OBJECT public: - PascalProjectPart(TQObject *tqparent, const char *name, const TQStringList &); + PascalProjectPart(TQObject *parent, const char *name, const TQStringList &); ~PascalProjectPart(); virtual void openProject(const TQString &dirName, const TQString &projectName); diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp index db5517cf..2b882466 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.cpp +++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp @@ -26,8 +26,8 @@ #include "pascalproject_part.h" #include "pascalprojectoptionsdlg.h" -PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl) - : PascalProjectOptionsDlgBase(tqparent,name, fl), m_part(part) +PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl) + : PascalProjectOptionsDlgBase(parent,name, fl), m_part(part) { config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); diff --git a/buildtools/pascal/pascalprojectoptionsdlg.h b/buildtools/pascal/pascalprojectoptionsdlg.h index 9ebcbe45..0654a7e0 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.h +++ b/buildtools/pascal/pascalprojectoptionsdlg.h @@ -24,7 +24,7 @@ class PascalProjectOptionsDlg : public PascalProjectOptionsDlgBase TQ_OBJECT public: - PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~PascalProjectOptionsDlg(); public slots: diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index a5651b27..63da84f8 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -15,8 +15,8 @@ #include "choosesubprojectdlg.h" #include "scope.h" -ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* tqparent, const char* name, bool modal, WFlags fl) - : ChooseSubprojectDlgBase(tqparent,name, modal,fl), m_widget(widget) +ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent, const char* name, bool modal, WFlags fl) + : ChooseSubprojectDlgBase(parent,name, modal,fl), m_widget(widget) { connect(subprojects_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(itemSelected(TQListViewItem *))); if( m_widget->m_rootSubproject) @@ -47,13 +47,13 @@ void ChooseSubprojectDlg::accept() TQDialog::accept(); } -ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListViewItem * tqparent, TQString text ) - :KListViewItem(tqparent, text), m_spitem(spitem) +ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListViewItem * parent, TQString text ) + :KListViewItem(parent, text), m_spitem(spitem) { } -ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListView * tqparent, TQString text ) - :KListViewItem(tqparent, text), m_spitem(spitem) +ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListView * parent, TQString text ) + :KListViewItem(parent, text), m_spitem(spitem) { } diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index cf97671f..f49eedf6 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -22,8 +22,8 @@ class TrollProjectWidget; class ChooseItem: public KListViewItem { public: - ChooseItem(QMakeScopeItem *spitem, TQListViewItem *tqparent, TQString text); - ChooseItem(QMakeScopeItem *spitem, TQListView *tqparent, TQString text); + ChooseItem(QMakeScopeItem *spitem, TQListViewItem *parent, TQString text); + ChooseItem(QMakeScopeItem *spitem, TQListView *parent, TQString text); QMakeScopeItem *subproject(); @@ -37,7 +37,7 @@ class ChooseSubprojectDlg : public ChooseSubprojectDlgBase TQ_OBJECT public: - ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ChooseSubprojectDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp index 2792d0ae..4f65dd17 100644 --- a/buildtools/qmake/createscopedlg.cpp +++ b/buildtools/qmake/createscopedlg.cpp @@ -26,8 +26,8 @@ #include "scope.h" #include "trollprojectwidget.h" -CreateScopeDlg::CreateScopeDlg( QMakeScopeItem* item, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : CreateScopeDlgBase( tqparent, name, modal, fl ), m_item( item ) +CreateScopeDlg::CreateScopeDlg( QMakeScopeItem* item, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : CreateScopeDlgBase( parent, name, modal, fl ), m_item( item ) { incUrl->setMode( KFile::File | KFile::LocalOnly ); incUrl->setCaption( i18n( "Choose existing .pri file or give a new filename for creation" ) ); diff --git a/buildtools/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h index 781522fe..30ef2e2e 100644 --- a/buildtools/qmake/createscopedlg.h +++ b/buildtools/qmake/createscopedlg.h @@ -23,7 +23,7 @@ class CreateScopeDlg : public CreateScopeDlgBase TQ_OBJECT public: - CreateScopeDlg( QMakeScopeItem* item, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreateScopeDlg( QMakeScopeItem* item, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreateScopeDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/buildtools/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp index 682fd906..c05c70c9 100644 --- a/buildtools/qmake/disablesubprojectdlg.cpp +++ b/buildtools/qmake/disablesubprojectdlg.cpp @@ -15,8 +15,8 @@ #include "scope.h" #include "qmakescopeitem.h" -DisableSubprojectDlg::DisableSubprojectDlg( const TQStringList& projects, TQWidget* tqparent, const char* name, WFlags fl ) - : DisableSubprojectDlgBase( tqparent, name, fl ) +DisableSubprojectDlg::DisableSubprojectDlg( const TQStringList& projects, TQWidget* parent, const char* name, WFlags fl ) + : DisableSubprojectDlgBase( parent, name, fl ) { for( TQStringList::const_iterator it = projects.begin(); it != projects.end(); ++it ) { diff --git a/buildtools/qmake/disablesubprojectdlg.h b/buildtools/qmake/disablesubprojectdlg.h index 296fcd14..0f242aa6 100644 --- a/buildtools/qmake/disablesubprojectdlg.h +++ b/buildtools/qmake/disablesubprojectdlg.h @@ -20,7 +20,7 @@ class DisableSubprojectDlg : public DisableSubprojectDlgBase TQ_OBJECT public: - DisableSubprojectDlg( const TQStringList& projects, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + DisableSubprojectDlg( const TQStringList& projects, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~DisableSubprojectDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/buildtools/qmake/newwidgetdlg.cpp b/buildtools/qmake/newwidgetdlg.cpp index 56a7c057..44dd7588 100644 --- a/buildtools/qmake/newwidgetdlg.cpp +++ b/buildtools/qmake/newwidgetdlg.cpp @@ -25,8 +25,8 @@ #define WIDGET_CLASS_NAME "class" #define WIDGET_SLOTS "slots" -NewWidgetDlg::NewWidgetDlg(TQStringList &newFileNames,TQWidget* tqparent, const char* name, bool modal, WFlags fl) -: NewWidgetDlgBase(tqparent,name,modal,fl), +NewWidgetDlg::NewWidgetDlg(TQStringList &newFileNames,TQWidget* parent, const char* name, bool modal, WFlags fl) +: NewWidgetDlgBase(parent,name,modal,fl), m_newFileNames(newFileNames) //================================================= { diff --git a/buildtools/qmake/newwidgetdlg.h b/buildtools/qmake/newwidgetdlg.h index 4c1843ab..994aead5 100644 --- a/buildtools/qmake/newwidgetdlg.h +++ b/buildtools/qmake/newwidgetdlg.h @@ -21,7 +21,7 @@ class TQDomDocument; class NewWidgetDlg : public NewWidgetDlgBase { public: - NewWidgetDlg(TQStringList &newFileNames,TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + NewWidgetDlg(TQStringList &newFileNames,TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~NewWidgetDlg(); diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index 713084fd..11b61507 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -51,15 +51,15 @@ #include "scope.h" #include "urlutil.h" -InsideCheckListItem::InsideCheckListItem( TQListView *tqparent, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : - TQCheckListItem( tqparent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), TQCheckListItem::CheckBox ) +InsideCheckListItem::InsideCheckListItem( TQListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : + TQCheckListItem( parent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), TQCheckListItem::CheckBox ) { prjItem = item; m_config = config; } -InsideCheckListItem::InsideCheckListItem( TQListView *tqparent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : - TQCheckListItem( tqparent, +InsideCheckListItem::InsideCheckListItem( TQListView *parent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : + TQCheckListItem( parent, after, item->relativePath(), TQCheckListItem::CheckBox ) { @@ -84,8 +84,8 @@ void InsideCheckListItem::stateChange( bool state ) } } -CustomVarListItem::CustomVarListItem(TQListView* tqparent, unsigned int id, TQMap<TQString, TQString> var) - : KListViewItem(tqparent), m_key(id) +CustomVarListItem::CustomVarListItem(TQListView* parent, unsigned int id, TQMap<TQString, TQString> var) + : KListViewItem(parent), m_key(id) { setText(0, var["var"]); setText(1, var["op"]); @@ -99,8 +99,8 @@ TQString CustomVarListItem::key(int column, bool ascending) const return KListViewItem::key(column, ascending); } -ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : ProjectConfigurationDlgBase( tqparent, name, modal, fl | TQt::WStyle_Tool ), myProjectItem(0) +ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : ProjectConfigurationDlgBase( parent, name, modal, fl | TQt::WStyle_Tool ), myProjectItem(0) { prjList = _prjList; prjWidget = _prjWidget; diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index 6ef112d7..75ad578d 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -34,9 +34,9 @@ class TrollProjectWidget; class InsideCheckListItem : public TQCheckListItem { public: - InsideCheckListItem( TQListView *tqparent, QMakeScopeItem *item, ProjectConfigurationDlg *config ); + InsideCheckListItem( TQListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ); - InsideCheckListItem( TQListView *tqparent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ); + InsideCheckListItem( TQListView *parent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ); QMakeScopeItem *prjItem; ProjectConfigurationDlg *m_config; @@ -56,7 +56,7 @@ class CustomVarListItem : public KListViewItem class ProjectConfigurationDlg : public ProjectConfigurationDlgBase { public: - ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ProjectConfigurationDlg(); void updateControls(); void updateSubproject( QMakeScopeItem* _item ); diff --git a/buildtools/qmake/qmakeoptionswidget.cpp b/buildtools/qmake/qmakeoptionswidget.cpp index 01ac0f7b..c2f4cfdd 100644 --- a/buildtools/qmake/qmakeoptionswidget.cpp +++ b/buildtools/qmake/qmakeoptionswidget.cpp @@ -20,8 +20,8 @@ #include <kdebug.h> QMakeOptionsWidget::QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup, - TQWidget *tqparent, const char *name ) - : QMakeOptionsWidgetBase( tqparent, name ), + TQWidget *parent, const char *name ) + : QMakeOptionsWidgetBase( parent, name ), m_dom( dom ), m_configGroup( configGroup ), m_projectDir( projectdir ) { groupBehaviour->setButton( DomUtil::readIntEntry( dom, configGroup+"/qmake/savebehaviour", 2) ); diff --git a/buildtools/qmake/qmakeoptionswidget.h b/buildtools/qmake/qmakeoptionswidget.h index 9db49213..a1233856 100644 --- a/buildtools/qmake/qmakeoptionswidget.h +++ b/buildtools/qmake/qmakeoptionswidget.h @@ -22,7 +22,7 @@ class QMakeOptionsWidget : public QMakeOptionsWidgetBase TQ_OBJECT public: QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~QMakeOptionsWidget(); public slots: diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index 9da11ca4..36c3d5e2 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -29,13 +29,13 @@ * Class qProjectItem */ -qProjectItem::qProjectItem( Type type, TQListView *tqparent, const TQString &text ) - : TQListViewItem( tqparent, text ), typ( type ) +qProjectItem::qProjectItem( Type type, TQListView *parent, const TQString &text ) + : TQListViewItem( parent, text ), typ( type ) {} -qProjectItem::qProjectItem( Type type, qProjectItem *tqparent, const TQString &text ) - : TQListViewItem( tqparent, text ), typ( type ) +qProjectItem::qProjectItem( Type type, qProjectItem *parent, const TQString &text ) + : TQListViewItem( parent, text ), typ( type ) {} @@ -306,16 +306,16 @@ FileItem::FileItem( TQListView *lv, const TQString &text ) * Class QMakeScopeItem */ -QMakeScopeItem::QMakeScopeItem( TQListView *tqparent, const TQString &text, Scope* s, TrollProjectWidget* widget ) - : qProjectItem( Subproject, tqparent, text ), scope( s ), m_widget( widget ) +QMakeScopeItem::QMakeScopeItem( TQListView *parent, const TQString &text, Scope* s, TrollProjectWidget* widget ) + : qProjectItem( Subproject, parent, text ), scope( s ), m_widget( widget ) { // configuration.m_template = TQTMP_APPLICATION; init(); } -QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *tqparent, const TQString &text, Scope* s ) - : qProjectItem( Subproject, tqparent, text ), scope( s ), m_widget( tqparent->m_widget ) +QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *parent, const TQString &text, Scope* s ) + : qProjectItem( Subproject, parent, text ), scope( s ), m_widget( parent->m_widget ) { init(); } @@ -334,28 +334,28 @@ QMakeScopeItem::~QMakeScopeItem() TQString QMakeScopeItem::relativePath() { - if( !scope || !scope->tqparent() ) + if( !scope || !scope->parent() ) return ""; if( scope->scopeType() == Scope::ProjectScope ) { - if( scope->tqparent() && scope->tqparent()->variableValues("SUBDIRS").contains( URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) ) + if( scope->parent() && scope->parent()->variableValues("SUBDIRS").contains( URLUtil::relativePathToFile( scope->parent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) ) { - return URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ); + return URLUtil::relativePathToFile( scope->parent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ); }else { return URLUtil::getRelativePath( m_widget->projectDirectory(), scope->projectDir() ); } }else - return static_cast<QMakeScopeItem*>( tqparent() ) ->relativePath(); -// if( !scope->tqparent() ) + return static_cast<QMakeScopeItem*>( parent() ) ->relativePath(); +// if( !scope->parent() ) // return ""; -// else if ( !scope->tqparent()->tqparent() || scope->scopeType() != Scope::ProjectScope ) +// else if ( !scope->parent()->parent() || scope->scopeType() != Scope::ProjectScope ) // return scope->scopeName(); // else if ( scope->scopeType() == Scope::ProjectScope ) -// return ( static_cast<QMakeScopeItem*>( tqparent() ) ->relativePath() +// return ( static_cast<QMakeScopeItem*>( parent() ) ->relativePath() // + TQString( TQChar( TQDir::separator() ) ) + scope->scopeName() ); // else -// return ( static_cast<QMakeScopeItem*>( tqparent() ) ->relativePath() ); +// return ( static_cast<QMakeScopeItem*>( parent() ) ->relativePath() ); } TQString QMakeScopeItem::getSharedLibAddObject( TQString basePath ) @@ -807,7 +807,7 @@ QMakeScopeItem* QMakeScopeItem::projectFileItem() { if( scope->scopeType() != Scope::ProjectScope ) { - QMakeScopeItem* parentitem = dynamic_cast<QMakeScopeItem*>(tqparent()); + QMakeScopeItem* parentitem = dynamic_cast<QMakeScopeItem*>(parent()); if( parentitem ) return parentitem->projectFileItem(); } diff --git a/buildtools/qmake/qmakescopeitem.h b/buildtools/qmake/qmakescopeitem.h index ec45877e..2e275511 100644 --- a/buildtools/qmake/qmakescopeitem.h +++ b/buildtools/qmake/qmakescopeitem.h @@ -28,8 +28,8 @@ class qProjectItem : public TQListViewItem public: enum Type { Subproject, Group, File }; - qProjectItem( Type type, TQListView *tqparent, const TQString &text ); - qProjectItem( Type type, qProjectItem *tqparent, const TQString &text ); + qProjectItem( Type type, TQListView *parent, const TQString &text ); + qProjectItem( Type type, qProjectItem *parent, const TQString &text ); TQString scopeString; Type type() @@ -88,8 +88,8 @@ public: class QMakeScopeItem : public qProjectItem { public: - QMakeScopeItem( TQListView *tqparent, const TQString &text, Scope *s, TrollProjectWidget* widget ); - QMakeScopeItem( QMakeScopeItem *tqparent, const TQString &text, Scope* ); + QMakeScopeItem( TQListView *parent, const TQString &text, Scope *s, TrollProjectWidget* widget ); + QMakeScopeItem( QMakeScopeItem *parent, const TQString &text, Scope* ); void updateValues( const TQString& var, const TQStringList& values ); void addValue( const TQString& var, const TQString& value ); void removeValue( const TQString& var, const TQString& value ); diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp index 17c360dc..6018c392 100644 --- a/buildtools/qmake/scope.cpp +++ b/buildtools/qmake/scope.cpp @@ -80,18 +80,18 @@ Scope::~Scope() } // Simple/Function Scopes -Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::ProjectAST* scope, +Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, TQMake::ProjectAST* scope, TQMakeDefaultOpts* defaultopts, TrollProjectPart* part ) - : m_root( scope ), m_incast( 0 ), m_parent( tqparent ), m_num(num), m_isEnabled( true ), + : m_root( scope ), m_incast( 0 ), m_parent( parent ), m_num(num), m_isEnabled( true ), m_part(part), m_defaultopts(defaultopts), m_environment( env ) { init(); } //Subdirs -Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, const TQString& filename, +Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, const TQString& filename, TrollProjectPart* part, bool isEnabled ) - : m_root( 0 ), m_incast( 0 ), m_parent( tqparent ), m_num(num), m_isEnabled( isEnabled ), + : m_root( 0 ), m_incast( 0 ), m_parent( parent ), m_num(num), m_isEnabled( isEnabled ), m_part(part), m_defaultopts(0), m_environment( env ) { if ( !loadFromFile( filename ) ) @@ -114,9 +114,9 @@ Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqp } //Include Scope -Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::IncludeAST* incast, const TQString& path, +Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, TQMake::IncludeAST* incast, const TQString& path, const TQString& incfile, TQMakeDefaultOpts* defaultopts, TrollProjectPart* part ) - : m_root( 0 ), m_incast( incast ), m_parent( tqparent ), m_num(num), m_isEnabled( true ), + : m_root( 0 ), m_incast( incast ), m_parent( parent ), m_num(num), m_isEnabled( true ), m_part(part), m_defaultopts(defaultopts), m_environment( env ) { TQString absfilename; @@ -1552,7 +1552,7 @@ TQString Scope::findCustomVarForPath( const TQString& path ) } if( scopeType() != ProjectScope ) { - return tqparent()->findCustomVarForPath( path ); + return parent()->findCustomVarForPath( path ); } return result; } diff --git a/buildtools/qmake/scope.h b/buildtools/qmake/scope.h index 8140b5e6..98519bdf 100644 --- a/buildtools/qmake/scope.h +++ b/buildtools/qmake/scope.h @@ -64,7 +64,7 @@ public: TQStringList variableValuesForOp( const TQString& variable, const TQString& op ) const; // Fetch the variable values by running over the statements and adding/removing/setting - // as the encountered op's say, begin with the tqparent projects variableValues list + // as the encountered op's say, begin with the parent projects variableValues list TQStringList variableValues( const TQString& variable, bool checkIncParent = true, bool fetchFromParent = true, bool evaluateSubScopes = false ); // Remove a variable+Op combination from the scope, if existant @@ -86,8 +86,8 @@ public: // Returns the absolute path of the dir containing the .pro file TQString projectDir() const; - // get the tqparent Scope - Scope* tqparent() const { return m_parent; } + // get the parent Scope + Scope* parent() const { return m_parent; } // Fetching sub-scopes const TQValueList<Scope*> scopesInOrder() const { return m_scopes.values(); } @@ -105,7 +105,7 @@ public: * creates a new function scope at the end of this (Sub-)AST * and a new include scope inside the new function scope. * It returns the Scope wrapping the include-AST, the function scope AST - * can be accessed easily using the tqparent() method. + * can be accessed easily using the parent() method. */ Scope* createIncludeScope( const TQString& includeFile, bool negate = false ); @@ -201,17 +201,17 @@ private: /* * just initializes the lists from the scope */ - Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::ProjectAST* root, TQMakeDefaultOpts*, TrollProjectPart* part ); + Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, TQMake::ProjectAST* root, TQMakeDefaultOpts*, TrollProjectPart* part ); /* * reads the given filename and parses it. If it doesn't exist creates an empty * ProjectAST with the given filename */ - Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, const TQString& filename, TrollProjectPart* part, bool isEnabled = true ); + Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, const TQString& filename, TrollProjectPart* part, bool isEnabled = true ); /* * Creates a scope for an include statement, parses the file and initializes the Scope * Create an empty ProjectAST if the file cannot be found or parsed. */ - Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::IncludeAST* incast, const TQString& path, const TQString& incfile, TQMakeDefaultOpts*, TrollProjectPart* part ); + Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, TQMake::IncludeAST* incast, const TQString& path, const TQString& incfile, TQMakeDefaultOpts*, TrollProjectPart* part ); // runs through the statements until stopHere is found (or the end is reached, if stopHere is 0), @@ -256,7 +256,7 @@ private: TQString replaceWs(TQString); - // The "position" inside the tqparent scope that this scope starts at + // The "position" inside the parent scope that this scope starts at unsigned int m_num; bool m_isEnabled; TrollProjectPart* m_part; diff --git a/buildtools/qmake/trolllistview.cpp b/buildtools/qmake/trolllistview.cpp index adca9d44..3bf99a0e 100644 --- a/buildtools/qmake/trolllistview.cpp +++ b/buildtools/qmake/trolllistview.cpp @@ -20,9 +20,9 @@ #include "trolllistview.h" -TrollListView::TrollListView(TrollProjectWidget *widget, TQWidget *tqparent, +TrollListView::TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name) - :KListView(tqparent, name), m_widget(widget), m_view(view) + :KListView(parent, name), m_widget(widget), m_view(view) { } diff --git a/buildtools/qmake/trolllistview.h b/buildtools/qmake/trolllistview.h index 9d843cb7..1e5fb5cd 100644 --- a/buildtools/qmake/trolllistview.h +++ b/buildtools/qmake/trolllistview.h @@ -29,7 +29,7 @@ class TrollListView : public KListView Q_OBJECT TQ_OBJECT public: - TrollListView(TrollProjectWidget *widget, TQWidget *tqparent, TrollProjectWidget::TrollProjectView view, const char *name = 0); + TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name = 0); ~TrollListView(); protected: virtual void focusOutEvent(TQFocusEvent *e); diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 5cb9260a..3bb68ef7 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -60,8 +60,8 @@ typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory; static const KDevPluginInfo data("kdevtrollproject"); K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) -TrollProjectPart::TrollProjectPart(TQObject *tqparent, const char *name, const TQStringList& args ) - : KDevBuildTool(&data, tqparent, name ? name : "TrollProjectPart") +TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) + : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") { setInstance(TrollProjectFactory::instance()); diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h index baeddc90..f000acf9 100644 --- a/buildtools/qmake/trollprojectpart.h +++ b/buildtools/qmake/trollprojectpart.h @@ -34,7 +34,7 @@ class TrollProjectPart : public KDevBuildTool TQ_OBJECT public: - TrollProjectPart( TQObject *tqparent, const char *name, const TQStringList &args ); + TrollProjectPart( TQObject *parent, const char *name, const TQStringList &args ); ~TrollProjectPart(); bool isTMakeProject() const { return m_tmakeProject; } diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 4baf0b6b..e4294f0a 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -545,7 +545,7 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item ) // { // // After AddTargetDialog, it can happen that an // // item is not yet in the list view, so better check... -// if ( it1.data() ->tqparent() ) +// if ( it1.data() ->parent() ) // while ( it1.data() ->firstChild() ) // it1.data() ->takeItem( it1.data() ->firstChild() ); // details->takeItem( it1.data() ); @@ -628,7 +628,7 @@ void TrollProjectWidget::slotDetailsExecuted( TQListViewItem *item ) TQString filePath; if( m_shownSubproject->scope->scopeType() == Scope::IncludeScope ) { - filePath = m_shownSubproject->scope->tqparent()->projectDir(); + filePath = m_shownSubproject->scope->parent()->projectDir(); }else { filePath = m_shownSubproject->scope->projectDir(); @@ -942,7 +942,7 @@ void TrollProjectWidget::slotRemoveSubproject( QMakeScopeItem *spitem ) { if ( spitem == 0 && m_shownSubproject == 0 ) return ; - else if ( ( spitem = dynamic_cast<QMakeScopeItem *>( m_shownSubproject->tqparent() ) ) != NULL ) + else if ( ( spitem = dynamic_cast<QMakeScopeItem *>( m_shownSubproject->parent() ) ) != NULL ) { m_filesCached = false; @@ -991,7 +991,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i int idAddScope = -2; - if ( spitem->scope->scopeType() == Scope::ProjectScope && ( !spitem->scope->tqparent() || spitem->scope->tqparent()->scopeType() == Scope::ProjectScope ) ) + if ( spitem->scope->scopeType() == Scope::ProjectScope && ( !spitem->scope->parent() || spitem->scope->parent()->scopeType() == Scope::ProjectScope ) ) { idBuild = popup.insertItem( SmallIcon( "make_kdevelop" ), i18n( "Build" ) ); popup.tqsetWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>" @@ -1030,7 +1030,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i popup.setItemEnabled( idAddSubproject, false ); idRemoveSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Remove Subproject..." ) ); popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) ); - if ( spitem->tqparent() == NULL ) + if ( spitem->parent() == NULL ) popup.setItemEnabled( idRemoveSubproject, false ); idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) ); popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file of the currently selected subproject." ) ); @@ -1055,7 +1055,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i popup.setItemEnabled( idAddSubproject, false ); idDisableSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Disable Subproject..." ) ); popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) ); - if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->tqparent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) + if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->parent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idDisableSubproject, false ); popup.insertSeparator(); idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Scope Settings" ) ); @@ -1363,7 +1363,7 @@ void TrollProjectWidget::slotNewFile() if( !gitem ) { - gitem = dynamic_cast<GroupItem*>( details->currentItem()->tqparent() ); + gitem = dynamic_cast<GroupItem*>( details->currentItem()->parent() ); } if ( gitem ) @@ -1469,7 +1469,7 @@ void TrollProjectWidget::slotExcludeFileFromScopeButton() return ; FileItem *fitem = static_cast<FileItem*>( pvitem ); - GroupItem *gitem = static_cast<GroupItem*>( fitem->tqparent() ); + GroupItem *gitem = static_cast<GroupItem*>( fitem->parent() ); gitem->removeFileFromScope( fitem->text( 0 ) ); } @@ -1744,7 +1744,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it m_part->appFrontend() ->startAppCommand( m_shownSubproject->scope->projectDir(), cmd, false ); }else if( r == idRemoveFile ) { - static_cast<GroupItem*>(titem->tqparent())->removeInstallObject( titem ); + static_cast<GroupItem*>(titem->parent())->removeInstallObject( titem ); slotOverviewSelectionChanged( m_shownSubproject ); } } @@ -1753,7 +1753,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it removefileButton->setEnabled( true ); FileItem *fitem = static_cast<FileItem*>( pvitem ); - GroupItem* gitem = static_cast<GroupItem*>( item->tqparent() ); + GroupItem* gitem = static_cast<GroupItem*>( item->parent() ); KPopupMenu popup( this ); if ( !( gitem->groupType == GroupItem::InstallObject ) ) @@ -1898,7 +1898,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it } else if ( r == idEditInstallPattern ) { - GroupItem * titem = static_cast<GroupItem*>( item->tqparent() ); + GroupItem * titem = static_cast<GroupItem*>( item->parent() ); bool ok = FALSE; TQString filepattern = KInputDialog::getText( @@ -1923,7 +1923,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) { - GroupItem * gitem = static_cast<GroupItem*>( fitem->tqparent() ); + GroupItem * gitem = static_cast<GroupItem*>( fitem->parent() ); m_filesCached = false; m_allFilesCache.clear(); @@ -2265,7 +2265,7 @@ void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem ) m_filesCached = false; m_allFilesCache.clear(); - QMakeScopeItem* pitem = dynamic_cast<QMakeScopeItem *>( spitem->tqparent() ); + QMakeScopeItem* pitem = dynamic_cast<QMakeScopeItem *>( spitem->parent() ); if ( pitem != 0 ) { switch ( spitem->scope->scopeType() ) @@ -2287,7 +2287,7 @@ void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem ) // pitem->scopes.remove( spitem ); delete spitem; spitem = pitem; - pitem = dynamic_cast<QMakeScopeItem *>( pitem->tqparent() ); + pitem = dynamic_cast<QMakeScopeItem *>( pitem->parent() ); // pitem->scopes.remove(spitem); break; case Scope::SimpleScope: @@ -2313,11 +2313,11 @@ void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem ) QMakeScopeItem * TrollProjectWidget::findSubprojectForScope( QMakeScopeItem * scope ) { - if ( ( scope == 0 ) || ( scope->tqparent() == 0 ) ) + if ( ( scope == 0 ) || ( scope->parent() == 0 ) ) return 0; if ( scope->scope->scopeType() == Scope::ProjectScope ) return scope; - return findSubprojectForScope( dynamic_cast<QMakeScopeItem *>( scope->tqparent() ) ); + return findSubprojectForScope( dynamic_cast<QMakeScopeItem *>( scope->parent() ) ); } void TrollProjectWidget::focusInEvent( TQFocusEvent * /*e*/ ) @@ -2447,11 +2447,11 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) } }else { - QMakeScopeItem* tqparent = static_cast<QMakeScopeItem*>(spitem->tqparent()); - tqparent->disableSubprojects( TQStringList( spitem->scope->scopeName() ) ); + QMakeScopeItem* parent = static_cast<QMakeScopeItem*>(spitem->parent()); + parent->disableSubprojects( TQStringList( spitem->scope->scopeName() ) ); delete spitem; - tqparent->scope->saveToFile(); - m_shownSubproject = tqparent; + parent->scope->saveToFile(); + m_shownSubproject = parent; slotOverviewSelectionChanged( m_shownSubproject ); } } diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index 0697f5f1..0e838612 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -30,8 +30,8 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part, - TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, true) + TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("New File")); diff --git a/buildtools/script/scriptnewfiledlg.h b/buildtools/script/scriptnewfiledlg.h index ca60ebd5..fa1ca53d 100644 --- a/buildtools/script/scriptnewfiledlg.h +++ b/buildtools/script/scriptnewfiledlg.h @@ -25,7 +25,7 @@ class ScriptNewFileDialog : public TQDialog TQ_OBJECT public: - ScriptNewFileDialog( ScriptProjectPart *part, TQWidget *tqparent=0, const char *name=0 ); + ScriptNewFileDialog( ScriptProjectPart *part, TQWidget *parent=0, const char *name=0 ); ~ScriptNewFileDialog(); protected: diff --git a/buildtools/script/scriptoptionswidget.cpp b/buildtools/script/scriptoptionswidget.cpp index 5b0e8cf8..d80cd501 100644 --- a/buildtools/script/scriptoptionswidget.cpp +++ b/buildtools/script/scriptoptionswidget.cpp @@ -20,8 +20,8 @@ ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part, - TQWidget *tqparent, const char *name) - : ScriptOptionsWidgetBase(tqparent, name) + TQWidget *parent, const char *name) + : ScriptOptionsWidgetBase(parent, name) { m_part = part; diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h index a93d63d1..f5d6e071 100644 --- a/buildtools/script/scriptoptionswidget.h +++ b/buildtools/script/scriptoptionswidget.h @@ -23,7 +23,7 @@ class ScriptOptionsWidget : public ScriptOptionsWidgetBase TQ_OBJECT public: - ScriptOptionsWidget( KDevPlugin *part, TQWidget *tqparent=0, const char *name=0 ); + ScriptOptionsWidget( KDevPlugin *part, TQWidget *parent=0, const char *name=0 ); ~ScriptOptionsWidget(); public slots: diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index e28ef2e4..4505368b 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -40,8 +40,8 @@ typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory; static const KDevPluginInfo data("kdevscriptproject"); K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) ) -ScriptProjectPart::ScriptProjectPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevBuildTool(&data, tqparent, name ? name : "ScriptProjectPart") +ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &) + : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") { setInstance(ScriptProjectFactory::instance()); diff --git a/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h index 2029c09b..03b21996 100644 --- a/buildtools/script/scriptprojectpart.h +++ b/buildtools/script/scriptprojectpart.h @@ -28,7 +28,7 @@ class ScriptProjectPart : public KDevBuildTool TQ_OBJECT public: - ScriptProjectPart( TQObject *tqparent, const char *name, const TQStringList &args ); + ScriptProjectPart( TQObject *parent, const char *name, const TQStringList &args ); ~ScriptProjectPart(); TQStringList distFiles() const; diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp index ca210b95..4dffa96d 100644 --- a/editors/editor-chooser/editorchooser_part.cpp +++ b/editors/editor-chooser/editorchooser_part.cpp @@ -16,8 +16,8 @@ typedef KDevGenericFactory<EditorChooserPart> EditorChooserFactory; static const KDevPluginInfo data("kdeveditorchooser"); K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( data ) ) -EditorChooserPart::EditorChooserPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "EditorChooserPart") +EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "EditorChooserPart") { setInstance(EditorChooserFactory::instance()); diff --git a/editors/editor-chooser/editorchooser_part.h b/editors/editor-chooser/editorchooser_part.h index ebf7ed48..42cac392 100644 --- a/editors/editor-chooser/editorchooser_part.h +++ b/editors/editor-chooser/editorchooser_part.h @@ -20,7 +20,7 @@ class EditorChooserPart : public KDevPlugin public: - EditorChooserPart(TQObject *tqparent, const char *name, const TQStringList &); + EditorChooserPart(TQObject *parent, const char *name, const TQStringList &); ~EditorChooserPart(); diff --git a/editors/editor-chooser/editorchooser_widget.cpp b/editors/editor-chooser/editorchooser_widget.cpp index 25bbb10e..3a8a3584 100644 --- a/editors/editor-chooser/editorchooser_widget.cpp +++ b/editors/editor-chooser/editorchooser_widget.cpp @@ -12,8 +12,8 @@ #include "editorchooser_widget.h" -EditorChooserWidget::EditorChooserWidget(TQWidget *tqparent, const char *name) - : EditChooser(tqparent, name) +EditorChooserWidget::EditorChooserWidget(TQWidget *parent, const char *name) + : EditChooser(parent, name) { // ask the trader which editors he has to offer m_offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes"); diff --git a/editors/editor-chooser/editorchooser_widget.h b/editors/editor-chooser/editorchooser_widget.h index 471eb3db..94216201 100644 --- a/editors/editor-chooser/editorchooser_widget.h +++ b/editors/editor-chooser/editorchooser_widget.h @@ -15,7 +15,7 @@ class EditorChooserWidget : public EditChooser public: - EditorChooserWidget(TQWidget *tqparent=0, const char *name=0); + EditorChooserWidget(TQWidget *parent=0, const char *name=0); public slots: virtual void slotEditPartChanged(const TQString &); diff --git a/embedded/visualboyadvance/vbaconfigwidget.cpp b/embedded/visualboyadvance/vbaconfigwidget.cpp index b9497dfe..a89a397f 100644 --- a/embedded/visualboyadvance/vbaconfigwidget.cpp +++ b/embedded/visualboyadvance/vbaconfigwidget.cpp @@ -30,7 +30,7 @@ using namespace VisualBoyAdvance; -VBAConfigWidget::VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *tqparent, const char *name ) : VBAConfigWidgetBase(tqparent,name) { +VBAConfigWidget::VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *parent, const char *name ) : VBAConfigWidgetBase(parent,name) { m_part = part; TQDomDocument &doc = *m_part->projectDom(); // read diff --git a/embedded/visualboyadvance/vbaconfigwidget.h b/embedded/visualboyadvance/vbaconfigwidget.h index 08735172..7f636f2b 100644 --- a/embedded/visualboyadvance/vbaconfigwidget.h +++ b/embedded/visualboyadvance/vbaconfigwidget.h @@ -31,7 +31,7 @@ class VBAConfigWidget : public VBAConfigWidgetBase { Q_OBJECT TQ_OBJECT public: - VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *tqparent=0, const char *name=0); + VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *parent=0, const char *name=0); ~VBAConfigWidget(); public slots: void accept(); diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp index d469bc15..12091768 100644 --- a/embedded/visualboyadvance/visualboyadvance_part.cpp +++ b/embedded/visualboyadvance/visualboyadvance_part.cpp @@ -23,8 +23,8 @@ typedef KDevGenericFactory<VisualBoyAdvancePart> VisualBoyAdvanceFactory; static const KDevPluginInfo data("kdevvisualboyadvance"); K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( data ) ) -VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name){ +VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name){ setInstance(VisualBoyAdvanceFactory::instance()); setXMLFile("kdevpart_visualboyadvance.rc"); diff --git a/embedded/visualboyadvance/visualboyadvance_part.h b/embedded/visualboyadvance/visualboyadvance_part.h index 8618a5a3..7a3378d1 100644 --- a/embedded/visualboyadvance/visualboyadvance_part.h +++ b/embedded/visualboyadvance/visualboyadvance_part.h @@ -18,7 +18,7 @@ namespace VisualBoyAdvance { public: - VisualBoyAdvancePart(TQObject *tqparent, const char *name, const TQStringList &); + VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &); ~VisualBoyAdvancePart(); private slots: void slotExecute(); diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp index c250f60e..9eb97cbd 100644 --- a/kdevdesigner/designer/actiondnd.cpp +++ b/kdevdesigner/designer/actiondnd.cpp @@ -131,14 +131,14 @@ void QDesignerAction::remove() widgetToInsert->reparent( 0, TQPoint( 0, 0 ), FALSE ); } -QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent, +QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *parent, const char* name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { - connect( tqparent, TQT_SIGNAL(orientationChanged(Qt::Orientation)), + connect( parent, TQT_SIGNAL(orientationChanged(Qt::Orientation)), this, TQT_SLOT(setOrientation(Qt::Orientation)) ); setOrientation( o ); - setBackgroundMode( tqparent->backgroundMode() ); + setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } @@ -177,8 +177,8 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) -QSeparatorAction::QSeparatorAction( TQObject *tqparent ) - : TQAction( tqparent, "qt_designer_separator" ), wid( 0 ) +QSeparatorAction::QSeparatorAction( TQObject *parent ) + : TQAction( parent, "qt_designer_separator" ), wid( 0 ) { } @@ -275,8 +275,8 @@ void QDesignerToolBar::addAction( TQAction *a ) static void fixObject( TQObject *&o ) { - while ( o && o->tqparent() && !::tqqt_cast<QDesignerToolBar*>(o->tqparent()) ) - o = o->tqparent(); + while ( o && o->parent() && !::tqqt_cast<QDesignerToolBar*>(o->parent()) ) + o = o->parent(); } bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) @@ -692,7 +692,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p ) TQWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, TRUE ); installEventFilters( w ); MainWindow::self->formWindow()->insertWidget( w, TRUE ); - QDesignerAction *a = new QDesignerAction( w, tqparent() ); + QDesignerAction *a = new QDesignerAction( w, parent() ); int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h index ee3e16ed..5e830949 100644 --- a/kdevdesigner/designer/actiondnd.h +++ b/kdevdesigner/designer/actiondnd.h @@ -85,8 +85,8 @@ class QDesignerActionGroup : public TQActionGroup TQ_OBJECT public: - QDesignerActionGroup( TQObject *tqparent ) - : TQActionGroup( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ) { init(); } + QDesignerActionGroup( TQObject *parent ) + : TQActionGroup( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ) { init(); } void init(); @@ -121,10 +121,10 @@ class QDesignerAction : public TQAction TQ_OBJECT public: - QDesignerAction( TQObject *tqparent ) - : TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); } - QDesignerAction( TQWidget *w, TQObject *tqparent ) - : TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); } + QDesignerAction( TQObject *parent ) + : TQAction( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); } + QDesignerAction( TQWidget *w, TQObject *parent ) + : TQAction( ::tqqt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); } void init(); @@ -158,7 +158,7 @@ class QDesignerToolBarSeparator : public TQWidget TQ_OBJECT public: - QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); + QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 ); TQSize tqsizeHint() const; Qt::Orientation orientation() const { return orient; } @@ -178,7 +178,7 @@ class QSeparatorAction : public TQAction TQ_OBJECT public: - QSeparatorAction( TQObject *tqparent ); + QSeparatorAction( TQObject *parent ); bool addTo( TQWidget *w ); bool removeFrom( TQWidget *w ); diff --git a/kdevdesigner/designer/actioneditorimpl.cpp b/kdevdesigner/designer/actioneditorimpl.cpp index 67cb0bdf..84514875 100644 --- a/kdevdesigner/designer/actioneditorimpl.cpp +++ b/kdevdesigner/designer/actioneditorimpl.cpp @@ -45,8 +45,8 @@ #include <klocale.h> -ActionEditor::ActionEditor( TQWidget* tqparent, const char* name, WFlags fl ) - : ActionEditorBase( tqparent, name, fl ), currentAction( 0 ), formWindow( 0 ), +ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) + : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ), explicitlyClosed(false) { listActions->addColumn( i18n( "Actions" ) ); @@ -150,7 +150,7 @@ void ActionEditor::newAction() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) ) - actionParent = (ActionItem*)actionParent->tqparent(); + actionParent = (ActionItem*)actionParent->parent(); } ActionItem *i = 0; @@ -186,7 +186,7 @@ void ActionEditor::newActionGroup() ActionItem *actionParent = (ActionItem*)listActions->selectedItem(); if ( actionParent ) { if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) ) - actionParent = (ActionItem*)actionParent->tqparent(); + actionParent = (ActionItem*)actionParent->parent(); } ActionItem *i = 0; @@ -231,7 +231,7 @@ void ActionEditor::setFormWindow( FormWindow *fw ) setEnabled( TRUE ); for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) { ActionItem *i = 0; - if ( ::tqqt_cast<TQAction*>(a->tqparent()) ) + if ( ::tqqt_cast<TQAction*>(a->parent()) ) continue; i = new ActionItem( listActions, a ); i->setText( 0, a->name() ); diff --git a/kdevdesigner/designer/actioneditorimpl.h b/kdevdesigner/designer/actioneditorimpl.h index cae92b95..248c9e24 100644 --- a/kdevdesigner/designer/actioneditorimpl.h +++ b/kdevdesigner/designer/actioneditorimpl.h @@ -39,7 +39,7 @@ class ActionEditor : public ActionEditorBase TQ_OBJECT public: - ActionEditor( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + ActionEditor( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); void setFormWindow( FormWindow *fw ); void updateActionName( TQAction *a ); void updateActionIcon( TQAction *a ); diff --git a/kdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp index c17c641a..3bce8872 100644 --- a/kdevdesigner/designer/actionlistview.cpp +++ b/kdevdesigner/designer/actionlistview.cpp @@ -30,8 +30,8 @@ #include <klocale.h> -ActionListView::ActionListView( TQWidget *tqparent, const char *name ) - : TQListView( tqparent, name ) +ActionListView::ActionListView( TQWidget *parent, const char *name ) + : TQListView( parent, name ) { setShowSortIndicator( TRUE ); setResizeMode( LastColumn ); diff --git a/kdevdesigner/designer/actionlistview.h b/kdevdesigner/designer/actionlistview.h index 9c213c99..313f5096 100644 --- a/kdevdesigner/designer/actionlistview.h +++ b/kdevdesigner/designer/actionlistview.h @@ -39,10 +39,10 @@ public: g( group ? new QDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); } ActionItem( TQListView *lv, TQAction *ac ); ActionItem( TQListViewItem *i, TQAction *ac ); - ActionItem( ActionItem *tqparent, bool group = FALSE ) - : TQListViewItem( tqparent ), - a( group ? 0 : new QDesignerAction( tqparent->actionGroup() ) ), - g( group ? new QDesignerActionGroup( tqparent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); } + ActionItem( ActionItem *parent, bool group = FALSE ) + : TQListViewItem( parent ), + a( group ? 0 : new QDesignerAction( parent->actionGroup() ) ), + g( group ? new QDesignerActionGroup( parent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); } QDesignerAction *action() const { return a; } QDesignerActionGroup *actionGroup() const { return g; } @@ -62,7 +62,7 @@ class ActionListView : public TQListView TQ_OBJECT public: - ActionListView( TQWidget *tqparent = 0, const char *name = 0 ); + ActionListView( TQWidget *parent = 0, const char *name = 0 ); protected: TQDragObject *dragObject(); diff --git a/kdevdesigner/designer/asciivalidator.cpp b/kdevdesigner/designer/asciivalidator.cpp index 3b1e4b45..667b0a61 100644 --- a/kdevdesigner/designer/asciivalidator.cpp +++ b/kdevdesigner/designer/asciivalidator.cpp @@ -28,18 +28,18 @@ #include <tqstring.h> -AsciiValidator::AsciiValidator( TQObject * tqparent, const char *name ) - : TQValidator( tqparent, name ), functionName( FALSE ) +AsciiValidator::AsciiValidator( TQObject * parent, const char *name ) + : TQValidator( parent, name ), functionName( FALSE ) { } -AsciiValidator::AsciiValidator( bool funcName, TQObject * tqparent, const char *name ) - : TQValidator( tqparent, name ), functionName( funcName ) +AsciiValidator::AsciiValidator( bool funcName, TQObject * parent, const char *name ) + : TQValidator( parent, name ), functionName( funcName ) { } -AsciiValidator::AsciiValidator( const TQString &allow, TQObject * tqparent, const char *name ) - : TQValidator( tqparent, name ), functionName( FALSE ), allowedChars( allow ) +AsciiValidator::AsciiValidator( const TQString &allow, TQObject * parent, const char *name ) + : TQValidator( parent, name ), functionName( FALSE ), allowedChars( allow ) { } diff --git a/kdevdesigner/designer/asciivalidator.h b/kdevdesigner/designer/asciivalidator.h index 00ff6b0a..cb5dbc27 100644 --- a/kdevdesigner/designer/asciivalidator.h +++ b/kdevdesigner/designer/asciivalidator.h @@ -36,9 +36,9 @@ class AsciiValidator: public TQValidator Q_OBJECT TQ_OBJECT public: - AsciiValidator( TQObject * tqparent, const char *name = 0 ); - AsciiValidator( bool funcName, TQObject * tqparent, const char *name = 0 ); - AsciiValidator( const TQString &allow, TQObject * tqparent, const char *name = 0 ); + AsciiValidator( TQObject * parent, const char *name = 0 ); + AsciiValidator( bool funcName, TQObject * parent, const char *name = 0 ); + AsciiValidator( const TQString &allow, TQObject * parent, const char *name = 0 ); ~AsciiValidator(); TQValidator::State validate( TQString &, int & ) const; diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp index 8d3d5161..60a14cdf 100644 --- a/kdevdesigner/designer/command.cpp +++ b/kdevdesigner/designer/command.cpp @@ -545,7 +545,7 @@ bool SetPropertyCommand::checkProperty() return FALSE; } - if ( ::tqqt_cast<FormWindow*>(widget->tqparent()) ) + if ( ::tqqt_cast<FormWindow*>(widget->parent()) ) formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->parentWidget() ); } return TRUE; @@ -672,9 +672,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ // ------------------------------------------------------------ LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase ) { } @@ -695,9 +695,9 @@ void LayoutHorizontalCommand::unexecute() // ------------------------------------------------------------ LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TRUE, TRUE ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TRUE, TRUE ) { } @@ -718,9 +718,9 @@ void LayoutHorizontalSplitCommand::unexecute() // ------------------------------------------------------------ LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase ) { } @@ -741,9 +741,9 @@ void LayoutVerticalCommand::unexecute() // ------------------------------------------------------------ LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TRUE, TRUE ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TRUE, TRUE ) { } @@ -764,9 +764,9 @@ void LayoutVerticalSplitCommand::unexecute() // ------------------------------------------------------------ LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl, int xres, int yres ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) ) + : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) ) { } @@ -1689,7 +1689,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) from->setSorting( -1 ); for ( ; it.current(); ++it ) { TQListViewItem *i = it.current(); - if ( i->tqparent() == fromParents.top() ) { + if ( i->parent() == fromParents.top() ) { TQListViewItem *pi = toParents.top(); TQListViewItem *ni = 0; if ( pi ) @@ -1706,7 +1706,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) if ( pi ) pi->setOpen( TRUE ); } else { - if ( i->tqparent() == fromLast ) { + if ( i->parent() == fromLast ) { fromParents.push( fromLast ); toParents.push( toLasts.top() ); toLasts.push( 0 ); @@ -1726,7 +1726,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to ) if ( pi ) pi->setOpen( TRUE ); } else { - while ( fromParents.top() != i->tqparent() ) { + while ( fromParents.top() != i->parent() ) { fromParents.pop(); toParents.pop(); toLasts.pop(); diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h index 2bd296bc..909c8ea4 100644 --- a/kdevdesigner/designer/command.h +++ b/kdevdesigner/designer/command.h @@ -282,7 +282,7 @@ class LayoutHorizontalCommand : public Command { public: LayoutHorizontalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -298,7 +298,7 @@ class LayoutHorizontalSplitCommand : public Command { public: LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -314,7 +314,7 @@ class LayoutVerticalCommand : public Command { public: LayoutVerticalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -330,7 +330,7 @@ class LayoutVerticalSplitCommand : public Command { public: LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -346,7 +346,7 @@ class LayoutGridCommand : public Command { public: LayoutGridCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *layoutBase, + TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl, int xres, int yres ); void execute(); diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h index 438ed832..711c51e6 100644 --- a/kdevdesigner/designer/configtoolboxdialog.ui.h +++ b/kdevdesigner/designer/configtoolboxdialog.ui.h @@ -51,14 +51,14 @@ void ConfigToolboxDialog::init() a; a = MainWindow::self->toolActions.prev() ) { TQString grp = ( (WidgetAction*)a )->group(); - TQListViewItem *tqparent = groups.find( grp ); - if ( !tqparent ) { - tqparent = new TQListViewItem( listViewTools ); - tqparent->setText( 0, grp ); - tqparent->setOpen( TRUE ); - groups.insert( grp, tqparent ); + TQListViewItem *parent = groups.find( grp ); + if ( !parent ) { + parent = new TQListViewItem( listViewTools ); + parent->setText( 0, grp ); + parent->setOpen( TRUE ); + groups.insert( grp, parent ); } - TQListViewItem *i = new TQListViewItem( tqparent ); + TQListViewItem *i = new TQListViewItem( parent ); i->setText( 0, a->text() ); i->setPixmap( 0, a->iconSet().pixmap() ); } @@ -99,10 +99,10 @@ void ConfigToolboxDialog::addTool() // processing tqchildren...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); - nextParent = (*it)->tqparent(); + nextParent = (*it)->parent(); while ( nextParent && !nextSibling ) { nextSibling = nextParent->nextSibling(); - nextParent = nextParent->tqparent(); + nextParent = nextParent->parent(); } } } else if ( ((*it)->childCount() == 0) && addKids ) { diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h index 39045ba6..4087c59f 100644 --- a/kdevdesigner/designer/connectionitems.h +++ b/kdevdesigner/designer/connectionitems.h @@ -168,9 +168,9 @@ class ConnectionContainer : public TQObject TQ_OBJECT public: - ConnectionContainer( TQObject *tqparent, SenderItem *i1, SignalItem *i2, + ConnectionContainer( TQObject *parent, SenderItem *i1, SignalItem *i2, ReceiverItem *i3, SlotItem *i4, int r ) - : TQObject( tqparent ), mod( FALSE ), se( i1 ), si( i2 ), + : TQObject( parent ), mod( FALSE ), se( i1 ), si( i2 ), re( i3 ), sl( i4 ), rw ( r ) { i1->setConnection( this ); i2->setConnection( this ); diff --git a/kdevdesigner/designer/connectiontable.cpp b/kdevdesigner/designer/connectiontable.cpp index ce1cabb7..2448f92d 100644 --- a/kdevdesigner/designer/connectiontable.cpp +++ b/kdevdesigner/designer/connectiontable.cpp @@ -28,8 +28,8 @@ #include <klocale.h> -ConnectionTable::ConnectionTable( TQWidget *tqparent, const char *name ) - : TQTable( 0, 4, tqparent, name ) +ConnectionTable::ConnectionTable( TQWidget *parent, const char *name ) + : TQTable( 0, 4, parent, name ) { setSorting( TRUE ); setShowGrid( FALSE ); diff --git a/kdevdesigner/designer/connectiontable.h b/kdevdesigner/designer/connectiontable.h index d3b28900..01c2f119 100644 --- a/kdevdesigner/designer/connectiontable.h +++ b/kdevdesigner/designer/connectiontable.h @@ -35,7 +35,7 @@ class ConnectionTable : public TQTable TQ_OBJECT public: - ConnectionTable( TQWidget *tqparent, const char *name ); + ConnectionTable( TQWidget *parent, const char *name ); void sortColumn( int col, bool ascending, bool wholeRows ); diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp index a5a270c6..d2d0f5b5 100644 --- a/kdevdesigner/designer/customwidgeteditorimpl.cpp +++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp @@ -55,8 +55,8 @@ #include <klocale.h> -CustomWidgetEditor::CustomWidgetEditor( TQWidget *tqparent, MainWindow *mw ) - : CustomWidgetEditorBase( tqparent, 0, TRUE ), mainWindow( mw ) +CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw ) + : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); checkTimer = new TQTimer( this ); diff --git a/kdevdesigner/designer/customwidgeteditorimpl.h b/kdevdesigner/designer/customwidgeteditorimpl.h index aca6bb8d..e367b37c 100644 --- a/kdevdesigner/designer/customwidgeteditorimpl.h +++ b/kdevdesigner/designer/customwidgeteditorimpl.h @@ -43,7 +43,7 @@ class CustomWidgetEditor : public CustomWidgetEditorBase TQ_OBJECT public: - CustomWidgetEditor( TQWidget *tqparent , MainWindow *mw); + CustomWidgetEditor( TQWidget *parent , MainWindow *mw); protected slots: void addWidgetClicked(); diff --git a/kdevdesigner/designer/database.cpp b/kdevdesigner/designer/database.cpp index 9d12aa21..b5baea28 100644 --- a/kdevdesigner/designer/database.cpp +++ b/kdevdesigner/designer/database.cpp @@ -46,7 +46,7 @@ DatabaseSupport::DatabaseSupport() { con = 0; frm = 0; - tqparent = 0; + parent = 0; } void DatabaseSupport::initPreview( const TQString &connection, const TQString &table, TQObject *o, @@ -54,7 +54,7 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t { tbl = table; dbControls = databaseControls; - tqparent = o; + parent = o; if ( connection != "(default)" ) con = TQSqlDatabase::database( connection ); @@ -62,15 +62,15 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t con = TQSqlDatabase::database(); frm = new TQSqlForm( o, table ); for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) { - TQObject *chld = tqparent->child( it.key(), TQWIDGET_OBJECT_NAME_STRING ); + TQObject *chld = parent->child( it.key(), TQWIDGET_OBJECT_NAME_STRING ); if ( !chld ) continue; frm->insert( (TQWidget*)chld, *it ); } } -QDesignerDataBrowser::QDesignerDataBrowser( TQWidget *tqparent, const char *name ) - : TQDataBrowser( tqparent, name ) +QDesignerDataBrowser::QDesignerDataBrowser( TQWidget *parent, const char *name ) + : TQDataBrowser( parent, name ) { } @@ -96,8 +96,8 @@ bool QDesignerDataBrowser::event( TQEvent* e ) return b; } -QDesignerDataView::QDesignerDataView( TQWidget *tqparent, const char *name ) - : TQDataView( tqparent, name ) +QDesignerDataView::QDesignerDataView( TQWidget *parent, const char *name ) + : TQDataView( parent, name ) { } diff --git a/kdevdesigner/designer/database.h b/kdevdesigner/designer/database.h index 8fe3442b..4f817e31 100644 --- a/kdevdesigner/designer/database.h +++ b/kdevdesigner/designer/database.h @@ -52,7 +52,7 @@ protected: TQSqlForm* frm; TQString tbl; TQMap<TQString, TQString> dbControls; - TQObject *tqparent; + TQObject *parent; }; @@ -62,7 +62,7 @@ class QDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport TQ_OBJECT public: - QDesignerDataBrowser( TQWidget *tqparent, const char *name ); + QDesignerDataBrowser( TQWidget *parent, const char *name ); protected: bool event( TQEvent* e ); @@ -74,7 +74,7 @@ class QDesignerDataView : public TQDataView, public DatabaseSupport TQ_OBJECT public: - QDesignerDataView( TQWidget *tqparent, const char *name ); + QDesignerDataView( TQWidget *parent, const char *name ); protected: bool event( TQEvent* e ); diff --git a/kdevdesigner/designer/dbconnectionimpl.cpp b/kdevdesigner/designer/dbconnectionimpl.cpp index d326df8a..3cfd1fdc 100644 --- a/kdevdesigner/designer/dbconnectionimpl.cpp +++ b/kdevdesigner/designer/dbconnectionimpl.cpp @@ -35,9 +35,9 @@ #include <tqlayout.h> #include <tqsqldatabase.h> -DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* tqparent, +DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : DatabaseConnectionEditorBase( tqparent, name, modal, fl ), conn( connection ) + : DatabaseConnectionEditorBase( parent, name, modal, fl ), conn( connection ) { connectionWidget = new DatabaseConnectionWidget( grp ); grpLayout->addWidget( connectionWidget, 0, 0 ); diff --git a/kdevdesigner/designer/dbconnectionimpl.h b/kdevdesigner/designer/dbconnectionimpl.h index a8bc0f68..be96aeb1 100644 --- a/kdevdesigner/designer/dbconnectionimpl.h +++ b/kdevdesigner/designer/dbconnectionimpl.h @@ -39,7 +39,7 @@ class DatabaseConnectionEditor : public DatabaseConnectionEditorBase TQ_OBJECT public: - DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* tqparent = 0, + DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~DatabaseConnectionEditor(); diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp index 00fb13eb..b5b4409f 100644 --- a/kdevdesigner/designer/dbconnectionsimpl.cpp +++ b/kdevdesigner/designer/dbconnectionsimpl.cpp @@ -45,14 +45,14 @@ static bool blockChanges = FALSE; /* - * Constructs a DatabaseConnectionsEditor which is a child of 'tqparent', with the + * Constructs a DatabaseConnectionsEditor which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : DatabaseConnectionBase( tqparent, name, modal, fl ), project( pro ) +DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : DatabaseConnectionBase( parent, name, modal, fl ), project( pro ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); connectionWidget = new DatabaseConnectionWidget( grp ); diff --git a/kdevdesigner/designer/dbconnectionsimpl.h b/kdevdesigner/designer/dbconnectionsimpl.h index a12f4dce..5bc4238b 100644 --- a/kdevdesigner/designer/dbconnectionsimpl.h +++ b/kdevdesigner/designer/dbconnectionsimpl.h @@ -38,7 +38,7 @@ class DatabaseConnectionsEditor : public DatabaseConnectionBase TQ_OBJECT public: - DatabaseConnectionsEditor( Project *pro, TQWidget* tqparent = 0, + DatabaseConnectionsEditor( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~DatabaseConnectionsEditor(); diff --git a/kdevdesigner/designer/designeraction.h b/kdevdesigner/designer/designeraction.h index b49874f0..a294698a 100644 --- a/kdevdesigner/designer/designeraction.h +++ b/kdevdesigner/designer/designeraction.h @@ -27,18 +27,18 @@ class DesignerAction : public TQAction Q_OBJECT TQ_OBJECT public: - DesignerAction(TQObject *tqparent = 0, const char *name = 0) - :TQAction(tqparent, name) {} - DesignerAction ( const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0 ) - :TQAction(menuText, accel, tqparent, name) {} - DesignerAction ( const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0 ) - :TQAction(icon, menuText, accel, tqparent, name) {} - DesignerAction ( const TQString & text, const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0, bool toggle = FALSE ) - :TQAction(text, icon, menuText, accel, tqparent, name, toggle) {} - DesignerAction ( const TQString & text, const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0, bool toggle = FALSE ) - :TQAction(text, menuText, accel, tqparent, name, toggle) {} - DesignerAction ( TQObject * tqparent, const char * name, bool toggle ) - :TQAction(tqparent, name, toggle) {} + DesignerAction(TQObject *parent = 0, const char *name = 0) + :TQAction(parent, name) {} + DesignerAction ( const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0 ) + :TQAction(menuText, accel, parent, name) {} + DesignerAction ( const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0 ) + :TQAction(icon, menuText, accel, parent, name) {} + DesignerAction ( const TQString & text, const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = FALSE ) + :TQAction(text, icon, menuText, accel, parent, name, toggle) {} + DesignerAction ( const TQString & text, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = FALSE ) + :TQAction(text, menuText, accel, parent, name, toggle) {} + DesignerAction ( TQObject * parent, const char * name, bool toggle ) + :TQAction(parent, name, toggle) {} ~DesignerAction(); virtual void setEnabled(bool e); diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp index d564cd6c..a5780339 100644 --- a/kdevdesigner/designer/designerappiface.cpp +++ b/kdevdesigner/designer/designerappiface.cpp @@ -190,7 +190,7 @@ TQPtrList<DesignerFormWindow> DesignerProjectImpl::formList() const while ( it.current() ) { TQObject *obj = it.current(); ++it; - TQWidget *par = ::tqqt_cast<FormWindow*>(obj->tqparent()); + TQWidget *par = ::tqqt_cast<FormWindow*>(obj->parent()); if ( !obj->isWidgetType() || !par ) continue; @@ -582,9 +582,9 @@ void DesignerFormWindowImpl::insertWidget( TQWidget * ) { } -TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *tqparent, const char *name ) +TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *parent, const char *name ) { - TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, name ); + TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, name ); formWindow->insertWidget( w, TRUE ); formWindow->killAccels( TQT_TQOBJECT(formWindow->mainContainer()) ); return w; @@ -717,9 +717,9 @@ TQPtrList<TQAction> DesignerFormWindowImpl::actionList() const } TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, - TQObject* tqparent, const char* name, bool toggle ) + TQObject* parent, const char* name, bool toggle ) { - QDesignerAction *a = new QDesignerAction( tqparent ); + QDesignerAction *a = new QDesignerAction( parent ); a->setName( name ); a->setText( text ); if ( !icon.isNull() && !icon.pixmap().isNull() ) diff --git a/kdevdesigner/designer/designerappiface.h b/kdevdesigner/designer/designerappiface.h index de048be1..2ddcd47c 100644 --- a/kdevdesigner/designer/designerappiface.h +++ b/kdevdesigner/designer/designerappiface.h @@ -175,7 +175,7 @@ public: void save() const; bool isModified() const; void insertWidget( TQWidget * ); - TQWidget *create( const char *className, TQWidget *tqparent, const char *name ); + TQWidget *create( const char *className, TQWidget *parent, const char *name ); void removeWidget( TQWidget * ); TQWidgetList widgets() const; void undo(); @@ -205,7 +205,7 @@ public: void setCurrentWidget( TQWidget * ); TQPtrList<TQAction> actionList() const; TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, - TQObject* tqparent, const char* name = 0, bool toggle = FALSE ); + TQObject* parent, const char* name = 0, bool toggle = FALSE ); void addAction( TQAction * ); void removeAction( TQAction * ); void preview() const; diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp index 1c3e2bc9..b28ff0ad 100644 --- a/kdevdesigner/designer/editfunctionsimpl.cpp +++ b/kdevdesigner/designer/editfunctionsimpl.cpp @@ -49,8 +49,8 @@ #include <klocale.h> -EditFunctions::EditFunctions( TQWidget *tqparent, FormWindow *fw, bool justSlots ) - : EditFunctionsBase( tqparent, 0, TRUE ), formWindow( fw ) +EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) + : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); @@ -116,7 +116,7 @@ EditFunctions::EditFunctions( TQWidget *tqparent, FormWindow *fw, bool justSlots TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "functionName" - TQObjectList *l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "functionName" ); + TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "functionName" ); TQObject *obj; TQObjectListIt itemsLineEditIt( *l ); while ( (obj = itemsLineEditIt.current()) != 0 ) { diff --git a/kdevdesigner/designer/editfunctionsimpl.h b/kdevdesigner/designer/editfunctionsimpl.h index 03a59b09..fff7b37f 100644 --- a/kdevdesigner/designer/editfunctionsimpl.h +++ b/kdevdesigner/designer/editfunctionsimpl.h @@ -41,7 +41,7 @@ class EditFunctions : public EditFunctionsBase TQ_OBJECT public: - EditFunctions( TQWidget *tqparent, FormWindow *fw, bool showOnlySlots = FALSE ); + EditFunctions( TQWidget *parent, FormWindow *fw, bool showOnlySlots = FALSE ); void setCurrentFunction( const TQString &function ); void functionAdd( const TQString &access = TQString(), diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp index 864bab7a..961cfee0 100644 --- a/kdevdesigner/designer/filechooser.cpp +++ b/kdevdesigner/designer/filechooser.cpp @@ -32,8 +32,8 @@ #include <kfiledialog.h> -FileChooser::FileChooser( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), md( File ) +FileChooser::FileChooser( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), md( File ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); tqlayout->setMargin( 0 ); diff --git a/kdevdesigner/designer/filechooser.h b/kdevdesigner/designer/filechooser.h index 8137b031..a08c2aa1 100644 --- a/kdevdesigner/designer/filechooser.h +++ b/kdevdesigner/designer/filechooser.h @@ -42,7 +42,7 @@ class FileChooser : public TQWidget TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName ) public: - FileChooser( TQWidget *tqparent = 0, const char *name = 0); + FileChooser( TQWidget *parent = 0, const char *name = 0); enum Mode { File, Directory }; diff --git a/kdevdesigner/designer/formsettingsimpl.cpp b/kdevdesigner/designer/formsettingsimpl.cpp index fc2e4445..e29ea157 100644 --- a/kdevdesigner/designer/formsettingsimpl.cpp +++ b/kdevdesigner/designer/formsettingsimpl.cpp @@ -40,8 +40,8 @@ #include <tqspinbox.h> #include <tqcheckbox.h> -FormSettings::FormSettings( TQWidget *tqparent, FormWindow *fw ) - : FormSettingsBase( tqparent, 0, TRUE ), formwindow( fw ) +FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) + : FormSettingsBase( parent, 0, TRUE ), formwindow( fw ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(fw) ); diff --git a/kdevdesigner/designer/formsettingsimpl.h b/kdevdesigner/designer/formsettingsimpl.h index 75aa5cbd..e1511b99 100644 --- a/kdevdesigner/designer/formsettingsimpl.h +++ b/kdevdesigner/designer/formsettingsimpl.h @@ -37,7 +37,7 @@ class FormSettings : public FormSettingsBase TQ_OBJECT public: - FormSettings( TQWidget *tqparent, FormWindow *fw ); + FormSettings( TQWidget *parent, FormWindow *fw ); protected slots: void okClicked(); diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp index 6070b378..fbd7e1ad 100644 --- a/kdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -134,8 +134,8 @@ static void flickerfree_update( TQWidget *w ) event filter which is implemented in MainWindow::eventFilter(). */ -FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, WDestructiveClose ), mainwindow( mw ), +FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, WDestructiveClose ), mainwindow( mw ), commands( 100 ), pixInline( TRUE ), pixProject( FALSE ) { ff = f; @@ -143,8 +143,8 @@ FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const c initSlots(); } -FormWindow::FormWindow( FormFile *f, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, WDestructiveClose ), mainwindow( 0 ), +FormWindow::FormWindow( FormFile *f, TQWidget *parent, const char *name ) + : TQWidget( parent, name, WDestructiveClose ), mainwindow( 0 ), commands( 100 ), pixInline( TRUE ) { ff = f; @@ -261,16 +261,16 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e ) if( !TQPixmapCache::find( grid_name, grid ) ) { grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) ); grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) ); - TQBitmap tqmask( grid.width(), grid.height() ); - tqmask.fill( color0 ); - TQPainter p( &tqmask ); + TQBitmap mask( grid.width(), grid.height() ); + mask.fill( color0 ); + TQPainter p( &mask ); p.setPen( color1 ); for ( int y = 0; y < grid.width(); y += mainWindow()->grid().y()) { for ( int x = 0; x < grid.height(); x += mainWindow()->grid().x() ) { p.drawPoint( x, y ); } } - grid.setMask( tqmask ); + grid.setMask( mask ); TQPixmapCache::insert( grid_name, grid ); } TQPainter p( w ); @@ -455,7 +455,7 @@ void FormWindow::insertWidget() np.append( pos ); } - MoveCommand *mv = new MoveCommand( i18n( "Retqparent Widgets" ), this, + MoveCommand *mv = new MoveCommand( i18n( "Reparent Widgets" ), this, lst, op, np, insertParent, pw ); if ( !toolFixed ) @@ -692,14 +692,14 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) break; default: // any insert widget tool if ( e->button() == Qt::LeftButton ) { - insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default tqparent for new widget is the formwindow - if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press was not on formwindow, check if we can find another tqparent + insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default parent for new widget is the formwindow + if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press was not on formwindow, check if we can find another parent TQWidget *wid = w; for (;;) { int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(wid) ) ); if ( ( WidgetDatabase::isContainer( id ) || wid == mainContainer() ) && !::tqqt_cast<TQLayoutWidget*>(wid) && !::tqqt_cast<TQSplitter*>(wid) ) { - insertParent = WidgetFactory::containerOfWidget( wid ); // found another tqparent, store it + insertParent = WidgetFactory::containerOfWidget( wid ); // found another parent, store it break; } else { wid = wid->parentWidget(); @@ -807,7 +807,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) checkSelectionsForMove( w ); } - // check whether we would have to reparent the selection and highlight the possible new tqparent container + // check whether we would have to reparent the selection and highlight the possible new parent container TQMapConstIterator<TQWidget*, TQPoint> it = moving.begin(); TQWidget* wa = containerAt( e->globalPos(), it.key() ); if ( wa && !isMainContainer( TQT_TQOBJECT(wa) ) && !isCentralWidget( TQT_TQOBJECT(wa) ) ) { @@ -1633,7 +1633,7 @@ TQWidget *FormWindow::designerWidget( TQObject *o ) const return 0; TQWidget *w = (TQWidget*)o; while ( w && !isMainContainer( TQT_TQOBJECT(w) ) && !insertedWidgets[ (void*)w ] || isCentralWidget( TQT_TQOBJECT(w) ) ) - w = (TQWidget*)w->tqparent(); + w = (TQWidget*)w->parent(); return w; } @@ -1966,12 +1966,12 @@ void FormWindow::raiseWidgets() commandHistory()->addCommand( cmd ); } -void FormWindow::paste( const TQString &cb, TQWidget *tqparent ) +void FormWindow::paste( const TQString &cb, TQWidget *parent ) { CHECK_MAINWINDOW; Resource resource( mainWindow() ); resource.setWidget( this ); - resource.paste( cb, tqparent ); + resource.paste( cb, parent ); } void FormWindow::selectAll() diff --git a/kdevdesigner/designer/formwindow.h b/kdevdesigner/designer/formwindow.h index 0f7d6938..1b27f762 100644 --- a/kdevdesigner/designer/formwindow.h +++ b/kdevdesigner/designer/formwindow.h @@ -69,8 +69,8 @@ class FormWindow : public TQWidget TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName ) public: - FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name = 0 ); - FormWindow( FormFile *f, TQWidget *tqparent, const char *name = 0 ); + FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name = 0 ); + FormWindow( FormFile *f, TQWidget *parent, const char *name = 0 ); ~FormWindow(); void init(); @@ -87,7 +87,7 @@ public: virtual void undo(); virtual void redo(); virtual TQString copy(); - virtual void paste( const TQString &cb, TQWidget *tqparent ); + virtual void paste( const TQString &cb, TQWidget *parent ); virtual void lowerWidgets(); virtual void raiseWidgets(); virtual void checkAccels(); diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp index a617ac31..c91f5333 100644 --- a/kdevdesigner/designer/hierarchyview.cpp +++ b/kdevdesigner/designer/hierarchyview.cpp @@ -68,15 +68,15 @@ TQListViewItem *newItem = 0; static TQPluginManager<ClassBrowserInterface> *classBrowserInterfaceManager = 0; -HierarchyItem::HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after, +HierarchyItem::HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after, const TQString &txt1, const TQString &txt2, const TQString &txt3 ) - : TQListViewItem( tqparent, after, txt1, txt2, txt3 ), typ( type ) + : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type ) { } -HierarchyItem::HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after, +HierarchyItem::HierarchyItem( Type type, TQListView *parent, TQListViewItem *after, const TQString &txt1, const TQString &txt2, const TQString &txt3 ) - : TQListViewItem( tqparent, after, txt1, txt2, txt3 ), typ( type ) + : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type ) { } @@ -172,8 +172,8 @@ void HierarchyItem::cancelRename( int col ) -HierarchyList::HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects ) - : TQListView( tqparent ), formWindow( fw ) +HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects ) + : TQListView( parent ), formWindow( fw ) { DesignerFormPix = SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()); DesignerLayoutPix = SmallIcon( "designer_layout.png" , KDevDesignerPartFactory::instance()); @@ -258,20 +258,20 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) if ( o->isWidgetType() ) { TQWidget *w = (TQWidget*)o; if ( !formWindow->widgets()->find( w ) ) { - if ( ::tqqt_cast<TQWidgetStack*>(w->tqparent()) ) { - if (::tqqt_cast<TQTabWidget*>(w->tqparent()->tqparent()) ) { - ((TQTabWidget*)w->tqparent()->tqparent())->showPage( w ); - o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent()); + if ( ::tqqt_cast<TQWidgetStack*>(w->parent()) ) { + if (::tqqt_cast<TQTabWidget*>(w->parent()->parent()) ) { + ((TQTabWidget*)w->parent()->parent())->showPage( w ); + o = TQT_TQOBJECT((TQWidget*)w->parent()->parent()); formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) ); - } else if ( ::tqqt_cast<TQWizard*>(w->tqparent()->tqparent()) ) { - ((QDesignerWizard*)w->tqparent()->tqparent())-> - setCurrentPage( ( (QDesignerWizard*)w->tqparent()->tqparent() )->pageNum( w ) ); - o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent()); + } else if ( ::tqqt_cast<TQWizard*>(w->parent()->parent()) ) { + ((QDesignerWizard*)w->parent()->parent())-> + setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) ); + o = TQT_TQOBJECT((TQWidget*)w->parent()->parent()); formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) ); } else { - ( (TQWidgetStack*)w->tqparent() )->raiseWidget( w ); - if ( (TQWidgetStack*)w->tqparent()->isA( "QDesignerWidgetStack" ) ) - ( (QDesignerWidgetStack*)w->tqparent() )->updateButtons(); + ( (TQWidgetStack*)w->parent() )->raiseWidget( w ); + if ( (TQWidgetStack*)w->parent()->isA( "QDesignerWidgetStack" ) ) + ( (QDesignerWidgetStack*)w->parent() )->updateButtons(); } } else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQDockWindow*>(w) ) { formWindow->setActiveObject( TQT_TQOBJECT(w) ); @@ -397,7 +397,7 @@ void HierarchyList::setOpen( TQListViewItem *i, bool b ) TQListView::setOpen( i, b ); } -void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) +void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) { if ( TQString( o->name() ).startsWith( "qt_dead_widget_" ) ) return; @@ -433,29 +433,29 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) #endif TQString name = o->name(); - if ( ::tqqt_cast<TQWidgetStack*>(o->tqparent()) ) { - if ( ::tqqt_cast<TQTabWidget*>(o->tqparent()->tqparent()) ) - name = ( (TQTabWidget*)o->tqparent()->tqparent() )->tabLabel( (TQWidget*)o ); - else if ( ::tqqt_cast<TQWizard*>(o->tqparent()->tqparent()) ) - name = ( (TQWizard*)o->tqparent()->tqparent() )->title( (TQWidget*)o ); + if ( ::tqqt_cast<TQWidgetStack*>(o->parent()) ) { + if ( ::tqqt_cast<TQTabWidget*>(o->parent()->parent()) ) + name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o ); + else if ( ::tqqt_cast<TQWizard*>(o->parent()->parent()) ) + name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o ); } TQToolBox *tb; - if ( o->tqparent() && o->tqparent()->tqparent() && - (tb = ::tqqt_cast<TQToolBox*>(o->tqparent()->tqparent()->tqparent())) ) + if ( o->parent() && o->parent()->parent() && + (tb = ::tqqt_cast<TQToolBox*>(o->parent()->parent()->parent())) ) name = tb->itemLabel( tb->indexOf((TQWidget*)o) ); if ( fakeMainWindow ) { - name = o->tqparent()->name(); + name = o->parent()->name(); className = TQMAINWINDOW_OBJECT_NAME_STRING; } - if ( !tqparent ) + if ( !parent ) item = new HierarchyItem( HierarchyItem::Widget, this, 0, name, className, dbInfo ); else - item = new HierarchyItem( HierarchyItem::Widget, tqparent, 0, name, className, dbInfo ); + item = new HierarchyItem( HierarchyItem::Widget, parent, 0, name, className, dbInfo ); item->setOpen( TRUE ); - if ( !tqparent ) + if ( !parent ) item->setPixmap( 0, DesignerFormPix ); else if ( ::tqqt_cast<TQLayoutWidget*>(o) ) item->setPixmap( 0, DesignerLayoutPix ); @@ -478,16 +478,16 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) ( (TQWidget*)it.current() )->isHidden() ) continue; if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { - if ( ::tqqt_cast<TQWidgetStack*>(it.current()->tqparent()) || + if ( ::tqqt_cast<TQWidgetStack*>(it.current()->parent()) || ::tqqt_cast<TQWidgetStack*>(it.current()) ) { TQObject *obj = it.current(); - QDesignerTabWidget *tw = ::tqqt_cast<QDesignerTabWidget*>(it.current()->tqparent()); - QDesignerWizard *dw = ::tqqt_cast<QDesignerWizard*>(it.current()->tqparent()); + QDesignerTabWidget *tw = ::tqqt_cast<QDesignerTabWidget*>(it.current()->parent()); + QDesignerWizard *dw = ::tqqt_cast<QDesignerWizard*>(it.current()->parent()); TQWidgetStack *stack = 0; if ( dw || tw || ::tqqt_cast<TQWidgetStack*>(obj) ) stack = (TQWidgetStack*)obj; else - stack = (TQWidgetStack*)obj->tqparent(); + stack = (TQWidgetStack*)obj->parent(); if ( widgetStacks->findRef( stack ) != -1 ) continue; widgetStacks->append( stack ); @@ -505,10 +505,10 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) insertObject( obj, item ); } delete l2; - } else if ( ::tqqt_cast<TQToolBox*>(it.current()->tqparent()) ) { + } else if ( ::tqqt_cast<TQToolBox*>(it.current()->parent()) ) { if ( !::tqqt_cast<TQScrollView*>(it.current()) ) continue; - TQToolBox *tb = (TQToolBox*)it.current()->tqparent(); + TQToolBox *tb = (TQToolBox*)it.current()->parent(); for ( int i = tb->count() - 1; i >= 0; --i ) insertObject( TQT_TQOBJECT(tb->item( i )), item ); } @@ -519,12 +519,12 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) } if ( fakeMainWindow ) { - TQObjectList *l = o->tqparent()->queryList( "QDesignerToolBar" ); + TQObjectList *l = o->parent()->queryList( "QDesignerToolBar" ); TQObject *obj; for ( obj = l->first(); obj; obj = l->next() ) insertObject( obj, item ); delete l; - l = o->tqparent()->queryList( "MenuBarEditor" ); + l = o->parent()->queryList( "MenuBarEditor" ); for ( obj = l->first(); obj; obj = l->next() ) insertObject( obj, item ); delete l; @@ -676,8 +676,8 @@ void HierarchyList::removeTabPage() // ------------------------------------------------------------ -FormDefinitionView::FormDefinitionView( TQWidget *tqparent, FormWindow *fw ) - : HierarchyList( tqparent, fw, TRUE ) +FormDefinitionView::FormDefinitionView( TQWidget *parent, FormWindow *fw ) + : HierarchyList( parent, fw, TRUE ) { header()->hide(); removeColumn( 1 ); @@ -976,7 +976,7 @@ void FormDefinitionView::contentsMouseDoubleClickEvent( TQMouseEvent *e ) HierarchyItem::Type t = getChildType( i->rtti() ); if ( (int)t == i->rtti() ) - i = i->tqparent(); + i = i->parent(); if ( formWindow->project()->isCpp() ) switch( i->rtti() ) { @@ -1100,7 +1100,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) if ( !lIface ) return; if ( i->rtti() == HierarchyItem::Definition ) - i = i->tqparent(); + i = i->parent(); ListEditor dia( this, 0, TRUE ); dia.setCaption( i18n( "Edit %1" ).tqarg( i->text( 0 ) ) ); TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() ); @@ -1114,7 +1114,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) } else if ( res == NEW ) { HierarchyItem::Type t = getChildType( i->rtti() ); if ( (int)t == i->rtti() ) - i = i->tqparent(); + i = i->parent(); switch( i->rtti() ) { case HierarchyItem::SlotPublic: execFunctionDialog( "public", "slot", TRUE ); @@ -1153,7 +1153,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } else { - TQListViewItem *p = i->tqparent(); + TQListViewItem *p = i->parent(); delete i; save( p, 0 ); } @@ -1178,9 +1178,9 @@ void FormDefinitionView::renamed( TQListViewItem *i ) { if ( newItem == i ) newItem = 0; - if ( !i->tqparent() ) + if ( !i->parent() ) return; - save( i->tqparent(), i ); + save( i->parent(), i ); } @@ -1235,8 +1235,8 @@ void FormDefinitionView::addVariable( const TQString &varName, const TQString &a // ------------------------------------------------------------ -HierarchyView::HierarchyView( TQWidget *tqparent ) - : TQTabWidget( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | +HierarchyView::HierarchyView( TQWidget *parent ) + : TQTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_Tool |WStyle_MinMax | WStyle_SysMenu ) { formwindow = 0; diff --git a/kdevdesigner/designer/hierarchyview.h b/kdevdesigner/designer/hierarchyview.h index f013f507..6ace03d1 100644 --- a/kdevdesigner/designer/hierarchyview.h +++ b/kdevdesigner/designer/hierarchyview.h @@ -68,9 +68,9 @@ public: Variable }; - HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after, + HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after, const TQString &txt1, const TQString &txt2, const TQString &txt3 ); - HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after, + HierarchyItem( Type type, TQListView *parent, TQListViewItem *after, const TQString &txt1, const TQString &txt2, const TQString &txt3 ); void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); @@ -101,7 +101,7 @@ class HierarchyList : public TQListView TQ_OBJECT public: - HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects = TRUE ); + HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects = TRUE ); virtual void setup(); virtual void setCurrent( TQObject *o ); @@ -130,7 +130,7 @@ public slots: void removeTabPage(); private: - void insertObject( TQObject *o, TQListViewItem *tqparent ); + void insertObject( TQObject *o, TQListViewItem *parent ); TQObject *findObject( TQListViewItem *i ); TQListViewItem *findItem( TQObject *o ); TQObject *current() const; @@ -159,7 +159,7 @@ class FormDefinitionView : public HierarchyList TQ_OBJECT public: - FormDefinitionView( TQWidget *tqparent, FormWindow *fw ); + FormDefinitionView( TQWidget *parent, FormWindow *fw ); void setup(); void setupVariables(); @@ -193,7 +193,7 @@ class HierarchyView : public TQTabWidget TQ_OBJECT public: - HierarchyView( TQWidget *tqparent ); + HierarchyView( TQWidget *parent ); ~HierarchyView(); void setFormWindow( FormWindow *fw, TQObject *o ); diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp index 8f0ca643..07db9813 100644 --- a/kdevdesigner/designer/iconvieweditorimpl.cpp +++ b/kdevdesigner/designer/iconvieweditorimpl.cpp @@ -37,8 +37,8 @@ #include <klocale.h> -IconViewEditor::IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ) - : IconViewEditorBase( tqparent, 0, TRUE ), formwindow( fw ) +IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) + : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); iconview = (TQIconView*)editWidget; diff --git a/kdevdesigner/designer/iconvieweditorimpl.h b/kdevdesigner/designer/iconvieweditorimpl.h index b1823770..aae7fb7d 100644 --- a/kdevdesigner/designer/iconvieweditorimpl.h +++ b/kdevdesigner/designer/iconvieweditorimpl.h @@ -37,7 +37,7 @@ class IconViewEditor : public IconViewEditorBase TQ_OBJECT public: - IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); protected slots: void insertNewItem(); diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp index cda34aba..bb0f2955 100644 --- a/kdevdesigner/designer/kdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -42,8 +42,8 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widgetName , - TQObject *tqparent, const char *name, const TQStringList &args ) - : KInterfaceDesigner::Designer(tqparent, name) + TQObject *parent, const char *name, const TQStringList &args ) + : KInterfaceDesigner::Designer(parent, name) { setInstance( KDevDesignerPartFactory::instance() ); @@ -257,11 +257,11 @@ KDevDesignerPartFactory::~KDevDesignerPartFactory() } KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { // Create an instance of our Part - KDevDesignerPart* obj = new KDevDesignerPart( parentWidget, widgetName, tqparent, name, args ); + KDevDesignerPart* obj = new KDevDesignerPart( parentWidget, widgetName, parent, name, args ); // See if we are to be read-write or not if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h index 314af47b..5d402856 100644 --- a/kdevdesigner/designer/kdevdesigner_part.h +++ b/kdevdesigner/designer/kdevdesigner_part.h @@ -42,7 +42,7 @@ class KDevDesignerPart : public KInterfaceDesigner::Designer TQ_OBJECT public: KDevDesignerPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList &args); + TQObject *parent, const char *name, const TQStringList &args); virtual ~KDevDesignerPart(); virtual void setReadWrite(bool rw); @@ -136,7 +136,7 @@ public: KDevDesignerPartFactory(); virtual ~KDevDesignerPartFactory(); virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp index 8dd642b8..f908dd4b 100644 --- a/kdevdesigner/designer/layout.cpp +++ b/kdevdesigner/designer/layout.cpp @@ -52,17 +52,17 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> & */ -/*! \a p specifies the tqparent of the layoutBase \a lb. The tqparent +/*! \a p specifies the parent of the layoutBase \a lb. The parent might be changed in setup(). If the layoutBase is a - container, the tqparent and the layoutBase are the same. Also they + container, the parent and the layoutBase are the same. Also they always have to be a widget known to the designer (e.g. in the case - of the tabwidget tqparent and layoutBase are the tabwidget and not the + of the tabwidget parent and layoutBase are the tabwidget and not the page which actually gets laid out. For actual usage the correct widget is found later by Layout.) */ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup, bool splitter ) - : widgets( wl ), tqparent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter ) + : widgets( wl ), parent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter ) { widgets.setAutoDelete( FALSE ); layoutBase = lb; @@ -85,8 +85,8 @@ void Layout::setup() TQWidget *w = 0; // Go through all widgets of the list we got. As we can only - // tqlayout widgets which have the same tqparent, we first do some - // sorting which means create a list for each tqparent containing + // tqlayout widgets which have the same parent, we first do some + // sorting which means create a list for each parent containing // its child here. After that we keep working on the list of // childs which has the most entries. // Widgets which are already laid out are thrown away here too @@ -135,8 +135,8 @@ void Layout::setup() // Now we have a new and clean widget list, which makes sense // to tqlayout widgets = *lastList; - // Also use the only correct tqparent later, so store it - tqparent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() ); + // Also use the only correct parent later, so store it + parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() ); // Now calculate the position where the tqlayout-meta-widget should // be placed and connect to widgetDestroyed() signals of the // widgets to get informed if one gets deleted to be able to @@ -160,21 +160,21 @@ void Layout::widgetDestroyed() widgets.removeRef( (TQWidget*)sender() ); } -bool Layout::prepareLayout( bool &needMove, bool &needRetqparent ) +bool Layout::prepareLayout( bool &needMove, bool &needReparent ) { if ( !widgets.count() ) return FALSE; for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->raise(); needMove = !layoutBase; - needRetqparent = needMove || ::tqqt_cast<TQLayoutWidget*>(layoutBase) || ::tqqt_cast<TQSplitter*>(layoutBase); + needReparent = needMove || ::tqqt_cast<TQLayoutWidget*>(layoutBase) || ::tqqt_cast<TQSplitter*>(layoutBase); if ( !layoutBase ) { if ( !useSplitter ) layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ), - WidgetFactory::containerOfWidget( tqparent ) ); + WidgetFactory::containerOfWidget( parent ) ); else layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ), - WidgetFactory::containerOfWidget( tqparent ) ); + WidgetFactory::containerOfWidget( parent ) ); } else { WidgetFactory::deleteLayout( layoutBase ); } @@ -211,12 +211,12 @@ void Layout::undoLayout() for ( ; it != geometries.end(); ++it ) { if ( !it.key() ) continue; - it.key()->reparent( WidgetFactory::containerOfWidget( tqparent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) ); + it.key()->reparent( WidgetFactory::containerOfWidget( parent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) ); it.key()->resize( ( *it ).size() ); } formWindow->selectWidget( TQT_TQOBJECT(layoutBase), FALSE ); WidgetFactory::deleteLayout( layoutBase ); - if ( tqparent != layoutBase && !::tqqt_cast<TQMainWindow*>(layoutBase) ) { + if ( parent != layoutBase && !::tqqt_cast<TQMainWindow*>(layoutBase) ) { layoutBase->hide(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); @@ -239,14 +239,14 @@ void Layout::breakLayout() rects.insert( w, w->tqgeometry() ); } WidgetFactory::deleteLayout( layoutBase ); - bool needRetqparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || + bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 || ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(layoutBase) ) ) ) && layoutBase != formWindow->mainContainer() ); bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0; bool add = geometries.isEmpty(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needRetqparent ) + if ( needReparent ) w->reparent( layoutBase->parentWidget(), 0, layoutBase->pos() + w->pos(), TRUE ); if ( needResize ) { @@ -257,14 +257,14 @@ void Layout::breakLayout() if ( add ) geometries.insert( w, TQRect( w->pos(), w->size() ) ); } - if ( needRetqparent ) { + if ( needReparent ) { layoutBase->hide(); - tqparent = layoutBase->parentWidget(); + parent = layoutBase->parentWidget(); TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); layoutBase->setName( n ); } else { - tqparent = layoutBase; + parent = layoutBase; } if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) ) formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) ); @@ -307,14 +307,14 @@ void HorizontalLayout::setup() void HorizontalLayout::doLayout() { - bool needMove, needRetqparent; - if ( !prepareLayout( needMove, needRetqparent ) ) + bool needMove, needReparent; + if ( !prepareLayout( needMove, needReparent ) ) return; TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) @@ -371,14 +371,14 @@ void VerticalLayout::setup() void VerticalLayout::doLayout() { - bool needMove, needRetqparent; - if ( !prepareLayout( needMove, needRetqparent ) ) + bool needMove, needReparent; + if ( !prepareLayout( needMove, needReparent ) ) return; TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) @@ -743,8 +743,8 @@ GridLayout::~GridLayout() void GridLayout::doLayout() { - bool needMove, needRetqparent; - if ( !prepareLayout( needMove, needRetqparent ) ) + bool needMove, needReparent; + if ( !prepareLayout( needMove, needReparent ) ) return; QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid ); @@ -756,7 +756,7 @@ void GridLayout::doLayout() int r, c, rs, cs; for ( w = widgets.first(); w; w = widgets.next() ) { if ( grid->locateWidget( w, r, c, rs, cs) ) { - if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( rs * cs == 1 ) { tqlayout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 ); @@ -863,8 +863,8 @@ void GridLayout::buildGrid() -Spacer::Spacer( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, WMouseNoMask ), +Spacer::Spacer( TQWidget *parent, const char *name ) + : TQWidget( parent, name, WMouseNoMask ), orient(Qt::Vertical ), interactive(TRUE), sh( TQSize(20,20) ) { setSizeType( Expanding ); diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h index 51e9d48b..d71368ab 100644 --- a/kdevdesigner/designer/layout.h +++ b/kdevdesigner/designer/layout.h @@ -50,12 +50,12 @@ public: virtual void doLayout() = 0; virtual void undoLayout(); virtual void breakLayout(); - virtual bool prepareLayout( bool &needMove, bool &needRetqparent ); + virtual bool prepareLayout( bool &needMove, bool &needReparent ); virtual void finishLayout( bool needMove, TQLayout *tqlayout ); protected: TQWidgetList widgets; - TQWidget *tqparent; + TQWidget *parent; TQPoint startPoint; TQMap<TQGuardedPtr<TQWidget>, TQRect> geometries; TQWidget *layoutBase; @@ -140,7 +140,7 @@ public: MinimumExpanding = Minimum|ExpMask, Expanding = MinimumExpanding|MayShrink }; - Spacer( TQWidget *tqparent, const char *name ); + Spacer( TQWidget *parent, const char *name ); TQSize tqminimumSize() const; TQSize tqsizeHint() const; @@ -166,7 +166,7 @@ class QDesignerGridLayout : public TQGridLayout Q_OBJECT TQ_OBJECT public: - QDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){}; + QDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){}; QDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){}; void addWidget( TQWidget *, int row, int col, int align = 0 ); diff --git a/kdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp index 9c57eb18..920559c5 100644 --- a/kdevdesigner/designer/listboxdnd.cpp +++ b/kdevdesigner/designer/listboxdnd.cpp @@ -35,10 +35,10 @@ class ListBoxItemDrag : public TQStoredDrag { public: - ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * tqparent = 0, const char * name = 0 ); + ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * parent = 0, const char * name = 0 ); ~ListBoxItemDrag() {}; static bool canDecode( TQDragMoveEvent * event ); - static bool decode( TQDropEvent * event, TQListBox * tqparent, TQListBoxItem * insertPoint ); + static bool decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * insertPoint ); enum ItemType { ListBoxText = 1, ListBoxPixmap = 2 }; }; // ------------------------------------------------------------------ @@ -184,8 +184,8 @@ bool ListBoxDnd::canDecode( TQDragEnterEvent * event ) // The Dragobject Implementation ------------------------------------ // ------------------------------------------------------------------ -ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * tqparent, const char * name ) - : TQStoredDrag( "qt/listboxitem", tqparent, name ) +ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * parent, const char * name ) + : TQStoredDrag( "qt/listboxitem", parent, name ) { // ### FIX! TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListBoxItem ) * items.count() ); @@ -238,7 +238,7 @@ bool ListBoxItemDrag::canDecode( TQDragMoveEvent * event ) return event->provides( "qt/listboxitem" ); } -bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListBoxItem * after ) +bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * after ) { TQByteArray data = event->tqencodedData( "qt/listboxitem" ); @@ -262,7 +262,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListB stream >> p; item = (TQListBoxItem *) p; - tqparent->insertItem( item, after ); + parent->insertItem( item, after ); } @@ -288,9 +288,9 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListB stream >> isSelectable; if ( hasPixmap ) { - item = new TQListBoxPixmap( tqparent, pixmap, text, after ); + item = new TQListBoxPixmap( parent, pixmap, text, after ); } else { - item = new TQListBoxText( tqparent, text, after ); + item = new TQListBoxText( parent, text, after ); } item->setSelectable( isSelectable ); diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp index 073fdda6..98c5c835 100644 --- a/kdevdesigner/designer/listboxeditorimpl.cpp +++ b/kdevdesigner/designer/listboxeditorimpl.cpp @@ -40,8 +40,8 @@ #include <klocale.h> -ListBoxEditor::ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ) - : ListBoxEditorBase( tqparent, 0, TRUE ), formwindow( fw ) +ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) + : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); listbox = (TQListBox*)editWidget; @@ -70,7 +70,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWind ListBoxRename *editorRename = new ListBoxRename( preview ); - TQObjectList *l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" ); + TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" ); TQObjectListIt it( *l ); TQObject *obj; while ( (obj = it.current()) != 0 ) { diff --git a/kdevdesigner/designer/listboxeditorimpl.h b/kdevdesigner/designer/listboxeditorimpl.h index a73865f2..8a3595bb 100644 --- a/kdevdesigner/designer/listboxeditorimpl.h +++ b/kdevdesigner/designer/listboxeditorimpl.h @@ -38,7 +38,7 @@ class ListBoxEditor : public ListBoxEditorBase TQ_OBJECT public: - ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); protected slots: void insertNewItem(); diff --git a/kdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp index b1d5323d..953551df 100644 --- a/kdevdesigner/designer/listviewdnd.cpp +++ b/kdevdesigner/designer/listviewdnd.cpp @@ -36,10 +36,10 @@ class ListViewItemDrag : public TQStoredDrag { public: enum DropRelation { Sibling, Child }; - ListViewItemDrag( ListViewItemList & items, TQWidget * tqparent = 0, const char * name = 0 ); + ListViewItemDrag( ListViewItemList & items, TQWidget * parent = 0, const char * name = 0 ); ~ListViewItemDrag() {}; static bool canDecode( TQDragMoveEvent * event ); - static bool decode( TQDropEvent * event, TQListView * tqparent, TQListViewItem * insertPoint, DropRelation dr ); + static bool decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr ); }; // ------------------------------------------------------------------ @@ -74,7 +74,7 @@ bool ListViewDnd::dropEvent( TQDropEvent * event ) } else if ( dpos < item->depth() ) { // Parent(s) Sibling while ( item && (item->depth() > dpos) ) - item = item->tqparent(); + item = item->parent(); } } @@ -150,10 +150,10 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) // processing tqchildren...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); - nextParent = (*it)->tqparent(); + nextParent = (*it)->parent(); while ( nextParent && !nextSibling ) { nextSibling = nextParent->nextSibling(); - nextParent = nextParent->tqparent(); + nextParent = nextParent->parent(); } } } else if ( ((*it)->childCount() == 0) && addKids ) { @@ -209,13 +209,13 @@ TQListViewItem * ListViewDnd::itemAt( TQPoint pos ) if ( result && ( pos.ry() < (src->itemPos(result) + result->height()/2) ) ) result = result->itemAbove(); - // Wind back if has tqparent, and we're in flat mode - while ( result && result->tqparent() && (dMode & Flat) ) - result = result->tqparent(); + // Wind back if has parent, and we're in flat mode + while ( result && result->parent() && (dMode & Flat) ) + result = result->parent(); - // Wind back if has tqparent, and we're in flat mode - while ( result && !result->isVisible() && result->tqparent() ) - result = result->tqparent(); + // Wind back if has parent, and we're in flat mode + while ( result && !result->isVisible() && result->parent() ) + result = result->parent(); if ( !result && src->firstChild() && (pos.y() > src->tqitemRect(src->firstChild()).bottom()) ) { result = src->lastItem(); @@ -259,8 +259,8 @@ bool ListViewDnd::canDecode( TQDragEnterEvent * event ) TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item ); TQDataStream & operator>> ( TQDataStream & stream, TQListViewItem & item ); -ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * tqparent, const char * name ) - : TQStoredDrag( "qt/listviewitem", tqparent, name ) +ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * parent, const char * name ) + : TQStoredDrag( "qt/listviewitem", parent, name ) { // ### FIX! TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListViewItem ) * items.count() ); @@ -282,10 +282,10 @@ bool ListViewItemDrag::canDecode( TQDragMoveEvent * event ) return event->provides( "qt/listviewitem" ); } -bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * tqparent, TQListViewItem * insertPoint, DropRelation dr ) +bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr ) { TQByteArray data = event->tqencodedData( "qt/listviewitem" ); - TQListViewItem* itemParent = insertPoint ? insertPoint->tqparent() : 0; + TQListViewItem* itemParent = insertPoint ? insertPoint->parent() : 0; // Change from sibling (default) to child creation if ( insertPoint && dr == Child ) { @@ -304,8 +304,8 @@ bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * tqparent, TQLis if ( itemParent ) { insertPoint = new TQListViewItem( itemParent, insertPoint ); itemParent->setOpen( TRUE ); - } else { // No tqparent for insertPoint, use TQListView - insertPoint = new TQListViewItem( tqparent, insertPoint ); + } else { // No parent for insertPoint, use TQListView + insertPoint = new TQListViewItem( parent, insertPoint ); } stream >> *insertPoint; } diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp index ce9ee737..9e6c54ed 100644 --- a/kdevdesigner/designer/listvieweditorimpl.cpp +++ b/kdevdesigner/designer/listvieweditorimpl.cpp @@ -46,8 +46,8 @@ #include <klocale.h> -ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw ) - : ListViewEditorBase( tqparent, 0, TRUE ), listview( lv ), formwindow( fw ) +ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) + : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); itemText->setEnabled( FALSE ); @@ -86,7 +86,7 @@ ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow * TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) ); // Connect signal-relay to TQLineEdit "itemText" - TQObjectList *l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" ); + TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" ); TQObject *obj; TQObjectListIt itemsLineEditIt( *l ); while ( (obj = itemsLineEditIt.current()) != 0 ) { @@ -112,7 +112,7 @@ ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow * TQT_SLOT( columnTextChanged( const TQString & ) ) ); // Find TQLineEdit "colText" and connect - l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "colText" ); + l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "colText" ); TQObjectListIt columnsLineEditIt( *l ); while ( (obj = columnsLineEditIt.current()) != 0 ) { ++columnsLineEditIt; @@ -378,10 +378,10 @@ void ListViewEditor::itemDownClicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); + TQListViewItem *parent = i->parent(); it++; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; it++; } @@ -406,11 +406,11 @@ void ListViewEditor::itemNewClicked() void ListViewEditor::itemNewSubClicked() { - TQListViewItem *tqparent = itemsPreview->currentItem(); + TQListViewItem *parent = itemsPreview->currentItem(); TQListViewItem *item = 0; - if ( tqparent ) { - item = new TQListViewItem( tqparent ); - tqparent->setOpen( TRUE ); + if ( parent ) { + item = new TQListViewItem( parent ); + parent->setOpen( TRUE ); } else { item = new TQListViewItem( itemsPreview ); } @@ -466,10 +466,10 @@ void ListViewEditor::itemUpClicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); + TQListViewItem *parent = i->parent(); --it; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; --it; } @@ -488,13 +488,13 @@ void ListViewEditor::itemRightClicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); - tqparent = tqparent ? tqparent->firstChild() : itemsPreview->firstChild(); - if ( !tqparent ) + TQListViewItem *parent = i->parent(); + parent = parent ? parent->firstChild() : itemsPreview->firstChild(); + if ( !parent ) return; it++; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; it++; } @@ -528,13 +528,13 @@ void ListViewEditor::itemLeftClicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); - if ( !tqparent ) + TQListViewItem *parent = i->parent(); + if ( !parent ) return; - tqparent = tqparent->tqparent(); + parent = parent->parent(); --it; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; --it; } diff --git a/kdevdesigner/designer/listvieweditorimpl.h b/kdevdesigner/designer/listvieweditorimpl.h index 1555823e..750dd280 100644 --- a/kdevdesigner/designer/listvieweditorimpl.h +++ b/kdevdesigner/designer/listvieweditorimpl.h @@ -41,7 +41,7 @@ class ListViewEditor : public ListViewEditorBase TQ_OBJECT public: - ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw ); + ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ); signals: void itemRenamed(const TQString &); diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index 8ad20987..dbc2b932 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -931,8 +931,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) { if ( ::tqqt_cast<MenuBarEditor*>(o) || ::tqqt_cast<PopupMenuEditor*>(o) || ( o && - ( ::tqqt_cast<MenuBarEditor*>(o->tqparent()) || - ::tqqt_cast<PopupMenuEditor*>(o->tqparent()) ) ) ) { + ( ::tqqt_cast<MenuBarEditor*>(o->parent()) || + ::tqqt_cast<PopupMenuEditor*>(o->parent()) ) ) ) { if ( e->type() == TQEvent::Accel && ::tqqt_cast<PopupMenuEditor*>(o) ) { return TRUE; // consume accel events @@ -993,9 +993,9 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ( ::tqqt_cast<TQComboBox*>(o) || ::tqqt_cast<TQToolButton*>(o) || ::tqqt_cast<QDesignerToolBarSeparator*>(o) ) && - o->tqparent() - && ( ::tqqt_cast<QDesignerToolBar*>(o->tqparent()) - || ::tqqt_cast<QDesignerWidgetStack*>(o->tqparent())) ) ) { + o->parent() + && ( ::tqqt_cast<QDesignerToolBar*>(o->parent()) + || ::tqqt_cast<QDesignerWidgetStack*>(o->parent())) ) ) { TQWidget *w = (TQWidget*)o; if ( ::tqqt_cast<TQToolButton*>(w) || ::tqqt_cast<TQComboBox*>(w) || @@ -1108,7 +1108,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ::tqqt_cast<SizeHandle*>(o) || ::tqqt_cast<OrderIndicator*>(o) ) { if ( ::tqqt_cast<TQToolButton*>(o) && ((TQToolButton*)o)->isOn() && - o->tqparent() && ::tqqt_cast<TQToolBar*>(o->tqparent()) && formWindow() ) + o->parent() && ::tqqt_cast<TQToolBar*>(o->parent()) && formWindow() ) formWindow()->setToolFixed(); break; } @@ -1151,7 +1151,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) ::tqqt_cast<SizeHandle*>(o) || ::tqqt_cast<OrderIndicator*>(o) ) break; - if ( WidgetFactory::layoutType( (TQWidget*)o->tqparent() ) != WidgetFactory::NoLayout ) { + if ( WidgetFactory::layoutType( (TQWidget*)o->parent() ) != WidgetFactory::NoLayout ) { ( (FormWindow*)w )->updateSelection( (TQWidget*)o ); if ( e->type() != TQEvent::Resize ) ( (FormWindow*)w )->updateChildSelections( (TQWidget*)o ); @@ -1233,12 +1233,12 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) TQWidget *MainWindow::isAFormWindowChild( TQObject *o ) const { - if ( ::tqqt_cast<TQWizard*>(o->tqparent()) && !::tqqt_cast<TQPushButton*>(o) ) + if ( ::tqqt_cast<TQWizard*>(o->parent()) && !::tqqt_cast<TQPushButton*>(o) ) return 0; while ( o ) { if ( ::tqqt_cast<FormWindow*>(o) ) return (TQWidget*)o; - o = o->tqparent(); + o = o->parent(); } return 0; } @@ -1250,7 +1250,7 @@ TQWidget *MainWindow::isAToolBarChild( TQObject *o ) const return (TQWidget*)o; if ( ::tqqt_cast<FormWindow*>(o) ) return 0; - o = o->tqparent(); + o = o->parent(); } return 0; } @@ -2261,7 +2261,7 @@ void MainWindow::readConfig() if ( !ok ) { if ( oWindow ) { oWindow->shuttingDown(); - ( (TQDockWindow*)oWindow->tqparent() )->hide(); + ( (TQDockWindow*)oWindow->parent() )->hide(); } TQPixmap pix; pix.load( backPixName ); @@ -2418,7 +2418,7 @@ void MainWindow::readConfig() } if ( readPreviousConfig && oWindow ) { oWindow->shuttingDown(); - ( (TQDockWindow*)oWindow->tqparent() )->hide(); + ( (TQDockWindow*)oWindow->parent() )->hide(); } rebuildCustomWidgetGUI(); @@ -2449,9 +2449,9 @@ HierarchyView *MainWindow::objectHierarchy() const return hierarchyView; } -TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *tqparent ) +TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *parent ) { - TQPopupMenu *menu = new TQPopupMenu( tqparent ); + TQPopupMenu *menu = new TQPopupMenu( parent ); actionEditCut->addTo( menu ); actionEditCopy->addTo( menu ); @@ -2461,12 +2461,12 @@ TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *tqparent ) return menu; } -TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot ) +TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot ) { - TQPopupMenu *menu = new TQPopupMenu( tqparent ); + TQPopupMenu *menu = new TQPopupMenu( parent ); - menu->insertItem( i18n( "Add Page" ), tqparent, addSlot ); - menu->insertItem( i18n( "Delete Page" ), tqparent, removeSlot ); + menu->insertItem( i18n( "Add Page" ), parent, addSlot ); + menu->insertItem( i18n( "Delete Page" ), parent, removeSlot ); menu->insertSeparator(); actionEditCut->addTo( menu ); actionEditCopy->addTo( menu ); diff --git a/kdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h index 359f1b67..c38c7951 100644 --- a/kdevdesigner/designer/mainwindow.h +++ b/kdevdesigner/designer/mainwindow.h @@ -109,8 +109,8 @@ public: void popupFormWindowMenu( const TQPoint &gp, FormWindow *fw ); void popupWidgetMenu( const TQPoint &gp, FormWindow *fw, TQWidget *w ); - TQPopupMenu *setupNormalHierarchyMenu( TQWidget *tqparent ); - TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot ); + TQPopupMenu *setupNormalHierarchyMenu( TQWidget *parent ); + TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot ); FormWindow *openFormWindow( const TQString &fn, bool validFileName = TRUE, FormFile *ff = 0 ); bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w ); diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp index f701f046..c4790ccc 100644 --- a/kdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -1444,7 +1444,7 @@ void MainWindow::fileCreateTemplate() void MainWindow::createNewTemplate() { - CreateTemplate *dia = (CreateTemplate*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent(); + CreateTemplate *dia = (CreateTemplate*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent(); TQString fn = dia->editName->text(); TQString cn = dia->listClass->currentText(); if ( fn.isEmpty() || cn.isEmpty() ) { diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp index 65b55522..498c6827 100644 --- a/kdevdesigner/designer/menubareditor.cpp +++ b/kdevdesigner/designer/menubareditor.cpp @@ -47,7 +47,7 @@ class MenuBarEditorItemPtrDrag : public TQStoredDrag { public: MenuBarEditorItemPtrDrag( MenuBarEditorItem * item, - TQWidget * tqparent = 0, + TQWidget * parent = 0, const char * name = 0 ); ~MenuBarEditorItemPtrDrag() {}; static bool canDecode( TQDragMoveEvent * e ); @@ -57,9 +57,9 @@ public: // Drag Object Implementation --------------------------------------- MenuBarEditorItemPtrDrag::MenuBarEditorItemPtrDrag( MenuBarEditorItem * item, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : TQStoredDrag( "qt/menubareditoritemptr", tqparent, name ) + : TQStoredDrag( "qt/menubareditoritemptr", parent, name ) { TQByteArray data( sizeof( TQ_LONG ) ); TQDataStream stream( data, IO_WriteOnly ); @@ -89,8 +89,8 @@ bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i ) // MenuBarEditorItem --------------------------------------------------- -MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( bar ), popupMenu( 0 ), visible( TRUE ), @@ -99,8 +99,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * tqparent, { } MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( bar ), popupMenu( menu ), visible( TRUE ), @@ -111,8 +111,8 @@ MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * ba } MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( bar ), popupMenu( 0 ), visible( TRUE ), @@ -124,8 +124,8 @@ MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor popupMenu->insert( actionGroup ); } -MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * parent, const char * name ) + : TQObject( parent, name ), menuBar( item->menuBar ), popupMenu( 0 ), text( item->text ), @@ -141,8 +141,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * tqpar int MenuBarEditor::clipboardOperation = 0; MenuBarEditorItem * MenuBarEditor::clipboardItem = 0; -MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * tqparent, const char * name ) - : TQMenuBar( tqparent, name ), +MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * name ) + : TQMenuBar( parent, name ), formWnd( fw ), draggedItem( 0 ), currentIndex( 0 ), @@ -185,7 +185,7 @@ FormWindow * MenuBarEditor::formWindow() MenuBarEditorItem * MenuBarEditor::createItem( int index, bool addToCmdStack ) { MenuBarEditorItem * i = - new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) tqparent() ), this ); + new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) parent() ), this ); if ( addToCmdStack ) { AddMenuCommand * cmd = new AddMenuCommand( i18n( "Add Menu" ), formWnd, this, i, index ); formWnd->commandHistory()->addCommand( cmd ); diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h index 6932fe44..0725fd5f 100644 --- a/kdevdesigner/designer/menubareditor.h +++ b/kdevdesigner/designer/menubareditor.h @@ -41,15 +41,15 @@ class MenuBarEditorItem : public TQObject friend class MenuBarEditor; - MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * tqparent = 0, const char * name = 0 ); + MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * parent = 0, const char * name = 0 ); public: MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar, - TQObject * tqparent = 0, const char * name = 0); + TQObject * parent = 0, const char * name = 0); MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar, - TQObject * tqparent = 0, const char * name = 0); + TQObject * parent = 0, const char * name = 0); MenuBarEditorItem( MenuBarEditorItem * item, - TQObject * tqparent = 0, const char * name = 0); + TQObject * parent = 0, const char * name = 0); ~MenuBarEditorItem() { }; PopupMenuEditor * menu() { return popupMenu; } @@ -85,7 +85,7 @@ class MenuBarEditor : public TQMenuBar TQ_OBJECT public: - MenuBarEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 ); + MenuBarEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 ); ~MenuBarEditor(); FormWindow * formWindow(); diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp index 20f94f86..166ab877 100644 --- a/kdevdesigner/designer/multilineeditorimpl.cpp +++ b/kdevdesigner/designer/multilineeditorimpl.cpp @@ -46,10 +46,10 @@ #include <klocale.h> -ToolBarItem::ToolBarItem( TQWidget *tqparent, TQWidget *toolBar, +ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar, const TQString &label, const TQString &tagstr, const TQIconSet &icon, const TQKeySequence &key ) - : TQAction( tqparent ) + : TQAction( parent ) { setIconSet( icon ); setText( label ); @@ -69,8 +69,8 @@ void ToolBarItem::wasActivated() emit clicked( tag ); } -TextEdit::TextEdit( TQWidget *tqparent, const char *name ) - : TQTextEdit( tqparent, name ) +TextEdit::TextEdit( TQWidget *parent, const char *name ) + : TQTextEdit( parent, name ) { setTextFormat( TQt::PlainText ); } @@ -82,9 +82,9 @@ TQTextParagraph* TextEdit::paragraph() } -MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget, +MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget, FormWindow *fw, const TQString &text ) - : MultiLineEditorBase( tqparent, 0, WType_Dialog | WShowModal ), formwindow( fw ), doWrap( FALSE ) + : MultiLineEditorBase( parent, 0, WType_Dialog | WShowModal ), formwindow( fw ), doWrap( FALSE ) { callStatic = call_static; @@ -378,9 +378,9 @@ TQString MultiLineEditor::getStaticText() return staticText.stripWhiteSpace(); } -TQString MultiLineEditor::getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap ) +TQString MultiLineEditor::getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap ) { - MultiLineEditor medit( TRUE, richtextMode, tqparent, 0, 0, text ); + MultiLineEditor medit( TRUE, richtextMode, parent, 0, 0, text ); if ( richtextMode ) medit.setUseWrapping( *useWrap ); if ( medit.exec() == TQDialog::Accepted ) { diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h index 9fc56257..4756f37c 100644 --- a/kdevdesigner/designer/multilineeditorimpl.h +++ b/kdevdesigner/designer/multilineeditorimpl.h @@ -42,7 +42,7 @@ class TextEdit : public TQTextEdit TQ_OBJECT public: - TextEdit( TQWidget *tqparent = 0, const char *name = 0 ); + TextEdit( TQWidget *parent = 0, const char *name = 0 ); TQTextDocument *document() const { return TQTextEdit::document(); } TQTextParagraph *paragraph(); @@ -54,7 +54,7 @@ class ToolBarItem : public TQAction TQ_OBJECT public: - ToolBarItem( TQWidget *tqparent, TQWidget *toolBar, + ToolBarItem( TQWidget *parent, TQWidget *toolBar, const TQString &label, const TQString &tagstr, const TQIconSet &icon, const TQKeySequence &key = 0 ); ~ToolBarItem(); @@ -74,11 +74,11 @@ class MultiLineEditor : public MultiLineEditorBase TQ_OBJECT public: - MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget, + MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget, FormWindow *fw, const TQString &text = TQString() ); bool useWrapping() const; void setUseWrapping( bool ); - static TQString getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap ); + static TQString getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap ); int exec(); protected slots: diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp index 0c90c056..dcc2c416 100644 --- a/kdevdesigner/designer/newformimpl.cpp +++ b/kdevdesigner/designer/newformimpl.cpp @@ -364,9 +364,9 @@ NewForm::NewForm( TQIconView *templateView, const TQString &templatePath ) projectChanged( i18n( "<No Project>" ) ); } -NewForm::NewForm( TQWidget *tqparent, const TQStringList& projects, +NewForm::NewForm( TQWidget *parent, const TQStringList& projects, const TQString& currentProject, const TQString &templatePath ) - : NewFormBase( tqparent, 0, TRUE ) + : NewFormBase( parent, 0, TRUE ) { connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); diff --git a/kdevdesigner/designer/newformimpl.h b/kdevdesigner/designer/newformimpl.h index 1ef5c1db..d8206bff 100644 --- a/kdevdesigner/designer/newformimpl.h +++ b/kdevdesigner/designer/newformimpl.h @@ -147,7 +147,7 @@ class NewForm : public NewFormBase public: NewForm( TQIconView *templateView, const TQString &templatePath ); - NewForm( TQWidget *tqparent, const TQStringList& projects, + NewForm( TQWidget *parent, const TQStringList& projects, const TQString& currentProject, const TQString &templatePath ); void insertTemplates( TQIconView*, const TQString& ); void accept(); diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp index 28f744b0..ad1cab22 100644 --- a/kdevdesigner/designer/outputwindow.cpp +++ b/kdevdesigner/designer/outputwindow.cpp @@ -44,8 +44,8 @@ bool debugToStderr = FALSE; TQtMsgHandler OutputWindow::oldMsgHandler = 0; -OutputWindow::OutputWindow( TQWidget *tqparent ) - : TQTabWidget( tqparent, "output_window" ), debugView( 0 ), errorView( 0 ) +OutputWindow::OutputWindow( TQWidget *parent ) + : TQTabWidget( parent, "output_window" ), debugView( 0 ), errorView( 0 ) { setupDebug(); setupError(); @@ -175,9 +175,9 @@ void OutputWindow::currentErrorChanged( TQListViewItem *i ) -ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line, +ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line, const TQString &locationString, TQObject *locationObject ) - : TQListViewItem( tqparent, after ) + : TQListViewItem( parent, after ) { setMultiLinesEnabled( TRUE ); TQString m( message ); @@ -190,8 +190,8 @@ ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQStrin object = locationObject; read = !after; if ( !after ) { - tqparent->setSelected( this, TRUE ); - tqparent->setCurrentItem( this ); + parent->setSelected( this, TRUE ); + parent->setCurrentItem( this ); } } diff --git a/kdevdesigner/designer/outputwindow.h b/kdevdesigner/designer/outputwindow.h index 9e1a5aaf..04ebc065 100644 --- a/kdevdesigner/designer/outputwindow.h +++ b/kdevdesigner/designer/outputwindow.h @@ -41,7 +41,7 @@ class ErrorItem : public TQListViewItem public: enum Type { Error, Warning }; - ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line, + ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line, const TQString &locationString, TQObject *locationObject ); void paintCell( TQPainter *, const TQColorGroup & cg, @@ -65,7 +65,7 @@ class OutputWindow : public TQTabWidget TQ_OBJECT public: - OutputWindow( TQWidget *tqparent ); + OutputWindow( TQWidget *parent ); ~OutputWindow(); void setErrorMessages( const TQStringList &errors, const TQValueList<uint> &lines, diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp index bf05e0e5..e8c780fc 100644 --- a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp +++ b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp @@ -65,9 +65,9 @@ void BoldListBoxText::paint( TQPainter* painter ) TQListBoxText::paint( painter ); } -PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent, +PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) - : PaletteEditorAdvancedBase( tqparent, name, modal, f ), formWindow( fw ), selectedPalette(0) + : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); @@ -619,10 +619,10 @@ void PaletteEditorAdvanced::setupBackgroundMode( BackgroundMode mode ) } TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init, - BackgroundMode mode, TQWidget* tqparent, + BackgroundMode mode, TQWidget* parent, const char* name, FormWindow *fw ) { - PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, tqparent, name, TRUE ); + PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, parent, name, TRUE ); dlg->setupBackgroundMode( mode ); if ( init != TQPalette() ) diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.h b/kdevdesigner/designer/paletteeditoradvancedimpl.h index 477a5a79..651c407b 100644 --- a/kdevdesigner/designer/paletteeditoradvancedimpl.h +++ b/kdevdesigner/designer/paletteeditoradvancedimpl.h @@ -36,12 +36,12 @@ class PaletteEditorAdvanced : public PaletteEditorAdvancedBase Q_OBJECT TQ_OBJECT public: - PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent=0, const char * name=0, + PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); ~PaletteEditorAdvanced(); static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground, - TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 ); + TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); protected slots: void paletteSelected(int); diff --git a/kdevdesigner/designer/paletteeditorimpl.cpp b/kdevdesigner/designer/paletteeditorimpl.cpp index edeba05f..ae0cf7fd 100644 --- a/kdevdesigner/designer/paletteeditorimpl.cpp +++ b/kdevdesigner/designer/paletteeditorimpl.cpp @@ -36,8 +36,8 @@ #include <tqapplication.h> #include <tqpushbutton.h> -PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * tqparent, const char * name, bool modal, WFlags f ) - : PaletteEditorBase( tqparent, name, modal, f ), formWindow( fw ) +PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) + : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); @@ -281,9 +281,9 @@ TQPalette PaletteEditor::pal() const } TQPalette PaletteEditor::getPalette( bool *ok, const TQPalette &init, BackgroundMode mode, - TQWidget* tqparent, const char* name, FormWindow *fw ) + TQWidget* parent, const char* name, FormWindow *fw ) { - PaletteEditor* dlg = new PaletteEditor( fw, tqparent, name, TRUE ); + PaletteEditor* dlg = new PaletteEditor( fw, parent, name, TRUE ); dlg->setupBackgroundMode( mode ); if ( init != TQPalette() ) diff --git a/kdevdesigner/designer/paletteeditorimpl.h b/kdevdesigner/designer/paletteeditorimpl.h index ed1756ed..285dc7a3 100644 --- a/kdevdesigner/designer/paletteeditorimpl.h +++ b/kdevdesigner/designer/paletteeditorimpl.h @@ -37,11 +37,11 @@ class PaletteEditor : public PaletteEditorBase TQ_OBJECT public: - PaletteEditor( FormWindow *fw, TQWidget * tqparent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); + PaletteEditor( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); ~PaletteEditor(); static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground, - TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 ); + TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); protected slots: void onChooseMainColor(); diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp index 6992bc77..1da0557b 100644 --- a/kdevdesigner/designer/pixmapchooser.cpp +++ b/kdevdesigner/designer/pixmapchooser.cpp @@ -56,8 +56,8 @@ static ImageIconProvider *imageIconProvider = 0; #endif -PixmapView::PixmapView( TQWidget *tqparent ) - : TQScrollView( tqparent ) +PixmapView::PixmapView( TQWidget *parent ) + : TQScrollView( parent ) { viewport()->setBackgroundMode( PaletteBase ); } @@ -105,7 +105,7 @@ static void buildImageFormatList( TQString &filter, TQString &all ) filter += tqApp->translate( "qChoosePixmap", "All Files (*)" ); } -TQStringList qChoosePixmaps( TQWidget *tqparent ) +TQStringList qChoosePixmaps( TQWidget *parent ) { /* if ( !imageIconProvider && !TQFileDialog::iconProvider() ) TQFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) ); @@ -114,7 +114,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent ) TQString all; buildImageFormatList( filter, all ); - TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE ); + TQFileDialog fd( TQString(), filter, parent, 0, TRUE ); fd.setMode( TQFileDialog::ExistingFiles ); fd.setContentsPreviewEnabled( TRUE ); PixmapView *pw = new PixmapView( &fd ); @@ -126,7 +126,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent ) return fd.selectedFiles(); return TQStringList();*/ TQStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading ); - KFileDialog dlg(TQString(), mimetypes.join(" "), tqparent, "filedialog", true); + KFileDialog dlg(TQString(), mimetypes.join(" "), parent, "filedialog", true); dlg.setOperationMode( KFileDialog::Opening ); dlg.setCaption( tqApp->translate( "qChoosePixmap", "Choose Images..." ) ); dlg.setMode( KFile::Files ); @@ -137,7 +137,7 @@ TQStringList qChoosePixmaps( TQWidget *tqparent ) return TQStringList(); } -TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, TQString *fn ) +TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, TQString *fn ) { #if defined(DESIGNER) if ( !fw || fw->savePixmapInline() ) { @@ -148,7 +148,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, TQString all; buildImageFormatList( filter, all ); - TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE ); + TQFileDialog fd( TQString(), filter, parent, 0, TRUE ); fd.setContentsPreviewEnabled( TRUE ); PixmapView *pw = new PixmapView( &fd ); fd.setContentsPreview( pw, pw ); @@ -163,7 +163,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, return pix; }*/ TQStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading ); - KFileDialog dlg(TQString(), mimetypes.join(" "), tqparent, "filedialog", true); + KFileDialog dlg(TQString(), mimetypes.join(" "), parent, "filedialog", true); dlg.setOperationMode( KFileDialog::Opening ); dlg.setCaption( tqApp->translate( "qChoosePixmap", "Choose Pixmap" ) ); dlg.setMode( KFile::File ); @@ -178,7 +178,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, return pix; } } else if ( fw && fw->savePixmapInProject() ) { - PixmapCollectionEditor dia( tqparent, 0, TRUE ); + PixmapCollectionEditor dia( parent, 0, TRUE ); dia.setProject( fw->project() ); dia.setChooserMode( TRUE ); dia.setCurrentItem( MetaDataBase::pixmapKey( TQT_TQOBJECT(fw), old.serialNumber() ) ); @@ -188,7 +188,7 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, return pix; } } else { - PixmapFunction dia( tqparent, 0, TRUE ); + PixmapFunction dia( parent, 0, TRUE ); TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); dia.editArguments->setText( MetaDataBase::pixmapArgument( TQT_TQOBJECT(fw), old.serialNumber() ) ); @@ -203,15 +203,15 @@ TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, } } #else - Q_UNUSED( tqparent ); + Q_UNUSED( parent ); Q_UNUSED( fw ); Q_UNUSED( old ); #endif return TQPixmap(); } -ImageIconProvider::ImageIconProvider( TQWidget *tqparent, const char *name ) - : TQFileIconProvider( TQT_TQOBJECT(tqparent), name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) ) +ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name ) + : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) ) { fmts = TQImage::inputFormats(); } diff --git a/kdevdesigner/designer/pixmapchooser.h b/kdevdesigner/designer/pixmapchooser.h index 2513a4c9..e30af751 100644 --- a/kdevdesigner/designer/pixmapchooser.h +++ b/kdevdesigner/designer/pixmapchooser.h @@ -41,7 +41,7 @@ class PixmapView : public TQScrollView, TQ_OBJECT public: - PixmapView( TQWidget *tqparent ); + PixmapView( TQWidget *parent ); void setPixmap( const TQPixmap &pix ); void drawContents( TQPainter *p, int, int, int, int ); void previewUrl( const TQUrl &u ); @@ -57,7 +57,7 @@ class ImageIconProvider : public TQFileIconProvider TQ_OBJECT public: - ImageIconProvider( TQWidget *tqparent = 0, const char *name = 0 ); + ImageIconProvider( TQWidget *parent = 0, const char *name = 0 ); ~ImageIconProvider(); const TQPixmap *pixmap( const TQFileInfo &fi ); @@ -68,7 +68,7 @@ private: }; -TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(), TQString *fn = 0 ); -TQStringList qChoosePixmaps( TQWidget *tqparent ); +TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(), TQString *fn = 0 ); +TQStringList qChoosePixmaps( TQWidget *parent ); #endif diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp index 78fe0aca..7770dcda 100644 --- a/kdevdesigner/designer/popupmenueditor.cpp +++ b/kdevdesigner/designer/popupmenueditor.cpp @@ -54,7 +54,7 @@ class PopupMenuEditorItemPtrDrag : public TQStoredDrag { public: - PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * tqparent = 0, + PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * parent = 0, const char * name = 0 ); ~PopupMenuEditorItemPtrDrag() {}; static bool canDecode( TQDragMoveEvent * e ); @@ -64,8 +64,8 @@ public: // Drag Object Implementation --------------------------------------- PopupMenuEditorItemPtrDrag::PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, - TQWidget * tqparent, const char * name ) - : TQStoredDrag( "qt/popupmenueditoritemptr", tqparent, name ) + TQWidget * parent, const char * name ) + : TQStoredDrag( "qt/popupmenueditoritemptr", parent, name ) { TQByteArray data( sizeof( TQ_LONG ) ); TQDataStream stream( data, IO_WriteOnly ); @@ -95,8 +95,8 @@ bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem ** // PopupMenuEditorItem Implementation ----------------------------------- -PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), +PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * parent, const char * name ) + : TQObject( parent, name ), a( 0 ), s( 0 ), m( menu ), @@ -110,8 +110,8 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * tqp PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), a( action ), s( 0 ), m( menu ), @@ -126,8 +126,8 @@ PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * m } PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu, - TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), + TQObject * parent, const char * name ) + : TQObject( parent, name ), a( item->a ), s( 0 ), m( menu ), @@ -255,10 +255,10 @@ PopupMenuEditorItem * PopupMenuEditor::draggedItem = 0; int PopupMenuEditor::clipboardOperation = 0; PopupMenuEditorItem * PopupMenuEditor::clipboardItem = 0; -PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * tqparent, const char * name ) +PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * parent, const char * name ) : TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase | WResizeNoErase ), formWnd( fw ), - parentMenu( tqparent ), + parentMenu( parent ), iconWidth( 0 ), textWidth( 0 ), accelWidth( 0 ), @@ -271,10 +271,10 @@ PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * tqparent, const ch } PopupMenuEditor::PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, - TQWidget * tqparent, const char * name ) + TQWidget * parent, const char * name ) : TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase ), formWnd( fw ), - parentMenu( tqparent ), + parentMenu( parent ), iconWidth( menu->iconWidth ), textWidth( menu->textWidth ), accelWidth( menu->accelWidth ), @@ -338,7 +338,7 @@ void PopupMenuEditor::insert( PopupMenuEditorItem * item, int index ) item->s->parentMenu = this; resizeToContents(); if ( isVisible() && parentMenu ) - parentMenu->update(); // draw arrow in tqparent menu + parentMenu->update(); // draw arrow in parent menu emit inserted( item->action() ); } diff --git a/kdevdesigner/designer/popupmenueditor.h b/kdevdesigner/designer/popupmenueditor.h index 70d7e085..9ae4c7b0 100644 --- a/kdevdesigner/designer/popupmenueditor.h +++ b/kdevdesigner/designer/popupmenueditor.h @@ -41,7 +41,7 @@ class PopupMenuEditorItem : public TQObject friend class PopupMenuEditor; - PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * tqparent = 0, const char * name = 0 ); + PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * parent = 0, const char * name = 0 ); public: enum ItemType { @@ -51,9 +51,9 @@ public: }; PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu, - TQObject * tqparent = 0, const char * name = 0 ); + TQObject * parent = 0, const char * name = 0 ); PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu, - TQObject * tqparent = 0, const char * name = 0 ); + TQObject * parent = 0, const char * name = 0 ); ~PopupMenuEditorItem(); void init(); @@ -108,8 +108,8 @@ class PopupMenuEditor : public TQWidget friend class Resource; public: - PopupMenuEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 ); - PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * tqparent, const char * name = 0 ); + PopupMenuEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 ); + PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * parent, const char * name = 0 ); ~PopupMenuEditor(); void init(); diff --git a/kdevdesigner/designer/previewframe.cpp b/kdevdesigner/designer/previewframe.cpp index 1722d765..c63e994f 100644 --- a/kdevdesigner/designer/previewframe.cpp +++ b/kdevdesigner/designer/previewframe.cpp @@ -29,8 +29,8 @@ #include "previewframe.h" -PreviewFrame::PreviewFrame( TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name ) +PreviewFrame::PreviewFrame( TQWidget *parent, const char *name ) + : TQVBox( parent, name ) { setMinimumSize(200, 200); setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); diff --git a/kdevdesigner/designer/previewframe.h b/kdevdesigner/designer/previewframe.h index 23af94ad..97d3741b 100644 --- a/kdevdesigner/designer/previewframe.h +++ b/kdevdesigner/designer/previewframe.h @@ -37,8 +37,8 @@ class PreviewWorkspace : public TQWorkspace Q_OBJECT TQ_OBJECT public: - PreviewWorkspace( TQWidget* tqparent = 0, const char* name = 0 ) - : TQWorkspace( tqparent, name ) {} + PreviewWorkspace( TQWidget* parent = 0, const char* name = 0 ) + : TQWorkspace( parent, name ) {} ~PreviewWorkspace() {} protected: @@ -51,7 +51,7 @@ class PreviewFrame : public TQVBox TQ_OBJECT public: - PreviewFrame( TQWidget *tqparent = 0, const char *name = 0 ); + PreviewFrame( TQWidget *parent = 0, const char *name = 0 ); void setPreviewPalette(TQPalette); private: diff --git a/kdevdesigner/designer/previewwidgetimpl.cpp b/kdevdesigner/designer/previewwidgetimpl.cpp index 3279b284..d574f9ae 100644 --- a/kdevdesigner/designer/previewwidgetimpl.cpp +++ b/kdevdesigner/designer/previewwidgetimpl.cpp @@ -27,8 +27,8 @@ #include "tqobjectlist.h" #include "previewwidgetimpl.h" -PreviewWidget::PreviewWidget( TQWidget *tqparent, const char *name ) - : PreviewWidgetBase( tqparent, name ) +PreviewWidget::PreviewWidget( TQWidget *parent, const char *name ) + : PreviewWidgetBase( parent, name ) { // install event filter on child widgets TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); diff --git a/kdevdesigner/designer/previewwidgetimpl.h b/kdevdesigner/designer/previewwidgetimpl.h index 49f56875..a10a4623 100644 --- a/kdevdesigner/designer/previewwidgetimpl.h +++ b/kdevdesigner/designer/previewwidgetimpl.h @@ -35,7 +35,7 @@ class PreviewWidget : public PreviewWidgetBase TQ_OBJECT public: - PreviewWidget( TQWidget *tqparent = 0, const char *name = 0 ); + PreviewWidget( TQWidget *parent = 0, const char *name = 0 ); void closeEvent(TQCloseEvent *); bool eventFilter(TQObject *, TQEvent *); diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp index d96bd4dd..1410361d 100644 --- a/kdevdesigner/designer/project.cpp +++ b/kdevdesigner/designer/project.cpp @@ -1300,8 +1300,8 @@ void Project::addObject( TQObject *o ) fakeFormFiles.insert( (void*)o, ff ); MetaDataBase::addEntry( o ); if ( hasGUI() ) { - TQWidget *tqparent = MainWindow::self ? MainWindow::self->qWorkspace() : 0; - FormWindow *fw = new FormWindow( ff, MainWindow::self, tqparent, "qt_fakewindow" ); + TQWidget *parent = MainWindow::self ? MainWindow::self->qWorkspace() : 0; + FormWindow *fw = new FormWindow( ff, MainWindow::self, parent, "qt_fakewindow" ); fw->setProject( this ); if ( TQFile::exists( ff->absFileName() ) ) Resource::loadExtraSource( ff, ff->absFileName(), @@ -1460,12 +1460,12 @@ bool Project::hasParentObject( TQObject *o ) TQString Project::qualifiedName( TQObject *o ) { TQString name = o->name(); - TQObject *p = o->tqparent(); + TQObject *p = o->parent(); while ( p ) { name.prepend( TQString( p->name() ) + "." ); if ( objs.findRef( p ) != -1 ) break; - p = p->tqparent(); + p = p->parent(); } return name; } diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp index b616930d..5cea9192 100644 --- a/kdevdesigner/designer/projectsettingsimpl.cpp +++ b/kdevdesigner/designer/projectsettingsimpl.cpp @@ -48,14 +48,14 @@ #include <tqlabel.h> /* - * Constructs a ProjectSettings which is a child of 'tqparent', with the + * Constructs a ProjectSettings which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -ProjectSettings::ProjectSettings( Project *pro, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : ProjectSettingsBase( tqparent, name, modal, fl ), project( pro ) +ProjectSettings::ProjectSettings( Project *pro, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : ProjectSettingsBase( parent, name, modal, fl ), project( pro ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); diff --git a/kdevdesigner/designer/projectsettingsimpl.h b/kdevdesigner/designer/projectsettingsimpl.h index 301ceb70..5928a9a4 100644 --- a/kdevdesigner/designer/projectsettingsimpl.h +++ b/kdevdesigner/designer/projectsettingsimpl.h @@ -40,7 +40,7 @@ class ProjectSettings : public ProjectSettingsBase TQ_OBJECT public: - ProjectSettings( Project *pro, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ProjectSettings( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ProjectSettings(); protected slots: diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index 6535ef7f..402c1117 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -167,7 +167,7 @@ bool PropertyWhatsThis::clicked( const TQString& href ) */ /*! If this item should be a child of another property item, specify - \a prop as the tqparent item. + \a prop as the parent item. */ PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName ) @@ -308,7 +308,7 @@ bool PropertyItem::hasSubItems() const return FALSE; } -/*! Returns the tqparent property item here if this is a child or 0 +/*! Returns the parent property item here if this is a child or 0 otherwise. */ @@ -2592,8 +2592,8 @@ void PropertyKeysequenceItem::setValue( const TQVariant &v ) // -------------------------------------------------------------- -EnumPopup::EnumPopup( TQWidget *tqparent, const char *name, WFlags f ) - : TQFrame( tqparent, name, f ) +EnumPopup::EnumPopup( TQWidget *parent, const char *name, WFlags f ) + : TQFrame( parent, name, f ) { setLineWidth( 1 ); setFrameStyle( Panel | Plain ); @@ -2654,8 +2654,8 @@ TQValueList<EnumItem> EnumPopup::enumList() const return itemList; } -EnumBox::EnumBox( TQWidget *tqparent, const char *name ) - : TQComboBox( tqparent, name ) +EnumBox::EnumBox( TQWidget *parent, const char *name ) + : TQComboBox( parent, name ) { pop = new EnumPopup( this, "popup", TQObject::WType_Popup ); connect( pop, TQT_SIGNAL( hidden() ), this, TQT_SLOT( popupHidden() ) ); @@ -2730,7 +2730,7 @@ void EnumBox::popup() popupShown = FALSE; return; } - pop->move( ((TQWidget*)tqparent())->mapToGlobal( tqgeometry().bottomLeft() ) ); + pop->move( ((TQWidget*)parent())->mapToGlobal( tqgeometry().bottomLeft() ) ); pop->setMinimumWidth( width() ); emit aboutToShowPopup(); pop->show(); @@ -3153,8 +3153,8 @@ void PropertyList::setupProperties() continue; if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in TQ_PROPERTY can take a function (isInButtonGroup() in this case) if ( !editor->widget()->isWidgetType() || - !editor->widget()->tqparent() || - !::tqqt_cast<TQButtonGroup*>(editor->widget()->tqparent()) ) + !editor->widget()->parent() || + !::tqqt_cast<TQButtonGroup*>(editor->widget()->parent()) ) continue; } @@ -3916,8 +3916,8 @@ PropertyList::LastEventType PropertyList::lastEvent() } // ------------------------------------------------------------ -EventList::EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e ) - : HierarchyList( tqparent, fw, TRUE ), editor( e ) +EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) + : HierarchyList( parent, fw, TRUE ), editor( e ) { header()->hide(); removeColumn( 1 ); @@ -3991,7 +3991,7 @@ extern TQListViewItem *newItem; void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) ); - if ( !i || i->tqparent() ) + if ( !i || i->parent() ) return; TQString s; if ( !formWindow->project()->isCpp() ) { @@ -4014,7 +4014,7 @@ void EventList::setCurrent( TQWidget * ) void EventList::objectClicked( TQListViewItem *i ) { - if ( !i || !i->tqparent() ) + if ( !i || !i->parent() ) return; // formWindow->clearSelection(false); formWindow->mainWindow()->part()->emitEditFunction(formWindow->fileName(), i->text( 0 )); @@ -4034,20 +4034,20 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) if ( res == NEW_ITEM ) { TQString s; if ( !formWindow->project()->isCpp() ) { - TQString s1 = ( i->tqparent() ? i->tqparent() : i )->text( 0 ); + TQString s1 = ( i->parent() ? i->parent() : i )->text( 0 ); int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); s = TQString( editor->widget()->name() ) + "_" + s1; } else { - s = TQString( editor->widget()->name() ) + "_" + ( i->tqparent() ? i->tqparent() : i )->text( 0 ); + s = TQString( editor->widget()->name() ) + "_" + ( i->parent() ? i->parent() : i )->text( 0 ); } - insertEntry( i->tqparent() ? i->tqparent() : i, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), s ); - } else if ( res == DEL_ITEM && i->tqparent() ) { + insertEntry( i->parent() ? i->parent() : i, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), s ); + } else if ( res == DEL_ITEM && i->parent() ) { MetaDataBase::Connection conn; conn.sender = editor->widget(); conn.receiver = TQT_TQOBJECT(formWindow->mainContainer()); - conn.signal = i->tqparent()->text( 0 ); + conn.signal = i->parent()->text( 0 ); conn.slot = i->text( 0 ); delete i; RemoveConnectionCommand *cmd = new RemoveConnectionCommand( i18n( "Remove Connection" ), @@ -4063,9 +4063,9 @@ void EventList::renamed( TQListViewItem *i ) { if ( newItem == i ) newItem = 0; - if ( !i->tqparent() ) + if ( !i->parent() ) return; - TQListViewItem *itm = i->tqparent()->firstChild(); + TQListViewItem *itm = i->parent()->firstChild(); bool del = FALSE; while ( itm ) { if ( itm != i && itm->text( 0 ) == i->text( 0 ) ) { @@ -4081,7 +4081,7 @@ void EventList::renamed( TQListViewItem *i ) MetaDataBase::Connection conn; conn.sender = editor->widget(); conn.receiver = TQT_TQOBJECT(formWindow->mainContainer()); - conn.signal = i->tqparent()->text( 0 ); + conn.signal = i->parent()->text( 0 ); conn.slot = i->text( 0 ); AddConnectionCommand *cmd = new AddConnectionCommand( i18n( "Add Connection" ), formWindow, @@ -4091,7 +4091,7 @@ void EventList::renamed( TQListViewItem *i ) // exists and if we can connect to this one TQString funcname = i->text( 0 ).latin1(); if ( funcname.find( '(' ) == -1 ) { // try to create a signature - TQString sig = i->tqparent()->text( 0 ); + TQString sig = i->parent()->text( 0 ); sig = sig.mid( sig.find( '(' ) + 1 ); sig.remove( (int)sig.length() - 1, 1 ); LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); @@ -4138,8 +4138,8 @@ void EventList::save( TQListViewItem *p ) listview for editing properties. */ -PropertyEditor::PropertyEditor( TQWidget *tqparent ) - : TQTabWidget( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | +PropertyEditor::PropertyEditor( TQWidget *parent ) + : TQTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_StaysOnTop | WStyle_Tool |WStyle_MinMax | WStyle_SysMenu ) { setCaption( i18n( "Property Editor" ) ); diff --git a/kdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h index 9c3250d2..1b0fcc85 100644 --- a/kdevdesigner/designer/propertyeditor.h +++ b/kdevdesigner/designer/propertyeditor.h @@ -593,7 +593,7 @@ class EnumPopup : public TQFrame TQ_OBJECT public: - EnumPopup( TQWidget *tqparent, const char *name, WFlags f=0 ); + EnumPopup( TQWidget *parent, const char *name, WFlags f=0 ); ~EnumPopup(); void insertEnums( TQValueList<EnumItem> lst ); TQValueList<EnumItem> enumList() const; @@ -618,7 +618,7 @@ class EnumBox : public TQComboBox TQ_OBJECT public: - EnumBox( TQWidget *tqparent, const char *name = 0 ); + EnumBox( TQWidget *parent, const char *name = 0 ); ~EnumBox() {} void setText( const TQString &text ); void insertEnums( TQValueList<EnumItem> lst ); @@ -743,7 +743,7 @@ class EventList : public HierarchyList TQ_OBJECT public: - EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e ); + EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ); void setup(); void setCurrent( TQWidget *w ); @@ -771,7 +771,7 @@ class PropertyEditor : public TQTabWidget TQ_OBJECT public: - PropertyEditor( TQWidget *tqparent ); + PropertyEditor( TQWidget *parent ); TQObject *widget() const; diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp index 0c7bd57d..7407370c 100644 --- a/kdevdesigner/designer/qcompletionedit.cpp +++ b/kdevdesigner/designer/qcompletionedit.cpp @@ -30,8 +30,8 @@ #include <tqapplication.h> #include <tqvbox.h> -QCompletionEdit::QCompletionEdit( TQWidget *tqparent, const char *name ) - : TQLineEdit( tqparent, name ), aAdd( FALSE ), caseSensitive( FALSE ) +QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name ) + : TQLineEdit( parent, name ), aAdd( FALSE ), caseSensitive( FALSE ) { popup = new TQVBox( 0, 0, WType_Popup ); popup->setFrameStyle( TQFrame::Box | TQFrame::Plain ); diff --git a/kdevdesigner/designer/qcompletionedit.h b/kdevdesigner/designer/qcompletionedit.h index 6e7ba455..08df157f 100644 --- a/kdevdesigner/designer/qcompletionedit.h +++ b/kdevdesigner/designer/qcompletionedit.h @@ -41,7 +41,7 @@ class QCompletionEdit : public TQLineEdit TQ_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive ) public: - QCompletionEdit( TQWidget *tqparent = 0, const char *name = 0 ); + QCompletionEdit( TQWidget *parent = 0, const char *name = 0 ); bool autoAdd() const; TQStringList completionList() const; diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index 74ef9862..0d83cb1e 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -761,7 +761,7 @@ TQString Resource::copy() } -void Resource::paste( const TQString &cb, TQWidget *tqparent ) +void Resource::paste( const TQString &cb, TQWidget *parent ) { if ( !formwindow ) return; @@ -795,30 +795,30 @@ void Resource::paste( const TQString &cb, TQWidget *tqparent ) formwindow->clearSelection( FALSE ); while ( !firstWidget.isNull() ) { if ( firstWidget.tagName() == "widget" ) { - TQWidget *w = (TQWidget*)createObject( firstWidget, tqparent, 0 ); + TQWidget *w = (TQWidget*)createObject( firstWidget, parent, 0 ); if ( !w ) continue; widgets.append( w ); int x = w->x() + formwindow->grid().x(); int y = w->y() + formwindow->grid().y(); - if ( w->x() + w->width() > tqparent->width() ) - x = TQMAX( 0, tqparent->width() - w->width() ); - if ( w->y() + w->height() > tqparent->height() ) - y = TQMAX( 0, tqparent->height() - w->height() ); + if ( w->x() + w->width() > parent->width() ) + x = TQMAX( 0, parent->width() - w->width() ); + if ( w->y() + w->height() > parent->height() ) + y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); formwindow->selectWidget( TQT_TQOBJECT(w) ); } else if ( firstWidget.tagName() == "spacer" ) { - TQWidget *w = createSpacer( firstWidget, tqparent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); + TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); if ( !w ) continue; widgets.append( w ); int x = w->x() + formwindow->grid().x(); int y = w->y() + formwindow->grid().y(); - if ( w->x() + w->width() > tqparent->width() ) - x = TQMAX( 0, tqparent->width() - w->width() ); - if ( w->y() + w->height() > tqparent->height() ) - y = TQMAX( 0, tqparent->height() - w->height() ); + if ( w->x() + w->width() > parent->width() ) + x = TQMAX( 0, parent->width() - w->width() ); + if ( w->y() + w->height() > parent->height() ) + y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); formwindow->selectWidget( TQT_TQOBJECT(w) ); @@ -1756,7 +1756,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c ) ts << makeIndent( indent ) << "<blue>" << TQString::number( c.blue() ) << "</blue>" << endl; } -TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout ) +TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout ) { lastItem = 0; TQDomElement n = e.firstChild().toElement(); @@ -1774,7 +1774,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS - TQString parentClassName = WidgetFactory::classNameOf( tqparent ); + TQString parentClassName = WidgetFactory::classNameOf( parent ); bool isPlugin = WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( parentClassName ) ); if ( isPlugin ) @@ -1782,7 +1782,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL // ### TODO loading for custom container widgets without pages #endif if ( !className.isNull() ) { - obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, 0, FALSE )); + obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, FALSE )); if ( !obj ) { TQMessageBox::critical( MainWindow::self, i18n( "Loading File" ), i18n( "Error loading %1.\n" @@ -1820,21 +1820,21 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL tqlayout = 0; if ( w && formwindow ) { - if ( !tqparent || - ( !::tqqt_cast<TQTabWidget*>(tqparent) && - !::tqqt_cast<TQWidgetStack*>(tqparent) && - !::tqqt_cast<TQToolBox*>(tqparent) && - !::tqqt_cast<TQWizard*>(tqparent) + if ( !parent || + ( !::tqqt_cast<TQTabWidget*>(parent) && + !::tqqt_cast<TQWidgetStack*>(parent) && + !::tqqt_cast<TQToolBox*>(parent) && + !::tqqt_cast<TQWizard*>(parent) #ifdef TQT_CONTAINER_CUSTOM_WIDGETS && !isPlugin #endif ) ) formwindow->insertWidget( w, pasting ); - else if ( tqparent && - ( ::tqqt_cast<TQTabWidget*>(tqparent) || - ::tqqt_cast<TQWidgetStack*>(tqparent) || - ::tqqt_cast<TQToolBox*>(tqparent) || - ::tqqt_cast<TQWizard*>(tqparent) + else if ( parent && + ( ::tqqt_cast<TQTabWidget*>(parent) || + ::tqqt_cast<TQWidgetStack*>(parent) || + ::tqqt_cast<TQToolBox*>(parent) || + ::tqqt_cast<TQWizard*>(parent) #ifdef TQT_CONTAINER_CUSTOM_WIDGETS || isPlugin #endif @@ -1877,18 +1877,18 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( ::tqqt_cast<TQTabWidget*>(tqparent) ) { + if ( ::tqqt_cast<TQTabWidget*>(parent) ) { if ( attrib == "title" ) - ( (TQTabWidget*)tqparent )->insertTab( w, v.toString() ); - } else if ( ::tqqt_cast<TQWidgetStack*>(tqparent) ) { + ( (TQTabWidget*)parent )->insertTab( w, v.toString() ); + } else if ( ::tqqt_cast<TQWidgetStack*>(parent) ) { if ( attrib == "id" ) - ( (QDesignerWidgetStack*)tqparent )->insertPage( w, v.toInt() ); - } else if ( ::tqqt_cast<TQToolBox*>(tqparent) ) { + ( (QDesignerWidgetStack*)parent )->insertPage( w, v.toInt() ); + } else if ( ::tqqt_cast<TQToolBox*>(parent) ) { if ( attrib == "label" ) - ( (TQToolBox*)tqparent )->addItem( w, v.toString() ); - } else if ( ::tqqt_cast<TQWizard*>(tqparent) ) { + ( (TQToolBox*)parent )->addItem( w, v.toString() ); + } else if ( ::tqqt_cast<TQWizard*>(parent) ) { if ( attrib == "title" ) - ( (TQWizard*)tqparent )->addPage( w, v.toString() ); + ( (TQWizard*)parent )->addPage( w, v.toString() ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS } else if ( isPlugin ) { if ( attrib == "label" ) { @@ -1899,7 +1899,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 ); if ( iface2 ) { iface2->insertPage( parentClassName, - (TQWidget*)tqparent, v.toString(), -1, w ); + (TQWidget*)parent, v.toString(), -1, w ); iface2->release(); } iface->release(); @@ -2104,7 +2104,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } } -TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o ) +TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o ) { TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); @@ -2117,7 +2117,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQL colspan = 1; Spacer *spacer = (Spacer*) WidgetFactory::create( WidgetDatabase::idFromClassName("Spacer"), - tqparent, "spacer", FALSE); + parent, "spacer", FALSE); spacer->setOrientation( o ); spacer->setInteraciveMode( FALSE ); while ( !n.isNull() ) { @@ -3000,12 +3000,12 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts ts << makeIndent( indent ) << "</actions>" << endl; } -void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e ) +void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) { TQDomElement n = e; TQAction *a = 0; if ( n.tagName() == "action" ) { - a = new QDesignerAction( tqparent ); + a = new QDesignerAction( parent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); bool hasMenuText = FALSE; @@ -3022,10 +3022,10 @@ void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !::tqqt_cast<TQAction*>(tqparent) ) + if ( !::tqqt_cast<TQAction*>(parent) ) formwindow->actionList().append( a ); } else if ( n.tagName() == "actiongroup" ) { - a = new QDesignerActionGroup( tqparent ); + a = new QDesignerActionGroup( parent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); bool hasMenuText = FALSE; @@ -3045,7 +3045,7 @@ void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !::tqqt_cast<TQAction*>(tqparent) ) + if ( !::tqqt_cast<TQAction*>(parent) ) formwindow->actionList().append( a ); } } diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h index 3dd20a22..ddbffb07 100644 --- a/kdevdesigner/designer/resource.h +++ b/kdevdesigner/designer/resource.h @@ -77,7 +77,7 @@ public: bool save( const TQString& filename, bool formCodeOnly = FALSE); bool save( TQIODevice* ); - void paste( const TQString &cb, TQWidget *tqparent ); + void paste( const TQString &cb, TQWidget *parent ); static void saveImageData( const TQImage &img, TQTextStream &ts, int indent ); static void loadCustomWidgets( const TQDomElement &e, Resource *r ); @@ -111,8 +111,8 @@ private: void saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ); void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent ); - TQObject *createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout = 0 ); - TQWidget *createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o ); + TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout = 0 ); + TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); void createColumn( const TQDomElement &e, TQWidget *widget ); void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e); @@ -125,7 +125,7 @@ private: void loadTabOrder( const TQDomElement &e ); void loadItem( const TQDomElement &n, TQPixmap &pix, TQString &txt, bool &hasPixmap ); void loadActions( const TQDomElement &n ); - void loadChildAction( TQObject *tqparent, const TQDomElement &e ); + void loadChildAction( TQObject *parent, const TQDomElement &e ); void loadToolBars( const TQDomElement &n ); void loadMenuBar( const TQDomElement &n ); void loadPopupMenu( PopupMenuEditor *pm, const TQDomElement &e ); diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp index c7134e97..6ba2ba3f 100644 --- a/kdevdesigner/designer/sizehandle.cpp +++ b/kdevdesigner/designer/sizehandle.cpp @@ -35,8 +35,8 @@ #include <tqlabel.h> #include <klocale.h> -SizeHandle::SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s ) - : TQWidget( tqparent ) +SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s ) + : TQWidget( parent ) { active = TRUE; setBackgroundMode( active ? PaletteText : PaletteDark ); @@ -44,7 +44,7 @@ SizeHandle::SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s ) widget = 0; dir =d ; setMouseTracking( FALSE ); - formWindow = tqparent; + formWindow = parent; sel = s; updateCursor(); } @@ -266,10 +266,10 @@ void SizeHandle::tryResize( TQWidget *w, int width, int height ) // ------------------------------------------------------------------------ -WidgetSelection::WidgetSelection( FormWindow *tqparent, TQPtrDict<WidgetSelection> *selDict ) +WidgetSelection::WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict ) : selectionDict( selDict ) { - formWindow = tqparent; + formWindow = parent; for ( int i = SizeHandle::LeftTop; i <= SizeHandle::Left; ++i ) { handles.insert( i, new SizeHandle( formWindow, (SizeHandle::Direction)i, this ) ); } diff --git a/kdevdesigner/designer/sizehandle.h b/kdevdesigner/designer/sizehandle.h index ee089de3..12cba4df 100644 --- a/kdevdesigner/designer/sizehandle.h +++ b/kdevdesigner/designer/sizehandle.h @@ -44,7 +44,7 @@ class SizeHandle : public TQWidget public: enum Direction { LeftTop, Top, RightTop, Right, RightBottom, Bottom, LeftBottom, Left }; - SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s ); + SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s ); void setWidget( TQWidget *w ); void setActive( bool a ); void updateCursor(); @@ -75,7 +75,7 @@ private: class WidgetSelection { public: - WidgetSelection( FormWindow *tqparent, TQPtrDict<WidgetSelection> *selDict ); + WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict ); void setWidget( TQWidget *w, bool updateDict = TRUE ); bool isUsed() const; diff --git a/kdevdesigner/designer/sourceeditor.cpp b/kdevdesigner/designer/sourceeditor.cpp index 863abaab..2850e20e 100644 --- a/kdevdesigner/designer/sourceeditor.cpp +++ b/kdevdesigner/designer/sourceeditor.cpp @@ -40,8 +40,8 @@ #include <tqtextstream.h> #include "kdevdesigner_part.h" -SourceEditor::SourceEditor( TQWidget *tqparent, EditorInterface *iface, LanguageInterface *liface ) - : TQVBox( tqparent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 ) +SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface ) + : TQVBox( parent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 ) { iFace->addRef(); lIface->addRef(); diff --git a/kdevdesigner/designer/sourceeditor.h b/kdevdesigner/designer/sourceeditor.h index e8d4cfb8..7ffaee4a 100644 --- a/kdevdesigner/designer/sourceeditor.h +++ b/kdevdesigner/designer/sourceeditor.h @@ -43,7 +43,7 @@ class SourceEditor : public TQVBox TQ_OBJECT public: - SourceEditor( TQWidget *tqparent, EditorInterface *iface, LanguageInterface *liface ); + SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface ); ~SourceEditor(); void setObject( TQObject *fw, Project *p ); diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp index 7ffb34f0..b1858859 100644 --- a/kdevdesigner/designer/sourcefile.cpp +++ b/kdevdesigner/designer/sourcefile.cpp @@ -141,9 +141,9 @@ bool SourceFile::saveAs( bool ignoreModified ) ed->setCaption( i18n( "Edit %1" ).tqarg( filename ) ); setModified( TRUE ); if ( pro->isDummy() ) { - TQObject *o = ed->tqparent(); + TQObject *o = ed->parent(); while ( o && !o->isA( "MainWindow" ) ) - o = o->tqparent(); + o = o->parent(); if ( o ) ((MainWindow *)o)->addRecentlyOpenedFile( fn ); } diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp index a85310be..72978260 100644 --- a/kdevdesigner/designer/startdialogimpl.cpp +++ b/kdevdesigner/designer/startdialogimpl.cpp @@ -26,8 +26,8 @@ #include <klocale.h> -FileDialog::FileDialog( const TQString &dir, TQWidget *tqparent ) - : TQFileDialog( dir, TQString(), tqparent ) +FileDialog::FileDialog( const TQString &dir, TQWidget *parent ) + : TQFileDialog( dir, TQString(), parent ) { } @@ -37,8 +37,8 @@ void FileDialog::accept() } -StartDialog::StartDialog( TQWidget *tqparent, const TQString &templatePath ) - : StartDialogBase( tqparent, 0 ) +StartDialog::StartDialog( TQWidget *parent, const TQString &templatePath ) + : StartDialogBase( parent, 0 ) { newForm = new NewForm( templateView, templatePath ); recentFiles.clear(); diff --git a/kdevdesigner/designer/startdialogimpl.h b/kdevdesigner/designer/startdialogimpl.h index 2b5c1866..b1f67990 100644 --- a/kdevdesigner/designer/startdialogimpl.h +++ b/kdevdesigner/designer/startdialogimpl.h @@ -43,7 +43,7 @@ class FileDialog : public TQFileDialog TQ_OBJECT public: - FileDialog( const TQString &dir, TQWidget *tqparent ); + FileDialog( const TQString &dir, TQWidget *parent ); protected slots: void accept(); @@ -59,7 +59,7 @@ class StartDialog : public StartDialogBase TQ_OBJECT public: - StartDialog( TQWidget *tqparent, const TQString &templatePath ); + StartDialog( TQWidget *parent, const TQString &templatePath ); void setRecentlyFiles( TQStringList& ); void setRecentlyProjects( TQStringList& ); bool showDialogInFuture() const { return showInFuture; } diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp index 709cb035..d2aea25f 100644 --- a/kdevdesigner/designer/styledbutton.cpp +++ b/kdevdesigner/designer/styledbutton.cpp @@ -38,8 +38,8 @@ #include <tqdragobject.h> #include <tqstyle.h> -StyledButton::StyledButton(TQWidget* tqparent, const char* name) - : TQButton( tqparent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE ) +StyledButton::StyledButton(TQWidget* parent, const char* name) + : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE ) { setMinimumSize( tqminimumSizeHint() ); setAcceptDrops( TRUE ); @@ -49,8 +49,8 @@ StyledButton::StyledButton(TQWidget* tqparent, const char* name) setEditor( ColorEditor ); } -StyledButton::StyledButton( const TQBrush& b, TQWidget* tqparent, const char* name, WFlags f ) - : TQButton( tqparent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 ) +StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name, WFlags f ) + : TQButton( parent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 ) { col = b.color(); pix = b.pixmap(); diff --git a/kdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h index 90f35dfe..f5a193b6 100644 --- a/kdevdesigner/designer/styledbutton.h +++ b/kdevdesigner/designer/styledbutton.h @@ -49,8 +49,8 @@ class StyledButton : public TQButton public: enum EditorType { ColorEditor, PixmapEditor }; - StyledButton( TQWidget* tqparent = 0, const char* name = 0 ); - StyledButton( const TQBrush& b, TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 ); + StyledButton( TQWidget* parent = 0, const char* name = 0 ); + StyledButton( const TQBrush& b, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); ~StyledButton(); void setEditor( EditorType ); diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp index 1027615e..4f549a28 100644 --- a/kdevdesigner/designer/tableeditorimpl.cpp +++ b/kdevdesigner/designer/tableeditorimpl.cpp @@ -46,8 +46,8 @@ #include <klocale.h> -TableEditor::TableEditor( TQWidget* tqparent, TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl ) - : TableEditorBase( tqparent, name, modal, fl ), +TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl ) + : TableEditorBase( parent, name, modal, fl ), #ifndef TQT_NO_TABLE editTable( (TQTable*)editWidget ), #endif diff --git a/kdevdesigner/designer/tableeditorimpl.h b/kdevdesigner/designer/tableeditorimpl.h index b437f4ce..280db0b1 100644 --- a/kdevdesigner/designer/tableeditorimpl.h +++ b/kdevdesigner/designer/tableeditorimpl.h @@ -40,7 +40,7 @@ class TableEditor : public TableEditorBase TQ_OBJECT public: - TableEditor( TQWidget* tqparent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0, + TableEditor( TQWidget* parent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~TableEditor(); diff --git a/kdevdesigner/designer/timestamp.cpp b/kdevdesigner/designer/timestamp.cpp index eb80c1cd..553d9e3f 100644 --- a/kdevdesigner/designer/timestamp.cpp +++ b/kdevdesigner/designer/timestamp.cpp @@ -30,8 +30,8 @@ class TQTimer; -TimeStamp::TimeStamp( TQObject *tqparent, const TQString &f ) - : TQObject( tqparent ), filename( f ), autoCheck( FALSE ) +TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) + : TQObject( parent ), filename( f ), autoCheck( FALSE ) { timer = new TQTimer( this ); connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) ); diff --git a/kdevdesigner/designer/timestamp.h b/kdevdesigner/designer/timestamp.h index 2c41b62a..ffe71c4b 100644 --- a/kdevdesigner/designer/timestamp.h +++ b/kdevdesigner/designer/timestamp.h @@ -37,7 +37,7 @@ class TimeStamp : public TQObject TQ_OBJECT public: - TimeStamp( TQObject *tqparent, const TQString &f ); + TimeStamp( TQObject *parent, const TQString &f ); void setFileName( const TQString &f ); TQString fileName() const; diff --git a/kdevdesigner/designer/variabledialogimpl.cpp b/kdevdesigner/designer/variabledialogimpl.cpp index 8cbf38f6..82461e91 100644 --- a/kdevdesigner/designer/variabledialogimpl.cpp +++ b/kdevdesigner/designer/variabledialogimpl.cpp @@ -40,8 +40,8 @@ #include <klocale.h> -VariableDialog::VariableDialog( FormWindow *fw, TQWidget *tqparent ) - : VariableDialogBase( tqparent ), formWindow( fw ) +VariableDialog::VariableDialog( FormWindow *fw, TQWidget *parent ) + : VariableDialogBase( parent ), formWindow( fw ) { varView->setSorting( -1 ); TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( TQT_TQOBJECT(formWindow) ); diff --git a/kdevdesigner/designer/variabledialogimpl.h b/kdevdesigner/designer/variabledialogimpl.h index 88cb439e..b8500677 100644 --- a/kdevdesigner/designer/variabledialogimpl.h +++ b/kdevdesigner/designer/variabledialogimpl.h @@ -37,7 +37,7 @@ class VariableDialog : public VariableDialogBase Q_OBJECT TQ_OBJECT public: - VariableDialog( FormWindow *fw, TQWidget* tqparent = 0 ); + VariableDialog( FormWindow *fw, TQWidget* parent = 0 ); ~VariableDialog(); void setCurrentItem( TQString text ); diff --git a/kdevdesigner/designer/widgetaction.cpp b/kdevdesigner/designer/widgetaction.cpp index 9547b049..c2ce0721 100644 --- a/kdevdesigner/designer/widgetaction.cpp +++ b/kdevdesigner/designer/widgetaction.cpp @@ -35,7 +35,7 @@ static TQStyle *windowsStyle = 0; void WidgetAction::addedTo( TQWidget *w, TQWidget *container ) { - if ( ::tqqt_cast<TQToolButton*>(w) && ::tqqt_cast<TQScrollView*>(container->tqparent()->tqparent()) ) { + if ( ::tqqt_cast<TQToolButton*>(w) && ::tqqt_cast<TQScrollView*>(container->parent()->parent()) ) { if ( !windowsStyle ) windowsStyle = TQStyleFactory::create( "windows" ); w->setStyle( windowsStyle ); diff --git a/kdevdesigner/designer/widgetaction.h b/kdevdesigner/designer/widgetaction.h index 78c0270e..da702468 100644 --- a/kdevdesigner/designer/widgetaction.h +++ b/kdevdesigner/designer/widgetaction.h @@ -35,17 +35,17 @@ class WidgetAction : public TQAction TQ_OBJECT public: - WidgetAction( const TQString &grp, TQObject* tqparent, + WidgetAction( const TQString &grp, TQObject* parent, const char* name = 0, bool toggle = FALSE ) - : TQAction( tqparent, name, toggle ) { init( grp ); } + : TQAction( parent, name, toggle ) { init( grp ); } WidgetAction( const TQString &grp, const TQString& text, const TQIconSet& icon, const TQString& menuText, TQKeySequence accel, - TQObject* tqparent, const char* name = 0, bool toggle = FALSE ) - : TQAction( text, icon, menuText, accel, tqparent, name, toggle ) { init( grp ); } + TQObject* parent, const char* name = 0, bool toggle = FALSE ) + : TQAction( text, icon, menuText, accel, parent, name, toggle ) { init( grp ); } WidgetAction( const TQString &grp, const TQString& text, - const TQString& menuText, TQKeySequence accel, TQObject* tqparent, + const TQString& menuText, TQKeySequence accel, TQObject* parent, const char* name = 0, bool toggle = FALSE ) - : TQAction( text, menuText, accel, tqparent, name, toggle ) { init( grp ); } + : TQAction( text, menuText, accel, parent, name, toggle ) { init( grp ); } ~WidgetAction(); #if !defined(TQ_NO_USING_KEYWORD) diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp index 55bb4c0d..e31f5d82 100644 --- a/kdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -123,8 +123,8 @@ void TQLayoutWidget::paintEvent( TQPaintEvent* ) } -QDesignerTabWidget::QDesignerTabWidget( TQWidget *tqparent, const char *name ) - : TQTabWidget( tqparent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE ) +QDesignerTabWidget::QDesignerTabWidget( TQWidget *parent, const char *name ) + : TQTabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE ) { tabBar()->setAcceptDrops( TRUE ); tabBar()->installEventFilter( this ); @@ -290,8 +290,8 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) } -QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *tqparent, const char *name ) - : TQWidgetStack( tqparent, name ) +QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *parent, const char *name ) + : TQWidgetStack( parent, name ) { prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" ); prev->setAutoRaise( TRUE ); @@ -517,12 +517,12 @@ void WidgetFactory::saveChangedProperties( TQObject *w, int id ) } /*! Creates a widget of the type which is registered as \a id as - child of \a tqparent. The \a name is optional. If \a init is TRUE, the + child of \a parent. The \a name is optional. If \a init is TRUE, the widget is initialized with some defaults, else the plain widget is created. */ -TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) +TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) { TQString n = WidgetDatabase::className( id ); if ( n.isEmpty() ) @@ -536,11 +536,11 @@ TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, b TQWidget *w = 0; TQString str = WidgetDatabase::createWidgetName( id ); const char *s = str.latin1(); - w = createWidget( n, tqparent, name ? name : s, init, r, orient ); + w = createWidget( n, parent, name ? name : s, init, r, orient ); if ( ::tqqt_cast<TQScrollView*>(w) ) ( (TQScrollView*)w )->disableSizeHintCaching(); if ( !w && WidgetDatabase::isCustomWidget( id ) ) - w = createCustomWidget( tqparent, name ? name : s, MetaDataBase::customWidget( id ) ); + w = createCustomWidget( parent, name ? name : s, MetaDataBase::customWidget( id ) ); if ( !w ) return 0; MetaDataBase::addEntry( TQT_TQOBJECT(w) ); @@ -677,30 +677,30 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) } /*! Factory functions for creating a widget of the type \a className - as child of \a tqparent with the name \a name. + as child of \a parent with the name \a name. If \a init is TRUE, some initial default properties are set. This has to be in sync with the initChangedProperties() function! */ -TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init, +TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) { if ( className == TQPUSHBUTTON_OBJECT_NAME_STRING ) { TQPushButton *b = 0; if ( init ) { - b = new QDesignerPushButton( tqparent, name ); + b = new QDesignerPushButton( parent, name ); b->setText( TQString::tqfromLatin1( name ) ); } else { - b = new QDesignerPushButton( tqparent, name ); + b = new QDesignerPushButton( parent, name ); } TQWidget *w = find_formwindow( b ); b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) ); return b; } else if ( className == TQTOOLBUTTON_OBJECT_NAME_STRING ) { if ( init ) { - QDesignerToolButton *tb = new QDesignerToolButton( tqparent, name ); - if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(tqparent))) { + QDesignerToolButton *tb = new QDesignerToolButton( parent, name ); + if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(parent))) { tb->setUsesTextLabel(TRUE); tb->setTextLabel("..."); tb->setAutoRaise(TRUE); @@ -710,32 +710,32 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return tb; } - return new QDesignerToolButton( tqparent, name ); + return new QDesignerToolButton( parent, name ); } else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) { if ( init ) { - QDesignerCheckBox *cb = new QDesignerCheckBox( tqparent, name ); + QDesignerCheckBox *cb = new QDesignerCheckBox( parent, name ); cb->setText( TQString::tqfromLatin1( name ) ); return cb; } - return new QDesignerCheckBox( tqparent, name ); + return new QDesignerCheckBox( parent, name ); } else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) { if ( init ) { - QDesignerRadioButton *rb = new QDesignerRadioButton( tqparent, name ); + QDesignerRadioButton *rb = new QDesignerRadioButton( parent, name ); rb->setText( TQString::tqfromLatin1( name ) ); return rb; } - return new QDesignerRadioButton( tqparent, name ); + return new QDesignerRadioButton( parent, name ); } else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) { if ( init ) - return new TQGroupBox( TQString::tqfromLatin1( name ), tqparent, name ); - return new TQGroupBox( tqparent, name ); + return new TQGroupBox( TQString::tqfromLatin1( name ), parent, name ); + return new TQGroupBox( parent, name ); } else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) { if ( init ) - return new TQButtonGroup( TQString::tqfromLatin1( name ), tqparent, name ); - return new TQButtonGroup( tqparent, name ); + return new TQButtonGroup( TQString::tqfromLatin1( name ), parent, name ); + return new TQButtonGroup( parent, name ); } else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) { #if !defined(TQT_NO_ICONVIEW) - TQIconView* iv = new TQIconView( tqparent, name ); + TQIconView* iv = new TQIconView( parent, name ); if ( init ) (void) new TQIconViewItem( iv, i18n( "New Item" ) ); return iv; @@ -745,31 +745,31 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else if ( className == TQTABLE_OBJECT_NAME_STRING ) { #if !defined(TQT_NO_TABLE) if ( init ) - return new TQTable( 3, 3, tqparent, name ); - return new TQTable( tqparent, name ); + return new TQTable( 3, 3, parent, name ); + return new TQTable( parent, name ); #else return 0; #endif #ifndef TQT_NO_SQL } else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) { - return new TQDataTable( tqparent, name ); + return new TQDataTable( parent, name ); #endif //TQT_NO_SQL } else if ( className == TQDATEEDIT_OBJECT_NAME_STRING ) { - return new TQDateEdit( tqparent, name ); + return new TQDateEdit( parent, name ); } else if ( className == TQTIMEEDIT_OBJECT_NAME_STRING ) { - return new TQTimeEdit( tqparent, name ); + return new TQTimeEdit( parent, name ); } else if ( className == TQDATETIMEEDIT_OBJECT_NAME_STRING ) { - return new TQDateTimeEdit( tqparent, name ); + return new TQDateTimeEdit( parent, name ); } else if ( className == TQLISTBOX_OBJECT_NAME_STRING ) { - TQListBox* lb = new TQListBox( tqparent, name ); + TQListBox* lb = new TQListBox( parent, name ); if ( init ) { lb->insertItem( i18n( "New Item" ) ); lb->setCurrentItem( 0 ); } return lb; } else if ( className == TQLISTVIEW_OBJECT_NAME_STRING ) { - TQListView *lv = new TQListView( tqparent, name ); + TQListView *lv = new TQListView( parent, name ); lv->setSorting( -1 ); if ( init ) { lv->addColumn( i18n( "Column 1" ) ); @@ -777,17 +777,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return lv; } else if ( className == TQLINEEDIT_OBJECT_NAME_STRING ) - return new TQLineEdit( tqparent, name ); + return new TQLineEdit( parent, name ); else if ( className == TQSPINBOX_OBJECT_NAME_STRING ) - return new TQSpinBox( tqparent, name ); + return new TQSpinBox( parent, name ); else if ( className == TQSPLITTER_OBJECT_NAME_STRING ) - return new TQSplitter( tqparent, name ); + return new TQSplitter( parent, name ); else if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING ) - return new TQMultiLineEdit( tqparent, name ); + return new TQMultiLineEdit( parent, name ); else if ( className == TQTEXTEDIT_OBJECT_NAME_STRING ) - return new TQTextEdit( tqparent, name ); + return new TQTextEdit( parent, name ); else if ( className == TQLABEL_OBJECT_NAME_STRING || className == "TextLabel" ) { - QDesignerLabel *l = new QDesignerLabel( tqparent, name ); + QDesignerLabel *l = new QDesignerLabel( parent, name ); if ( init ) { l->setText( TQString::tqfromLatin1( name ) ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); @@ -795,7 +795,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return l; } else if ( className == "PixmapLabel" ) { - QDesignerLabel *l = new QDesignerLabel( tqparent, name ); + QDesignerLabel *l = new QDesignerLabel( parent, name ); if ( init ) { l->setPixmap( BarIcon( "designer_qtlogo.png", KDevDesignerPartFactory::instance() ) ); l->setScaledContents( TRUE ); @@ -805,11 +805,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return l; } else if ( className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) - return new TQLayoutWidget( tqparent, name ); + return new TQLayoutWidget( parent, name ); else if ( className == TQTABWIDGET_OBJECT_NAME_STRING ) { - TQTabWidget *tw = new QDesignerTabWidget( tqparent, name ); + TQTabWidget *tw = new QDesignerTabWidget( parent, name ); if ( init ) { - FormWindow *fw = find_formwindow( tqparent ); + FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, i18n("Tab 1") ); MetaDataBase::addEntry( TQT_TQOBJECT(w) ); @@ -820,9 +820,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return tw; } else if ( className == TQWIDGETSTACK_OBJECT_NAME_STRING ) { - QDesignerWidgetStack *ws = new QDesignerWidgetStack( tqparent, name ); + QDesignerWidgetStack *ws = new QDesignerWidgetStack( parent, name ); if ( init ) { - FormWindow *fw = find_formwindow( tqparent ); + FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new QDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" ); ws->insertPage( w ); MetaDataBase::addEntry( TQT_TQOBJECT(w) ); @@ -830,53 +830,53 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } return ws; } else if ( className == TQCOMBOBOX_OBJECT_NAME_STRING ) { - return new TQComboBox( FALSE, tqparent, name ); + return new TQComboBox( FALSE, parent, name ); } else if ( className == TQWIDGET_OBJECT_NAME_STRING ) { - if ( tqparent && - ( ::tqqt_cast<FormWindow*>(tqparent) || - ::tqqt_cast<TQWizard*>(tqparent) || - ::tqqt_cast<TQTabWidget*>(tqparent) || - ::tqqt_cast<TQWidgetStack*>(tqparent) || - ::tqqt_cast<TQToolBox*>(tqparent) || - ::tqqt_cast<TQMainWindow*>(tqparent) ) ) { - FormWindow *fw = find_formwindow( tqparent ); + if ( parent && + ( ::tqqt_cast<FormWindow*>(parent) || + ::tqqt_cast<TQWizard*>(parent) || + ::tqqt_cast<TQTabWidget*>(parent) || + ::tqqt_cast<TQWidgetStack*>(parent) || + ::tqqt_cast<TQToolBox*>(parent) || + ::tqqt_cast<TQMainWindow*>(parent) ) ) { + FormWindow *fw = find_formwindow( parent ); if ( fw ) { - QDesignerWidget *dw = new QDesignerWidget( fw, tqparent, name ); + QDesignerWidget *dw = new QDesignerWidget( fw, parent, name ); MetaDataBase::addEntry( TQT_TQOBJECT(dw) ); return dw; } } - return new TQWidget( tqparent, name ); + return new TQWidget( parent, name ); } else if ( className == TQDIALOG_OBJECT_NAME_STRING ) { TQDialog *dia = 0; - if ( ::tqqt_cast<FormWindow*>(tqparent) ) - dia = new QDesignerDialog( (FormWindow*)tqparent, tqparent, name ); + if ( ::tqqt_cast<FormWindow*>(parent) ) + dia = new QDesignerDialog( (FormWindow*)parent, parent, name ); else - dia = new TQDialog( tqparent, name ); + dia = new TQDialog( parent, name ); #if defined(TQT_NON_COMMERCIAL) - if ( ::tqqt_cast<MainWindow*>(tqparent) ) + if ( ::tqqt_cast<MainWindow*>(parent) ) #else - if ( tqparent ) + if ( parent ) #endif - dia->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); + dia->reparent( parent, TQPoint( 0, 0 ), TRUE ); return dia; } else if ( className == TQWIZARD_OBJECT_NAME_STRING ) { - TQWizard *wiz = new QDesignerWizard( tqparent, name ); + TQWizard *wiz = new QDesignerWizard( parent, name ); #if defined(TQT_NON_COMMERCIAL) - if ( ::tqqt_cast<MainWindow*>(tqparent) ) + if ( ::tqqt_cast<MainWindow*>(parent) ) #else - if ( tqparent ) + if ( parent ) #endif - wiz->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); - if ( init && ::tqqt_cast<FormWindow*>(tqparent) ) { - QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)tqparent, wiz, "WizardPage" ); + wiz->reparent( parent, TQPoint( 0, 0 ), TRUE ); + if ( init && ::tqqt_cast<FormWindow*>(parent) ) { + QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" ); MetaDataBase::addEntry( TQT_TQOBJECT(dw) ); wiz->addPage( dw, i18n( "Page" ) ); TQTimer::singleShot( 0, wiz, TQT_SLOT( next() ) ); } return wiz; } else if ( className == "Spacer" ) { - Spacer *s = new Spacer( tqparent, name ); + Spacer *s = new Spacer( parent, name ); MetaDataBase::addEntry( TQT_TQOBJECT(s) ); MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE ); MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "sizeType", TRUE ); @@ -890,17 +890,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa s->setOrientation( Qt::Horizontal ); return s; } else if ( className == TQLCDNUMBER_OBJECT_NAME_STRING ) - return new TQLCDNumber( tqparent, name ); + return new TQLCDNumber( parent, name ); else if ( className == TQPROGRESSBAR_OBJECT_NAME_STRING ) - return new TQProgressBar( tqparent, name ); + return new TQProgressBar( parent, name ); else if ( className == TQTEXTVIEW_OBJECT_NAME_STRING ) - return new TQTextView( tqparent, name ); + return new TQTextView( parent, name ); else if ( className == TQTEXTBROWSER_OBJECT_NAME_STRING ) - return new TQTextBrowser( tqparent, name ); + return new TQTextBrowser( parent, name ); else if ( className == TQDIAL_OBJECT_NAME_STRING ) - return new TQDial( tqparent, name ); + return new TQDial( parent, name ); else if ( className == TQSLIDER_OBJECT_NAME_STRING ) { - TQSlider *s = new TQSlider( tqparent, name ); + TQSlider *s = new TQSlider( parent, name ); if ( !r ) return s; if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) @@ -911,7 +911,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE ); return s; } else if ( className == TQSCROLLBAR_OBJECT_NAME_STRING ) { - TQScrollBar *s = new TQScrollBar( tqparent, name ); + TQScrollBar *s = new TQScrollBar( parent, name ); if ( !r ) return s; if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) @@ -923,12 +923,12 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return s; } else if ( className == TQFRAME_OBJECT_NAME_STRING ) { if ( !init ) - return new TQFrame( tqparent, name ); - TQFrame *f = new TQFrame( tqparent, name ); + return new TQFrame( parent, name ); + TQFrame *f = new TQFrame( parent, name ); f->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); return f; } else if ( className == "Line" ) { - Line *l = new Line( tqparent, name ); + Line *l = new Line( parent, name ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "orientation", TRUE ); MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "frameShadow", TRUE ); @@ -941,9 +941,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa l->setOrientation( Qt::Vertical ); return l; } else if ( className == TQMAINWINDOW_OBJECT_NAME_STRING ) { - TQMainWindow *mw = new TQMainWindow( tqparent, name, 0 ); + TQMainWindow *mw = new TQMainWindow( parent, name, 0 ); mw->setDockEnabled( TQt::DockMinimized, FALSE ); - QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)tqparent, mw, "central widget" ); + QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, mw, "central widget" ); mw->setDockMenuEnabled( FALSE ); MetaDataBase::addEntry( TQT_TQOBJECT(dw) ); mw->setCentralWidget( dw ); @@ -952,9 +952,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa return mw; } else if ( className == TQTOOLBOX_OBJECT_NAME_STRING ) { if ( !init ) - return new QDesignerToolBox( tqparent, name ); - TQToolBox *tb = new QDesignerToolBox( tqparent, name ); - FormWindow *fw = find_formwindow( tqparent ); + return new QDesignerToolBox( parent, name ); + TQToolBox *tb = new QDesignerToolBox( parent, name ); + FormWindow *fw = find_formwindow( parent ); TQWidget *w = fw ? new QDesignerWidget( fw, tb, "page1" ) : new TQWidget( tb, "page1" ); tb->addItem( w, i18n("Page 1") ); @@ -967,14 +967,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } #ifndef TQT_NO_SQL else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) { - TQWidget *w = new QDesignerDataBrowser( tqparent, name ); - if ( tqparent ) - w->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); + TQWidget *w = new QDesignerDataBrowser( parent, name ); + if ( parent ) + w->reparent( parent, TQPoint( 0, 0 ), TRUE ); return w; } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) { - TQWidget *w = new QDesignerDataView( tqparent, name ); - if ( tqparent ) - w->reparent( tqparent, TQPoint( 0, 0 ), TRUE ); + TQWidget *w = new QDesignerDataView( parent, name ); + if ( parent ) + w->reparent( parent, TQPoint( 0, 0 ), TRUE ); return w; } #endif @@ -984,7 +984,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa if ( !iface ) return 0; - TQWidget *w = iface->create( className, tqparent, name ); + TQWidget *w = iface->create( className, parent, name ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS if ( init && WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( className ) ) ) { TQWidgetContainerInterfacePrivate *iface2 = 0; @@ -1075,7 +1075,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout ) while ( o ) { if ( o->isWidgetType() ) return (TQWidget*)o; - o = o->tqparent(); + o = o->parent(); } return 0; } @@ -1124,10 +1124,10 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) } /*! Returns the actual designer widget of the container \a w. This is - normally \a w itself, but might be a tqparent or grand tqparent of \a w + normally \a w itself, but might be a parent or grand parent of \a w (e.g. when working with a tabwidget and \a w is the container which contains and layouts childs, but the actual widget known to the - designer is the tabwidget which is the tqparent of \a w. So this + designer is the tabwidget which is the parent of \a w. So this function returns the tabwidget then.) */ @@ -1170,11 +1170,11 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) else if ( ::tqqt_cast<TQSizeGrip*>(o) ) return ( lastWasAPassiveInteractor = TRUE ); else if ( ::tqqt_cast<TQButton*>(o) && - ( ::tqqt_cast<TQTabBar*>(o->tqparent()) || ::tqqt_cast<TQToolBox*>(o->tqparent()) ) ) + ( ::tqqt_cast<TQTabBar*>(o->parent()) || ::tqqt_cast<TQToolBox*>(o->parent()) ) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::tqqt_cast<TQPushButton*>(o) && ::tqqt_cast<TQWizard*>(o->tqparent()) ) + else if ( ::tqqt_cast<TQPushButton*>(o) && ::tqqt_cast<TQWizard*>(o->parent()) ) return ( lastWasAPassiveInteractor = TRUE ); - else if ( ::tqqt_cast<TQMenuBar*>(o) && ::tqqt_cast<TQMainWindow*>(o->tqparent()) ) + else if ( ::tqqt_cast<TQMenuBar*>(o) && ::tqqt_cast<TQMainWindow*>(o->parent()) ) return ( lastWasAPassiveInteractor = TRUE ); // else if ( ::tqqt_cast<TQDockWindowHandle*>(o) ) else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) ) @@ -1314,7 +1314,7 @@ void WidgetFactory::initChangedProperties( TQObject *o ) ::tqqt_cast<TQRadioButton*>(o) || ::tqqt_cast<TQCheckBox*>(o) || ::tqqt_cast<TQToolButton*>(o) ) { - if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->tqparent()))) { + if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "textLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE ); @@ -1400,14 +1400,14 @@ bool WidgetFactory::hasItems( int id, TQObject *editorWidget ) return FALSE; } -void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ) +void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) { TQString className = WidgetDatabase::className( id ); if ( className.contains( "ListBox" ) ) { if ( !::tqqt_cast<TQListBox*>(editWidget) ) return; - ListBoxEditor *e = new ListBoxEditor( tqparent, editWidget, fw ); + ListBoxEditor *e = new ListBoxEditor( parent, editWidget, fw ); e->exec(); delete e; return; @@ -1417,7 +1417,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if ( !::tqqt_cast<TQComboBox*>(editWidget) ) return; TQComboBox *cb = (TQComboBox*)editWidget; - ListBoxEditor *e = new ListBoxEditor( tqparent, cb->listBox(), fw ); + ListBoxEditor *e = new ListBoxEditor( parent, cb->listBox(), fw ); e->exec(); delete e; cb->update(); @@ -1428,7 +1428,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if ( !::tqqt_cast<TQListView*>(editWidget) ) return; TQListView *lv = (TQListView*)editWidget; - ListViewEditor *e = new ListViewEditor( tqparent, lv, fw ); + ListViewEditor *e = new ListViewEditor( parent, lv, fw ); e->exec(); delete e; return; @@ -1437,21 +1437,21 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget if ( className.contains( "IconView" ) ) { if ( !::tqqt_cast<TQIconView*>(editWidget) ) return; - IconViewEditor *e = new IconViewEditor( tqparent, editWidget, fw ); + IconViewEditor *e = new IconViewEditor( parent, editWidget, fw ); e->exec(); delete e; return; } if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING ) { - MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, tqparent, editWidget, fw ); + MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, parent, editWidget, fw ); e->exec(); delete e; return; } #ifndef TQT_NO_TABLE if (::tqqt_cast<TQTable*>(editWidget) != 0) { - TableEditor *e = new TableEditor( tqparent, editWidget, fw ); + TableEditor *e = new TableEditor( parent, editWidget, fw ); e->exec(); delete e; return; @@ -1527,11 +1527,11 @@ TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propNam return p->valueToKey( defaultValue( w, propName ).toInt() ); } -TQWidget *WidgetFactory::createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w ) +TQWidget *WidgetFactory::createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w ) { if ( !w ) return 0; - return new CustomWidget( tqparent, name, w ); + return new CustomWidget( parent, name, w ); } TQVariant WidgetFactory::property( TQObject *w, const char *name ) @@ -1601,7 +1601,7 @@ bool TQLayoutWidget::event( TQEvent *e ) /* This function must be called on TQLayoutWidget creation and whenever - the TQLayoutWidget's tqparent tqlayout changes (e.g., from a TQHBoxLayout + the TQLayoutWidget's parent tqlayout changes (e.g., from a TQHBoxLayout to a TQVBoxLayout), because of the (illogical) way layouting works. */ void TQLayoutWidget::updateSizePolicy() @@ -1626,12 +1626,12 @@ void TQLayoutWidget::updateSizePolicy() if ( tqlayout() ) { /* - parentLayout is set to the tqparent tqlayout if there is one and if it is + parentLayout is set to the parent tqlayout if there is one and if it is top level, in which case layouting is illogical. */ TQLayout *parentLayout = 0; - if ( tqparent() && tqparent()->isWidgetType() ) { - parentLayout = ((TQWidget *)tqparent())->tqlayout(); + if ( parent() && parent()->isWidgetType() ) { + parentLayout = ((TQWidget *)parent())->tqlayout(); if ( parentLayout && ::tqqt_cast<TQLayoutWidget*>(parentLayout->mainWidget()) ) parentLayout = 0; @@ -1748,17 +1748,17 @@ CustomWidgetFactory::CustomWidgetFactory() { } -TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const +TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name ) const { MetaDataBase::CustomWidget *w = MetaDataBase::customWidget( WidgetDatabase::idFromClassName( className ) ); if ( !w ) return 0; - return WidgetFactory::createCustomWidget( tqparent, name, w ); + return WidgetFactory::createCustomWidget( parent, name, w ); } -QDesignerToolBox::QDesignerToolBox( TQWidget *tqparent, const char *name ) - : TQToolBox( tqparent, name ) +QDesignerToolBox::QDesignerToolBox( TQWidget *parent, const char *name ) + : TQToolBox( parent, name ) { } diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h index 43f19f7f..1bb1f1f3 100644 --- a/kdevdesigner/designer/widgetfactory.h +++ b/kdevdesigner/designer/widgetfactory.h @@ -60,7 +60,7 @@ class CustomWidgetFactory : public TQWidgetFactory { public: CustomWidgetFactory(); - TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const; + TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const; }; @@ -76,7 +76,7 @@ public: NoLayout }; - static TQWidget *create( int id, TQWidget *tqparent, const char *name = 0, bool init = TRUE, + static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE, const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal ); static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type ); static void deleteLayout( TQWidget *widget ); @@ -96,7 +96,7 @@ public: static bool hasSpecialEditor( int id, TQObject *editorWidget ); static bool hasItems( int id, TQObject *editorWidget ); - static void editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw ); + static void editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw ); static bool canResetProperty( TQObject *w, const TQString &propName ); static bool resetProperty( TQObject *w, const TQString &propName ); @@ -110,9 +110,9 @@ public: static TQString defaultSignal( TQObject *w ); private: - static TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init, + static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, const TQRect *r = 0, Qt::Orientation orient = Qt::Horizontal ); - static TQWidget *createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w ); + static TQWidget *createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w ); static TQGuardedPtr<TQObject> *lastPassiveInteractor; static bool lastWasAPassiveInteractor; @@ -127,7 +127,7 @@ class QDesignerTabWidget : public TQTabWidget TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - QDesignerTabWidget( TQWidget *tqparent, const char *name ); + QDesignerTabWidget( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -156,7 +156,7 @@ class QDesignerWidgetStack : public TQWidgetStack TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true ) public: - QDesignerWidgetStack( TQWidget *tqparent, const char *name ); + QDesignerWidgetStack( TQWidget *parent, const char *name ); int currentPage() const; void setCurrentPage( int i ); @@ -203,8 +203,8 @@ class QDesignerWizard : public TQWizard TQ_OVERRIDE( bool modal READ isModal WRITE setModal ) public: - QDesignerWizard( TQWidget *tqparent, const char *name ) - : TQWizard( tqparent, name ), modal(FALSE) {} + QDesignerWizard( TQWidget *parent, const char *name ) + : TQWizard( parent, name ), modal(FALSE) {} int currentPageNum() const; void setCurrentPage( int i ); @@ -242,7 +242,7 @@ class TQLayoutWidget : public TQWidget TQ_OBJECT public: - TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( sizePolicy() ) {} + TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( sizePolicy() ) {} TQSizePolicy sizePolicy() const; void updateSizePolicy(); @@ -261,8 +261,8 @@ class CustomWidget : public TQWidget TQ_OBJECT public: - CustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *cw ) - : TQWidget( tqparent, name ), cusw( cw ) { + CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw ) + : TQWidget( parent, name ), cusw( cw ) { alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" ); tqsetSizePolicy( cw->sizePolicy ); if ( !alwaysExpand ) @@ -299,8 +299,8 @@ class Line : public TQFrame TQ_OVERRIDE( TQRect frameRect DESIGNABLE false ) TQ_OVERRIDE( TQRect contentsRect DESIGNABLE false ) public: - Line( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, WMouseNoMask ) { + Line( TQWidget *parent, const char *name ) + : TQFrame( parent, name, WMouseNoMask ) { setFrameStyle( HLine | Sunken ); } @@ -323,8 +323,8 @@ class QDesignerLabel : public TQLabel TQ_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget ) public: - QDesignerLabel( TQWidget *tqparent = 0, const char *name = 0 ) - : TQLabel( tqparent, name ) { myBuddy = 0; } + QDesignerLabel( TQWidget *parent = 0, const char *name = 0 ) + : TQLabel( parent, name ) { myBuddy = 0; } void setBuddyWidget( const TQCString &b ) { myBuddy = b; @@ -354,9 +354,9 @@ class QDesignerWidget : public TQWidget TQ_OBJECT public: - QDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, WResizeNoErase ), formwindow( fw ) { - need_frame = tqparent && tqparent->inherits("QDesignerWidgetStack" ); + QDesignerWidget( FormWindow *fw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, WResizeNoErase ), formwindow( fw ) { + need_frame = parent && parent->inherits("QDesignerWidgetStack" ); } protected: @@ -376,8 +376,8 @@ class QDesignerDialog : public TQDialog TQ_OVERRIDE( bool modal READ isModal WRITE setModal ) public: - QDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name ) - : TQDialog( tqparent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {} + QDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name ) + : TQDialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {} bool isModal() const { return modal; } void setModal(bool b) { modal = b; } @@ -398,8 +398,8 @@ class QDesignerToolButton : public TQToolButton TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - QDesignerToolButton( TQWidget *tqparent, const char *name ) - : TQToolButton( tqparent, name ) {} + QDesignerToolButton( TQWidget *parent, const char *name ) + : TQToolButton( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); @@ -422,8 +422,8 @@ class QDesignerRadioButton : public TQRadioButton TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - QDesignerRadioButton( TQWidget *tqparent, const char *name ) - : TQRadioButton( tqparent, name ) {} + QDesignerRadioButton( TQWidget *parent, const char *name ) + : TQRadioButton( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); @@ -447,8 +447,8 @@ class QDesignerPushButton : public TQPushButton TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - QDesignerPushButton( TQWidget *tqparent, const char *name ) - : TQPushButton( tqparent, name ) {} + QDesignerPushButton( TQWidget *parent, const char *name ) + : TQPushButton( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); @@ -472,8 +472,8 @@ class QDesignerCheckBox : public TQCheckBox TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) public: - QDesignerCheckBox( TQWidget *tqparent, const char *name ) - : TQCheckBox( tqparent, name ) {} + QDesignerCheckBox( TQWidget *parent, const char *name ) + : TQCheckBox( parent, name ) {} bool isInButtonGroup() const { return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); @@ -499,7 +499,7 @@ class QDesignerToolBox : public TQToolBox TQ_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true ) public: - QDesignerToolBox( TQWidget *tqparent, const char *name ); + QDesignerToolBox( TQWidget *parent, const char *name ); TQString itemLabel() const; void setItemLabel( const TQString &l ); diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp index 587f46d3..850cafef 100644 --- a/kdevdesigner/designer/wizardeditorimpl.cpp +++ b/kdevdesigner/designer/wizardeditorimpl.cpp @@ -38,8 +38,8 @@ #include <klocale.h> -WizardEditor::WizardEditor( TQWidget *tqparent, TQWizard *w, FormWindow *fw ) - : WizardEditorBase( tqparent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 ) +WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) + : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 ) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); fillListBox(); diff --git a/kdevdesigner/designer/wizardeditorimpl.h b/kdevdesigner/designer/wizardeditorimpl.h index 94a9e900..84b8c20c 100644 --- a/kdevdesigner/designer/wizardeditorimpl.h +++ b/kdevdesigner/designer/wizardeditorimpl.h @@ -41,7 +41,7 @@ class WizardEditor : public WizardEditorBase TQ_OBJECT public: - WizardEditor( TQWidget *tqparent, TQWizard *wizard, FormWindow *fw ); + WizardEditor( TQWidget *parent, TQWizard *wizard, FormWindow *fw ); ~WizardEditor(); protected slots: diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp index 664a586e..5f92b691 100644 --- a/kdevdesigner/designer/workspace.cpp +++ b/kdevdesigner/designer/workspace.cpp @@ -53,8 +53,8 @@ #include <klocale.h> -WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p ) + : TQListViewItem( parent ) { init(); project = p; @@ -63,8 +63,8 @@ WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p ) setExpandable( FALSE ); } -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf ) + : TQListViewItem( parent ) { init(); sourceFile = sf; @@ -72,8 +72,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ) setPixmap( 0, SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) ); } -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ) + : TQListViewItem( parent ) { init(); object = o; @@ -84,8 +84,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p listView(), TQT_SLOT( update() ) ); } -WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type type ) - : TQListViewItem( tqparent ) +WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) + : TQListViewItem( parent ) { init(); formFile = ff; @@ -119,8 +119,8 @@ void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, if ( type() == FormSourceType && ( !formFile->hasFormCode() || ( formFile->codeFileState() == FormFile::Deleted && formFile->formWindow() ) ) && - tqparent() && tqparent()->tqparent() && ( (WorkspaceItem*)tqparent()->tqparent() )->project && - ( (WorkspaceItem*)tqparent()->tqparent() )->project->isCpp() ) { + parent() && parent()->parent() && ( (WorkspaceItem*)parent()->parent() )->project && + ( (WorkspaceItem*)parent()->parent() )->project->isCpp() ) { g.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().color( TQColorGroup::Text) ); g.setColor( TQColorGroup::HighlightedText, listView()->tqpalette().disabled().color( TQColorGroup::Text) ); } else { @@ -252,8 +252,8 @@ TQString WorkspaceItem::key( int column, bool ) const TQColor WorkspaceItem::backgroundColor() { bool b = useOddColor; - if ( t == FormSourceType && tqparent() ) - b = ( ( WorkspaceItem*)tqparent() )->useOddColor; + if ( t == FormSourceType && parent() ) + b = ( ( WorkspaceItem*)parent() )->useOddColor; return b ? *backColor2 : *backColor1; } @@ -270,8 +270,8 @@ void WorkspaceItem::setAutoOpen( bool b ) autoOpen = b; } -Workspace::Workspace( TQWidget *tqparent, MainWindow *mw ) - : TQListView( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | +Workspace::Workspace( TQWidget *parent, MainWindow *mw ) + : TQListView( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_Tool | WStyle_MinMax | WStyle_SysMenu ), mainWindow( mw ), project( 0 ), completionDirty( FALSE ) { @@ -499,7 +499,7 @@ void Workspace::closeAutoOpenItems() TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { WorkspaceItem* i = (WorkspaceItem*) it.current(); - WorkspaceItem* ip = (WorkspaceItem*) i->tqparent(); + WorkspaceItem* ip = (WorkspaceItem*) i->parent(); if ( i->type() == WorkspaceItem::FormSourceType ) { if ( !i->isSelected() && !ip->isSelected() && ip->isAutoOpen() ) { diff --git a/kdevdesigner/designer/workspace.h b/kdevdesigner/designer/workspace.h index b3bb705e..ad88dfca 100644 --- a/kdevdesigner/designer/workspace.h +++ b/kdevdesigner/designer/workspace.h @@ -47,10 +47,10 @@ class WorkspaceItem : public TQListViewItem public: enum Type { ProjectType, FormFileType, FormSourceType, SourceFileType, ObjectType }; - WorkspaceItem( TQListView *tqparent, Project* p ); - WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf ); - WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type t = FormFileType ); - WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p ); + WorkspaceItem( TQListView *parent, Project* p ); + WorkspaceItem( TQListViewItem *parent, SourceFile* sf ); + WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type t = FormFileType ); + WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ); void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); @@ -90,7 +90,7 @@ class Workspace : public TQListView TQ_OBJECT public: - Workspace( TQWidget *tqparent , MainWindow *mw ); + Workspace( TQWidget *parent , MainWindow *mw ); void setCurrentProject( Project *pro ); diff --git a/kdevdesigner/interfaces/actioninterface.h b/kdevdesigner/interfaces/actioninterface.h index 03e1c98e..cf217ee7 100644 --- a/kdevdesigner/interfaces/actioninterface.h +++ b/kdevdesigner/interfaces/actioninterface.h @@ -55,12 +55,12 @@ public: }; /*! This functions is called to create the action with the name \a - name. \a tqparent should be used as tqparent of the action. + name. \a parent should be used as parent of the action. In the implementation return the TQAction object for the action \a name. */ - virtual TQAction* create( const TQString &name, TQObject* tqparent = 0 ) = 0; + virtual TQAction* create( const TQString &name, TQObject* parent = 0 ) = 0; /*! In the implementation of the interface return the name of the group of the action \a name. diff --git a/kdevdesigner/interfaces/classbrowserinterface.h b/kdevdesigner/interfaces/classbrowserinterface.h index d76df941..99dc4911 100644 --- a/kdevdesigner/interfaces/classbrowserinterface.h +++ b/kdevdesigner/interfaces/classbrowserinterface.h @@ -53,7 +53,7 @@ struct ClassBrowserInterface : public TQUnknownInterface { enum Type { Class, Function }; - virtual TQListView *createClassBrowser( TQWidget *tqparent ) const = 0; + virtual TQListView *createClassBrowser( TQWidget *parent ) const = 0; virtual void update( const TQString &code ) const = 0; virtual void clear() const = 0; diff --git a/kdevdesigner/interfaces/designerinterface.h b/kdevdesigner/interfaces/designerinterface.h index d6d980cc..d5aeebf6 100644 --- a/kdevdesigner/interfaces/designerinterface.h +++ b/kdevdesigner/interfaces/designerinterface.h @@ -180,7 +180,7 @@ struct DesignerFormWindow virtual bool isModified() const = 0; virtual void insertWidget( TQWidget * ) = 0; virtual void removeWidget( TQWidget * ) = 0; - virtual TQWidget *create( const char *className, TQWidget *tqparent, const char *name ) = 0; + virtual TQWidget *create( const char *className, TQWidget *parent, const char *name ) = 0; virtual TQWidgetList widgets() const = 0; virtual void undo() = 0; virtual void redo() = 0; @@ -209,7 +209,7 @@ struct DesignerFormWindow virtual void setCurrentWidget( TQWidget * ) = 0; virtual TQPtrList<TQAction> actionList() const = 0; virtual TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel, - TQObject* tqparent, const char* name = 0, bool toggle = FALSE ) = 0; + TQObject* parent, const char* name = 0, bool toggle = FALSE ) = 0; virtual void addAction( TQAction * ) = 0; virtual void removeAction( TQAction * ) = 0; virtual void preview() const = 0; diff --git a/kdevdesigner/interfaces/editorinterface.h b/kdevdesigner/interfaces/editorinterface.h index 21a76fb1..29055324 100644 --- a/kdevdesigner/interfaces/editorinterface.h +++ b/kdevdesigner/interfaces/editorinterface.h @@ -62,7 +62,7 @@ struct EditorInterface : public TQUnknownInterface }; virtual TQWidget *editor( bool readOnly, - TQWidget *tqparent, + TQWidget *parent, TQUnknownInterface *designerIface ) = 0; virtual void setText( const TQString &txt ) = 0; diff --git a/kdevdesigner/plugins/languageinterfaceimpl.cpp b/kdevdesigner/plugins/languageinterfaceimpl.cpp index fb05aaeb..d761a9e7 100644 --- a/kdevdesigner/plugins/languageinterfaceimpl.cpp +++ b/kdevdesigner/plugins/languageinterfaceimpl.cpp @@ -33,19 +33,19 @@ #include <tqmetaobject.h> LanguageInterfaceImpl::LanguageInterfaceImpl( TQUnknownInterface *outer ) - : tqparent( outer ), ref( 0 ) + : parent( outer ), ref( 0 ) { } ulong LanguageInterfaceImpl::addRef() { - return tqparent ? tqparent->addRef() : ref++; + return parent ? parent->addRef() : ref++; } ulong LanguageInterfaceImpl::release() { - if ( tqparent ) - return tqparent->release(); + if ( parent ) + return parent->release(); if ( !--ref ) { delete this; return 0; @@ -55,8 +55,8 @@ ulong LanguageInterfaceImpl::release() TQRESULT LanguageInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface** iface ) { - if ( tqparent ) - return tqparent->queryInterface( uuid, iface ); + if ( parent ) + return parent->queryInterface( uuid, iface ); *iface = 0; if ( uuid == IID_TQUnknown ) diff --git a/kdevdesigner/plugins/languageinterfaceimpl.h b/kdevdesigner/plugins/languageinterfaceimpl.h index 56c675ae..b9db9997 100644 --- a/kdevdesigner/plugins/languageinterfaceimpl.h +++ b/kdevdesigner/plugins/languageinterfaceimpl.h @@ -75,7 +75,7 @@ public: TQStrList signalNames( TQObject *obj ) const; private: - TQUnknownInterface *tqparent; + TQUnknownInterface *parent; ulong ref; }; diff --git a/kdevdesigner/uilib/database.cpp b/kdevdesigner/uilib/database.cpp index 89e17a6b..2b1956a9 100644 --- a/kdevdesigner/uilib/database.cpp +++ b/kdevdesigner/uilib/database.cpp @@ -46,7 +46,7 @@ DatabaseSupport::DatabaseSupport() { con = 0; frm = 0; - tqparent = 0; + parent = 0; } void DatabaseSupport::initPreview( const TQString &connection, const TQString &table, TQObject *o, @@ -54,7 +54,7 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t { tbl = table; dbControls = databaseControls; - tqparent = o; + parent = o; if ( connection != "(default)" ) con = TQSqlDatabase::database( connection ); @@ -62,15 +62,15 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t con = TQSqlDatabase::database(); frm = new TQSqlForm( o, table.ascii() ); for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) { - TQObject *chld = tqparent->child( it.key().ascii(), TQWIDGET_OBJECT_NAME_STRING ); + TQObject *chld = parent->child( it.key().ascii(), TQWIDGET_OBJECT_NAME_STRING ); if ( !chld ) continue; frm->insert( (TQWidget*)chld, *it ); } } -TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *tqparent, const char *name ) - : TQDataBrowser( tqparent, name ) +TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *parent, const char *name ) + : TQDataBrowser( parent, name ) { } @@ -96,8 +96,8 @@ bool TQDesignerDataBrowser::event( TQEvent* e ) return b; } -TQDesignerDataView::TQDesignerDataView( TQWidget *tqparent, const char *name ) - : TQDataView( tqparent, name ) +TQDesignerDataView::TQDesignerDataView( TQWidget *parent, const char *name ) + : TQDataView( parent, name ) { } diff --git a/kdevdesigner/uilib/database2.h b/kdevdesigner/uilib/database2.h index c8881736..c0de2b3d 100644 --- a/kdevdesigner/uilib/database2.h +++ b/kdevdesigner/uilib/database2.h @@ -52,7 +52,7 @@ protected: TQSqlForm* frm; TQString tbl; TQMap<TQString, TQString> dbControls; - TQObject *tqparent; + TQObject *parent; }; @@ -62,7 +62,7 @@ class QDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2 TQ_OBJECT public: - QDesignerDataBrowser2( TQWidget *tqparent, const char *name ); + QDesignerDataBrowser2( TQWidget *parent, const char *name ); protected: bool event( TQEvent* e ); @@ -74,7 +74,7 @@ class QDesignerDataView2 : public TQDataView, public DatabaseSupport2 TQ_OBJECT public: - QDesignerDataView2( TQWidget *tqparent, const char *name ); + QDesignerDataView2( TQWidget *parent, const char *name ); protected: bool event( TQEvent* e ); diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp index 842f8a92..c61584a7 100644 --- a/kdevdesigner/uilib/qwidgetfactory.cpp +++ b/kdevdesigner/uilib/qwidgetfactory.cpp @@ -260,7 +260,7 @@ TQWidgetFactory::~TQWidgetFactory() /*! Loads the \e{TQt Designer} user interface description file \a uiFile - and returns the top-level widget in that description. \a tqparent and + and returns the top-level widget in that description. \a parent and \a name are passed to the constructor of the top-level widget. This function also performs signal and slot connections, tab @@ -278,7 +278,7 @@ TQWidgetFactory::~TQWidgetFactory() */ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) { setupPluginDir(); TQFile f( uiFile ); @@ -295,7 +295,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, return 0; qwf_currFileName = uiFile; - TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&f), connector, tqparent, name ); + TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&f), connector, parent, name ); if ( !qwf_forms ) qwf_forms = new TQMap<TQWidget*, TQString>; qwf_forms->insert( w, uiFile ); @@ -308,7 +308,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, Loads the user interface description from device \a dev. */ -TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *tqparent, const char *name ) +TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *parent, const char *name ) { setupPluginDir(); TQWidget *w = 0; @@ -326,12 +326,12 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge TQDataStream in( dev ); in >> magic; if ( magic == UibMagic ) { - w = widgetFactory->createFromUibFile( in, connector, tqparent, name ); + w = widgetFactory->createFromUibFile( in, connector, parent, name ); } else { in.unsetDevice(); dev->at( start ); if ( doc.setContent( dev, &errMsg, &errLine ) ) { - w = widgetFactory->createFromUiFile( doc, connector, tqparent, name ); + w = widgetFactory->createFromUiFile( doc, connector, parent, name ); } else { // qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); } @@ -405,7 +405,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge } TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connector, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) { DomTool::fixDocument( doc ); @@ -466,7 +466,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec if ( !imageCollection.isNull() ) loadImageCollection( imageCollection ); - createWidgetInternal( widget, tqparent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) ); + createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) ); TQWidget *w = toplevel; if ( !w ) return 0; @@ -652,7 +652,7 @@ void TQWidgetFactory::unpackVariant( const UibStrTable& strings, TQDataStream& i } void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, - TQLayout *tqparent ) + TQLayout *parent ) { TQCString name; TQVariant value; @@ -695,7 +695,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, in >> objectTag; } - if ( tqparent != 0 ) { + if ( parent != 0 ) { TQSpacerItem *spacer; if ( vertical ) { spacer = new TQSpacerItem( w, h, TQSizePolicy::Minimum, sizeType ); @@ -703,18 +703,18 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, spacer = new TQSpacerItem( w, h, sizeType, TQSizePolicy::Minimum ); } - if ( tqparent->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { - ((TQGridLayout *) tqparent)->addMultiCell( spacer, row, + if ( parent->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { + ((TQGridLayout *) parent)->addMultiCell( spacer, row, row + rowspan - 1, column, column + colspan - 1, vertical ? TQt::AlignHCenter : TQt::AlignVCenter ); } else { - tqparent->addItem( spacer ); + parent->addItem( spacer ); } } } void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, - TQDataStream& in, TQObject *tqparent, + TQDataStream& in, TQObject *parent, bool isRow ) { TQString text; @@ -762,13 +762,13 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, in >> objectTag; } - if ( tqparent != 0 ) { - if ( tqparent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) ) { - createListViewColumn( (TQListView *) tqparent, text, pixmap, clickable, + if ( parent != 0 ) { + if ( parent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) ) { + createListViewColumn( (TQListView *) parent, text, pixmap, clickable, resizable ); #ifndef TQT_NO_TABLE - } else if ( tqparent->inherits(TQTABLE_OBJECT_NAME_STRING) ) { - createTableColumnOrRow( (TQTable *) tqparent, text, pixmap, field, + } else if ( parent->inherits(TQTABLE_OBJECT_NAME_STRING) ) { + createTableColumnOrRow( (TQTable *) parent, text, pixmap, field, isRow ); #endif } @@ -776,7 +776,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, } void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, - TQObject *tqparent, TQListViewItem *parentItem ) + TQObject *parent, TQListViewItem *parentItem ) { TQStringList texts; TQValueList<TQPixmap> pixmaps; @@ -786,8 +786,8 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, TQ_UINT8 objectTag; TQListView *listView = 0; - if ( tqparent != 0 && tqparent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) ) - tqparent = TQT_TQOBJECT((TQListView *) tqparent); + if ( parent != 0 && parent->inherits(TQLISTVIEW_OBJECT_NAME_STRING) ) + parent = TQT_TQOBJECT((TQListView *) parent); TQListViewItem *item = 0; if ( listView != 0 ) { if ( parentItem == 0 ) { @@ -804,7 +804,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, case Object_Item: if ( listView != 0 ) d->lastItem->setOpen( TRUE ); - inputItem( strings, in, tqparent, item ); + inputItem( strings, in, parent, item ); break; case Object_TextProperty: unpackCString( strings, in, name ); @@ -847,12 +847,12 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, TQString text = texts.last(); TQPixmap pixmap = pixmaps.last(); - if ( tqparent != 0 ) { - if ( tqparent->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || - tqparent->inherits(TQLISTBOX_OBJECT_NAME_STRING) ) { - TQListBox *listBox = (TQListBox *) tqparent->qt_cast( TQLISTBOX_OBJECT_NAME_STRING ); + if ( parent != 0 ) { + if ( parent->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || + parent->inherits(TQLISTBOX_OBJECT_NAME_STRING) ) { + TQListBox *listBox = (TQListBox *) parent->qt_cast( TQLISTBOX_OBJECT_NAME_STRING ); if ( listBox == 0 ) - listBox = ((TQComboBox *) tqparent)->listBox(); + listBox = ((TQComboBox *) parent)->listBox(); if ( pixmap.isNull() ) { (void) new TQListBoxText( listBox, text ); @@ -860,8 +860,8 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, (void) new TQListBoxPixmap( listBox, pixmap, text ); } #ifndef TQT_NO_ICONVIEW - } else if ( tqparent->inherits(TQICONVIEW_OBJECT_NAME_STRING) ) { - (void) new TQIconViewItem( (TQIconView *) tqparent, text, pixmap ); + } else if ( parent->inherits(TQICONVIEW_OBJECT_NAME_STRING) ) { + (void) new TQIconViewItem( (TQIconView *) parent, text, pixmap ); #endif } } @@ -903,7 +903,7 @@ void TQWidgetFactory::inputMenuItem( TQObject **objects, TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, const UibStrTable& strings, TQDataStream& in, TQWidget *ancestorWidget, - TQObject *tqparent, TQCString className ) + TQObject *parent, TQCString className ) { TQObject *obj = 0; TQWidget *widget = 0; @@ -913,15 +913,15 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, bool isTQObject = !className.isEmpty(); if ( isTQObject ) { - if ( tqparent != 0 ) { - if ( tqparent->isWidgetType() ) { - if ( tqparent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) ) { - parentWidget = ((TQMainWindow *) tqparent)->centralWidget(); + if ( parent != 0 ) { + if ( parent->isWidgetType() ) { + if ( parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) ) { + parentWidget = ((TQMainWindow *) parent)->centralWidget(); } else { - parentWidget = (TQWidget *) tqparent; + parentWidget = (TQWidget *) parent; } - } else if ( tqparent->inherits(TQLAYOUT_OBJECT_NAME_STRING) ) { - parentLayout = (TQLayout *) tqparent; + } else if ( parent->inherits(TQLAYOUT_OBJECT_NAME_STRING) ) { + parentLayout = (TQLayout *) parent; parentWidget = ancestorWidget; } } @@ -929,9 +929,9 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( className == TQACTION_OBJECT_NAME_STRING ) { unpackCString( strings, in, className ); if ( className == TQACTIONGROUP_OBJECT_NAME_STRING ) { - obj = new TQActionGroup( tqparent ); + obj = new TQActionGroup( parent ); } else { - obj = new TQAction( tqparent ); + obj = new TQAction( parent ); } } else if ( className == TQLAYOUT_OBJECT_NAME_STRING ) { unpackCString( strings, in, className ); @@ -949,13 +949,13 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, obj = TQT_TQOBJECT(tqlayout); } else if ( className == TQMENUBAR_OBJECT_NAME_STRING ) { unpackCString( strings, in, className ); - widget = ((TQMainWindow *) tqparent)->menuBar(); + widget = ((TQMainWindow *) parent)->menuBar(); obj = TQT_TQOBJECT(widget); } else if ( className == TQTOOLBAR_OBJECT_NAME_STRING ) { TQ_UINT8 dock; in >> dock; unpackCString( strings, in, className ); - widget = new TQToolBar( TQString(), (TQMainWindow *) tqparent, + widget = new TQToolBar( TQString(), (TQMainWindow *) parent, (TQt::Dock) dock ); obj = TQT_TQOBJECT(widget); } else if ( className == TQWIDGET_OBJECT_NAME_STRING ) { @@ -1099,7 +1099,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, break; case Object_SubAction: inputObject( objects, numObjects, strings, in, parentWidget, - obj != 0 ? obj : tqparent, TQACTION_OBJECT_NAME_STRING ); + obj != 0 ? obj : parent, TQACTION_OBJECT_NAME_STRING ); break; case Object_SubLayout: inputObject( objects, numObjects, strings, in, parentWidget, obj, @@ -1117,11 +1117,11 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( metAttribute > 0 ) { if ( name == "title" ) { - if ( tqparent != 0 ) { - if ( tqparent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) ) { - ((TQTabWidget *) tqparent)->insertTab( widget, str ); - } else if ( tqparent->inherits(TQWIZARD_OBJECT_NAME_STRING) ) { - ((TQWizard *) tqparent)->addPage( widget, str ); + if ( parent != 0 ) { + if ( parent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) ) { + ((TQTabWidget *) parent)->insertTab( widget, str ); + } else if ( parent->inherits(TQWIZARD_OBJECT_NAME_STRING) ) { + ((TQWizard *) parent)->addPage( widget, str ); } } } @@ -1136,8 +1136,8 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, if ( metAttribute > 0 ) { if ( name == "id" ) { - if ( tqparent != 0 && tqparent->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING) ) - ((TQWidgetStack *) tqparent)->addWidget( widget, value.toInt() ); + if ( parent != 0 && parent->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING) ) + ((TQWidgetStack *) parent)->addWidget( widget, value.toInt() ); } } else { if ( obj != 0 ) @@ -1172,7 +1172,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, } TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, - TQObject * /* connector */ , TQWidget *tqparent, const char *name ) + TQObject * /* connector */ , TQWidget *parent, const char *name ) { #define END_OF_BLOCK() \ ( in.atEnd() || in.tqdevice()->at() >= nextBlock ) @@ -1344,7 +1344,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, break; case Block_Widget: toplevel = (TQWidget *) - inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(tqparent), + inputObject( objects, numObjects, strings, in, toplevel, TQT_TQOBJECT(parent), TQWIDGET_OBJECT_NAME_STRING ); if ( toplevel != 0 ) toplevel->setName( name ); @@ -1370,7 +1370,7 @@ void TQWidgetFactory::addWidgetFactory( TQWidgetFactory *factory ) } /*! - Creates a widget of the type \a className passing \a tqparent and \a + Creates a widget of the type \a className passing \a parent and \a name to its constructor. If \a className is a widget in the TQt library, it is directly @@ -1406,106 +1406,106 @@ void TQWidgetFactory::addWidgetFactory( TQWidgetFactory *factory ) \endlist */ -TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, +TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name ) const { // create widgets we know if ( className == TQPUSHBUTTON_OBJECT_NAME_STRING ) { - return new TQPushButton( tqparent, name ); + return new TQPushButton( parent, name ); } else if ( className == TQTOOLBUTTON_OBJECT_NAME_STRING ) { - return new TQToolButton( tqparent, name ); + return new TQToolButton( parent, name ); } else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) { - return new TQCheckBox( tqparent, name ); + return new TQCheckBox( parent, name ); } else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) { - return new TQRadioButton( tqparent, name ); + return new TQRadioButton( parent, name ); } else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) { - return new TQGroupBox( tqparent, name ); + return new TQGroupBox( parent, name ); } else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) { - return new TQButtonGroup( tqparent, name ); + return new TQButtonGroup( parent, name ); } else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) { #if !defined(TQT_NO_ICONVIEW) - return new TQIconView( tqparent, name ); + return new TQIconView( parent, name ); #endif } else if ( className == TQTABLE_OBJECT_NAME_STRING ) { #if !defined(TQT_NO_TABLE) - return new TQTable( tqparent, name ); + return new TQTable( parent, name ); #endif } else if ( className == TQLISTBOX_OBJECT_NAME_STRING ) { - return new TQListBox( tqparent, name ); + return new TQListBox( parent, name ); } else if ( className == TQLISTVIEW_OBJECT_NAME_STRING ) { - return new TQListView( tqparent, name ); + return new TQListView( parent, name ); } else if ( className == TQLINEEDIT_OBJECT_NAME_STRING ) { - return new TQLineEdit( tqparent, name ); + return new TQLineEdit( parent, name ); } else if ( className == TQSPINBOX_OBJECT_NAME_STRING ) { - return new TQSpinBox( tqparent, name ); + return new TQSpinBox( parent, name ); } else if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING ) { - return new TQMultiLineEdit( tqparent, name ); + return new TQMultiLineEdit( parent, name ); } else if ( className == TQLABEL_OBJECT_NAME_STRING || className == "TextLabel" || className == "PixmapLabel" ) { - return new TQLabel( tqparent, name ); + return new TQLabel( parent, name ); } else if ( className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { - return new TQWidget( tqparent, name ); + return new TQWidget( parent, name ); } else if ( className == TQTABWIDGET_OBJECT_NAME_STRING ) { - return new TQTabWidget( tqparent, name ); + return new TQTabWidget( parent, name ); } else if ( className == TQCOMBOBOX_OBJECT_NAME_STRING ) { - return new TQComboBox( FALSE, tqparent, name ); + return new TQComboBox( FALSE, parent, name ); } else if ( className == TQWIDGET_OBJECT_NAME_STRING ) { if ( !qwf_stays_on_top ) - return new TQWidget( tqparent, name ); - return new TQWidget( tqparent, name, TQt::WStyle_StaysOnTop ); + return new TQWidget( parent, name ); + return new TQWidget( parent, name, TQt::WStyle_StaysOnTop ); } else if ( className == TQDIALOG_OBJECT_NAME_STRING ) { if ( !qwf_stays_on_top ) - return new TQDialog( tqparent, name ); - return new TQDialog( tqparent, name, FALSE, TQt::WStyle_StaysOnTop ); + return new TQDialog( parent, name ); + return new TQDialog( parent, name, FALSE, TQt::WStyle_StaysOnTop ); } else if ( className == TQWIZARD_OBJECT_NAME_STRING ) { - return new TQWizard( tqparent, name ); + return new TQWizard( parent, name ); } else if ( className == TQLCDNUMBER_OBJECT_NAME_STRING ) { - return new TQLCDNumber( tqparent, name ); + return new TQLCDNumber( parent, name ); } else if ( className == TQPROGRESSBAR_OBJECT_NAME_STRING ) { - return new TQProgressBar( tqparent, name ); + return new TQProgressBar( parent, name ); } else if ( className == TQTEXTVIEW_OBJECT_NAME_STRING ) { - return new TQTextView( tqparent, name ); + return new TQTextView( parent, name ); } else if ( className == TQTEXTBROWSER_OBJECT_NAME_STRING ) { - return new TQTextBrowser( tqparent, name ); + return new TQTextBrowser( parent, name ); } else if ( className == TQDIAL_OBJECT_NAME_STRING ) { - return new TQDial( tqparent, name ); + return new TQDial( parent, name ); } else if ( className == TQSLIDER_OBJECT_NAME_STRING ) { - return new TQSlider( tqparent, name ); + return new TQSlider( parent, name ); } else if ( className == TQFRAME_OBJECT_NAME_STRING ) { - return new TQFrame( tqparent, name ); + return new TQFrame( parent, name ); } else if ( className == TQSPLITTER_OBJECT_NAME_STRING ) { - return new TQSplitter( tqparent, name ); + return new TQSplitter( parent, name ); } else if ( className == "Line" ) { - TQFrame *f = new TQFrame( tqparent, name ); + TQFrame *f = new TQFrame( parent, name ); f->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); return f; } else if ( className == TQTEXTEDIT_OBJECT_NAME_STRING ) { - return new TQTextEdit( tqparent, name ); + return new TQTextEdit( parent, name ); } else if ( className == TQDATEEDIT_OBJECT_NAME_STRING ) { - return new TQDateEdit( tqparent, name ); + return new TQDateEdit( parent, name ); } else if ( className == TQTIMEEDIT_OBJECT_NAME_STRING ) { - return new TQTimeEdit( tqparent, name ); + return new TQTimeEdit( parent, name ); } else if ( className == TQDATETIMEEDIT_OBJECT_NAME_STRING ) { - return new TQDateTimeEdit( tqparent, name ); + return new TQDateTimeEdit( parent, name ); } else if ( className == TQSCROLLBAR_OBJECT_NAME_STRING ) { - return new TQScrollBar( tqparent, name ); + return new TQScrollBar( parent, name ); } else if ( className == TQPOPUPMENU_OBJECT_NAME_STRING ) { - return new TQPopupMenu( tqparent, name ); + return new TQPopupMenu( parent, name ); } else if ( className == TQWIDGETSTACK_OBJECT_NAME_STRING ) { - return new TQWidgetStack( tqparent, name ); + return new TQWidgetStack( parent, name ); } else if ( className == TQTOOLBOX_OBJECT_NAME_STRING ) { - return new TQToolBox( tqparent, name ); + return new TQToolBox( parent, name ); } else if ( className == TQVBOX_OBJECT_NAME_STRING ) { - return new TQVBox( tqparent, name ); + return new TQVBox( parent, name ); } else if ( className == TQHBOX_OBJECT_NAME_STRING ) { - return new TQHBox( tqparent, name ); + return new TQHBox( parent, name ); } else if ( className == TQGRID_OBJECT_NAME_STRING ) { - return new TQGrid( 4, tqparent, name ); + return new TQGrid( 4, parent, name ); } else if ( className == TQMAINWINDOW_OBJECT_NAME_STRING ) { TQMainWindow *mw = 0; if ( !qwf_stays_on_top ) - mw = new TQMainWindow( tqparent, name ); + mw = new TQMainWindow( parent, name ); else - mw = new TQMainWindow( tqparent, name, TQt::WType_TopLevel | TQt::WStyle_StaysOnTop ); + mw = new TQMainWindow( parent, name, TQt::WType_TopLevel | TQt::WStyle_StaysOnTop ); mw->setCentralWidget( new TQWidget( mw, "qt_central_widget" ) ); mw->centralWidget()->show(); (void)mw->statusBar(); @@ -1514,11 +1514,11 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq } #if !defined(TQT_NO_SQL) else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) { - return new TQDataTable( tqparent, name ); + return new TQDataTable( parent, name ); } else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) { - return new QDesignerDataBrowser2( tqparent, name ); + return new QDesignerDataBrowser2( parent, name ); } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) { - return new QDesignerDataView2( tqparent, name ); + return new QDesignerDataView2( parent, name ); } #endif @@ -1532,7 +1532,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq TQInterfacePtr<WidgetInterface> iface = 0; widgetInterfaceManager->queryInterface( className, &iface ); if ( iface ) { - TQWidget *w = iface->create( className, tqparent, name ); + TQWidget *w = iface->create( className, parent, name ); if ( w ) { d->customWidgets.replace( className.latin1(), new bool(TRUE) ); return w; @@ -1541,7 +1541,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq // hope we have a factory which can do it for ( TQWidgetFactory* f = widgetFactories.first(); f; f = widgetFactories.next() ) { - TQWidget *w = f->createWidget( className, tqparent, name ); + TQWidget *w = f->createWidget( className, parent, name ); if ( w ) return w; } @@ -1567,7 +1567,7 @@ bool TQWidgetFactory::supportsWidget( const TQString &widget ) return ( availableWidgetMap->find( widget ) != availableWidgetMap->end() ); } -TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, +TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg ) { d->lastItem = 0; @@ -1595,9 +1595,9 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } if ( tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { // hide tqlayout widgets - w = tqparent; + w = parent; } else { - obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, tqparent, 0 )); + obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, parent, 0 )); if ( !obj ) return 0; w = (TQWidget*)obj; @@ -1626,8 +1626,8 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } } #ifdef TQT_CONTAINER_CUSTOM_WIDGETS - TQString parentClassName = tqparent ? tqparent->className() : 0; - bool isPlugin = tqparent ? !!d->customWidgets.find( tqparent->className() ) : FALSE; + TQString parentClassName = parent ? parent->className() : 0; + bool isPlugin = parent ? !!d->customWidgets.find( parent->className() ) : FALSE; if ( isPlugin ) qWarning( "####### loading custom container widgets without page support not implemented!" ); // ### TODO loading for custom container widgets without pages @@ -1682,19 +1682,19 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( tqparent ) { - if ( tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( parent ) { + if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) - ( (TQTabWidget*)tqparent )->insertTab( w, translate( v.toString() ) ); - } else if ( tqparent->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) { + ( (TQTabWidget*)parent )->insertTab( w, translate( v.toString() ) ); + } else if ( parent->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) { if ( attrib == "id" ) - ( (TQWidgetStack*)tqparent )->addWidget( w, v.toInt() ); - } else if ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + ( (TQWidgetStack*)parent )->addWidget( w, v.toInt() ); + } else if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { if ( attrib == "label" ) - ( (TQToolBox*)tqparent )->addItem( w, v.toString() ); - } else if ( tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + ( (TQToolBox*)parent )->addItem( w, v.toString() ); + } else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) - ( (TQWizard*)tqparent )->addPage( w, translate( v.toString() ) ); + ( (TQWizard*)parent )->addPage( w, translate( v.toString() ) ); #ifdef TQT_CONTAINER_CUSTOM_WIDGETS } else if ( isPlugin ) { if ( attrib == "label" ) { @@ -1706,7 +1706,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget (TQUnknownInterface**)&iface2 ); if ( iface2 ) { iface2->insertPage( parentClassName, - (TQWidget*)tqparent, translate( v.toString() ), -1, w ); + (TQWidget*)parent, translate( v.toString() ), -1, w ); iface2->release(); } iface->release(); @@ -1850,8 +1850,8 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, } else if ( prop == "buddy" ) { buddies.insert( obj->name(), value.toCString() ); } else if ( prop == "buttonGroupId" ) { - if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->tqparent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) - ( (TQButtonGroup*)obj->tqparent() )->insert( (TQButton*)obj, value.toInt() ); + if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) + ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, value.toInt() ); #ifndef TQT_NO_SQL } else if ( prop == "database" && !obj->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && !obj->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) ) { @@ -2399,13 +2399,13 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis -void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e ) +void TQWidgetFactory::loadChildAction( TQObject *parent, const TQDomElement &e ) { TQDomElement n = e; TQAction *a = 0; bool hasMenuText = FALSE; if ( n.tagName() == "action" ) { - a = new TQAction( tqparent ); + a = new TQAction( parent ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { @@ -2417,10 +2417,10 @@ void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) actionList.append( a ); } else if ( n.tagName() == "actiongroup" ) { - a = new TQActionGroup( tqparent ); + a = new TQActionGroup( parent ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "property" ) { @@ -2435,7 +2435,7 @@ void TQWidgetFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e } n2 = n2.nextSibling().toElement(); } - if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) actionList.append( a ); } diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h index ebdb38c0..c6770341 100644 --- a/kdevdesigner/uilib/qwidgetfactory.h +++ b/kdevdesigner/uilib/qwidgetfactory.h @@ -52,12 +52,12 @@ public: TQWidgetFactory(); virtual ~TQWidgetFactory(); - static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 ); - static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 ); + static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 ); + static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 ); static void addWidgetFactory( TQWidgetFactory *factory ); static void loadImages( const TQString &dir ); - virtual TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const; + virtual TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const; static TQStringList widgets(); static bool supportsWidget( const TQString &widget ); @@ -66,7 +66,7 @@ private: void loadImageCollection( const TQDomElement &e ); void loadConnections( const TQDomElement &e, TQObject *connector ); void loadTabOrder( const TQDomElement &e ); - TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg ); + TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg ); TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type, bool isTQLayoutWidget = FALSE ); LayoutType layoutType( TQLayout *l ) const; void setProperty( TQObject* widget, const TQString &prop, TQVariant value ); @@ -87,7 +87,7 @@ private: void createColumn( const TQDomElement &e, TQWidget *widget ); void loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); - void loadChildAction( TQObject *tqparent, const TQDomElement &e ); + void loadChildAction( TQObject *parent, const TQDomElement &e ); void loadActions( const TQDomElement &e ); void loadToolBars( const TQDomElement &e ); void loadMenuBar( const TQDomElement &e ); @@ -110,21 +110,21 @@ private: void unpackVariant( const UibStrTable& strings, TQDataStream& in, TQVariant& value ); void inputSpacer( const UibStrTable& strings, TQDataStream& in, - TQLayout *tqparent ); + TQLayout *parent ); void inputColumnOrRow( const UibStrTable& strings, TQDataStream& in, - TQObject *tqparent, bool isRow ); + TQObject *parent, bool isRow ); void inputItem( const UibStrTable& strings, TQDataStream& in, - TQObject *tqparent, TQListViewItem *parentItem = 0 ); + TQObject *parent, TQListViewItem *parentItem = 0 ); void inputMenuItem( TQObject **objects, const UibStrTable& strings, TQDataStream& in, TQMenuBar *menuBar ); TQObject *inputObject( TQObject **objects, int& numObjects, const UibStrTable& strings, TQDataStream& in, - TQWidget *ancestorWidget, TQObject *tqparent, + TQWidget *ancestorWidget, TQObject *parent, TQCString className = "" ); TQWidget *createFromUiFile( TQDomDocument doc, TQObject *connector, - TQWidget *tqparent, const char *name ); + TQWidget *parent, const char *name ); TQWidget *createFromUibFile( TQDataStream& in, TQObject *connector, - TQWidget *tqparent, const char *name ); + TQWidget *parent, const char *name ); private: struct Image { diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index c1caf305..85374ee4 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -50,8 +50,8 @@ struct AdaSupportPartData { AdaSupportPartData () : problemReporter (0) {} }; -AdaSupportPart::AdaSupportPart (TQObject *tqparent, const char *name, const TQStringList &) - : KDevLanguageSupport (&data, tqparent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) +AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &) + : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) { setInstance (AdaSupportPartFactory::instance ()); diff --git a/languages/ada/adasupportpart.h b/languages/ada/adasupportpart.h index a2e01a5f..6d32c18a 100644 --- a/languages/ada/adasupportpart.h +++ b/languages/ada/adasupportpart.h @@ -15,7 +15,7 @@ class AdaSupportPart : public KDevLanguageSupport Q_OBJECT TQ_OBJECT public: - AdaSupportPart (TQObject *tqparent, const char *name, const TQStringList &); + AdaSupportPart (TQObject *parent, const char *name, const TQStringList &); ~AdaSupportPart (); void parseContents (const TQString& contents, const TQString& fileName); diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index 23ef2981..616f8449 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -52,13 +52,13 @@ class ProblemItem: public TQListViewItem{ public: - ProblemItem( TQListView* tqparent, const TQString& level, const TQString& problem, + ProblemItem( TQListView* parent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : TQListViewItem( tqparent, level, problem, file, line, column ) {} + : TQListViewItem( parent, level, problem, file, line, column ) {} - ProblemItem( TQListViewItem* tqparent, const TQString& level, const TQString& problem, + ProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : TQListViewItem( tqparent, level, problem, file, line, column ) {} + : TQListViewItem( parent, level, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 3 || column == 4 ){ @@ -73,8 +73,8 @@ public: }; -ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* tqparent, const char* name ) - : TQListView( tqparent, name ), +ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* parent, const char* name ) + : TQListView( parent, name ), m_adaSupport( part ), m_editor( 0 ), m_document( 0 ), diff --git a/languages/ada/problemreporter.h b/languages/ada/problemreporter.h index 84c9ce57..5ac12154 100644 --- a/languages/ada/problemreporter.h +++ b/languages/ada/problemreporter.h @@ -41,7 +41,7 @@ class ProblemReporter: public TQListView{ Q_OBJECT TQ_OBJECT public: - ProblemReporter( AdaSupportPart* part, TQWidget* tqparent=0, const char* name=0 ); + ProblemReporter( AdaSupportPart* part, TQWidget* parent=0, const char* name=0 ); virtual ~ProblemReporter(); virtual void reportError( TQString message, TQString filename, diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index 4b167623..a36761a8 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -36,8 +36,8 @@ typedef KDevGenericFactory<BashSupportPart> BashSupportFactory; static const KDevPluginInfo data("kdevbashsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) ) -BashSupportPart::BashSupportPart(TQObject *tqparent, const char *name, const TQStringList& ) -: KDevLanguageSupport (&data, tqparent, name ? name : "BashSupportPart" ) +BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& ) +: KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" ) { setInstance(BashSupportFactory::instance()); setXMLFile("kdevbashsupport.rc"); diff --git a/languages/bash/bashsupport_part.h b/languages/bash/bashsupport_part.h index b083a32a..a05e93f9 100644 --- a/languages/bash/bashsupport_part.h +++ b/languages/bash/bashsupport_part.h @@ -52,7 +52,7 @@ class BashSupportPart : public KDevLanguageSupport Q_OBJECT TQ_OBJECT public: - BashSupportPart(TQObject *tqparent, const char *name, const TQStringList &); + BashSupportPart(TQObject *parent, const char *name, const TQStringList &); virtual ~BashSupportPart(); protected: diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index 84929a22..fcc59880 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -41,8 +41,8 @@ #include <tqtextstream.h> AddAttributeDialog::AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* tqparent, const char* name, bool modal, WFlags fl ) -: AddAttributeDialogBase( tqparent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) + TQWidget* parent, const char* name, bool modal, WFlags fl ) +: AddAttributeDialogBase( parent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) { access->insertStringList( TQStringList() << "Public" << "Protected" << "Private" ); diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h index ffe2a92d..948eefa7 100644 --- a/languages/cpp/addattributedialog.h +++ b/languages/cpp/addattributedialog.h @@ -32,7 +32,7 @@ class AddAttributeDialog : public AddAttributeDialogBase TQ_OBJECT public: AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddAttributeDialog(); virtual void addAttribute(); diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index 80397074..b7ffe02c 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -44,8 +44,8 @@ #include <tqtextstream.h> AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* tqparent, const char* name, bool modal, WFlags fl ) -: AddMethodDialogBase( tqparent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) + TQWidget* parent, const char* name, bool modal, WFlags fl ) +: AddMethodDialogBase( parent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) { TQString fileName = m_klass->fileName(); diff --git a/languages/cpp/addmethoddialog.h b/languages/cpp/addmethoddialog.h index 70ab9958..f0bb1f2d 100644 --- a/languages/cpp/addmethoddialog.h +++ b/languages/cpp/addmethoddialog.h @@ -32,7 +32,7 @@ class AddMethodDialog : public AddMethodDialogBase TQ_OBJECT public: AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddMethodDialog(); virtual void addMethod(); diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index 5b42a36a..5f9d906a 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -13,8 +13,8 @@ #include <krun.h> #include <klocale.h> -%{APPNAME}View::%{APPNAME}View(TQWidget *tqparent) - : TQWidget(tqparent), +%{APPNAME}View::%{APPNAME}View(TQWidget *parent) + : TQWidget(parent), DCOPObject("%{APPNAME}Iface") { // setup our tqlayout manager to automatically add our widgets diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h index 2eab2322..a32c35a0 100644 --- a/languages/cpp/app_templates/kapp/appview.h +++ b/languages/cpp/app_templates/kapp/appview.h @@ -29,7 +29,7 @@ public: /** * Default constructor */ - %{APPNAME}View(TQWidget *tqparent); + %{APPNAME}View(TQWidget *parent); /** * Destructor diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp index 3d720a65..673df14e 100644 --- a/languages/cpp/app_templates/kapp/pref.cpp +++ b/languages/cpp/app_templates/kapp/pref.cpp @@ -22,8 +22,8 @@ m_pageTwo = new %{APPNAME}PrefPageTwo(frame); } -%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *tqparent) - : TQFrame(tqparent) +%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent) + : TQFrame(parent) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -31,8 +31,8 @@ new TQLabel(i18n("Add something here"), this); } -%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *tqparent) - : TQFrame(tqparent) +%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent) + : TQFrame(parent) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); diff --git a/languages/cpp/app_templates/kapp/pref.h b/languages/cpp/app_templates/kapp/pref.h index 23798000..b22ab262 100644 --- a/languages/cpp/app_templates/kapp/pref.h +++ b/languages/cpp/app_templates/kapp/pref.h @@ -26,7 +26,7 @@ class %{APPNAME}PrefPageOne : public TQFrame Q_OBJECT TQ_OBJECT public: - %{APPNAME}PrefPageOne(TQWidget *tqparent = 0); + %{APPNAME}PrefPageOne(TQWidget *parent = 0); }; class %{APPNAME}PrefPageTwo : public TQFrame @@ -34,7 +34,7 @@ class %{APPNAME}PrefPageTwo : public TQFrame Q_OBJECT TQ_OBJECT public: - %{APPNAME}PrefPageTwo(TQWidget *tqparent = 0); + %{APPNAME}PrefPageTwo(TQWidget *parent = 0); }; #endif // _%{APPNAMEUC}PREF_H_ diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 8c729f72..1a40df32 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -33,15 +33,15 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { - return new KatePlugin%{APPNAME}( tqparent, name ); + return new KatePlugin%{APPNAME}( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ) +KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) + : Kate::Plugin ( (Kate::Application*)parent, name ) { } diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h index 2183e88e..53e46d06 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin/plugin_app.h @@ -23,7 +23,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -35,7 +35,7 @@ class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); + KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); virtual ~KatePlugin%{APPNAME}(); void addView (Kate::MainWindow *win); diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 1670f252..18595d10 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -37,15 +37,15 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { - return new KatePlugin%{APPNAME}( tqparent, name ); + return new KatePlugin%{APPNAME}( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ) +KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) + : Kate::Plugin ( (Kate::Application*)parent, name ) { } @@ -114,7 +114,7 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p ) /** * %{APPNAME}ConfigPage */ -%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *parentWidget /*= 0L*/) +%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* parent /*= 0L*/, TQWidget *parentWidget /*= 0L*/) : Kate::PluginConfigPage( parentWidget ) { TQVBoxLayout* lo = new TQVBoxLayout( this, 0, 0, "config_page_layout" ); diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h index 3550a344..297c0b4c 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h @@ -27,7 +27,7 @@ public: KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -39,7 +39,7 @@ class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kat TQ_OBJECT public: - KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); + KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); virtual ~KatePlugin%{APPNAME}(); void addView (Kate::MainWindow *win); @@ -71,7 +71,7 @@ class %{APPNAME}ConfigPage : public Kate::PluginConfigPage friend class KatePlugin%{APPNAME}; public: - %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L); + %{APPNAME}ConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~%{APPNAME}ConfigPage (); /** Reimplemented from Kate::PluginConfigPage; just emits configPageApplyRequest( this ). */ diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp index 4e9d3ca5..bb15b923 100644 --- a/languages/cpp/app_templates/kcmodule/module.cpp +++ b/languages/cpp/app_templates/kcmodule/module.cpp @@ -11,8 +11,8 @@ typedef KGenericFactory<%{APPNAME}, TQWidget> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY( kcm_%{APPNAME}, %{APPNAME}Factory("kcm%{APPNAMELC}")) -%{APPNAME}::%{APPNAME}(TQWidget *tqparent, const char *name, const TQStringList&) - : KCModule(tqparent, name), myAboutData(0) +%{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name, const TQStringList&) + : KCModule(parent, name), myAboutData(0) { // place widgets here load(); diff --git a/languages/cpp/app_templates/kcmodule/module.h b/languages/cpp/app_templates/kcmodule/module.h index 57542aae..8be473a9 100644 --- a/languages/cpp/app_templates/kcmodule/module.h +++ b/languages/cpp/app_templates/kcmodule/module.h @@ -12,7 +12,7 @@ class %{APPNAME}: public KCModule TQ_OBJECT public: - %{APPNAME}( TQWidget *tqparent=0, const char *name=0, const TQStringList& = TQStringList() ); + %{APPNAME}( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); ~%{APPNAME}(); virtual void load(); diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/kconfig35/appview.cpp index 0c82dd25..6123db0b 100644 --- a/languages/cpp/app_templates/kconfig35/appview.cpp +++ b/languages/cpp/app_templates/kconfig35/appview.cpp @@ -6,8 +6,8 @@ #include <klocale.h> #include <tqlabel.h> -%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent) - : %{APPNAMELC}view_base(tqparent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) + : %{APPNAMELC}view_base(parent) { settingsChanged(); } diff --git a/languages/cpp/app_templates/kconfig35/appview.h b/languages/cpp/app_templates/kconfig35/appview.h index 897072a6..338cfaa9 100644 --- a/languages/cpp/app_templates/kconfig35/appview.h +++ b/languages/cpp/app_templates/kconfig35/appview.h @@ -27,7 +27,7 @@ public: /** * Default constructor */ - %{APPNAMELC}View(TQWidget *tqparent); + %{APPNAMELC}View(TQWidget *parent); /** * Destructor diff --git a/languages/cpp/app_templates/kde4app/kapp4view.h b/languages/cpp/app_templates/kde4app/kapp4view.h index c4ce6517..c8851bdc 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view.h +++ b/languages/cpp/app_templates/kde4app/kapp4view.h @@ -27,7 +27,7 @@ public: /** * Default constructor */ - %{APPNAME}View(TQWidget *tqparent); + %{APPNAME}View(TQWidget *parent); /** * Destructor diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 1ca8f046..364ec0d7 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -21,8 +21,8 @@ typedef KGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( "kdev%{APPNAMELC}" ) ); static const KDevPluginInfo data("kdev%{APPNAMELC}"); -%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList& ) -: KDevLanguageSupport(&data, tqparent, name ? name : "%{APPNAME}Part" ) +%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList& ) +: KDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" ) { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdevlang_%{APPNAMELC}.rc"); diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h index 234107bb..e8b4d15a 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h @@ -20,7 +20,7 @@ class %{APPNAME}Part : public KDevLanguageSupport Q_OBJECT TQ_OBJECT public: - %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &); + %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &); ~%{APPNAME}Part(); protected: virtual Features features(); diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.cpp b/languages/cpp/app_templates/kdevpart/globalconfig.cpp index 54e56426..cddf3e7e 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/globalconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) - : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) + : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.h b/languages/cpp/app_templates/kdevpart/globalconfig.h index f08bd1bd..b7bfc732 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart/globalconfig.h @@ -11,7 +11,7 @@ class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase Q_OBJECT TQ_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index 96ddb6ca..082549c4 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part") +%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdev%{APPNAMELC}.rc"); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h index ddedde17..05494c1d 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h @@ -21,7 +21,7 @@ class %{APPNAME}Part: public KDevPlugin Q_OBJECT TQ_OBJECT public: - %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args); + %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.cpp b/languages/cpp/app_templates/kdevpart/projectconfig.cpp index a3bc8b8c..42a9f3e7 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/projectconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) - : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) + : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.h b/languages/cpp/app_templates/kdevpart/projectconfig.h index 2d13ce14..fe77464b 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart/projectconfig.h @@ -11,7 +11,7 @@ class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase Q_OBJECT TQ_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp index 54e56426..cddf3e7e 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) - : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) + : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h index f08bd1bd..b7bfc732 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.h @@ -11,7 +11,7 @@ class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase Q_OBJECT TQ_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index 96ddb6ca..082549c4 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part") +%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdev%{APPNAMELC}.rc"); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h index ddedde17..05494c1d 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -21,7 +21,7 @@ class %{APPNAME}Part: public KDevPlugin Q_OBJECT TQ_OBJECT public: - %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args); + %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp index a3bc8b8c..42a9f3e7 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) - : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) + : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h index 2d13ce14..fe77464b 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.h @@ -11,7 +11,7 @@ class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase Q_OBJECT TQ_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp index 5ccbec50..db259cb3 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp @@ -13,9 +13,9 @@ typedef KGenericFactory<%{APPNAME}Plugin> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY(kfile_%{APPNAME}, %{APPNAME}Factory( "kfile_%{APPNAMELC}" )) -%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *tqparent, const char *name, +%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { //add the mimetype here - example: //KFileMimeTypeInfo* info = addMimeTypeInfo( "text/html" ); diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h index 93303359..f2ed7408 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h @@ -16,7 +16,7 @@ class %{APPNAME}Plugin: public KFilePlugin TQ_OBJECT public: - %{APPNAME}Plugin( TQObject *tqparent, const char *name, const TQStringList& args ); + %{APPNAME}Plugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/languages/cpp/app_templates/khello2/widget.cpp b/languages/cpp/app_templates/khello2/widget.cpp index 40e2d2bb..266e894f 100644 --- a/languages/cpp/app_templates/khello2/widget.cpp +++ b/languages/cpp/app_templates/khello2/widget.cpp @@ -4,8 +4,8 @@ #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* tqparent, const char* name, WFlags fl) - : %{APPNAME}WidgetBase(tqparent,name,fl) +%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* parent, const char* name, WFlags fl) + : %{APPNAME}WidgetBase(parent,name,fl) {} %{APPNAME}Widget::~%{APPNAME}Widget() diff --git a/languages/cpp/app_templates/khello2/widget.h b/languages/cpp/app_templates/khello2/widget.h index 3773456b..ed436a38 100644 --- a/languages/cpp/app_templates/khello2/widget.h +++ b/languages/cpp/app_templates/khello2/widget.h @@ -11,7 +11,7 @@ class %{APPNAME}Widget : public %{APPNAME}WidgetBase TQ_OBJECT public: - %{APPNAME}Widget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}Widget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}Widget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp index d609fa26..29ec3d1d 100644 --- a/languages/cpp/app_templates/kicker/applet.cpp +++ b/languages/cpp/app_templates/kicker/applet.cpp @@ -10,8 +10,8 @@ #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) - : KPanelApplet(configFile, type, actions, tqparent, name) +%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) + : KPanelApplet(configFile, type, actions, parent, name) { // Get the current application configuration handle ksConfig = config(); @@ -62,11 +62,11 @@ void %{APPNAME}::resizeEvent(TQResizeEvent *e) extern "C" { - KPanelApplet* init( TQWidget *tqparent, const TQString& configFile) + KPanelApplet* init( TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, - tqparent, "%{APPNAMELC}"); + parent, "%{APPNAMELC}"); } } diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h index b11b1aa9..1c134399 100644 --- a/languages/cpp/app_templates/kicker/applet.h +++ b/languages/cpp/app_templates/kicker/applet.h @@ -24,11 +24,11 @@ public: * @param configFile The configFile handed over in the factory function. * @param Type The applet @ref type(). * @param actions Standard RMB menu actions supported by the applet (see @ref action() ). - * @param tqparent The pointer to the tqparent widget handed over in the factory function. + * @param parent The pointer to the parent widget handed over in the factory function. * @param name A TQt object name for your applet. **/ %{APPNAME}(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); /** destructor */ ~%{APPNAME}(); diff --git a/languages/cpp/app_templates/kmake/mainviewimp.cpp b/languages/cpp/app_templates/kmake/mainviewimp.cpp index 5e953b0d..8a0de706 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.cpp +++ b/languages/cpp/app_templates/kmake/mainviewimp.cpp @@ -3,8 +3,8 @@ #include <tqlabel.h> #include <klocale.h> -MainViewImp::MainViewImp(TQWidget* tqparent, const char* name, WFlags fl) -: MainView(tqparent,name,fl) +MainViewImp::MainViewImp(TQWidget* parent, const char* name, WFlags fl) +: MainView(parent,name,fl) { } diff --git a/languages/cpp/app_templates/kmake/mainviewimp.h b/languages/cpp/app_templates/kmake/mainviewimp.h index 1a8af0b8..bcd627d0 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.h +++ b/languages/cpp/app_templates/kmake/mainviewimp.h @@ -9,7 +9,7 @@ class MainViewImp : public MainView TQ_OBJECT public: - MainViewImp(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + MainViewImp(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~MainViewImp(); public slots: diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp index d020ed5e..86287a3f 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -23,8 +23,8 @@ extern "C" KInstance* %{APPNAME}Factory::s_global = 0L; KAboutData* %{APPNAME}Factory::s_aboutData = 0L; -%{APPNAME}Factory::%{APPNAME}Factory( TQObject* tqparent, const char* name ) - : KoFactory( tqparent, name ) +%{APPNAME}Factory::%{APPNAME}Factory( TQObject* parent, const char* name ) + : KoFactory( parent, name ) { global(); } @@ -37,14 +37,14 @@ KAboutData* %{APPNAME}Factory::s_aboutData = 0L; s_global = 0L; } -KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) +KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & ) { // If classname is "KoDocument", our host is a koffice application // otherwise, the host wants us as a simple part, so switch to readonly and single view. bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case. - %{APPNAME}Part *part = new %{APPNAME}Part( parentWidget, widgetName, tqparent, name, !bWantKoDocument ); + %{APPNAME}Part *part = new %{APPNAME}Part( parentWidget, widgetName, parent, name, !bWantKoDocument ); if ( !bWantKoDocument ) part->setReadWrite( false ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h index b0f934d9..9e820797 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.h +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h @@ -16,10 +16,10 @@ class %{APPNAME}Factory : public KoFactory Q_OBJECT TQ_OBJECT public: - %{APPNAME}Factory( TQObject* tqparent = 0, const char* name = 0 ); + %{APPNAME}Factory( TQObject* parent = 0, const char* name = 0 ); ~%{APPNAME}Factory(); - virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp index fe8c0cca..a1196404 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp @@ -8,8 +8,8 @@ #include <tqpainter.h> -%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) - : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode ) +%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode ) + : KoDocument( parentWidget, widgetName, parent, name, singleViewMode ) { } @@ -19,9 +19,9 @@ bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget ) return TRUE; } -KoView* %{APPNAME}Part::createViewInstance( TQWidget* tqparent, const char* name ) +KoView* %{APPNAME}Part::createViewInstance( TQWidget* parent, const char* name ) { - return new %{APPNAME}View( this, tqparent, name ); + return new %{APPNAME}View( this, parent, name ); } bool %{APPNAME}Part::loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store ) diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h index fc67a523..21ad460a 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.h +++ b/languages/cpp/app_templates/kofficepart/kopart_part.h @@ -13,7 +13,7 @@ class %{APPNAME}Part : public KoDocument Q_OBJECT TQ_OBJECT public: - %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false ); + %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); @@ -25,7 +25,7 @@ public: virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter ); protected: - virtual KoView* createViewInstance( TQWidget* tqparent, const char* name ); + virtual KoView* createViewInstance( TQWidget* parent, const char* name ); }; #endif diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index 240251f9..f32707a8 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -13,8 +13,8 @@ #include <klocale.h> #include <kdebug.h> -%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* tqparent, const char* name ) - : KoView( part, tqparent, name ) +%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent, const char* name ) + : KoView( part, parent, name ) { setInstance( %{APPNAME}Factory::global() ); setXMLFile( "%{APPNAMELC}.rc" ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h index bcaac2e1..2b97fe4f 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.h +++ b/languages/cpp/app_templates/kofficepart/kopart_view.h @@ -18,7 +18,7 @@ class %{APPNAME}View : public KoView Q_OBJECT TQ_OBJECT public: - %{APPNAME}View( %{APPNAME}Part* part, TQWidget* tqparent = 0, const char* name = 0 ); + %{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent = 0, const char* name = 0 ); protected slots: void cut(); diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp index 4f0d7557..ae9a85a6 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp @@ -7,8 +7,8 @@ #include "%{APPNAMELC}.h" #include "%{APPNAMELC}.moc" -%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name): - KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name) +%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): + KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { widget=new TQLabel("Init Value",widgetParent); } diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index b219619b..83c5c2c4 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -21,12 +21,12 @@ public: * Construct a @ref KonqSidebarPlugin. * * @param inst The sidebar's kinstance class. - * @param tqparent The sidebar internal button info class responsible for this plugin. + * @param parent The sidebar internal button info class responsible for this plugin. * @param widgetParent The container which will contain the plugins widget. * @param desktopName The filename of the configuration file. * @param name A TQt object name for your plugin. **/ - %{APPNAME}(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + %{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); /** destructor */ ~%{APPNAME}(); diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 479a6782..1f3992af 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -13,8 +13,8 @@ #include <tqmultilineedit.h> %{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name ) - : KParts::ReadWritePart(tqparent, name) + TQObject *parent, const char *name ) + : KParts::ReadWritePart(parent, name) { // we need an instance setInstance( %{APPNAME}PartFactory::instance() ); @@ -74,7 +74,7 @@ void %{APPNAME}Part::setModified(bool modified) else save->setEnabled(false); - // in any event, we want our tqparent to do it's thing + // in any event, we want our parent to do it's thing ReadWritePart::setModified(modified); } @@ -165,11 +165,11 @@ KAboutData* %{APPNAME}PartFactory::s_about = 0L; } KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { // Create an instance of our Part - %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, tqparent, name ); + %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, parent, name ); // See if we are to be read-write or not if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h index 3a481c5c..30f99b04 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.h +++ b/languages/cpp/app_templates/kpartapp/app_part.h @@ -27,7 +27,7 @@ public: * Default constructor */ %{APPNAME}Part(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name); + TQObject *parent, const char *name); /** * Destructor @@ -76,7 +76,7 @@ public: %{APPNAME}PartFactory(); virtual ~%{APPNAME}PartFactory(); virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index dac6dc20..61e3ca0e 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -8,8 +8,8 @@ #include <klocale.h> #include <kglobal.h> -Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* tqparent, const char* name ) - : Plugin( tqparent, name ) +Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) + : Plugin( parent, name ) { // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. @@ -27,7 +27,7 @@ void Plugin%{APPNAME}::slotAction() // This plugin assumes KHTMLPart. If your plugin can handle more // than this or a different Part than this, simply delete or // change the following block. - if ( !tqparent()->inherits("KHTMLPart") ) + if ( !parent()->inherits("KHTMLPart") ) { TQString title( i18n( "Cannot Translate Source" ) ); TQString text( i18n( "You cannot translate anything except web pages " @@ -37,9 +37,9 @@ void Plugin%{APPNAME}::slotAction() return; } - // Get a handle on our tqparent so we may get the necessary data for + // Get a handle on our parent so we may get the necessary data for // processing - KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent()); + KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); // This plugin only uses the URL. You may use whatever data you // need. @@ -83,9 +83,9 @@ void Plugin%{APPNAME}::slotAction() s_instance = 0; } -TQObject* %{APPNAME}Factory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) +TQObject* %{APPNAME}Factory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { - return new Plugin%{APPNAME}( tqparent, name ); + return new Plugin%{APPNAME}( parent, name ); } KInstance *%{APPNAME}Factory::instance() diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h index 3d637d1b..cff0a63c 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.h +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h @@ -10,7 +10,7 @@ class Plugin%{APPNAME} : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - Plugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); + Plugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); virtual ~Plugin%{APPNAME}(); public slots: @@ -25,7 +25,7 @@ public: %{APPNAME}Factory(); virtual ~%{APPNAME}Factory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); static KInstance* instance(); diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp index 0818d856..06a6409c 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp @@ -18,8 +18,8 @@ typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory; K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); %{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList & /*args*/) - : KParts::ReadWritePart(tqparent) + TQObject *parent, const char *name, const TQStringList & /*args*/) + : KParts::ReadWritePart(parent) { // we need an instance setInstance( %{APPNAMELC}PartFactory::instance() ); @@ -88,7 +88,7 @@ void %{APPNAMELC}Part::setModified(bool modified) else save->setEnabled(false); - // in any event, we want our tqparent to do it's thing + // in any event, we want our parent to do it's thing ReadWritePart::setModified(modified); } diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h index fabeedbc..5ab44003 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.h +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h @@ -29,7 +29,7 @@ public: * Default constructor */ %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList & /*args*/); + TQObject *parent, const char *name, const TQStringList & /*args*/); /** * Destructor diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp index d0c856ec..5bd6b949 100644 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp @@ -12,7 +12,7 @@ #include "kmdikonsole.h" -kmdikonsole::kmdikonsole(TQWidget *tqparent, const char *name) : TQVBox(tqparent, name) +kmdikonsole::kmdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name) { m_haskonsole = false; respawn(); diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h index e97175c1..727e9675 100644 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h +++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h @@ -11,7 +11,7 @@ class kmdikonsole : public TQVBox TQ_OBJECT public: - kmdikonsole( TQWidget* tqparent, const char* name=0); + kmdikonsole( TQWidget* parent, const char* name=0); ~kmdikonsole(); public slots: diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp index a474e605..f2dd28a3 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.cpp +++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp @@ -6,8 +6,8 @@ #include <klocale.h> #include <tqlabel.h> -%{APPNAME}View::%{APPNAME}View(TQWidget *tqparent) - : %{APPNAME}view_base(tqparent) +%{APPNAME}View::%{APPNAME}View(TQWidget *parent) + : %{APPNAME}view_base(parent) { settingsChanged(); } diff --git a/languages/cpp/app_templates/kscons_kxt/appview.h b/languages/cpp/app_templates/kscons_kxt/appview.h index 8d4517bd..56a6edd3 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.h +++ b/languages/cpp/app_templates/kscons_kxt/appview.h @@ -27,7 +27,7 @@ public: /** * Default constructor */ - %{APPNAME}View(TQWidget *tqparent); + %{APPNAME}View(TQWidget *parent); /** * Destructor diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp index 855fb657..efdbf40b 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp @@ -33,8 +33,8 @@ extern "C" //----------------------------------------------------------------------------- //! dialog to setup screen saver parameters -%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *tqparent, const char *name ) - : %{APPNAME}UI( tqparent, name, TRUE ) +%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name ) + : %{APPNAME}UI( parent, name, TRUE ) { /// @todo //Connect your signals and slots here to configure the screen saver. diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.h b/languages/cpp/app_templates/kscreensaver/kscreensaver.h index c8511d34..fc2fd650 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.h +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.h @@ -23,7 +23,7 @@ class %{APPNAME}Setup : public %{APPNAME}UI Q_OBJECT TQ_OBJECT public: - %{APPNAME}Setup( TQWidget *tqparent = NULL, const char *name = NULL ); + %{APPNAME}Setup( TQWidget *parent = NULL, const char *name = NULL ); private slots: void slotOkPressed(); diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp index 0c82dd25..6123db0b 100644 --- a/languages/cpp/app_templates/kxt/appview.cpp +++ b/languages/cpp/app_templates/kxt/appview.cpp @@ -6,8 +6,8 @@ #include <klocale.h> #include <tqlabel.h> -%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent) - : %{APPNAMELC}view_base(tqparent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) + : %{APPNAMELC}view_base(parent) { settingsChanged(); } diff --git a/languages/cpp/app_templates/kxt/appview.h b/languages/cpp/app_templates/kxt/appview.h index 897072a6..338cfaa9 100644 --- a/languages/cpp/app_templates/kxt/appview.h +++ b/languages/cpp/app_templates/kxt/appview.h @@ -27,7 +27,7 @@ public: /** * Default constructor */ - %{APPNAMELC}View(TQWidget *tqparent); + %{APPNAMELC}View(TQWidget *parent); /** * Destructor diff --git a/languages/cpp/app_templates/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp index 6636116e..6a0d616e 100644 --- a/languages/cpp/app_templates/opieapp/example.cpp +++ b/languages/cpp/app_templates/opieapp/example.cpp @@ -6,11 +6,11 @@ typedef OApplicationFactory<%{APPNAME}> %{APPNAME}Factory; OPIE_EXPORT_APP( %{APPNAME}Factory ) /* - * Constructs a %{APPNAME} which is a child of 'tqparent', with the + * Constructs a %{APPNAME} which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( TQWidget* tqparent, const char* name, WFlags fl ) - : %{APPNAME}Base( tqparent, name, fl ) +%{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) + : %{APPNAME}Base( parent, name, fl ) { connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h index 0a8320c9..7da09f5a 100644 --- a/languages/cpp/app_templates/opieapp/example.h +++ b/languages/cpp/app_templates/opieapp/example.h @@ -11,7 +11,7 @@ public: static TQString appName() { return TQString::tqfromLatin1("%{APPNAMELC}" ); } - %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp index cc2a6a17..9a181745 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp @@ -8,8 +8,8 @@ #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(TQWidget *tqparent) - : TQWidget( tqparent, "%{APPNAME} Applet" ) { +%{APPNAME}::%{APPNAME}(TQWidget *parent) + : TQWidget( parent, "%{APPNAME} Applet" ) { /* * we will load an Image, scale it for the right usage * remember your applet might be used by different @@ -89,12 +89,12 @@ void %{APPNAME}::paintEvent( TQPaintEvent* ) { /* * For the taskbar interface return a Widget */ -TQWidget* %{APPNAME}Impl::applet( TQWidget* tqparent ) { +TQWidget* %{APPNAME}Impl::applet( TQWidget* parent ) { /* * There are problems with ownership. So we add * our ownlist and clear this; */ - %{APPNAME}* ap = new %{APPNAME}( tqparent ); + %{APPNAME}* ap = new %{APPNAME}( parent ); m_applets.append( ap ); return ap; diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.h b/languages/cpp/app_templates/opieapplet/simpleimpl.h index 855aed57..311d7c14 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.h +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.h @@ -42,7 +42,7 @@ class %{APPNAME} : public TQWidget { Q_OBJECT TQ_OBJECT public: - %{APPNAME}(TQWidget *tqparent); + %{APPNAME}(TQWidget *parent); ~%{APPNAME}(); private: void mousePressEvent( TQMouseEvent* ); @@ -58,7 +58,7 @@ public: TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); - TQWidget *applet( TQWidget* tqparent ); + TQWidget *applet( TQWidget* parent ); int position()const; /* diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index ea178e59..6a7bef4f 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp @@ -102,10 +102,10 @@ void %{APPNAME}::slotCtrl(bool b){ delete m_icn; } -TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *tqparent, TQt::WFlags f ) +TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *parent, TQt::WFlags f ) { if ( !m_pickboard ) - m_pickboard = new %{APPNAME}( tqparent, f ); + m_pickboard = new %{APPNAME}( parent, f ); return m_pickboard; } diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.h b/languages/cpp/app_templates/opieinput/simpleimpl.h index 76af8138..ab41e38d 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.h +++ b/languages/cpp/app_templates/opieinput/simpleimpl.h @@ -37,7 +37,7 @@ public: TQ_REFCOUNT #endif - virtual TQWidget *inputMethod( TQWidget *tqparent, TQt::WFlags f ); + virtual TQWidget *inputMethod( TQWidget *parent, TQt::WFlags f ); virtual void resetState(); virtual TQPixmap *icon(); virtual TQString name(); diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.h b/languages/cpp/app_templates/opiemenu/simpleimpl.h index 61c3cc5b..71d7afa4 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.h +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.h @@ -26,7 +26,7 @@ public: /* virtual TQString tr( const char* ) const; virtual TQString tr( const char*, const char* ) const; */ - virtual TQPopupMenu *popup ( TQWidget *tqparent ) const; + virtual TQPopupMenu *popup ( TQWidget *parent ) const; virtual void activated ( ); }; diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp index 9b38bc77..e98148d2 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.cpp +++ b/languages/cpp/app_templates/opienet/simpleiface.cpp @@ -1,9 +1,9 @@ #include "%{APPNAMELC}iface.h" -%{APPNAME}Interface::%{APPNAME}Interface( TQObject* tqparent, +%{APPNAME}Interface::%{APPNAME}Interface( TQObject* parent, const char* name, bool status ) - : Interface(tqparent, name, status ) + : Interface(parent, name, status ) { } diff --git a/languages/cpp/app_templates/opienet/simpleiface.h b/languages/cpp/app_templates/opienet/simpleiface.h index c38d884f..d998de8f 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.h +++ b/languages/cpp/app_templates/opienet/simpleiface.h @@ -8,7 +8,7 @@ class %{APPNAME}Interface : public Interface { TQ_OBJECT public: - %{APPNAME}Interface(TQObject* tqparent, const char* name = "vpn", bool up = false ); + %{APPNAME}Interface(TQObject* parent, const char* name = "vpn", bool up = false ); ~%{APPNAME}Interface(); public slots: diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp index d3dc37ab..12d702b6 100644 --- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp +++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp @@ -36,7 +36,7 @@ TQString %{APPNAME}::pixmapNameConfig() const { } // No config widget yet, look at the datebook plugin for an example of that -TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*tqparent*/ ) { +TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*parent*/ ) { return 0l; } diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp index 98b19f9a..2f491481 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *tqparent, const char* name) - : TQWidget(tqparent, name ) { +%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *parent, const char* name) + : TQWidget(parent, name ) { m_exampleLabel = 0l; m_layout = 0l; diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h index f5e35d4e..f079013e 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h @@ -11,7 +11,7 @@ class %{APPNAME}Widget : public TQWidget { TQ_OBJECT public: - %{APPNAME}Widget( TQWidget *tqparent, const char *name ); + %{APPNAME}Widget( TQWidget *parent, const char *name ); ~%{APPNAME}Widget(); void refresh(); diff --git a/languages/cpp/app_templates/qtopia4app/example.cpp b/languages/cpp/app_templates/qtopia4app/example.cpp index 12c3f634..735f7e03 100644 --- a/languages/cpp/app_templates/qtopia4app/example.cpp +++ b/languages/cpp/app_templates/qtopia4app/example.cpp @@ -2,8 +2,8 @@ #include "%{APPNAMELC}.h" #include <tqpushbutton.h> -%{APPNAME}Base::%{APPNAME}Base( TQWidget *tqparent, TQt::WFlags f ) - : TQWidget( tqparent, f ) +%{APPNAME}Base::%{APPNAME}Base( TQWidget *parent, TQt::WFlags f ) + : TQWidget( parent, f ) { setupUi( this ); } @@ -13,11 +13,11 @@ } /* - * Constructs a %{APPNAME} which is a child of 'tqparent', with the + * Constructs a %{APPNAME} which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( TQWidget *tqparent, TQt::WFlags f ) - : %{APPNAME}Base( tqparent, f ) +%{APPNAME}::%{APPNAME}( TQWidget *parent, TQt::WFlags f ) + : %{APPNAME}Base( parent, f ) { connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } diff --git a/languages/cpp/app_templates/qtopia4app/example.h b/languages/cpp/app_templates/qtopia4app/example.h index e4c44a8f..0b174641 100644 --- a/languages/cpp/app_templates/qtopia4app/example.h +++ b/languages/cpp/app_templates/qtopia4app/example.h @@ -6,7 +6,7 @@ class %{APPNAME}Base : public TQWidget, public Ui_%{APPNAME}Base { public: - %{APPNAME}Base( TQWidget *tqparent = 0, TQt::WFlags f = 0 ); + %{APPNAME}Base( TQWidget *parent = 0, TQt::WFlags f = 0 ); virtual ~%{APPNAME}Base(); }; @@ -15,7 +15,7 @@ class %{APPNAME} : public %{APPNAME}Base Q_OBJECT TQ_OBJECT public: - %{APPNAME}( TQWidget *tqparent = 0, TQt::WFlags f = 0 ); + %{APPNAME}( TQWidget *parent = 0, TQt::WFlags f = 0 ); virtual ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp index 85082508..d68f6c6d 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.cpp +++ b/languages/cpp/app_templates/qtopiaapp/example.cpp @@ -3,11 +3,11 @@ #include <tqpushbutton.h> /* - * Constructs a %{APPNAME} which is a child of 'tqparent', with the + * Constructs a %{APPNAME} which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( TQWidget* tqparent, const char* name, WFlags fl ) - : %{APPNAME}Base( tqparent, name, fl ) +%{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) + : %{APPNAME}Base( parent, name, fl ) { connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } diff --git a/languages/cpp/app_templates/qtopiaapp/example.h b/languages/cpp/app_templates/qtopiaapp/example.h index 64abf97c..84f90cfd 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.h +++ b/languages/cpp/app_templates/qtopiaapp/example.h @@ -9,7 +9,7 @@ class %{APPNAME} : public %{APPNAME}Base TQ_OBJECT public: - %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); private slots: diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp index 8db2e754..050d4c24 100644 --- a/languages/cpp/ast_utils.cpp +++ b/languages/cpp/ast_utils.cpp @@ -63,8 +63,8 @@ void scopeOfNode( AST* ast, TQStringList& scope ) if ( !ast ) return ; - if ( ast->tqparent() ) - scopeOfNode( ast->tqparent(), scope ); + if ( ast->parent() ) + scopeOfNode( ast->parent(), scope ); TQString s; switch ( ast->nodeType() ) diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 7bf2601e..e786fb87 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -60,8 +60,8 @@ using namespace std; -CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* tqparent, const char* name ) - : CCConfigWidgetBase( tqparent, name ) +CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const char* name ) + : CCConfigWidgetBase( parent, name ) { m_pPart = part; connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogRegistered( Catalog* ) ), diff --git a/languages/cpp/ccconfigwidget.h b/languages/cpp/ccconfigwidget.h index 3cf2f89b..3e7fe0bf 100644 --- a/languages/cpp/ccconfigwidget.h +++ b/languages/cpp/ccconfigwidget.h @@ -26,7 +26,7 @@ class CCConfigWidget : public CCConfigWidgetBase TQ_OBJECT public: - CCConfigWidget( CppSupportPart* part, TQWidget* tqparent = 0, const char* name = 0 ); + CCConfigWidget( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 ); virtual ~CCConfigWidget( ); public slots: diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp index 963faa71..70ad5d10 100644 --- a/languages/cpp/classgeneratorconfig.cpp +++ b/languages/cpp/classgeneratorconfig.cpp @@ -21,8 +21,8 @@ #include "cppsupportfactory.h" #include "classgeneratorconfig.h" -ClassGeneratorConfig::ClassGeneratorConfig( TQWidget* tqparent, const char* name, WFlags fl ) - : ClassGeneratorConfigBase( tqparent, name, fl ) +ClassGeneratorConfig::ClassGeneratorConfig( TQWidget* parent, const char* name, WFlags fl ) + : ClassGeneratorConfigBase( parent, name, fl ) { readConfig(); currTemplate = &cppHeaderText; @@ -34,8 +34,8 @@ ClassGeneratorConfig::ClassGeneratorConfig( TQString v_cppHeaderText, TQString v TQString v_gtkHeaderText, TQString v_gtkSourceText, NameCase v_fileCase, NameCase v_defCase, NameCase v_superCase, bool v_showAuthor, bool v_genDoc, bool v_reformat, - TQWidget* tqparent, const char* name, WFlags fl ) - : ClassGeneratorConfigBase( tqparent, name, fl ), + TQWidget* parent, const char* name, WFlags fl ) + : ClassGeneratorConfigBase( parent, name, fl ), cppHeaderText( v_cppHeaderText ), cppSourceText( v_cppSourceText ), objcHeaderText( v_objcHeaderText ), objcSourceText( v_objcSourceText ), gtkHeaderText( v_gtkHeaderText ), gtkSourceText( v_gtkSourceText ) diff --git a/languages/cpp/classgeneratorconfig.h b/languages/cpp/classgeneratorconfig.h index f9a82752..bbe59e24 100644 --- a/languages/cpp/classgeneratorconfig.h +++ b/languages/cpp/classgeneratorconfig.h @@ -22,14 +22,14 @@ class ClassGeneratorConfig : public ClassGeneratorConfigBase public: enum NameCase { LowerCase, UpperCase, SameAsClassCase, SameAsFileCase }; - ClassGeneratorConfig( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + ClassGeneratorConfig( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ClassGeneratorConfig( TQString v_cppHeaderText, TQString v_cppSourceText, TQString v_objcHeaderText, TQString v_objcSourceText, TQString v_gtkHeaderText, TQString v_gtkSourceText, NameCase v_fileCase, NameCase v_defCase, NameCase v_superCase, bool v_showAuthor, bool v_genDoc, bool v_reformat, - TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~ClassGeneratorConfig(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp index 533f6ad7..4add5992 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp @@ -29,7 +29,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevgccoptions, KGenericFactory<GccOptionsPlugin> class GeneralTab : public TQWidget { public: - GeneralTab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 ); + GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~GeneralTab(); void readFlags( TQStringList *str ); @@ -43,7 +43,7 @@ private: class OptimizationTab : public TQWidget { public: - OptimizationTab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 ); + OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~OptimizationTab(); void readFlags( TQStringList *str ); @@ -58,7 +58,7 @@ private: class G77Tab : public TQWidget { public: - G77Tab( TQWidget *tqparent = 0, const char *name = 0 ); + G77Tab( TQWidget *parent = 0, const char *name = 0 ); ~G77Tab(); void readFlags( TQStringList *str ); @@ -72,7 +72,7 @@ private: class Warnings1Tab : public TQWidget { public: - Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 ); + Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~Warnings1Tab(); void readFlags( TQStringList *str ); @@ -87,7 +87,7 @@ private: class Warnings2Tab : public TQWidget { public: - Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 ); + Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~Warnings2Tab(); void readFlags( TQStringList *str ); @@ -98,8 +98,8 @@ private: }; -GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), controller( new FlagCheckBoxController ) +GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); tqlayout->setAutoAdd( true ); @@ -164,8 +164,8 @@ void GeneralTab::writeFlags( TQStringList *list ) } -OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); tqlayout->setAutoAdd( true ); @@ -261,8 +261,8 @@ void OptimizationTab::writeFlags( TQStringList *list ) } -G77Tab::G77Tab( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), controller( new FlagCheckBoxController ) +G77Tab::G77Tab( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); tqlayout->setAutoAdd( true ); @@ -316,8 +316,8 @@ void G77Tab::writeFlags( TQStringList *list ) } -Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), controller( new FlagCheckBoxController ) +Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); tqlayout->setAutoAdd( true ); @@ -414,8 +414,8 @@ void Warnings1Tab::writeFlags( TQStringList *list ) } -Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); tqlayout->setAutoAdd( true ); @@ -572,8 +572,8 @@ void Warnings2Tab::writeFlags( TQStringList *list ) // Last but not least... :-) -GccOptionsDialog::GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) - : KDialogBase( Tabbed, GccOptionsPlugin::captionForType( type ), Ok | Cancel, Ok, tqparent, name, true ) +GccOptionsDialog::GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : KDialogBase( Tabbed, GccOptionsPlugin::captionForType( type ), Ok | Cancel, Ok, parent, name, true ) { TQVBox * vbox; @@ -649,8 +649,8 @@ TQString GccOptionsDialog::flags() const } -GccOptionsPlugin::GccOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) - : KDevCompilerOptions( tqparent, name ) +GccOptionsPlugin::GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ) + : KDevCompilerOptions( parent, name ) { gcctype = Unknown; @@ -688,11 +688,11 @@ TQString GccOptionsPlugin::captionForType( Type type ) } -TQString GccOptionsPlugin::exec( TQWidget *tqparent, const TQString &flags ) +TQString GccOptionsPlugin::exec( TQWidget *parent, const TQString &flags ) { if ( gcctype == Unknown ) return TQString(); - GccOptionsDialog *dlg = new GccOptionsDialog( gcctype, tqparent, "gcc options dialog" ); + GccOptionsDialog *dlg = new GccOptionsDialog( gcctype, parent, "gcc options dialog" ); TQString newFlags = flags; dlg->setFlags( flags ); if ( dlg->exec() == TQDialog::Accepted ) diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h index 0ac93c23..d5a0d644 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h @@ -31,12 +31,12 @@ class GccOptionsPlugin : public KDevCompilerOptions public: enum Type { GCC, GPP, G77, Unknown }; - GccOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~GccOptionsPlugin(); static TQString captionForType(Type type); - virtual TQString exec(TQWidget *tqparent, const TQString &flags); + virtual TQString exec(TQWidget *parent, const TQString &flags); private: Type gcctype; @@ -46,7 +46,7 @@ private: class GccOptionsDialog : public KDialogBase { public: - GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *tqparent=0, const char *name=0 ); + GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 ); ~GccOptionsDialog(); void setFlags(const TQString &flags); diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index 846aec77..be16ec28 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -348,7 +348,7 @@ struct PopupFillerHelpStruct { TQMap<TQString, TQPopupMenu*> m_namespacePopupCache; - void insertItem( TQPopupMenu* tqparent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { + void insertItem( TQPopupMenu* parent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { Q_UNUSED(prefix); TQString memType = d.memberTypeToString(); @@ -357,12 +357,12 @@ struct PopupFillerHelpStruct { memType = "enum"; TQString txt = i18n( "Jump to %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) ); - int id = tqparent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); receiver->m_popupActions.insert( id, d.decl ); } - void insertItem ( TQPopupMenu* tqparent, TypeDesc d , TQString prefix ) { + void insertItem ( TQPopupMenu* parent, TypeDesc d , TQString prefix ) { Debug dbg( "#insert# ", 10 ); TQString txt1, txt2; @@ -374,14 +374,14 @@ struct PopupFillerHelpStruct { for ( SimpleTypeNamespace::SlaveList::iterator it = slaves.begin(); it != slaves.end(); ++it ) { SimpleTypeCodeModel* cm = dynamic_cast<SimpleTypeCodeModel*>( ( *it ).first.first.resolved().data() ); if ( cm && cm->item() ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); TQString scope = cm->scope().join("::"); TQMap< TQString, TQPopupMenu* >::iterator it = m_namespacePopupCache.find( scope ); if( it != m_namespacePopupCache.end() ) { - tqparent->insertItem( "Imported Namespace " + scope, *it ); + parent->insertItem( "Imported Namespace " + scope, *it ); delete m; } else { - tqparent->insertItem( "Imported Namespace " + scope, m ); + parent->insertItem( "Imported Namespace " + scope, m ); insertItem( m, ( new SimpleTypeCachedCodeModel( cm->item() ) ) ->desc(), prefix ); m_namespacePopupCache.insert( scope, m ); @@ -390,7 +390,7 @@ struct PopupFillerHelpStruct { SimpleTypeNamespace* cn = dynamic_cast<SimpleTypeNamespace*>( ( *it ).first.first.resolved().data() ); if( cn ) { TypePointer t = new SimpleTypeNamespace( cn ); //To avoid endless recursion, this needs to be done(the dynamic-cast above fails) - insertItem( tqparent, t->desc(), prefix ); + insertItem( parent, t->desc(), prefix ); } } } @@ -423,7 +423,7 @@ struct PopupFillerHelpStruct { int sLine, sCol, eLine, eCol; i->getStartPosition( &sLine, &sCol ); i->getEndPosition( &eLine, &eCol ); - insertItem( tqparent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").tqarg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. + insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").tqarg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. } } @@ -447,12 +447,12 @@ struct PopupFillerHelpStruct { } } - int id = tqparent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) ); if ( d.resolved() ) receiver->m_popupActions.insert( id, d.resolved() ->getDeclarationInfo() ); if ( !txt2.isEmpty() ) { - int id2 = tqparent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) ); + int id2 = parent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) ); if ( d.resolved() ) receiver->m_popupDefinitionActions.insert( id2, d.resolved() ->getDeclarationInfo() ); } @@ -523,7 +523,7 @@ struct PopupClassViewFillerHelpStruct { return false; } - void insertItem( TQPopupMenu* tqparent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { + void insertItem( TQPopupMenu* parent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { Q_UNUSED(prefix); FileDom f = receiver->m_pSupport->codeModel() ->fileByName( d.decl.file ); if ( !f ) @@ -537,12 +537,12 @@ struct PopupClassViewFillerHelpStruct { memType = "enum"; TQString txt = i18n( "Show %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) ); - int id = tqparent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); receiver->m_popupClassViewActions.insert( id, dom ); } - void insertItem ( TQPopupMenu* tqparent, TypeDesc d , TQString prefix ) { + void insertItem ( TQPopupMenu* parent, TypeDesc d , TQString prefix ) { Debug dbg( "#insert# ", 10 ); TQString txt; @@ -565,12 +565,12 @@ struct PopupClassViewFillerHelpStruct { for ( SimpleTypeNamespace::SlaveList::iterator it = slaves.begin(); it != slaves.end(); ++it ) { SimpleTypeCodeModel* cm = dynamic_cast<SimpleTypeCodeModel*>( ( *it ).first.first.resolved().data() ); if ( cm && cm->item() ) { - insertItem( tqparent, ( new SimpleTypeCachedCodeModel( cm->item() ) ) ->desc(), prefix ); + insertItem( parent, ( new SimpleTypeCachedCodeModel( cm->item() ) ) ->desc(), prefix ); } else { SimpleTypeNamespace* cn = dynamic_cast<SimpleTypeNamespace*>( ( *it ).first.first.resolved().data() ); if( cn ) { TypePointer t = new SimpleTypeNamespace( cn ); //to avoid endless recursion (caching would be better) - insertItem( tqparent, t->desc(), prefix ); + insertItem( parent, t->desc(), prefix ); } } } @@ -596,7 +596,7 @@ struct PopupClassViewFillerHelpStruct { } } - int id = tqparent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); if ( dom ) receiver->m_popupClassViewActions.insert( id, dom ); @@ -612,13 +612,13 @@ class PopupFiller { PopupFiller( HelpStruct str , TQString dAdd, int maxCount = 100 ) : struk( str ), depthAdd( dAdd ), s( maxCount ) {} - void fillIncludes( const DeclarationInfo& decl, TQPopupMenu* tqparent, bool& needSeparator ) { + void fillIncludes( const DeclarationInfo& decl, TQPopupMenu* parent, bool& needSeparator ) { if( !struk.receiver->getIncludeFiles()[ HashedString( decl.file ) ] ) { TQString file = decl.file; //The include-file seems to be missing if( needSeparator ) { needSeparator = false; - tqparent->insertSeparator(); + parent->insertSeparator(); } TQString includeFile = file; @@ -644,7 +644,7 @@ class PopupFiller { //kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl; } - int id = tqparent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).tqarg ( includeFile ).tqarg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).tqarg ( includeFile ).tqarg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); DeclarationInfo fakeDec; fakeDec.name = decl.name; fakeDec.file = includeFile; @@ -653,7 +653,7 @@ class PopupFiller { } } - void fill( TQPopupMenu * tqparent, LocateResult d, TQString prefix = "", const DeclarationInfo & sourceVariable = DeclarationInfo() ) { + void fill( TQPopupMenu * parent, LocateResult d, TQString prefix = "", const DeclarationInfo & sourceVariable = DeclarationInfo() ) { Debug dbg( "#fl# ", 10 ) ; @@ -673,29 +673,29 @@ class PopupFiller { /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable );*/ - struk.insertItem( tqparent, f, prefix ); + struk.insertItem( parent, f, prefix ); - tqparent->insertSeparator(); + parent->insertSeparator(); if ( !sourceVariable.comment.isEmpty() ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Comment on %1" ).tqarg( sourceVariable.name ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Comment on %1" ).tqarg( sourceVariable.name ), m ); TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); } - tqparent->insertSeparator(); + parent->insertSeparator(); } } - struk.insertItem( tqparent, d, prefix ); + struk.insertItem( parent, d, prefix ); if( d->resolved() && !d->resolved()->specialization().isEmpty() ) { - SimpleType p = d->resolved()->tqparent(); + SimpleType p = d->resolved()->parent(); LocateResult r = p->locateDecType( d->name() ); if( r ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Specialized from \"%1\"" ).tqarg( cleanForMenu( r->fullNameChain() ) ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Specialized from \"%1\"" ).tqarg( cleanForMenu( r->fullNameChain() ) ), m ); fill( m, r ); } } @@ -703,11 +703,11 @@ class PopupFiller { TypeDesc::TemplateParams p = d->templateParams(); for ( TypeDesc::TemplateParams::iterator it = p.begin(); it != p.end(); ++it ) { //if( (*it)->resolved() ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Template-param \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Template-param \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); fill( m, **it ); /*} else { - fill( tqparent, **it, prefix + depthAdd ); + fill( parent, **it, prefix + depthAdd ); }*/ } @@ -715,16 +715,16 @@ class PopupFiller { if ( d->resolved() ->asFunction() ) { LocateResult rt = d->resolved() ->locateDecType( d->resolved() ->asFunction() ->getReturnType() ); if ( rt ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Return-type \"%1\"" ).tqarg( cleanForMenu( rt->fullNameChain() ) ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Return-type \"%1\"" ).tqarg( cleanForMenu( rt->fullNameChain() ) ), m ); fill( m, rt ); } TQValueList<TypeDesc> args = d->resolved() ->asFunction() ->getArgumentTypes(); TQStringList argNames = d->resolved() ->asFunction() ->getArgumentNames(); if ( !args.isEmpty() ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Argument-types" ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Argument-types" ), m ); TQStringList::iterator it2 = argNames.begin(); for ( TQValueList<TypeDesc>::iterator it = args.begin(); it != args.end(); ++it ) { LocateResult at = d->resolved() ->locateDecType( *it ); @@ -745,8 +745,8 @@ class PopupFiller { if ( d.trace() ) { TQValueList<TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace(); if ( !trace.isEmpty() ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Trace" ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Trace" ), m ); for ( TQValueList<TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) { TQPopupMenu * mo = PopupTracker::createPopup( m ); @@ -778,21 +778,21 @@ class PopupFiller { if ( d->resolved() ) { TQValueList<LocateResult> bases = d->resolved() ->getBases(); for ( TQValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Base-class \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Base-class \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); fill( m, *it ); } - if ( d->resolved() ->tqparent() && d->resolved() ->tqparent() ->desc() ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Nested in \"%1\"" ).tqarg( cleanForMenu( d->resolved() ->tqparent() ->fullTypeResolved() ) ), m ); - fill( m, d->resolved() ->tqparent() ->desc() ); + if ( d->resolved() ->parent() && d->resolved() ->parent() ->desc() ) { + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Nested in \"%1\"" ).tqarg( cleanForMenu( d->resolved() ->parent() ->fullTypeResolved() ) ), m ); + fill( m, d->resolved() ->parent() ->desc() ); } if ( !d->resolved() ->comment().isEmpty() ) { - tqparent->insertSeparator(); - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Comment on %1" ).tqarg( cleanForMenu( d->name() ) ), m ); + parent->insertSeparator(); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Comment on %1" ).tqarg( cleanForMenu( d->name() ) ), m ); TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); @@ -809,14 +809,14 @@ class PopupFiller { if ( !trace.isEmpty() ) { for ( TQValueList<TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) { if( struk.shouldShowIncludeMenu() && struk.receiver->cppSupport()->codeCompletionConfig()->preProcessAllHeaders() && !(*it).first.decl.file.operator TQString().isEmpty() ) - fillIncludes( (*it).first.decl, tqparent, needSeparator ); + fillIncludes( (*it).first.decl, parent, needSeparator ); } } } //Show the include-file for the item itself if( d->resolved() && !d->resolved()->isNamespace() && struk.receiver->cppSupport() ) { - fillIncludes( d->resolved()->getDeclarationInfo(), tqparent, needSeparator ); + fillIncludes( d->resolved()->getDeclarationInfo(), parent, needSeparator ); } } } @@ -1691,7 +1691,7 @@ void CppCodeCompletion::slotTextHint( int line, int column, TQString &text ) { } text += "type: \"" + type.resultType->fullTypeResolved() + "\""; } - if( type.resultType->tqparent()) text += "\nnested in: \"" + type.resultType->tqparent()->fullTypeResolvedWithScope() + "\""; + if( type.resultType->parent()) text += "\nnested in: \"" + type.resultType->parent()->fullTypeResolvedWithScope() + "\""; DeclarationInfo i = type.resultType->getDeclarationInfo(); if( i ) text += "\n" + i.locationToText(); @@ -2790,7 +2790,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } if( !t->isNamespace() || invokedOnDemand || alwaysIncludeNamespaces ) computeCompletionEntryList( t, entryList, t->scope(), false, depth ); - t = t->tqparent(); + t = t->parent(); depth++; } } @@ -2807,7 +2807,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } if ( ( (t->isNamespace() && invokedOnDemand) || alwaysIncludeNamespaces ) || ( first && isInstance ) ) computeCompletionEntryList( t, entryList, t->scope(), t->isNamespace() ? true : isInstance, depth ); - t = t->tqparent(); + t = t->parent(); depth++; first = false; } @@ -2890,7 +2890,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( method ) signatureList += computeSignatureList( method ); if ( t ) - t = t->tqparent(); + t = t->parent(); } while ( !ready && s ); if ( !signatureList.isEmpty() ) { @@ -3293,7 +3293,7 @@ FunctionDefinitionAST * CppCodeCompletion::functionDefinition( AST* node ) { while ( node ) { if ( node->nodeType() == NodeType_FunctionDefinition ) return static_cast<FunctionDefinitionAST*>( node ); - node = node->tqparent(); + node = node->parent(); } return 0; } @@ -3360,7 +3360,7 @@ TQString codeModelAccessToString( CodeModelItem::Access access ) { #define MAXCOMMENTCOLUMNS 45 -TQString CppCodeCompletion::commentFromItem( const SimpleType& tqparent, const ItemDom& item ) { +TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const ItemDom& item ) { --m_maxComments; static TQString maxReached = " "; if( m_maxComments < 0 ) { @@ -3371,8 +3371,8 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& tqparent, const I item->getStartPosition( &line, &col ); - if ( !tqparent->scope().isEmpty() ) { - ret += "Container: " + tqparent->fullTypeResolvedWithScope(); + if ( !parent->scope().isEmpty() ) { + ret += "Container: " + parent->fullTypeResolvedWithScope(); } if ( item->isEnum() ) { @@ -3451,7 +3451,7 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& tqparent, const I ret += "\nKind: Typedef"; if ( t ) { ret += "\nType: " + t->type(); - LocateResult r = tqparent->locateDecType( t->type() ); + LocateResult r = parent->locateDecType( t->type() ); if ( r.desc().resolved() ) ret += "\nResolved type: " + r.desc().resolved() ->fullTypeResolvedWithScope(); else @@ -3469,7 +3469,7 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& tqparent, const I return ret; } -TQString CppCodeCompletion::commentFromTag( const SimpleType& tqparent, Tag& tag ) { +TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) { --m_maxComments; static TQString maxReached = " "; if( m_maxComments < 0 ) { @@ -3480,8 +3480,8 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& tqparent, Tag& tag tag.getStartPosition( &line, &col ); TQString ret; // = tag.comment(); - if ( !tqparent->scope().isEmpty() ) { - ret += "Container: " + tqparent->fullTypeResolvedWithScope(); + if ( !parent->scope().isEmpty() ) { + ret += "Container: " + parent->fullTypeResolvedWithScope(); } /* if( tag.kind() == Tag::Kind_Enum ) { @@ -3571,7 +3571,7 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& tqparent, Tag& tag if ( tag.kind() == Tag::Kind_Typedef ) { ret += "\nKind: Typedef"; ret += "\nType: " + tagType( tag ); - LocateResult r = tqparent->locateDecType( tagType( tag ) ); + LocateResult r = parent->locateDecType( tagType( tag ) ); if ( r.desc().resolved() ) ret += "\nResolved type: " + r.desc().resolved() ->fullTypeResolvedWithScope(); else @@ -3962,7 +3962,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList computeCompletionEntryList( type, entryList, scope->namespaceList(), isInstance, depth ); } -void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const ClassList & lst, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const ClassList & lst, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -3981,7 +3981,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleTyp if ( isInstance ) continue; - entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( tqparent ).tqarg( 6 ); + entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( parent ).tqarg( 6 ); entryList << entry; @@ -3993,7 +3993,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleTyp } } -void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const TypeAliasList & lst, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const TypeAliasList & lst, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -4015,7 +4015,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleTyp entry.prefix = stringMult( depth, " " ) + entry.prefix.stripWhiteSpace(); entry.text = klass->name(); entry.comment = commentFromItem( type, klass.data() ); - entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( tqparent ).tqarg( 5 ); + entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( parent ).tqarg( 5 ); entryList << entry; } } diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h index 4b619984..27bfc1b6 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -52,9 +52,9 @@ public: static uint pendingPopups; - static TQPopupMenu* createPopup( TQWidget* tqparent ) { + static TQPopupMenu* createPopup( TQWidget* parent ) { if( !pt ) pt = new PopupTracker(); - TQPopupMenu* m = new TQPopupMenu( tqparent ); + TQPopupMenu* m = new TQPopupMenu( parent ); ++pendingPopups; connect( m, TQT_SIGNAL(destroyed()), pt, TQT_SLOT(destroyedPopup()) ); return m; @@ -189,8 +189,8 @@ private: bool functionContains( FunctionDom f , int line, int col ); void getFunctionBody( FunctionDom f , int& line, int& col ); void selectItem( ItemDom item ); - void addTypePopups( TQPopupMenu* tqparent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); - void addTypeClassPopups( TQPopupMenu* tqparent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); + void addTypePopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); + void addTypeClassPopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); TQValueList<TQStringList> computeSignatureList( CppEvaluation::EvaluationResult function ); void integratePart( KParts::Part* part ); void setupCodeInformationRepository(); @@ -235,8 +235,8 @@ private: void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, NamespaceDom scope, bool isInstance, int depth ); void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const FunctionList& methods, bool isInstance, int depth ); void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const VariableList& attributes, bool isInstance, int depth ); - void computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const ClassList& lst, bool isInstance, int depth ); - void computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const TypeAliasList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( TQString parent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const ClassList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( TQString parent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const TypeAliasList& lst, bool isInstance, int depth ); void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const NamespaceList& lst, bool isInstance, int depth ); SimpleContext* computeContext( FunctionDefinitionAST* ast, int line, int col, int lineOffset, int colOffset ); @@ -298,8 +298,8 @@ private: //If more then the given count of comments were requested, all following ones will be blank.(Performance-reasons) void setMaxComments( int count ); - TQString commentFromItem( const SimpleType& tqparent, const ItemDom& item ); - TQString commentFromTag( const SimpleType& tqparent, Tag& tag ); + TQString commentFromItem( const SimpleType& parent, const ItemDom& item ); + TQString commentFromTag( const SimpleType& parent, Tag& tag ); ItemDom m_cachedFromContext; ///Can be a function or a class, representing the position from where the last completion was started. Necessary as long as all imports are put into the global namespace. diff --git a/languages/cpp/cppevaluation.cpp b/languages/cpp/cppevaluation.cpp index a20c2339..bb3e354b 100644 --- a/languages/cpp/cppevaluation.cpp +++ b/languages/cpp/cppevaluation.cpp @@ -433,7 +433,7 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr, } depth++; - if( !ready ) current = current->tqparent(); + if( !ready ) current = current->parent(); } } /* @@ -455,7 +455,7 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr, if( !bestRet || /** Did we find a constructor within a class? */ - (type->resolved() && ( bestRet->resolved() && type->resolved()->desc() == bestRet->resolved()->tqparent()->desc() && bestRet->resolved()->asFunction() ) ) ) { + (type->resolved() && ( bestRet->resolved() && type->resolved()->desc() == bestRet->resolved()->parent()->desc() && bestRet->resolved()->asFunction() ) ) ) { /*if ( type && type->resolved() ) {*/ EvaluationResult ret = type; diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index bd727d95..75d01b5f 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -37,14 +37,14 @@ #include <filetemplate.h> CppImplementationWidget::CppImplementationWidget( KDevLanguageSupport *part, - TQWidget *tqparent, const char *name, bool modal ) - : ImplementationWidget( part, tqparent, name, modal ) + TQWidget *parent, const char *name, bool modal ) + : ImplementationWidget( part, parent, name, modal ) {} TQStringList CppImplementationWidget::createClassFiles() { - TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\nTQ_OBJECT\npublic:\n $CLASSNAME$(TQWidget *tqparent = 0, const char *name = 0);\n};\n\n#endif\n"; - TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *tqparent, const char *name)\n :$BASECLASSNAME$(tqparent, name)\n{\n}\n"; + TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\nTQ_OBJECT\npublic:\n $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n"; + TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *parent, const char *name)\n :$BASECLASSNAME$(parent, name)\n{\n}\n"; if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem ) template_cpp += "\n#include \"$TQMOCINCLUDE$\"\n"; diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h index da1ef71b..c766156e 100644 --- a/languages/cpp/cppimplementationwidget.h +++ b/languages/cpp/cppimplementationwidget.h @@ -32,7 +32,7 @@ class CppImplementationWidget : public ImplementationWidget Q_OBJECT TQ_OBJECT public: - CppImplementationWidget( KDevLanguageSupport *part, TQWidget* tqparent = 0, const char* name = 0, bool modal = false ); + CppImplementationWidget( KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false ); protected: virtual TQStringList createClassFiles(); diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index db4d0160..65fb9c76 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -57,8 +57,8 @@ TQString TQRegExp_escape( const TQString& str ) return TQRegExp::escape( str ); } -CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *tqparent, const char *name ) - : CppNewClassDialogBase( tqparent, name ), myModel( 0 ) +CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, const char *name ) + : CppNewClassDialogBase( parent, name ), myModel( 0 ) { headerModified = false; baseincludeModified = false; @@ -377,8 +377,8 @@ void CppNewClassDialog::checkTQWidgetInheritance( int val ) basename_edit->setText( TQWIDGET_OBJECT_NAME_STRING ); } /* constructors_cpp_edit->append(classname_edit->text() + "::" + classname_edit->text() + - "(TQWidget *tqparent, const char *name):\n TQWidget(tqparent, name)\n{\n}\n"); - constructors_h_edit->append(classname_edit->text() + "(TQWidget *tqparent, const char *name);\n");*/ + "(TQWidget *parent, const char *name):\n TQWidget(parent, name)\n{\n}\n"); + constructors_h_edit->append(classname_edit->text() + "(TQWidget *parent, const char *name);\n");*/ } if ( val && ( baseclasses_view->childCount() > 1 ) ) @@ -952,21 +952,21 @@ void CppNewClassDialog::addToConstructorsList( TQCheckListItem *myClass, Functio new PCheckListItem<FunctionDom>( method, myClass, m_part->formatModelItem( method.data() ), TQCheckListItem::RadioButton ); } -void CppNewClassDialog::addToMethodsList( TQListViewItem *tqparent, FunctionDom method ) +void CppNewClassDialog::addToMethodsList( TQListViewItem *parent, FunctionDom method ) { - PCheckListItem<FunctionDom> *it = new PCheckListItem<FunctionDom>( method, tqparent, m_part->formatModelItem( method.data() ), TQCheckListItem::CheckBox ); + PCheckListItem<FunctionDom> *it = new PCheckListItem<FunctionDom>( method, parent, m_part->formatModelItem( method.data() ), TQCheckListItem::CheckBox ); method->isAbstract() ? it->setText( 1, i18n( "replace" ) ) : it->setText( 1, i18n( "extend" ) ); } -void CppNewClassDialog::addToUpgradeList( TQListViewItem *tqparent, FunctionDom method, TQString modifier ) +void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, FunctionDom method, TQString modifier ) { - PListViewItem<FunctionDom> *it = new PListViewItem<FunctionDom>( method, tqparent, m_part->formatModelItem( method.data() ) ); + PListViewItem<FunctionDom> *it = new PListViewItem<FunctionDom>( method, parent, m_part->formatModelItem( method.data() ) ); it->setText( 1, modifier ); } -void CppNewClassDialog::addToUpgradeList( TQListViewItem *tqparent, VariableDom attr, TQString modifier ) +void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, VariableDom attr, TQString modifier ) { - PListViewItem<VariableDom> *it = new PListViewItem<VariableDom>( attr, tqparent, m_part->formatModelItem( attr.data() ) ); + PListViewItem<VariableDom> *it = new PListViewItem<VariableDom>( attr, parent, m_part->formatModelItem( attr.data() ) ); it->setText( 1, modifier ); } @@ -1244,13 +1244,13 @@ void CppNewClassDialog::to_constructors_list_clicked() PCheckListItem<FunctionDom> *curr; if ( ( curr = dynamic_cast<PCheckListItem<FunctionDom>* >( it.current() ) ) ) { - if ( curr->isOn() && curr->tqparent() ) + if ( curr->isOn() && curr->parent() ) { //fill the base classes list base += base.isEmpty() ? ": " : ", "; - base += curr->tqparent() ->text( 0 ); + base += curr->parent() ->text( 0 ); PCheckListItem<ClassDom> *p; - if ( ( p = dynamic_cast<PCheckListItem<ClassDom>* >( curr->tqparent() ) ) ) + if ( ( p = dynamic_cast<PCheckListItem<ClassDom>* >( curr->parent() ) ) ) { base += p->templateAddition; } @@ -1507,7 +1507,7 @@ void CppNewClassDialog::ClassGenerator::common_text() PCheckListItem<FunctionDom> *curr; if ( ( curr = dynamic_cast<PCheckListItem<FunctionDom>* >( it.current() ) ) ) { - if ( curr->isOn() && ( curr->tqparent() ) && ( curr->tqparent() ->tqparent() ) ) + if ( curr->isOn() && ( curr->parent() ) && ( curr->parent() ->parent() ) ) { TQString * adv_h = 0; if ( curr->item() ->access() == CodeModelItem::Private ) @@ -1519,9 +1519,9 @@ void CppNewClassDialog::ClassGenerator::common_text() // if (advCpp.isEmpty()) advCpp += "\n\n"; - TQString bcName = curr->tqparent() ->tqparent() ->text( 0 ); + TQString bcName = curr->parent() ->parent() ->text( 0 ); PListViewItem<ClassDom> *bc; - if ( ( bc = dynamic_cast<PListViewItem<ClassDom>* >( curr->tqparent() ->tqparent() ) ) ) + if ( ( bc = dynamic_cast<PListViewItem<ClassDom>* >( curr->parent() ->parent() ) ) ) { bcName += bc->templateAddition; } @@ -1540,7 +1540,7 @@ void CppNewClassDialog::ClassGenerator::common_text() PListViewItem<FunctionDom> *curr_m; if ( ( curr = dynamic_cast<PListViewItem<VariableDom>* >( ita.current() ) ) ) { - if ( ( !curr->text( 2 ).isEmpty() ) && ( curr->tqparent() ) && ( curr->tqparent() ->tqparent() ) ) + if ( ( !curr->text( 2 ).isEmpty() ) && ( curr->parent() ) && ( curr->parent() ->parent() ) ) { TQString * adv_h = 0; if ( curr->text( 2 ) == "private" ) @@ -1553,12 +1553,12 @@ void CppNewClassDialog::ClassGenerator::common_text() /* if ((*adv_h).isEmpty()) *adv_h += "\n\n";*/ if ( adv_h ) - *adv_h += TQString( " using " ) + curr->tqparent() ->tqparent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n"; + *adv_h += TQString( " using " ) + curr->parent() ->parent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n"; } } else if ( ( curr_m = dynamic_cast<PListViewItem<FunctionDom>* >( ita.current() ) ) ) { - if ( ( !curr_m->text( 2 ).isEmpty() ) && ( curr_m->tqparent() ) && ( curr_m->tqparent() ->tqparent() ) ) + if ( ( !curr_m->text( 2 ).isEmpty() ) && ( curr_m->parent() ) && ( curr_m->parent() ->parent() ) ) { TQString * adv_h = 0; if ( curr_m->text( 2 ) == "private" ) @@ -1574,7 +1574,7 @@ void CppNewClassDialog::ClassGenerator::common_text() TQString methodName = curr_m->item() ->name(); if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) ) methodName = "operator" + methodName; - *adv_h += " using " + curr_m->tqparent() ->tqparent() ->text( 0 ) + "::" + methodName + ";\n"; + *adv_h += " using " + curr_m->parent() ->parent() ->text( 0 ) + "::" + methodName + ";\n"; } } ++ita; @@ -1707,26 +1707,26 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() { if( dlg.m_part->qtBuildConfig()->version() == 3 ) { - argsH = "TQWidget *tqparent = 0, const char *name = 0"; - argsCpp = "TQWidget *tqparent, const char *name"; + argsH = "TQWidget *parent = 0, const char *name = 0"; + argsCpp = "TQWidget *parent, const char *name"; } else { - argsH = "TQWidget *tqparent = 0"; - argsCpp = "TQWidget *tqparent"; + argsH = "TQWidget *parent = 0"; + argsCpp = "TQWidget *parent"; } } else if ( qobject ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) { - argsH = "TQObject *tqparent = 0, const char *name = 0"; - argsCpp = "TQObject *tqparent, const char *name"; + argsH = "TQObject *parent = 0, const char *name = 0"; + argsCpp = "TQObject *parent, const char *name"; } else { - argsH = "TQObject *tqparent = 0"; - argsCpp = "TQObject *tqparent"; + argsH = "TQObject *parent = 0"; + argsCpp = "TQObject *parent"; } } else @@ -1739,16 +1739,16 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() if ( childClass && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer = " : TQWidget(tqparent, name)"; + baseInitializer = " : TQWidget(parent, name)"; else - baseInitializer = " : TQWidget(tqparent)"; + baseInitializer = " : TQWidget(parent)"; } else if ( qobject && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer = " : TQObject(tqparent, name)"; + baseInitializer = " : TQObject(parent, name)"; else - baseInitializer = " : TQObject(tqparent)"; + baseInitializer = " : TQObject(parent)"; } else if ( dlg.baseclasses_view->childCount() != 0 ) { @@ -1766,16 +1766,16 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() if ( childClass && ( baseInitializer == " : " ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer += it.current()->text( 0 ) + "(tqparent, name)"; + baseInitializer += it.current()->text( 0 ) + "(parent, name)"; else - baseInitializer += it.current()->text( 0 ) + "(tqparent)"; + baseInitializer += it.current()->text( 0 ) + "(parent)"; } else if ( qobject && ( baseInitializer == " : " ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer += it.current()->text( 0 ) + "(tqparent, name)"; + baseInitializer += it.current()->text( 0 ) + "(parent, name)"; else - baseInitializer += it.current()->text( 0 ) + "(tqparent)"; + baseInitializer += it.current()->text( 0 ) + "(parent)"; } else { diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h index 39e9e458..55563f0c 100644 --- a/languages/cpp/cppnewclassdlg.h +++ b/languages/cpp/cppnewclassdlg.h @@ -35,36 +35,36 @@ class PCheckListItem: public TQCheckListItem { public: - PCheckListItem ( T item, TQCheckListItem * tqparent, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( tqparent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQCheckListItem * parent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQCheckListItem * tqparent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( tqparent, after, text, tt ), m_item( item ) + PCheckListItem ( T item, TQCheckListItem * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQListViewItem * tqparent, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( tqparent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * parent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQListViewItem * tqparent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( tqparent, after, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQListView * tqparent, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( tqparent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListView * parent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQListView * tqparent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( tqparent, after, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListView * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQListViewItem * tqparent, const TQString & text, const TQPixmap & p ) : - TQCheckListItem ( tqparent, text, p ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * parent, const TQString & text, const TQPixmap & p ) : + TQCheckListItem ( parent, text, p ), m_item( item ) {} - PCheckListItem ( T item, TQListView * tqparent, const TQString & text, const TQPixmap & p ) : - TQCheckListItem ( tqparent, text, p ), m_item( item ) + PCheckListItem ( T item, TQListView * parent, const TQString & text, const TQPixmap & p ) : + TQCheckListItem ( parent, text, p ), m_item( item ) {} T item() @@ -83,20 +83,20 @@ class PListViewItem: public TQListViewItem { public: - PListViewItem ( T item, TQListViewItem * tqparent, TQListViewItem * after, const TQString & text ) : - TQListViewItem ( tqparent, after, text ), m_item( item ) + PListViewItem ( T item, TQListViewItem * parent, TQListViewItem * after, const TQString & text ) : + TQListViewItem ( parent, after, text ), m_item( item ) {} - PListViewItem ( T item, TQListViewItem * tqparent, const TQString & text ) : - TQListViewItem ( tqparent, text ), m_item( item ) + PListViewItem ( T item, TQListViewItem * parent, const TQString & text ) : + TQListViewItem ( parent, text ), m_item( item ) {} - PListViewItem ( T item, TQListView * tqparent, const TQString & text ) : - TQListViewItem ( tqparent, text ), m_item( item ) + PListViewItem ( T item, TQListView * parent, const TQString & text ) : + TQListViewItem ( parent, text ), m_item( item ) {} - PListViewItem ( T item, TQListView * tqparent, TQListViewItem * after, const TQString & text ) : - TQListViewItem ( tqparent, after, text ), m_item( item ) + PListViewItem ( T item, TQListView * parent, TQListViewItem * after, const TQString & text ) : + TQListViewItem ( parent, after, text ), m_item( item ) {} T item() @@ -116,7 +116,7 @@ class CppNewClassDialog : public CppNewClassDialogBase TQ_OBJECT public: - CppNewClassDialog( CppSupportPart *part, TQWidget *tqparent = 0, const char *name = 0 ); + CppNewClassDialog( CppSupportPart *part, TQWidget *parent = 0, const char *name = 0 ); ~CppNewClassDialog(); protected: @@ -168,9 +168,9 @@ protected: void parseClass( TQString clName, TQString inheritance ); void parsePCSClass( TQString clName, TQString inheritance ); void addToConstructorsList( TQCheckListItem *myClass, FunctionDom method ); - void addToMethodsList( TQListViewItem *tqparent, FunctionDom method ); - void addToUpgradeList( TQListViewItem *tqparent, FunctionDom method, TQString modifier ); - void addToUpgradeList( TQListViewItem *tqparent, VariableDom attr, TQString modifier ); + void addToMethodsList( TQListViewItem *parent, FunctionDom method ); + void addToUpgradeList( TQListViewItem *parent, FunctionDom method, TQString modifier ); + void addToUpgradeList( TQListViewItem *parent, VariableDom attr, TQString modifier ); void clearConstructorsList( bool clean = false ); void clearMethodsList( bool clean = false ); void clearUpgradeList( bool clean = false ); diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index 31d25e2c..c4d68a70 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -413,7 +413,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <enum>StrongFocus</enum> </property> <property name="whatsThis" stdset="0"> - <string>Insert the base class which your new class will be derived from. If you have checked 'Generate QWidget child class' the new class will be derived from QWidget. If no base class is named, the new class will not have a tqparent class. You can also use template classes here (like BaseClass<int, int>)</string> + <string>Insert the base class which your new class will be derived from. If you have checked 'Generate QWidget child class' the new class will be derived from QWidget. If no base class is named, the new class will not have a parent class. You can also use template classes here (like BaseClass<int, int>)</string> </property> </widget> <widget class="KLineEdit" row="0" column="2"> diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index 204195aa..9cae9c77 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -191,8 +191,8 @@ public: }; -CppSupportPart::CppSupportPart( TQObject *tqparent, const char *name, const TQStringList &args ) -: KDevLanguageSupport( CppSupportFactory::info(), tqparent, name ? name : "KDevCppSupport" ), m_backgroundParser(0), +CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStringList &args ) +: KDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "KDevCppSupport" ), m_backgroundParser(0), m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ), m_projectClosed( true ), m_projectClosing( false ), m_valid( false ), m_isTyping( false ), m_hadErrors( false ), _jd(0) @@ -1705,7 +1705,7 @@ void CppSupportPart::slotNeedTextHint( int line, int column, TQString& textHint { while ( node && node->nodeType() != NodeType_FunctionDefinition ) - node = node->tqparent(); + node = node->parent(); if ( node ) { @@ -1747,7 +1747,7 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum { if ( currentNode->nodeType() == NodeType_Declarator ) declarator = ( DeclaratorAST* ) currentNode; - currentNode = currentNode->tqparent(); + currentNode = currentNode->parent(); } SimpleDeclarationAST* decl = currentNode ? ( SimpleDeclarationAST* ) currentNode : 0; @@ -3136,7 +3136,7 @@ TQString CppSupportPart::findHeaderSimple( const TQString &header ) return TQString(); } -UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& tqparent ) : TQThread(), m_parent( tqparent ), m_stop(false) { +UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : TQThread(), m_parent( parent ), m_stop(false) { } void UIBlockTester::UIBlockTesterThread::run() { diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index 650831e8..906a2694 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -42,7 +42,7 @@ class UIBlockTester : public TQObject { TQ_OBJECT class UIBlockTesterThread : public TQThread { public: - UIBlockTesterThread( UIBlockTester& tqparent ); + UIBlockTesterThread( UIBlockTester& parent ); void run(); void stop(); private: @@ -159,7 +159,7 @@ class CppSupportPart : public KDevLanguageSupport TQ_OBJECT public: - CppSupportPart( TQObject *tqparent, const char *name, const TQStringList &args ); + CppSupportPart( TQObject *parent, const char *name, const TQStringList &args ); virtual ~CppSupportPart(); bool isValid() const diff --git a/languages/cpp/creategettersetterdialog.cpp b/languages/cpp/creategettersetterdialog.cpp index 5b5dae69..e63fcf23 100644 --- a/languages/cpp/creategettersetterdialog.cpp +++ b/languages/cpp/creategettersetterdialog.cpp @@ -19,8 +19,8 @@ #include "creategettersetterconfiguration.h" CreateGetterSetterDialog::CreateGetterSetterDialog( CppSupportPart* part, ClassDom aClass, - VariableDom aVar, TQWidget *tqparent, const char *pName ) -: CreateGetterSetterDialogBase( tqparent, pName ), m_part( part ), m_class( aClass ), m_var( aVar ) + VariableDom aVar, TQWidget *parent, const char *pName ) +: CreateGetterSetterDialogBase( parent, pName ), m_part( part ), m_class( aClass ), m_var( aVar ) { TQString name = aVar->name(); setCaption( "Create methods for " + name ); diff --git a/languages/cpp/creategettersetterdialog.h b/languages/cpp/creategettersetterdialog.h index 8f609c33..ac4e4997 100644 --- a/languages/cpp/creategettersetterdialog.h +++ b/languages/cpp/creategettersetterdialog.h @@ -26,7 +26,7 @@ class CreateGetterSetterDialog: public CreateGetterSetterDialogBase Q_OBJECT TQ_OBJECT public: - CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, TQWidget *tqparent = 0, const char *name = 0); + CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, TQWidget *parent = 0, const char *name = 0); protected slots: void accept(); diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index a5b328c4..93c5d754 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -132,13 +132,13 @@ private: class PCSListViewItem: public KListViewItem { public: - PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* tqparent ) - : KListViewItem( tqparent ), m_importer( importer ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* parent ) + : KListViewItem( parent ), m_importer( importer ) { init( ptr ); } - PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* tqparent ) - : KListViewItem( tqparent ), m_importer( importer ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* parent ) + : KListViewItem( parent ), m_importer( importer ) { init( ptr ); } @@ -196,8 +196,8 @@ public: -CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : CreatePCSDialogBase( tqparent, name, modal, fl ), m_part( part ), m_jobData( 0 ) +CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : CreatePCSDialogBase( parent, name, modal, fl ), m_part( part ), m_jobData( 0 ) { helpButton()->hide(); diff --git a/languages/cpp/createpcsdialog.h b/languages/cpp/createpcsdialog.h index e9371434..cdb30538 100644 --- a/languages/cpp/createpcsdialog.h +++ b/languages/cpp/createpcsdialog.h @@ -22,7 +22,7 @@ class CreatePCSDialog : public CreatePCSDialogBase TQ_OBJECT public: - CreatePCSDialog( CppSupportPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreatePCSDialog( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreatePCSDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index fe04ffd4..64f4dcee 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -50,8 +50,8 @@ namespace GDBDebugger // For use with the internal debugger, but this dialog doesn't know anything // about why it's doing it. -Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *tqparent, const char *name) - : KDialog(tqparent, name, true), // modal +Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) + : KDialog(parent, name, true), // modal psProc_(0), pids_(new KListView(this)), pidLines_(TQString()) diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h index 273bb7b8..82e73606 100644 --- a/languages/cpp/debugger/dbgpsdlg.h +++ b/languages/cpp/debugger/dbgpsdlg.h @@ -34,7 +34,7 @@ class Dbg_PS_Dialog : public KDialog TQ_OBJECT public: - Dbg_PS_Dialog( TQWidget *tqparent=0, const char *name=0 ); + Dbg_PS_Dialog( TQWidget *parent=0, const char *name=0 ); ~Dbg_PS_Dialog(); int pidSelected(); diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 58cea851..9a3f4e02 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -68,7 +68,7 @@ namespace GDBDebugger class DbgMoveHandle : public TQFrame { public: - DbgMoveHandle(DbgToolBar *tqparent=0, const char * name=0, WFlags f=0); + DbgMoveHandle(DbgToolBar *parent=0, const char * name=0, WFlags f=0); virtual ~DbgMoveHandle(); virtual void mousePressEvent(TQMouseEvent *e); @@ -83,9 +83,9 @@ private: // ************************************************************************** -DbgMoveHandle::DbgMoveHandle(DbgToolBar *tqparent, const char * name, WFlags f) - : TQFrame(tqparent, name, f), - toolBar_(tqparent), +DbgMoveHandle::DbgMoveHandle(DbgToolBar *parent, const char * name, WFlags f) + : TQFrame(parent, name, f), + toolBar_(parent), offset_(TQPoint(0,0)), moving_(false) { @@ -111,9 +111,9 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) KPopupMenu *menu = new KPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - tqparent(), TQT_SLOT(slotDock())); + parent(), TQT_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"), - tqparent(), TQT_SLOT(slotIconifyAndDock())); + parent(), TQT_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; @@ -159,7 +159,7 @@ class DbgButton : public TQPushButton { public: DbgButton(const TQPixmap &pixmap, const TQString &text, - DbgToolBar *tqparent, const char *name=0); + DbgToolBar *parent, const char *name=0); virtual ~DbgButton() {}; void drawButtonLabel(TQPainter *painter); TQSize tqsizeHint() const; @@ -171,8 +171,8 @@ private: // ************************************************************************** DbgButton::DbgButton(const TQPixmap& pixmap, const TQString& text, - DbgToolBar* tqparent, const char* name) - : TQPushButton(tqparent, name), + DbgToolBar* parent, const char* name) + : TQPushButton(parent, name), pixmap_(pixmap) { setText(text); @@ -217,8 +217,8 @@ TQSize DbgButton::tqsizeHint() const // ************************************************************************** // ************************************************************************** -DbgDocker::DbgDocker(TQWidget* tqparent, DbgToolBar* toolBar, const TQPixmap& pixmap) : - KSystemTray(tqparent, "DbgDocker"), +DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixmap) : + KSystemTray(parent, "DbgDocker"), toolBar_(toolBar) { setPixmap(pixmap); @@ -258,7 +258,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) // ************************************************************************** DbgToolBar::DbgToolBar(DebuggerPart* part, - TQWidget* tqparent, const char* name) + TQWidget* parent, const char* name) : TQFrame(0, name), part_(part), activeWindow_(0), @@ -268,10 +268,10 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, appIsActive_(false), docked_(false), docker_(0), - dockWindow_(new KSystemTray(tqparent)) + dockWindow_(new KSystemTray(parent)) { winModule_ = new KWinModule(TQT_TQOBJECT(this)); - docker_ = new DbgDocker(tqparent, this, BarIcon("dbgnext")); + docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h index 427120d9..a163af0c 100644 --- a/languages/cpp/debugger/dbgtoolbar.h +++ b/languages/cpp/debugger/dbgtoolbar.h @@ -36,7 +36,7 @@ class DbgDocker : public KSystemTray TQ_OBJECT public: - DbgDocker(TQWidget *tqparent, DbgToolBar *toolBar, const TQPixmap &pixmap); + DbgDocker(TQWidget *parent, DbgToolBar *toolBar, const TQPixmap &pixmap); virtual ~DbgDocker() {}; virtual void mousePressEvent(TQMouseEvent *e); @@ -54,7 +54,7 @@ class DbgToolBar : public TQFrame TQ_OBJECT public: - DbgToolBar(DebuggerPart *part, TQWidget* tqparent, const char* name=0); + DbgToolBar(DebuggerPart *part, TQWidget* parent, const char* name=0); virtual ~DbgToolBar(); private slots: diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp index 2fbc6a88..409329f7 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.cpp +++ b/languages/cpp/debugger/debuggerconfigwidget.cpp @@ -27,8 +27,8 @@ namespace GDBDebugger { -DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *tqparent, const char *name) - : DebuggerConfigWidgetBase(tqparent, name), dom(*part->projectDom()) +DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent, const char *name) + : DebuggerConfigWidgetBase(parent, name), dom(*part->projectDom()) { gdbPath_edit->setMode(KFile::File|KFile::ExistingOnly|KFile::LocalOnly); diff --git a/languages/cpp/debugger/debuggerconfigwidget.h b/languages/cpp/debugger/debuggerconfigwidget.h index cdd2479d..d17d1202 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.h +++ b/languages/cpp/debugger/debuggerconfigwidget.h @@ -29,7 +29,7 @@ class DebuggerConfigWidget : public DebuggerConfigWidgetBase TQ_OBJECT public: - DebuggerConfigWidget( DebuggerPart* part, TQWidget *tqparent=0, const char *name=0 ); + DebuggerConfigWidget( DebuggerPart* part, TQWidget *parent=0, const char *name=0 ); ~DebuggerConfigWidget(); public slots: diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 43d6990e..b74b9d63 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -76,8 +76,8 @@ static const KDevPluginInfo data("kdevdebugger"); typedef KDevGenericFactory<DebuggerPart> DebuggerFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdebugger, DebuggerFactory( data ) ) -DebuggerPart::DebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ) : - KDevPlugin( &data, tqparent, name ? name : "DebuggerPart" ), +DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringList & ) : + KDevPlugin( &data, parent, name ? name : "DebuggerPart" ), controller(0), previousDebuggerState_(s_dbgNotStarted), justRestarted_(false), needRebuild_(true), running_(false) diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h index 71d56568..6981265f 100644 --- a/languages/cpp/debugger/debuggerpart.h +++ b/languages/cpp/debugger/debuggerpart.h @@ -50,7 +50,7 @@ class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface TQ_OBJECT public: - DebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ); + DebuggerPart( TQObject *parent, const char *name, const TQStringList & ); ~DebuggerPart(); virtual void restorePartialProjectSession(const TQDomElement* el); virtual void savePartialProjectSession(TQDomElement* el); diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp index 0af77613..6bf70f3b 100644 --- a/languages/cpp/debugger/debuggertracingdialog.cpp +++ b/languages/cpp/debugger/debuggertracingdialog.cpp @@ -14,8 +14,8 @@ namespace GDBDebugger DebuggerTracingDialog ::DebuggerTracingDialog(Breakpoint* bp, - TQWidget* tqparent, const char* name) - : DebuggerTracingDialogBase(tqparent, name), bp_(bp) + TQWidget* parent, const char* name) + : DebuggerTracingDialogBase(parent, name), bp_(bp) { expressions->setButtons(KEditListBox::Add | KEditListBox::Remove); diff --git a/languages/cpp/debugger/debuggertracingdialog.h b/languages/cpp/debugger/debuggertracingdialog.h index e0e8dc48..4cbffe36 100644 --- a/languages/cpp/debugger/debuggertracingdialog.h +++ b/languages/cpp/debugger/debuggertracingdialog.h @@ -26,7 +26,7 @@ namespace GDBDebugger TQ_OBJECT public: DebuggerTracingDialog(Breakpoint* bp, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); private slots: void enableOrDisable(int); diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp index 6b848a27..562aa1ae 100644 --- a/languages/cpp/debugger/disassemblewidget.cpp +++ b/languages/cpp/debugger/disassemblewidget.cpp @@ -35,8 +35,8 @@ namespace GDBDebugger /***************************************************************************/ /***************************************************************************/ -DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *tqparent, const char *name) - : TQTextEdit(tqparent, name), controller_(controller), +DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *parent, const char *name) + : TQTextEdit(parent, name), controller_(controller), active_(false), lower_(0), upper_(0), diff --git a/languages/cpp/debugger/disassemblewidget.h b/languages/cpp/debugger/disassemblewidget.h index 33f29da9..18dc3a7a 100644 --- a/languages/cpp/debugger/disassemblewidget.h +++ b/languages/cpp/debugger/disassemblewidget.h @@ -36,7 +36,7 @@ class DisassembleWidget : public TQTextEdit TQ_OBJECT public: - DisassembleWidget( GDBController* controller, TQWidget *tqparent=0, const char *name=0 ); + DisassembleWidget( GDBController* controller, TQWidget *parent=0, const char *name=0 ); virtual ~DisassembleWidget(); public slots: diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp index 28fd076e..639ab74b 100644 --- a/languages/cpp/debugger/framestackwidget.cpp +++ b/languages/cpp/debugger/framestackwidget.cpp @@ -39,9 +39,9 @@ namespace GDBDebugger { FramestackWidget::FramestackWidget(GDBController* controller, - TQWidget *tqparent, + TQWidget *parent, const char *name, WFlags f) - : TQListView(tqparent, name, f), + : TQListView(parent, name, f), viewedThread_(0), controller_(controller), mayUpdate_( false ) @@ -493,10 +493,10 @@ void FramestackWidget::drawContentsOffset( TQPainter * p, int ox, int oy, // ************************************************************************** // ************************************************************************** -FrameStackItem::FrameStackItem(FramestackWidget *tqparent, +FrameStackItem::FrameStackItem(FramestackWidget *parent, unsigned frameNo, const TQString &name) - : TQListViewItem(tqparent, tqparent->lastChild()), + : TQListViewItem(parent, parent->lastChild()), frameNo_(frameNo), threadNo_(-1) { @@ -505,12 +505,12 @@ FrameStackItem::FrameStackItem(FramestackWidget *tqparent, // ************************************************************************** -FrameStackItem::FrameStackItem(ThreadStackItem *tqparent, +FrameStackItem::FrameStackItem(ThreadStackItem *parent, unsigned frameNo, const TQString &name) - : TQListViewItem(tqparent, tqparent->lastChild()), + : TQListViewItem(parent, parent->lastChild()), frameNo_(frameNo), - threadNo_(tqparent->threadNo()) + threadNo_(parent->threadNo()) { setText(0, name); } @@ -554,8 +554,8 @@ void FrameStackItem::setOpen(bool open) // ************************************************************************** // ************************************************************************** -ThreadStackItem::ThreadStackItem(FramestackWidget *tqparent, unsigned threadNo) -: TQListViewItem(tqparent), +ThreadStackItem::ThreadStackItem(FramestackWidget *parent, unsigned threadNo) +: TQListViewItem(parent), threadNo_(threadNo) { setText(0, i18n("Thread %1").tqarg(threadNo_)); diff --git a/languages/cpp/debugger/framestackwidget.h b/languages/cpp/debugger/framestackwidget.h index 5d0b98e7..631c440f 100644 --- a/languages/cpp/debugger/framestackwidget.h +++ b/languages/cpp/debugger/framestackwidget.h @@ -33,7 +33,7 @@ class FramestackWidget; class ThreadStackItem : public TQListViewItem { public: - ThreadStackItem(FramestackWidget *tqparent, + ThreadStackItem(FramestackWidget *parent, unsigned threadNo); virtual ~ThreadStackItem(); @@ -59,10 +59,10 @@ private: class FrameStackItem : public TQListViewItem { public: - FrameStackItem(FramestackWidget *tqparent, + FrameStackItem(FramestackWidget *parent, unsigned frameNo, const TQString &name); - FrameStackItem(ThreadStackItem *tqparent, + FrameStackItem(ThreadStackItem *parent, unsigned frameNo, const TQString &name); virtual ~FrameStackItem(); @@ -95,7 +95,7 @@ class FramestackWidget : public TQListView public: FramestackWidget( GDBController* controller, - TQWidget *tqparent=0, + TQWidget *parent=0, const char *name=0, WFlags f=0 ); virtual ~FramestackWidget(); diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index dffdf5d4..10d8a749 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -100,9 +100,9 @@ private: /***************************************************************************/ /***************************************************************************/ -BreakpointTableRow::BreakpointTableRow(TQTable* tqparent, EditType editType, +BreakpointTableRow::BreakpointTableRow(TQTable* parent, EditType editType, Breakpoint* bp) : - TQTableItem(tqparent, editType, ""), + TQTableItem(parent, editType, ""), m_breakpoint(bp) { appendEmptyRow(); @@ -146,7 +146,7 @@ void BreakpointTableRow::appendEmptyRow() ComplexEditCell* act = new ComplexEditCell(table()); table()->setItem(row, Tracing, act); TQObject::connect(act, TQT_SIGNAL(edit(TQTableItem*)), - table()->tqparent(), TQT_SLOT(editTracing(TQTableItem*))); + table()->parent(), TQT_SLOT(editTracing(TQTableItem*))); } /***************************************************************************/ @@ -196,8 +196,8 @@ void BreakpointTableRow::setRow() /***************************************************************************/ GDBBreakpointWidget::GDBBreakpointWidget(GDBController* controller, - TQWidget *tqparent, const char *name) : -TQHBox(tqparent, name), + TQWidget *parent, const char *name) : +TQHBox(parent, name), controller_(controller) { m_table = new GDBTable(0, numCols, this, name); diff --git a/languages/cpp/debugger/gdbbreakpointwidget.h b/languages/cpp/debugger/gdbbreakpointwidget.h index 2379a318..c1a0c7fe 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.h +++ b/languages/cpp/debugger/gdbbreakpointwidget.h @@ -48,7 +48,7 @@ class GDBBreakpointWidget : public TQHBox public: GDBBreakpointWidget( GDBController* controller, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); virtual ~GDBBreakpointWidget(); void reset(); diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index fe5059cb..7648fdf2 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -39,8 +39,8 @@ namespace GDBDebugger /***************************************************************************/ -GDBOutputWidget::GDBOutputWidget( TQWidget *tqparent, const char *name) : - TQWidget(tqparent, name), +GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : + TQWidget(parent, name), m_userGDBCmdEditor(0), m_Interrupt(0), m_gdbView(0), diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h index 171fdb86..ed841d9b 100644 --- a/languages/cpp/debugger/gdboutputwidget.h +++ b/languages/cpp/debugger/gdboutputwidget.h @@ -38,7 +38,7 @@ class GDBOutputWidget : public TQWidget TQ_OBJECT public: - GDBOutputWidget( TQWidget *tqparent=0, const char *name=0 ); + GDBOutputWidget( TQWidget *parent=0, const char *name=0 ); ~GDBOutputWidget(); void savePartialProjectSession(TQDomElement* el); @@ -119,9 +119,9 @@ class OutputText : public TQTextEdit Q_OBJECT TQ_OBJECT public: - OutputText(GDBOutputWidget* tqparent) - : TQTextEdit(tqparent), - parent_(tqparent) + OutputText(GDBOutputWidget* parent) + : TQTextEdit(parent), + parent_(parent) {} TQPopupMenu* createPopupMenu(const TQPoint& pos); diff --git a/languages/cpp/debugger/gdbparser.h b/languages/cpp/debugger/gdbparser.h index 08e5cda7..a56c082d 100644 --- a/languages/cpp/debugger/gdbparser.h +++ b/languages/cpp/debugger/gdbparser.h @@ -35,7 +35,7 @@ public: static void destroy(); private: - void parseArray(TrimmableItem *tqparent, const char *buf); + void parseArray(TrimmableItem *parent, const char *buf); const char *skipTokenEnd(const char *buf) const; const char *skipTokenValue(const char *buf) const; diff --git a/languages/cpp/debugger/gdbtable.cpp b/languages/cpp/debugger/gdbtable.cpp index c4b16da8..c9c1bf2f 100644 --- a/languages/cpp/debugger/gdbtable.cpp +++ b/languages/cpp/debugger/gdbtable.cpp @@ -11,13 +11,13 @@ namespace GDBDebugger { -GDBTable::GDBTable(TQWidget *tqparent, const char *name) - : TQTable(tqparent, name) +GDBTable::GDBTable(TQWidget *parent, const char *name) + : TQTable(parent, name) { } -GDBTable::GDBTable(int nr, int nc, TQWidget * tqparent, const char * name) - : TQTable(nr, nc, tqparent, name) +GDBTable::GDBTable(int nr, int nc, TQWidget * parent, const char * name) + : TQTable(nr, nc, parent, name) { } diff --git a/languages/cpp/debugger/gdbtable.h b/languages/cpp/debugger/gdbtable.h index 55374380..da1e7a0e 100644 --- a/languages/cpp/debugger/gdbtable.h +++ b/languages/cpp/debugger/gdbtable.h @@ -19,8 +19,8 @@ class GDBTable : public TQTable Q_OBJECT TQ_OBJECT public: - GDBTable(TQWidget *tqparent = 0, const char *name = 0); - GDBTable( int numRows, int numCols, TQWidget * tqparent = 0, const char * name = 0 ); + GDBTable(TQWidget *parent = 0, const char *name = 0); + GDBTable( int numRows, int numCols, TQWidget * parent = 0, const char * name = 0 ); ~GDBTable(); virtual void keyPressEvent ( TQKeyEvent * e ); diff --git a/languages/cpp/debugger/label_with_double_click.cpp b/languages/cpp/debugger/label_with_double_click.cpp index deaab3cc..f08c7358 100644 --- a/languages/cpp/debugger/label_with_double_click.cpp +++ b/languages/cpp/debugger/label_with_double_click.cpp @@ -1,8 +1,8 @@ #include "label_with_double_click.h" -LabelWithDoubleClick::LabelWithDoubleClick(const TQString& s, TQWidget* tqparent) -: TQLabel(s, tqparent) +LabelWithDoubleClick::LabelWithDoubleClick(const TQString& s, TQWidget* parent) +: TQLabel(s, parent) {} void LabelWithDoubleClick::mouseDoubleClickEvent(TQMouseEvent*) diff --git a/languages/cpp/debugger/label_with_double_click.h b/languages/cpp/debugger/label_with_double_click.h index 616ad903..ebff3d92 100644 --- a/languages/cpp/debugger/label_with_double_click.h +++ b/languages/cpp/debugger/label_with_double_click.h @@ -9,7 +9,7 @@ class LabelWithDoubleClick : public TQLabel Q_OBJECT TQ_OBJECT public: - LabelWithDoubleClick(const TQString& s, TQWidget* tqparent); + LabelWithDoubleClick(const TQString& s, TQWidget* parent); signals: void doubleClicked(); diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index c594d134..48c2ddd4 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -79,8 +79,8 @@ namespace GDBDebugger TQPushButton* okButton; TQPushButton* cancelButton; - MemoryRangeSelector(TQWidget* tqparent) - : TQWidget(tqparent) + MemoryRangeSelector(TQWidget* parent) + : TQWidget(parent) { TQVBoxLayout* l = new TQVBoxLayout(this); @@ -127,8 +127,8 @@ namespace GDBDebugger MemoryView::MemoryView(GDBController* controller, - TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name), + TQWidget* parent, const char* name) + : TQWidget(parent, name), controller_(controller), // New memory view can be created only when debugger is active, // so don't set s_appNotStarted here. @@ -403,9 +403,9 @@ namespace GDBDebugger ViewerWidget::ViewerWidget(GDBController* controller, - TQWidget* tqparent, + TQWidget* parent, const char* name) - : TQWidget(tqparent, name), + : TQWidget(parent, name), controller_(controller) { setIcon(SmallIcon("math_brace")); diff --git a/languages/cpp/debugger/memviewdlg.h b/languages/cpp/debugger/memviewdlg.h index 991efbb3..ecdb304f 100644 --- a/languages/cpp/debugger/memviewdlg.h +++ b/languages/cpp/debugger/memviewdlg.h @@ -37,7 +37,7 @@ namespace GDBDebugger TQ_OBJECT public: ViewerWidget(GDBController* controller, - TQWidget* tqparent, const char* name); + TQWidget* parent, const char* name); public slots: /** Adds a new memory view to *this, initially showing @@ -68,7 +68,7 @@ namespace GDBDebugger TQ_OBJECT public: MemoryView(GDBController* controller, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); void debuggerStateChanged(int state); diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index 07b848d9..52ff7a24 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -346,11 +346,11 @@ bool STTY::findExternalTTY(const TQString &termApp) ::exit(1); } - // tqparent process + // parent process if (pid <= 0) ::exit(1); - // Open the communication between us (the tqparent) and the + // Open the communication between us (the parent) and the // child (the process running on a tty console) fifo_fd = ::open(fifo, O_RDONLY); if (fifo_fd < 0) diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 2b9e4de3..581b3cb8 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -77,8 +77,8 @@ namespace GDBDebugger VariableWidget::VariableWidget(GDBController* controller, GDBBreakpointWidget* breakpointWidget, - TQWidget *tqparent, const char *name) -: TQWidget(tqparent, name) + TQWidget *parent, const char *name) +: TQWidget(parent, name) { setIcon(SmallIcon("math_brace")); setCaption(i18n("Variable Tree")); @@ -197,11 +197,11 @@ void VariableWidget::focusInEvent(TQFocusEvent */*e*/) // ************************************************************************** // ************************************************************************** -VariableTree::VariableTree(VariableWidget *tqparent, +VariableTree::VariableTree(VariableWidget *parent, GDBController* controller, GDBBreakpointWidget* breakpointWidget, const char *name) - : KListView(tqparent, name), + : KListView(parent, name), TQToolTip( viewport() ), controller_(controller), breakpointWidget_(breakpointWidget), @@ -244,7 +244,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) setSelected(item, true); // Need to select this item. - if (item->tqparent()) + if (item->parent()) { KPopupMenu popup(this); KPopupMenu format(this); @@ -360,7 +360,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) { if (VarItem *item = dynamic_cast<VarItem*>(currentItem())) { - ((VariableWidget*)tqparent())-> + ((VariableWidget*)parent())-> slotEvaluateExpression(item->gdbExpression()); } } @@ -368,7 +368,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) { if (VarItem *item = dynamic_cast<VarItem*>(currentItem())) { - ((VariableWidget*)tqparent())-> + ((VariableWidget*)parent())-> slotAddWatchVariable(item->gdbExpression()); } } @@ -547,8 +547,8 @@ void VariableTree::slotEvaluateExpression(const TQString &expression) TQListViewItem *VariableTree::findRoot(TQListViewItem *item) const { - while (item->tqparent()) - item = item->tqparent(); + while (item->parent()) + item = item->parent(); return item; } @@ -1018,15 +1018,15 @@ void VariableTree::handleAddressComputed(const GDBMI::ResultRecord& r) // ************************************************************************** // ************************************************************************** -TrimmableItem::TrimmableItem(VariableTree *tqparent) - : KListViewItem (tqparent, tqparent->lastChild()) +TrimmableItem::TrimmableItem(VariableTree *parent) + : KListViewItem (parent, parent->lastChild()) { } // ************************************************************************** -TrimmableItem::TrimmableItem(TrimmableItem *tqparent) - : KListViewItem (tqparent, tqparent->lastChild()) +TrimmableItem::TrimmableItem(TrimmableItem *parent) + : KListViewItem (parent, parent->lastChild()) { } @@ -1044,7 +1044,7 @@ void TrimmableItem::paintCell(TQPainter *p, const TQColorGroup &cg, if ( !p ) return; // make toplevel item (watch and frame items) names bold - if (column == 0 && !tqparent()) + if (column == 0 && !parent()) { TQFont f = p->font(); f.setBold(true); @@ -1069,10 +1069,10 @@ TQListViewItem *TrimmableItem::lastChild() const int VarItem::varobjIndex = 0; -VarItem::VarItem(TrimmableItem *tqparent, +VarItem::VarItem(TrimmableItem *parent, const TQString& expression, bool frozen) - : TrimmableItem (tqparent), + : TrimmableItem (parent), expression_(expression), highlight_(false), oldSpecialRepresentationSet_(false), @@ -1116,9 +1116,9 @@ VarItem::VarItem(TrimmableItem *tqparent, createVarobj(); } -VarItem::VarItem(TrimmableItem *tqparent, const GDBMI::Value& varobj, +VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, format_t format, bool baseClassMember) -: TrimmableItem (tqparent), +: TrimmableItem (parent), highlight_(false), oldSpecialRepresentationSet_(false), format_(format), @@ -1394,7 +1394,7 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, { kdDebug(9012) << "Creating new varobj " << exp << " " << baseObject << "\n"; - // Propagate format from tqparent. + // Propagate format from parent. VarItem* v = 0; v = new VarItem(this, tqchildren[i], format_, baseObject); } @@ -1469,10 +1469,10 @@ TQString VarItem::displayName() const if (expression_[0] != '*') return expression_; - if (const VarItem* tqparent = - dynamic_cast<const VarItem*>(TrimmableItem::tqparent())) + if (const VarItem* parent = + dynamic_cast<const VarItem*>(TrimmableItem::parent())) { - return "*" + tqparent->displayName(); + return "*" + parent->displayName(); } else { @@ -1504,24 +1504,24 @@ TQString VarItem::gdbExpression() const // - number, for array element // - identifier, for member, // - ***intentifier, for derefenreced pointer. - const VarItem* tqparent = dynamic_cast<const VarItem*>(TrimmableItem::tqparent()); + const VarItem* parent = dynamic_cast<const VarItem*>(TrimmableItem::parent()); bool ok = false; expression_.toInt(&ok); if (ok) { - // Array, tqparent always exists. - return tqparent->gdbExpression() + "[" + expression_ + "]"; + // Array, parent always exists. + return parent->gdbExpression() + "[" + expression_ + "]"; } else if (expression_[0] == '*') { - if (tqparent) + if (parent) { // For MI, expression_ can be "*0" (meaing // references 0-th element of some array). - // So, we really need to get to the tqparent to computed the right + // So, we really need to get to the parent to computed the right // gdb expression. - return "*" + tqparent->gdbExpression(); + return "*" + parent->gdbExpression(); } else { @@ -1532,14 +1532,14 @@ TQString VarItem::gdbExpression() const } else { - if (tqparent) + if (parent) /* This is varitem corresponds to a base suboject, - the expression should cast tqparent to the base's + the expression should cast parent to the base's type. */ if (baseClassMember_) - return "((" + expression_ + ")" + tqparent->gdbExpression() + ")"; + return "((" + expression_ + ")" + parent->gdbExpression() + ")"; else - return tqparent->gdbExpression() + "." + expression_; + return parent->gdbExpression() + "." + expression_; else return expression_; } @@ -1877,7 +1877,7 @@ VariableTree* VarItem::varTree() const void VarItem::unhookFromGdb() { // Unhook tqchildren first, so that child varitems are deleted - // before tqparent. Strictly speaking, we can avoid calling + // before parent. Strictly speaking, we can avoid calling // -var-delete on child varitems, but that's a bit cheesy, for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) @@ -1931,8 +1931,8 @@ bool VarItem::isAlive() const // ************************************************************************** // ************************************************************************** -VarFrameRoot::VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo) - : TrimmableItem (tqparent), +VarFrameRoot::VarFrameRoot(VariableTree *parent, int frameNo, int threadNo) + : TrimmableItem (parent), needLocals_(false), frameNo_(frameNo), threadNo_(threadNo), @@ -1956,8 +1956,8 @@ void VarFrameRoot::setOpen(bool open) if (frameOpened && needLocals_) { needLocals_ = false; - VariableTree* tqparent = static_cast<VariableTree*>(listView()); - tqparent->updateCurrentFrame(); + VariableTree* parent = static_cast<VariableTree*>(listView()); + parent->updateCurrentFrame(); } } @@ -1978,8 +1978,8 @@ void VarFrameRoot::setDirty() // ************************************************************************** // ************************************************************************** -WatchRoot::WatchRoot(VariableTree *tqparent) - : TrimmableItem(tqparent) +WatchRoot::WatchRoot(VariableTree *parent) + : TrimmableItem(parent) { setText(0, i18n("Watch")); setOpen(true); diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h index d56e8977..2e5e6c38 100644 --- a/languages/cpp/debugger/variablewidget.h +++ b/languages/cpp/debugger/variablewidget.h @@ -57,7 +57,7 @@ class VariableWidget : public TQWidget public: VariableWidget( GDBController* controller, GDBBreakpointWidget* breakpointWidget, - TQWidget *tqparent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); VariableTree *varTree() const { return varTree_; } @@ -88,7 +88,7 @@ class VariableTree : public KListView, public TQToolTip Q_OBJECT TQ_OBJECT public: - VariableTree(VariableWidget *tqparent, + VariableTree(VariableWidget *parent, GDBController* controller, GDBBreakpointWidget* breakpointWidget, const char *name=0 ); @@ -207,8 +207,8 @@ private: class TrimmableItem : public KListViewItem { public: - TrimmableItem(VariableTree *tqparent); - TrimmableItem(TrimmableItem *tqparent); + TrimmableItem(VariableTree *parent); + TrimmableItem(TrimmableItem *parent); virtual ~TrimmableItem(); @@ -235,11 +235,11 @@ public: /** Creates top-level variable item from the specified expression. Optionally, alternative display name can be provided. */ - VarItem( TrimmableItem *tqparent, + VarItem( TrimmableItem *parent, const TQString& expression, bool frozen = false); - VarItem( TrimmableItem *tqparent, const GDBMI::Value& varobj, + VarItem( TrimmableItem *parent, const GDBMI::Value& varobj, format_t format, bool baseClassMember); virtual ~VarItem(); @@ -373,7 +373,7 @@ private: private: // The gdb expression for this varItem relatively to - // tqparent VarItem. + // parent VarItem. TQString expression_; bool highlight_; @@ -418,7 +418,7 @@ private: class VarFrameRoot : public TrimmableItem { public: - VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo); + VarFrameRoot(VariableTree *parent, int frameNo, int threadNo); virtual ~VarFrameRoot(); void setOpen(bool open); @@ -456,7 +456,7 @@ private: class WatchRoot : public TrimmableItem { public: - WatchRoot(VariableTree *tqparent); + WatchRoot(VariableTree *parent); virtual ~WatchRoot(); }; diff --git a/languages/cpp/doc/libc.toc b/languages/cpp/doc/libc.toc index 626558da..53e996aa 100644 --- a/languages/cpp/doc/libc.toc +++ b/languages/cpp/doc/libc.toc @@ -455,7 +455,7 @@ <tocsect3 name="18.2.1 openlog" url="chapters_18.html#SEC385"/> <tocsect3 name="18.2.2 syslog, vsyslog" url="chapters_18.html#SEC386"/> <tocsect3 name="18.2.3 closelog" url="chapters_18.html#SEC387"/> - <tocsect3 name="18.2.4 setlogtqmask" url="chapters_18.html#SEC388"/> + <tocsect3 name="18.2.4 setlogmask" url="chapters_18.html#SEC388"/> <tocsect3 name="18.2.5 Syslog Example" url="chapters_18.html#SEC389"/> </tocsect2> </tocsect1> diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp index 930bcfef..38a41eb8 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp @@ -19,9 +19,9 @@ K_EXPORT_COMPONENT_FACTORY( libkdevcustompcsimporter, KGenericFactory<KDevCustomImporter>( "kdevcustompcsimporter" ) ) -KDevCustomImporter::KDevCustomImporter( TQObject* tqparent, const char* name, const TQStringList & // args +KDevCustomImporter::KDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args ) - : KDevPCSImporter( tqparent, name ) + : KDevPCSImporter( parent, name ) {} @@ -75,9 +75,9 @@ TQStringList KDevCustomImporter::includePaths() return m_settings->dirs(); } -TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* tqparent, const char* name ) +TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name ) { - m_settings = new SettingsDialog( tqparent, name ); + m_settings = new SettingsDialog( parent, name ); return m_settings; } diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h index 0aea3974..501ae0ea 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h @@ -21,14 +21,14 @@ class KDevCustomImporter : public KDevPCSImporter Q_OBJECT TQ_OBJECT public: - KDevCustomImporter(TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~KDevCustomImporter(); virtual TQString dbName() const; virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage(TQWidget* tqparent, const char* name); + virtual TQWidget* createSettingsPage(TQWidget* parent, const char* name); protected: TQStringList fileList( const TQString& path ); diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp index 5845ff83..9994dcdd 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp @@ -34,8 +34,8 @@ #include <cstdlib> -SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl ) - : SettingsDialogBase( tqparent, name, fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) + : SettingsDialogBase( parent, name, fl ) { KURLRequester * req = new KURLRequester( this ); req->setMode( KFile::Directory ); diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.h b/languages/cpp/pcsimporter/customimporter/settingsdialog.h index 3d683f99..7b920a7d 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.h @@ -22,7 +22,7 @@ class SettingsDialog : public SettingsDialogBase TQ_OBJECT public: - SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); bool isValidTQtDir( const TQString& path ) const; diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp index d487ab35..f85b4ded 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp +++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp @@ -23,8 +23,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevkdelibsimporter, KGenericFactory<KDevKDELibsImporter>( "kdevkdelibsimporter" ) ) -KDevKDELibsImporter::KDevKDELibsImporter( TQObject * tqparent, const char * name, const TQStringList& ) - : KDevPCSImporter( tqparent, name ) +KDevKDELibsImporter::KDevKDELibsImporter( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) {} KDevKDELibsImporter::~KDevKDELibsImporter() @@ -109,9 +109,9 @@ TQStringList KDevKDELibsImporter::includePaths() return includePaths; } -TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * tqparent, const char * name ) +TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * parent, const char * name ) { - m_settings = new SettingsDialog( tqparent, name ); + m_settings = new SettingsDialog( parent, name ); return m_settings; } //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h index 1e2c8254..47671869 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h +++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h @@ -22,14 +22,14 @@ class KDevKDELibsImporter : public KDevPCSImporter Q_OBJECT TQ_OBJECT public: - KDevKDELibsImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() ); + KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevKDELibsImporter(); virtual TQString dbName() const { return TQString::tqfromLatin1("KDElibs"); } virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: TQStringList fileList( const TQString& path ); diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp index a9a24c48..57d16676 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp @@ -38,8 +38,8 @@ TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox ) return 0; } -SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl ) -: SettingsDialogBase( tqparent, name, fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) +: SettingsDialogBase( parent, name, fl ) { KApplication::kApplication()->dirs()->addResourceType("include","include"); TQStringList kdedirs=KApplication::kApplication()->dirs()->findDirs("include",""); diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h index 7de31292..afe38e8d 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h @@ -20,7 +20,7 @@ class SettingsDialog : public SettingsDialogBase TQ_OBJECT public: - SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp index e26872e2..c73b7456 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -24,8 +24,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) ) -KDevQt4Importer::KDevQt4Importer( TQObject * tqparent, const char * name, const TQStringList& ) - : KDevPCSImporter( tqparent, name ) +KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) { m_qtfile = 0; } @@ -99,9 +99,9 @@ TQStringList KDevQt4Importer::includePaths() return includePaths; } -TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * tqparent, const char * name ) +TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) { - m_settings = new SettingsDialog( tqparent, name ); + m_settings = new SettingsDialog( parent, name ); return m_settings; } diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h index 0da1185d..3b9c6cb9 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h @@ -23,14 +23,14 @@ class KDevQt4Importer : public KDevPCSImporter Q_OBJECT TQ_OBJECT public: - KDevQt4Importer( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() ); + KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevQt4Importer(); virtual TQString dbName() const { return TQString::tqfromLatin1("TQt4"); } virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: TQGuardedPtr<SettingsDialog> m_settings; diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp index 75fad7f3..10288502 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp @@ -36,8 +36,8 @@ TQListBoxItem* TQListBox_selectedItem(TQListBox* cpTQListBox) return 0; } -SettingsDialog::SettingsDialog(TQWidget* tqparent, const char* name, WFlags fl) - : SettingsDialogBase(tqparent,name,fl) +SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl) + : SettingsDialogBase(parent,name,fl) { TQStringList qtdirs; qtdirs.push_back( ::getenv("TQTDIR") + TQString("/include") ); diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h index 9a28b2ad..bd4ce565 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h @@ -20,7 +20,7 @@ class SettingsDialog : public SettingsDialogBase TQ_OBJECT public: - SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp index ea9bfb52..62eb38fd 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp @@ -20,8 +20,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevQtImporter>( "kdevqtimporter" ) ) -KDevQtImporter::KDevQtImporter( TQObject * tqparent, const char * name, const TQStringList& ) - : KDevPCSImporter( tqparent, name ) +KDevQtImporter::KDevQtImporter( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) {} KDevQtImporter::~KDevQtImporter() @@ -64,9 +64,9 @@ TQStringList KDevQtImporter::includePaths() return includePaths; } -TQWidget * KDevQtImporter::createSettingsPage( TQWidget * tqparent, const char * name ) +TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * name ) { - m_settings = new SettingsDialog( tqparent, name ); + m_settings = new SettingsDialog( parent, name ); return m_settings; } diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h index ebbc7ab4..7504b649 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h @@ -22,14 +22,14 @@ class KDevQtImporter : public KDevPCSImporter Q_OBJECT TQ_OBJECT public: - KDevQtImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() ); + KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevQtImporter(); virtual TQString dbName() const { return TQString::tqfromLatin1("TQt"); } virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: TQGuardedPtr<SettingsDialog> m_settings; diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp index 0c25753c..bcd62037 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp @@ -36,8 +36,8 @@ TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox ) return 0; } -SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl ) - : SettingsDialogBase( tqparent, name, fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) + : SettingsDialogBase( parent, name, fl ) { TQStringList qtdirs; qtdirs.push_back( ::getenv( "TQTDIR" ) + TQString("/include") ); diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h index 9a28b2ad..bd4ce565 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h @@ -20,7 +20,7 @@ class SettingsDialog : public SettingsDialogBase TQ_OBJECT public: - SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index ea1c3dc6..af76638c 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -57,14 +57,14 @@ class ProblemItem: public KListViewItem { public: - ProblemItem( TQListView* tqparent, const TQString& problem, + ProblemItem( TQListView* parent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( tqparent, problem, file, line, column ) + : KListViewItem( parent, problem, file, line, column ) {} - ProblemItem( TQListViewItem* tqparent, const TQString& problem, + ProblemItem( TQListViewItem* parent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( tqparent, problem, file, line, column ) + : KListViewItem( parent, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const @@ -82,8 +82,8 @@ public: }; -ProblemReporter::ProblemReporter( CppSupportPart* part, TQWidget* tqparent, const char* name ) -: TQWidget( tqparent, name ? name : "problemreporter" ), +ProblemReporter::ProblemReporter( CppSupportPart* part, TQWidget* parent, const char* name ) +: TQWidget( parent, name ? name : "problemreporter" ), m_cppSupport( part ), // m_document( 0 ), m_markIface( 0 ) diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h index c2abb294..9efc3593 100644 --- a/languages/cpp/problemreporter.h +++ b/languages/cpp/problemreporter.h @@ -107,7 +107,7 @@ class ProblemReporter: public TQWidget Q_OBJECT TQ_OBJECT public: - ProblemReporter( CppSupportPart* part, TQWidget* tqparent = 0, const char* name = 0 ); + ProblemReporter( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 ); virtual ~ProblemReporter(); void removeAllProblems( const TQString& filename ); diff --git a/languages/cpp/simplecontext.cpp b/languages/cpp/simplecontext.cpp index 3d23f76c..225bfc84 100644 --- a/languages/cpp/simplecontext.cpp +++ b/languages/cpp/simplecontext.cpp @@ -27,7 +27,7 @@ SimpleType getGlobal( SimpleType t ) { SafetyCounter s( 50 ); while( !global.scope().isEmpty() && s ) { if( !s ) { kdDebug( 9007 ) << "error" << endl; break; } - global = global->tqparent(); + global = global->parent(); } if( !global.scope().isEmpty() ) {kdDebug( 9007 ) << "ERROR WITH GLOBAL SCOPE" << endl; return SimpleType(); } return global; diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index 2a2b27de..a5efb703 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -795,7 +795,7 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d ///Ask parentsc if ( !scope().isEmpty() && dir != 1 && ! ( mode & ExcludeParents ) ) { - LocateResult rett = tqparent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode ); + LocateResult rett = parent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode ); if ( rett->resolved() ) return rett.increaseDepth(); else @@ -842,12 +842,12 @@ TypePointer SimpleTypeImpl::bigContainer() { return TypePointer( this ); } -SimpleType SimpleTypeImpl::tqparent() { +SimpleType SimpleTypeImpl::parent() { if ( m_parent ) { - //ifVerbose( dbg() << "\"" << str() << "\": returning tqparent" << endl; + //ifVerbose( dbg() << "\"" << str() << "\": returning parent" << endl; return SimpleType( m_parent ); } else { - ifVerbose( dbg() << "\"" << str() << "\": locating tqparent" << endl ); + ifVerbose( dbg() << "\"" << str() << "\": locating parent" << endl ); invalidateSecondaryCache(); TQStringList sc = scope(); @@ -855,13 +855,13 @@ SimpleType SimpleTypeImpl::tqparent() { sc.pop_back(); SimpleType r = SimpleType( sc, m_desc.includeFiles() ); if ( &( *r.get() ) == this ) { - kdDebug( 9007 ) << "error: self set as tqparent: " << m_scope.join( "::" ) << "(" << m_scope.count() << ")" << ", " << sc.join( "::" ) << "(" << sc.count() << ")" /* << kdBacktrace()*/ << endl; + kdDebug( 9007 ) << "error: self set as parent: " << m_scope.join( "::" ) << "(" << m_scope.count() << ")" << ", " << sc.join( "::" ) << "(" << sc.count() << ")" /* << kdBacktrace()*/ << endl; return SimpleType( new SimpleTypeImpl( "" ) ); } m_parent = r.get(); return r; } else { - ifVerbose( dbg() << "\"" << str() << "\"warning: returning tqparent of global scope!" << endl ); + ifVerbose( dbg() << "\"" << str() << "\"warning: returning parent of global scope!" << endl ); return SimpleType( new SimpleTypeImpl( "" ) ); } } @@ -934,8 +934,8 @@ TQString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { TQString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { Q_UNUSED( depth ); - if ( !m_scope.isEmpty() && tqparent() ) { - return tqparent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved(); + if ( !m_scope.isEmpty() && parent() ) { + return parent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved(); } else { return fullTypeResolved(); } diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h index d3b288c0..43e55280 100644 --- a/languages/cpp/simpletype.h +++ b/languages/cpp/simpletype.h @@ -42,7 +42,7 @@ class SimpleTypeFunctionInterface; typedef KSharedPtr<SimpleTypeImpl> TypePointer; -///if this is set, imported items will get their tqparent set to the node they were acquired through(which may increase the overall count of items, decrease the caching-performance, and may create other problems in locating stuff) +///if this is set, imported items will get their parent set to the node they were acquired through(which may increase the overall count of items, decrease the caching-performance, and may create other problems in locating stuff) //#define PHYSICAL_IMPORT enum Repository { @@ -322,7 +322,7 @@ class SimpleTypeImpl : public KShared { }; - ///Sets the tqparent of the given slave to either this class, or the proxy of this class + ///Sets the parent of the given slave to either this class, or the proxy of this class virtual void setSlaveParent( SimpleTypeImpl& slave ); void setMasterProxy( TypePointer t ) { @@ -480,19 +480,19 @@ class SimpleTypeImpl : public KShared { return ts; } - ///sets the tqparent-type(type this one is nested in) - void setParent( TypePointer tqparent ) { - if( tqparent == m_parent ) return; + ///sets the parent-type(type this one is nested in) + void setParent( TypePointer parent ) { + if( parent == m_parent ) return; invalidateSecondaryCache(); - if ( &( *tqparent ) == this ) { + if ( &( *parent ) == this ) { kdDebug( 9007 ) << "setSlaveParent error\n" << kdBacktrace() << endl; return ; } - m_parent = tqparent; + m_parent = parent; } - ///returns whether the type has template-parameters, or one of the tqparent-types has template-parameters. + ///returns whether the type has template-parameters, or one of the parent-types has template-parameters. bool usingTemplates() const { return !m_desc.templateParams().isEmpty() || ( m_parent && m_parent->usingTemplates() ); } @@ -617,7 +617,7 @@ class SimpleTypeImpl : public KShared { ExcludeParents = 16, ExcludeNestedTypes = 32, ExcludeNamespaces = 64, - ForgetModeUpwards = 128, ///forgets everything, even NoFail, while passing control to the tqparent + ForgetModeUpwards = 128, ///forgets everything, even NoFail, while passing control to the parent LocateBase = 4 + 8 + 32 + 64 + 128, ///searching in the scope visible while the base-declaration of a class NoFail = 256, TraceAliases = 512, ///Stores a copy whenever an alias is applied @@ -718,8 +718,8 @@ class SimpleTypeImpl : public KShared { ///Returns either itself, or the (namespace-)proxy this type is a slave of. TypePointer bigContainer(); - ///Returns the tqparent, eg. the SimpleType this one is nested in. - SimpleType tqparent(); + ///Returns the parent, eg. the SimpleType this one is nested in. + SimpleType parent(); ///this must be a reference, so the desc can be manipulated in-place from outside const TypeDesc& desc(); @@ -779,7 +779,7 @@ class SimpleTypeImpl : public KShared { ///Used to set the include-files that were used to find this type(needed for lazy evaluation of the base-classes) void setFindIncludeFiles( const IncludeFiles& files ); - ///Should be called within the tqparent-namespace/class + ///Should be called within the parent-namespace/class virtual void chooseSpecialization( MemberInfo& member ); }; diff --git a/languages/cpp/simpletypecatalog.h b/languages/cpp/simpletypecatalog.h index 69a920c7..e22a3fcf 100644 --- a/languages/cpp/simpletypecatalog.h +++ b/languages/cpp/simpletypecatalog.h @@ -100,7 +100,7 @@ protected: TypeDesc m_desc; TypePointer m_parent; - CatalogBuildInfo( Tag tag , const TypeDesc& desc, TypePointer tqparent ) : m_tag( tag ) , m_desc( desc ), m_parent( tqparent ) { + CatalogBuildInfo( Tag tag , const TypeDesc& desc, TypePointer parent ) : m_tag( tag ) , m_desc( desc ), m_parent( parent ) { } virtual TypePointer build(); diff --git a/languages/cpp/simpletypefunction.cpp b/languages/cpp/simpletypefunction.cpp index 4edaddba..0af7bdc8 100644 --- a/languages/cpp/simpletypefunction.cpp +++ b/languages/cpp/simpletypefunction.cpp @@ -572,8 +572,8 @@ TypePointer SimpleTypeCodeModel::CodeModelBuildInfo::build() { TypeDesc SimpleTypeCodeModelFunction::getReturnType() { if ( item() ) { IncludeFiles files; - if( tqparent() ) - files = tqparent()->getFindIncludeFiles(); + if( parent() ) + files = parent()->getFindIncludeFiles(); if ( FunctionModel* m = dynamic_cast<FunctionModel*>( & ( *item() ) ) ) { TypeDesc d = m->resultType(); d.setIncludeFiles( files ); @@ -597,8 +597,8 @@ TQValueList<TypeDesc> SimpleTypeCodeModelFunction::getArgumentTypes() { if ( item() ) { IncludeFiles files; - if( tqparent() ) - files = tqparent()->getFindIncludeFiles(); + if( parent() ) + files = parent()->getFindIncludeFiles(); if ( FunctionModel* m = dynamic_cast<FunctionModel*>( & ( *item() ) ) ) { ArgumentList l = m->argumentList(); for ( ArgumentList::iterator it = l.begin(); it != l.end(); ++it ) { @@ -642,7 +642,7 @@ TQStringList SimpleTypeCodeModelFunction::getArgumentDefaults() { //SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo implementation -SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer tqparent ) : m_desc( desc ), m_parent( tqparent ) { +SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer parent ) : m_desc( desc ), m_parent( parent ) { for ( FunctionDefinitionList::iterator it = items.begin(); it != items.end(); ++it ) { m_items << model_cast<FunctionDom> ( *it ); diff --git a/languages/cpp/simpletypefunction.h b/languages/cpp/simpletypefunction.h index 86f32a65..90b5fcab 100644 --- a/languages/cpp/simpletypefunction.h +++ b/languages/cpp/simpletypefunction.h @@ -139,7 +139,7 @@ public: ///paramInfo now contains the information for all implicit types } - return this->tqparent()->locateDecType( f->replaceTemplateParams( rt, paramInfo ) ); + return this->parent()->locateDecType( f->replaceTemplateParams( rt, paramInfo ) ); } else { ifVerbose( dbg() << "failed to find a fitting overloaded method" << endl ); } @@ -239,7 +239,7 @@ protected: TypeDesc m_desc; TypePointer m_parent; - CodeModelBuildInfo( ItemDom item, const TypeDesc& desc, TypePointer tqparent ) : m_item( item ), m_desc( desc ), m_parent( tqparent ) { + CodeModelBuildInfo( ItemDom item, const TypeDesc& desc, TypePointer parent ) : m_item( item ), m_desc( desc ), m_parent( parent ) { } virtual TypePointer build(); @@ -281,9 +281,9 @@ public: TypeDesc m_desc; TypePointer m_parent; - CodeModelFunctionBuildInfo( FunctionList items, TypeDesc& desc, TypePointer tqparent ) : m_items( items ), m_desc( desc ), m_parent( tqparent ) { + CodeModelFunctionBuildInfo( FunctionList items, TypeDesc& desc, TypePointer parent ) : m_items( items ), m_desc( desc ), m_parent( parent ) { } - CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer tqparent ); + CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer parent ); virtual TypePointer build(); }; @@ -317,7 +317,7 @@ public: TypeDesc m_desc; TypePointer m_parent; - CatalogFunctionBuildInfo( TQValueList<Tag> tags, TypeDesc& desc, TypePointer tqparent ) : m_tags( tags ), m_desc( desc ), m_parent( tqparent ) { + CatalogFunctionBuildInfo( TQValueList<Tag> tags, TypeDesc& desc, TypePointer parent ) : m_tags( tags ), m_desc( desc ), m_parent( parent ) { } virtual TypePointer build(); diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp index 10e9b83d..f7937db1 100644 --- a/languages/cpp/simpletypenamespace.cpp +++ b/languages/cpp/simpletypenamespace.cpp @@ -159,7 +159,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe if ( mem.memberType != MemberInfo::Namespace ) { #ifdef PHYSICAL_IMPORT TypePointer b = mem.build(); - if ( b && !( b->tqparent()->masterProxy().data() == this ) ) { + if ( b && !( b->parent()->masterProxy().data() == this ) ) { b = b ->clone(); //expensive, cache is not shared b->setParent( this ); @@ -169,7 +169,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe if( mem.memberType == MemberInfo::NestedType ) chooseSpecialization( mem ); TypePointer b = mem.build(); - if( b && b->tqparent() && b->tqparent()->masterProxy().data() == this ) + if( b && b->parent() && b->parent()->masterProxy().data() == this ) b->setParent( this ); #endif return mem; diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.cpp b/languages/cpp/subclassing_template/subclass_qt4_template.cpp index 3e96646a..4531fa69 100644 --- a/languages/cpp/subclassing_template/subclass_qt4_template.cpp +++ b/languages/cpp/subclassing_template/subclass_qt4_template.cpp @@ -2,8 +2,8 @@ #include "$NEWFILENAMELC$.h" -$NEWCLASS$::$NEWCLASS$(TQWidget* tqparent, TQt::WFlags fl) -: $TQTBASECLASS$( tqparent, fl ), Ui::$BASECLASS$() +$NEWCLASS$::$NEWCLASS$(TQWidget* parent, TQt::WFlags fl) +: $TQTBASECLASS$( parent, fl ), Ui::$BASECLASS$() { setupUi(this); } diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.h b/languages/cpp/subclassing_template/subclass_qt4_template.h index 64ba390e..8895bceb 100644 --- a/languages/cpp/subclassing_template/subclass_qt4_template.h +++ b/languages/cpp/subclassing_template/subclass_qt4_template.h @@ -11,7 +11,7 @@ class $NEWCLASS$ : public $TQTBASECLASS$, private Ui::$BASECLASS$ TQ_OBJECT public: - $NEWCLASS$(TQWidget* tqparent = 0, TQt::WFlags fl = 0 ); + $NEWCLASS$(TQWidget* parent = 0, TQt::WFlags fl = 0 ); ~$NEWCLASS$(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/subclassing_template/subclass_template.cpp b/languages/cpp/subclassing_template/subclass_template.cpp index 8373a260..adc89082 100644 --- a/languages/cpp/subclassing_template/subclass_template.cpp +++ b/languages/cpp/subclassing_template/subclass_template.cpp @@ -2,8 +2,8 @@ #include "$NEWFILENAMELC$.h" -$NEWCLASS$::$NEWCLASS$(TQWidget* tqparent, const char* name$CAN_BE_MODAL_CPP1$, WFlags fl) -: $BASECLASS$(tqparent,name$CAN_BE_MODAL_CPP2$,fl) +$NEWCLASS$::$NEWCLASS$(TQWidget* parent, const char* name$CAN_BE_MODAL_CPP1$, WFlags fl) +: $BASECLASS$(parent,name$CAN_BE_MODAL_CPP2$,fl) { } diff --git a/languages/cpp/subclassing_template/subclass_template.h b/languages/cpp/subclassing_template/subclass_template.h index 7f9d2ae2..1451e471 100644 --- a/languages/cpp/subclassing_template/subclass_template.h +++ b/languages/cpp/subclassing_template/subclass_template.h @@ -10,7 +10,7 @@ class $NEWCLASS$ : public $BASECLASS$ TQ_OBJECT public: - $NEWCLASS$(TQWidget* tqparent = 0, const char* name = 0$CAN_BE_MODAL_H$, WFlags fl = 0 ); + $NEWCLASS$(TQWidget* parent = 0, const char* name = 0$CAN_BE_MODAL_H$, WFlags fl = 0 ); ~$NEWCLASS$(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 72db362b..d4edb897 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -54,11 +54,11 @@ #define SLOT_HELP SlotItem(m_slotView,"help()","virtual","protected","void",false,true) -SlotItem::SlotItem(TQListView *tqparent,const TQString &methodName, +SlotItem::SlotItem(TQListView *parent,const TQString &methodName, const TQString &specifier, const TQString &access, const TQString &returnType, bool isFunc,bool callBaseClass) -: TQCheckListItem(tqparent,methodName,TQCheckListItem::CheckBox) +: TQCheckListItem(parent,methodName,TQCheckListItem::CheckBox) { setOn(true); m_methodName = methodName; @@ -94,9 +94,9 @@ void SlotItem::setAllreadyInSubclass() SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const TQString &formFile, - TQStringList &newFileNames, TQWidget* tqparent, + TQStringList &newFileNames, TQWidget* parent, const char* name,bool modal, WFlags fl) -: SubclassingDlgBase(tqparent,name,modal,fl), +: SubclassingDlgBase(parent,name,modal,fl), m_newFileNames(newFileNames), m_cppSupport( cppSupport ) { @@ -117,8 +117,8 @@ m_newFileNames(newFileNames), m_cppSupport( cppSupport ) SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const TQString &formFile, const TQString &filename, TQStringList &dummy, - TQWidget* tqparent, const char* name, bool modal, WFlags fl) -: SubclassingDlgBase(tqparent, name, modal, fl), + TQWidget* parent, const char* name, bool modal, WFlags fl) +: SubclassingDlgBase(parent, name, modal, fl), m_newFileNames(dummy), m_cppSupport( cppSupport ) { diff --git a/languages/cpp/subclassingdlg.h b/languages/cpp/subclassingdlg.h index e63dee7b..43fd06ad 100644 --- a/languages/cpp/subclassingdlg.h +++ b/languages/cpp/subclassingdlg.h @@ -23,7 +23,7 @@ class CppSupportPart; class SlotItem : public TQCheckListItem { public: - SlotItem( TQListView *tqparent, const TQString &text, + SlotItem( TQListView *parent, const TQString &text, const TQString &specifier, const TQString &Access, const TQString &returnType, bool isFunc, bool callBaseClass = false ); @@ -42,10 +42,10 @@ class SubclassingDlg : public SubclassingDlgBase { public: SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, TQStringList &newFileNames, - TQWidget* tqparent = 0, const char* name = 0, + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, const TQString &filename, TQStringList &dummy, - TQWidget* tqparent = 0, const char* name = 0, + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SubclassingDlg(); diff --git a/languages/csharp/csharpconfigwidget.cpp b/languages/csharp/csharpconfigwidget.cpp index dea62747..620f7881 100644 --- a/languages/csharp/csharpconfigwidget.cpp +++ b/languages/csharp/csharpconfigwidget.cpp @@ -17,8 +17,8 @@ CSharpConfigWidget::CSharpConfigWidget(TQDomDocument &projectDom, - TQWidget *tqparent, const char *name) - : CSharpConfigWidgetBase(tqparent, name), dom(projectDom) + TQWidget *parent, const char *name) + : CSharpConfigWidgetBase(parent, name), dom(projectDom) { interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevcsharpsupport/run/interpreter")); terminal_box->setChecked(DomUtil::readBoolEntry(dom, "/kdevcsharpsupport/run/terminal")); diff --git a/languages/csharp/csharpconfigwidget.h b/languages/csharp/csharpconfigwidget.h index 25b6e58f..1f14bd3e 100644 --- a/languages/csharp/csharpconfigwidget.h +++ b/languages/csharp/csharpconfigwidget.h @@ -22,7 +22,7 @@ class CSharpConfigWidget : public CSharpConfigWidgetBase TQ_OBJECT public: - CSharpConfigWidget( TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0 ); + CSharpConfigWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 ); ~CSharpConfigWidget(); public slots: diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index 6f12836c..f6a3545c 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -48,8 +48,8 @@ typedef KDevGenericFactory<CSharpSupportPart> CSharpSupportFactory; static const KDevPluginInfo data("kdevcsharpsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) ) -CSharpSupportPart::CSharpSupportPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevLanguageSupport(&data, tqparent, name ? name : "CSharpSupportPart") +CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &) + : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart") { setInstance(CSharpSupportFactory::instance()); diff --git a/languages/csharp/csharpsupportpart.h b/languages/csharp/csharpsupportpart.h index df2390c8..d116514a 100644 --- a/languages/csharp/csharpsupportpart.h +++ b/languages/csharp/csharpsupportpart.h @@ -22,7 +22,7 @@ class CSharpSupportPart : public KDevLanguageSupport TQ_OBJECT public: - CSharpSupportPart( TQObject *tqparent, const char *name, const TQStringList & ); + CSharpSupportPart( TQObject *parent, const char *name, const TQStringList & ); ~CSharpSupportPart(); protected: diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp index f6c3465e..66a12fbb 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp @@ -25,8 +25,8 @@ extern "C" { } -PgiOptionsFactory::PgiOptionsFactory(TQObject *tqparent, const char *name) - : KLibFactory(tqparent, name) +PgiOptionsFactory::PgiOptionsFactory(TQObject *parent, const char *name) + : KLibFactory(parent, name) { instance(); } @@ -39,15 +39,15 @@ PgiOptionsFactory::~PgiOptionsFactory() } -TQObject *PgiOptionsFactory::createObject(TQObject *tqparent, const char *name, +TQObject *PgiOptionsFactory::createObject(TQObject *parent, const char *name, const char * /*classname*/, const TQStringList &args) { if (args.count() > 0 && qstrcmp(args[0].latin1(), "pghpf") == 0) { kdDebug(9021) << "Building PgiOptions for PGHPF" << endl; - return new PgiOptionsPlugin(PgiOptionsPlugin::PGHPF, tqparent, name); + return new PgiOptionsPlugin(PgiOptionsPlugin::PGHPF, parent, name); } else if (args.count() > 0 && qstrcmp(args[0].latin1(), "pgf77") == 0) { kdDebug(9021) << "Building PgiOptions for PGF77" << endl; - return new PgiOptionsPlugin(PgiOptionsPlugin::PGF77, tqparent, name); + return new PgiOptionsPlugin(PgiOptionsPlugin::PGF77, parent, name); } else { kdDebug(9021) << "Wrong args for kdevpgioptions library" << endl; if (args.count() > 0) diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h index e66e0cf2..88030b72 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h @@ -21,10 +21,10 @@ class PgiOptionsFactory : public KLibFactory TQ_OBJECT public: - PgiOptionsFactory( TQObject *tqparent=0, const char *name=0 ); + PgiOptionsFactory( TQObject *parent=0, const char *name=0 ); ~PgiOptionsFactory(); - virtual TQObject* createObject( TQObject *tqparent, const char *name, + virtual TQObject* createObject( TQObject *parent, const char *name, const char *classname, const TQStringList &args); static KInstance *instance(); diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp index 113b5abd..c8137575 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp @@ -75,7 +75,7 @@ const char * const hpf_flags[] = { class GeneralTab : public TQWidget { public: - GeneralTab( TQWidget *tqparent=0, const char *name=0 ); + GeneralTab( TQWidget *parent=0, const char *name=0 ); ~GeneralTab(); void readFlags(TQStringList *str); @@ -86,7 +86,7 @@ public: class OptimizationTab : public TQWidget { public: - OptimizationTab( PgiOptionsPlugin::Type type, TQWidget *tqparent=0, const char *name=0 ); + OptimizationTab( PgiOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 ); ~OptimizationTab(); void readFlags(TQStringList *str); @@ -101,7 +101,7 @@ private: class HpfTab : public TQWidget { public: - HpfTab( TQWidget *tqparent=0, const char *name=0 ); + HpfTab( TQWidget *parent=0, const char *name=0 ); ~HpfTab(); void readFlags(TQStringList *str); @@ -112,8 +112,8 @@ private: }; -OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name) + : TQWidget(parent, name) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); tqlayout->setAutoAdd(true); @@ -195,8 +195,8 @@ void OptimizationTab::writeFlags(TQStringList *list) } -HpfTab::HpfTab(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +HpfTab::HpfTab(TQWidget *parent, const char *name) + : TQWidget(parent, name) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); tqlayout->setAutoAdd(true); @@ -239,9 +239,9 @@ void HpfTab::writeFlags(TQStringList *list) } -PgiOptionsDialog::PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *tqparent, const char *name) +PgiOptionsDialog::PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name) : KDialogBase(Tabbed, (type == PgiOptionsPlugin::PGHPF)? i18n("PGHPF Compiler Options") : i18n("PGF77 Compiler Options"), - Ok|Cancel, Ok, tqparent, name, true) + Ok|Cancel, Ok, parent, name, true) { TQVBox *vbox; @@ -299,8 +299,8 @@ TQString PgiOptionsDialog::flags() const } -PgiOptionsPlugin::PgiOptionsPlugin(Type type, TQObject *tqparent, const char *name) - : KDevCompilerOptions(tqparent, name) +PgiOptionsPlugin::PgiOptionsPlugin(Type type, TQObject *parent, const char *name) + : KDevCompilerOptions(parent, name) { pgitype = type; } @@ -310,9 +310,9 @@ PgiOptionsPlugin::~PgiOptionsPlugin() {} -TQString PgiOptionsPlugin::exec(TQWidget *tqparent, const TQString &flags) +TQString PgiOptionsPlugin::exec(TQWidget *parent, const TQString &flags) { - PgiOptionsDialog *dlg = new PgiOptionsDialog(pgitype, tqparent, "pgi options dialog"); + PgiOptionsDialog *dlg = new PgiOptionsDialog(pgitype, parent, "pgi options dialog"); TQString newFlags = flags; dlg->setFlags(flags); if (dlg->exec() == TQDialog::Accepted) diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h index 28392c0d..5022f929 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h @@ -29,10 +29,10 @@ class PgiOptionsPlugin : public KDevCompilerOptions public: enum Type { PGHPF, PGF77 }; - PgiOptionsPlugin( Type type, TQObject *tqparent=0, const char *name=0 ); + PgiOptionsPlugin( Type type, TQObject *parent=0, const char *name=0 ); ~PgiOptionsPlugin(); - virtual TQString exec(TQWidget *tqparent, const TQString &flags); + virtual TQString exec(TQWidget *parent, const TQString &flags); private: Type pgitype; @@ -42,7 +42,7 @@ private: class PgiOptionsDialog : public KDialogBase { public: - PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *tqparent=0, const char *name=0 ); + PgiOptionsDialog(PgiOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 ); ~PgiOptionsDialog(); void setFlags(const TQString &flags); diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index 3ac3f6e3..f60e9049 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -48,8 +48,8 @@ typedef KDevGenericFactory<FortranSupportPart> FortranSupportFactory; static const KDevPluginInfo data("kdevfortransupport"); K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) ) -FortranSupportPart::FortranSupportPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevLanguageSupport(&data, tqparent, name ? name : "FortranSupportPart") +FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &) + : KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart") { setInstance(FortranSupportFactory::instance()); diff --git a/languages/fortran/fortransupportpart.h b/languages/fortran/fortransupportpart.h index 8bd5872b..bf927a7d 100644 --- a/languages/fortran/fortransupportpart.h +++ b/languages/fortran/fortransupportpart.h @@ -26,7 +26,7 @@ class FortranSupportPart : public KDevLanguageSupport TQ_OBJECT public: - FortranSupportPart( TQObject *tqparent, const char *name, const TQStringList & ); + FortranSupportPart( TQObject *parent, const char *name, const TQStringList & ); ~FortranSupportPart(); protected: diff --git a/languages/fortran/ftnchekconfigwidget.cpp b/languages/fortran/ftnchekconfigwidget.cpp index 2fcd7905..286293aa 100644 --- a/languages/fortran/ftnchekconfigwidget.cpp +++ b/languages/fortran/ftnchekconfigwidget.cpp @@ -25,9 +25,9 @@ class FtnchekItem : public TQCheckListItem { public: - FtnchekItem(TQListView *tqparent, const TQString &flagstr, + FtnchekItem(TQListView *parent, const TQString &flagstr, const TQString &description) - : TQCheckListItem(tqparent, flagstr, TQCheckListItem::CheckBox), + : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox), flag(flagstr), desc(description) { setText(1, desc); @@ -73,8 +73,8 @@ void FtnchekItem::writeFlagsFromListView(TQListView *listview, TQStringList *lis class FtnchekToolTip : public TQToolTip { public: - FtnchekToolTip(TQWidget *tqparent) - : TQToolTip(tqparent) + FtnchekToolTip(TQWidget *parent) + : TQToolTip(parent) {} protected: void maybeTip(const TQPoint &pos) @@ -147,8 +147,8 @@ const char *portability_flags[] = { }; -FtnchekConfigWidget::FtnchekConfigWidget(TQDomDocument &projectDom, TQWidget *tqparent, const char *name) - : FtnchekConfigWidgetBase(tqparent, name), dom(projectDom) +FtnchekConfigWidget::FtnchekConfigWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name) + : FtnchekConfigWidgetBase(parent, name), dom(projectDom) { arguments_group = new TQButtonGroup; arguments_group->insert(argumentsall_button); diff --git a/languages/fortran/ftnchekconfigwidget.h b/languages/fortran/ftnchekconfigwidget.h index 78cdd93e..ac4afcc0 100644 --- a/languages/fortran/ftnchekconfigwidget.h +++ b/languages/fortran/ftnchekconfigwidget.h @@ -23,7 +23,7 @@ class FtnchekConfigWidget : public FtnchekConfigWidgetBase TQ_OBJECT public: - FtnchekConfigWidget(TQDomDocument &projectDom, TQWidget *tqparent, const char *name); + FtnchekConfigWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name); ~FtnchekConfigWidget(); public slots: diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java index 0a25ea22..fc25a273 100644 --- a/languages/java/app_templates/kappjava/appview.java +++ b/languages/java/app_templates/kappjava/appview.java @@ -22,9 +22,9 @@ public class %{APPNAME}View extends QWidget QHBoxLayout top_layout; -public %{APPNAME}View(QWidget tqparent) +public %{APPNAME}View(QWidget parent) { - super(tqparent, null); + super(parent, null); // setup our tqlayout manager to automatically add our widgets top_layout = new QHBoxLayout(this); top_layout.setAutoAdd(true); diff --git a/languages/java/app_templates/kappjava/pref.java b/languages/java/app_templates/kappjava/pref.java index 4ba240f9..48e1ca6a 100644 --- a/languages/java/app_templates/kappjava/pref.java +++ b/languages/java/app_templates/kappjava/pref.java @@ -28,9 +28,9 @@ public %{APPNAME}Preferences() } public class %{APPNAME}PrefPageOne extends QFrame { -public %{APPNAME}PrefPageOne(QWidget tqparent) +public %{APPNAME}PrefPageOne(QWidget parent) { - super(tqparent); + super(parent); QHBoxLayout tqlayout = new QHBoxLayout(this); tqlayout.setAutoAdd(true); @@ -39,9 +39,9 @@ public %{APPNAME}PrefPageOne(QWidget tqparent) } public class %{APPNAME}PrefPageTwo extends QFrame { -public %{APPNAME}PrefPageTwo(QWidget tqparent) +public %{APPNAME}PrefPageTwo(QWidget parent) { - super(tqparent); + super(parent); QHBoxLayout tqlayout = new QHBoxLayout(this); tqlayout.setAutoAdd(true); diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 68a22250..258d7cc6 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -118,8 +118,8 @@ public: } }; -JavaSupportPart::JavaSupportPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/) - : KDevLanguageSupport(JavaSupportFactory::info(), tqparent, name ? name : "KDevJavaSupport"), +JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStringList &/*args*/) + : KDevLanguageSupport(JavaSupportFactory::info(), parent, name ? name : "KDevJavaSupport"), m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ), m_projectClosed( true ), m_valid( false ) { diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h index 4b624c80..54a8cee4 100644 --- a/languages/java/javasupportpart.h +++ b/languages/java/javasupportpart.h @@ -52,7 +52,7 @@ class JavaSupportPart : public KDevLanguageSupport TQ_OBJECT public: - JavaSupportPart( TQObject *tqparent, const char *name, const TQStringList &args ); + JavaSupportPart( TQObject *parent, const char *name, const TQStringList &args ); virtual ~JavaSupportPart(); bool isValid() const { return m_valid; } diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index d2237ad3..f2d655b0 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -54,13 +54,13 @@ class ProblemItem: public KListViewItem { public: - ProblemItem( TQListView* tqparent, const TQString& level, const TQString& problem, + ProblemItem( TQListView* parent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( tqparent, level, problem, file, line, column ) {} + : KListViewItem( parent, level, problem, file, line, column ) {} - ProblemItem( TQListViewItem* tqparent, const TQString& level, const TQString& problem, + ProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( tqparent, level, problem, file, line, column ) {} + : KListViewItem( parent, level, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 2 || column == 3 ){ @@ -75,8 +75,8 @@ public: }; -ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* tqparent, const char* name ) - : KListView( tqparent, name ? name : "problemreporter" ), +ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const char* name ) + : KListView( parent, name ? name : "problemreporter" ), m_javaSupport( part ), m_document( 0 ), m_markIface( 0 ) diff --git a/languages/java/problemreporter.h b/languages/java/problemreporter.h index 4ac7876d..67230aa2 100644 --- a/languages/java/problemreporter.h +++ b/languages/java/problemreporter.h @@ -40,7 +40,7 @@ class ProblemReporter: public KListView{ Q_OBJECT TQ_OBJECT public: - ProblemReporter( JavaSupportPart* part, TQWidget* tqparent=0, const char* name=0 ); + ProblemReporter( JavaSupportPart* part, TQWidget* parent=0, const char* name=0 ); virtual ~ProblemReporter(); void removeAllProblems( const TQString& filename ); diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp index 6d290532..5717858a 100644 --- a/languages/kjssupport/jscodecompletion.cpp +++ b/languages/kjssupport/jscodecompletion.cpp @@ -37,8 +37,8 @@ #include <kdevelop/domutil.h> #include <kdevelop/codemodel.h> -JSCodeCompletion::JSCodeCompletion(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +JSCodeCompletion::JSCodeCompletion(TQObject *parent, const char *name) + : TQObject(parent, name) { m_argWidgetShow = false; m_completionBoxShow=false; diff --git a/languages/kjssupport/jscodecompletion.h b/languages/kjssupport/jscodecompletion.h index 4586836f..3cad550c 100644 --- a/languages/kjssupport/jscodecompletion.h +++ b/languages/kjssupport/jscodecompletion.h @@ -31,7 +31,7 @@ class JSCodeCompletion : public TQObject Q_OBJECT TQ_OBJECT public: - JSCodeCompletion(TQObject *tqparent = 0, const char *name = 0); + JSCodeCompletion(TQObject *parent = 0, const char *name = 0); ~JSCodeCompletion(); void setActiveEditorPart(KParts::Part* editorPart); diff --git a/languages/kjssupport/kjsproblems.cpp b/languages/kjssupport/kjsproblems.cpp index 318ff44e..31882e7c 100644 --- a/languages/kjssupport/kjsproblems.cpp +++ b/languages/kjssupport/kjsproblems.cpp @@ -23,14 +23,14 @@ class KJSProblemItem: public KListViewItem { public: - KJSProblemItem( TQListView* tqparent, const TQString& level, const TQString& problem, + KJSProblemItem( TQListView* parent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( tqparent, level, problem, file, line, column ) + : KListViewItem( parent, level, problem, file, line, column ) {} - KJSProblemItem( TQListViewItem* tqparent, const TQString& level, const TQString& problem, + KJSProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( tqparent, level, problem, file, line, column ) + : KListViewItem( parent, level, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const @@ -48,7 +48,7 @@ class KJSProblemItem: public KListViewItem }; -KJSProblems::KJSProblems(kjsSupportPart *part, TQWidget *tqparent, const char *name) : KListView(tqparent,name), m_part(part) +KJSProblems::KJSProblems(kjsSupportPart *part, TQWidget *parent, const char *name) : KListView(parent,name), m_part(part) { addColumn ("File"); addColumn ("Line #"); diff --git a/languages/kjssupport/kjsproblems.h b/languages/kjssupport/kjsproblems.h index 8c5d37a1..849b68d5 100644 --- a/languages/kjssupport/kjsproblems.h +++ b/languages/kjssupport/kjsproblems.h @@ -31,7 +31,7 @@ Q_OBJECT TQ_OBJECT public: - KJSProblems(kjsSupportPart *part, TQWidget *tqparent = 0L, const char *name = 0L); + KJSProblems(kjsSupportPart *part, TQWidget *parent = 0L, const char *name = 0L); ~KJSProblems(); void clearItems(); diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp index 2c894b17..44a3659b 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -62,8 +62,8 @@ class typeProperty int depth; }; -kjsSupportPart::kjsSupportPart(TQObject *tqparent, const char *name, const TQStringList& ) -: KDevLanguageSupport(&data, tqparent, name ? name : "kjsSupportPart" ) +kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& ) +: KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" ) { setInstance(kjsSupportFactory::instance()); setXMLFile("kdevkjssupport.rc"); diff --git a/languages/kjssupport/kjssupport_part.h b/languages/kjssupport/kjssupport_part.h index 3ea2b5da..dc279f1f 100644 --- a/languages/kjssupport/kjssupport_part.h +++ b/languages/kjssupport/kjssupport_part.h @@ -48,7 +48,7 @@ class kjsSupportPart : public KDevLanguageSupport Q_OBJECT TQ_OBJECT public: - kjsSupportPart(TQObject *tqparent, const char *name, const TQStringList &); + kjsSupportPart(TQObject *parent, const char *name, const TQStringList &); ~kjsSupportPart(); protected: virtual Features features(); diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp index a4697569..a4052064 100644 --- a/languages/kjssupport/subclassingdlg.cpp +++ b/languages/kjssupport/subclassingdlg.cpp @@ -53,11 +53,11 @@ #define SLOT_HELP SlotItem(m_slotView,"help()","virtual","protected","void",false,true) -SlotItem::SlotItem(TQListView *tqparent,const TQString &methodName, +SlotItem::SlotItem(TQListView *parent,const TQString &methodName, const TQString &specifier, const TQString &access, const TQString &returnType, bool isFunc,bool callBaseClass) -: TQCheckListItem(tqparent,methodName,TQCheckListItem::CheckBox) +: TQCheckListItem(parent,methodName,TQCheckListItem::CheckBox) { setOn(true); m_methodName = methodName; @@ -94,8 +94,8 @@ void SlotItem::setAllreadyInSubclass() SubclassingDlg::SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,TQStringList &newFileNames, - TQWidget* tqparent, const char* name,bool modal, WFlags fl) -: SubclassingDlgBase(tqparent,name,modal,fl), + TQWidget* parent, const char* name,bool modal, WFlags fl) +: SubclassingDlgBase(parent,name,modal,fl), m_newFileNames(newFileNames), m_kjsSupport( kjsSupport ) //================================================= { @@ -116,8 +116,8 @@ m_newFileNames(newFileNames), m_kjsSupport( kjsSupport ) /*SubclassingDlg::SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,const TQString &filename,TQStringList &dummy, - TQWidget* tqparent, const char* name,bool modal, WFlags fl) -: SubclassingDlgBase(tqparent,name,modal,fl), + TQWidget* parent, const char* name,bool modal, WFlags fl) +: SubclassingDlgBase(parent,name,modal,fl), m_newFileNames(dummy), m_kjsSupport( kjsSupport ) //================================================= { diff --git a/languages/kjssupport/subclassingdlg.h b/languages/kjssupport/subclassingdlg.h index b6836037..651120b0 100644 --- a/languages/kjssupport/subclassingdlg.h +++ b/languages/kjssupport/subclassingdlg.h @@ -23,7 +23,7 @@ class kjsSupportPart; class SlotItem : public TQCheckListItem { public: - SlotItem(TQListView *tqparent,const TQString &text, + SlotItem(TQListView *parent,const TQString &text, const TQString &specifier, const TQString &Access, const TQString &returnType,bool isFunc, bool callBaseClass=false); @@ -42,10 +42,10 @@ class SubclassingDlg : public SubclassingDlgBase { public: SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,TQStringList &newFileNames, - TQWidget* tqparent = 0, const char* name = 0, + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); /* SubclassingDlg(CppSupportPart* kjsSupport, const TQString &formFile,const TQString &filename,TQStringList &dummy, - TQWidget* tqparent = 0, const char* name = 0, + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );*/ ~SubclassingDlg(); diff --git a/languages/lib/debugger/kdevdebugger.cpp b/languages/lib/debugger/kdevdebugger.cpp index 416f567c..b9ee4a05 100644 --- a/languages/lib/debugger/kdevdebugger.cpp +++ b/languages/lib/debugger/kdevdebugger.cpp @@ -19,8 +19,8 @@ */ #include "kdevdebugger.h" -KDevDebugger::KDevDebugger(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +KDevDebugger::KDevDebugger(TQObject *parent, const char *name) + : TQObject(parent, name) { } diff --git a/languages/lib/debugger/kdevdebugger.h b/languages/lib/debugger/kdevdebugger.h index f1e50987..dda58aeb 100644 --- a/languages/lib/debugger/kdevdebugger.h +++ b/languages/lib/debugger/kdevdebugger.h @@ -38,7 +38,7 @@ class KDevDebugger : public TQObject public: - KDevDebugger(TQObject *tqparent=0, const char *name=0); + KDevDebugger(TQObject *parent=0, const char *name=0); ~KDevDebugger(); /** diff --git a/languages/lib/designer_integration/implementationwidget.cpp b/languages/lib/designer_integration/implementationwidget.cpp index 6198f9bc..d9a3d6a7 100644 --- a/languages/lib/designer_integration/implementationwidget.cpp +++ b/languages/lib/designer_integration/implementationwidget.cpp @@ -40,10 +40,10 @@ namespace ImplUtils{ class ClassItem: public KListViewItem{ public: - ClassItem(KListViewItem *tqparent, ClassDom dom) - :KListViewItem(tqparent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } - ClassItem(KListView *tqparent, ClassDom dom) - :KListViewItem(tqparent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } + ClassItem(KListViewItem *parent, ClassDom dom) + :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } + ClassItem(KListView *parent, ClassDom dom) + :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } ClassDom dom() const { return m_dom; } private: ClassDom m_dom; @@ -51,18 +51,18 @@ private: class NamespaceItem: public KListViewItem{ public: - NamespaceItem(KListViewItem *tqparent, NamespaceDom dom) - :KListViewItem(tqparent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } - NamespaceItem(KListView *tqparent, NamespaceDom dom) - :KListViewItem(tqparent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } + NamespaceItem(KListViewItem *parent, NamespaceDom dom) + :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } + NamespaceItem(KListView *parent, NamespaceDom dom) + :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } NamespaceDom dom() const { return m_dom; } private: NamespaceDom m_dom; }; } -ImplementationWidget::ImplementationWidget(KDevLanguageSupport *part, TQWidget* tqparent, const char* name, bool modal) - :CreateImplemenationWidgetBase(tqparent, name, modal), m_part(part) +ImplementationWidget::ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent, const char* name, bool modal) + :CreateImplemenationWidgetBase(parent, name, modal), m_part(part) { } @@ -84,21 +84,21 @@ void ImplementationWidget::init(const TQString &formName) processNamespaces(m_part->codeModel()->globalNamespace(), item); } -void ImplementationWidget::processNamespaces(NamespaceDom dom, KListViewItem *tqparent) +void ImplementationWidget::processNamespaces(NamespaceDom dom, KListViewItem *parent) { const NamespaceList nslist = dom->namespaceList(); for (NamespaceList::const_iterator it = nslist.begin(); it != nslist.end(); ++it) - processNamespaces(*it, new ImplUtils::NamespaceItem(tqparent, *it)); + processNamespaces(*it, new ImplUtils::NamespaceItem(parent, *it)); const ClassList cllist = dom->classList(); for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it) - processClasses(*it, new ImplUtils::ClassItem(tqparent, *it)); + processClasses(*it, new ImplUtils::ClassItem(parent, *it)); } -void ImplementationWidget::processClasses(ClassDom dom, KListViewItem *tqparent) +void ImplementationWidget::processClasses(ClassDom dom, KListViewItem *parent) { const ClassList cllist = dom->classList(); for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it) - processClasses(*it, new ImplUtils::ClassItem(tqparent, *it)); + processClasses(*it, new ImplUtils::ClassItem(parent, *it)); } ImplementationWidget::~ImplementationWidget() diff --git a/languages/lib/designer_integration/implementationwidget.h b/languages/lib/designer_integration/implementationwidget.h index 91f93228..83b84bb4 100644 --- a/languages/lib/designer_integration/implementationwidget.h +++ b/languages/lib/designer_integration/implementationwidget.h @@ -42,7 +42,7 @@ class ImplementationWidget : public CreateImplemenationWidgetBase Q_OBJECT TQ_OBJECT public: - ImplementationWidget(KDevLanguageSupport *part, TQWidget* tqparent = 0, const char* name = 0, bool modal = false); + ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false); virtual ~ImplementationWidget(); /*$PUBLIC_FUNCTIONS$*/ @@ -61,8 +61,8 @@ protected: the number of classes being displayed as possible implementation classes.*/ void init(const TQString &formName); - void processNamespaces(NamespaceDom dom, KListViewItem *tqparent); - void processClasses(ClassDom dom, KListViewItem *tqparent); + void processNamespaces(NamespaceDom dom, KListViewItem *parent); + void processClasses(ClassDom dom, KListViewItem *parent); /**Creates a class and adds it to a project. No need to reimplement.*/ bool createClass(); diff --git a/languages/lib/interfaces/kdevpcsimporter.cpp b/languages/lib/interfaces/kdevpcsimporter.cpp index 457c131f..c4b4e664 100644 --- a/languages/lib/interfaces/kdevpcsimporter.cpp +++ b/languages/lib/interfaces/kdevpcsimporter.cpp @@ -20,8 +20,8 @@ #include "kdevpcsimporter.h" #include "kdevpcsimporter.moc" -KDevPCSImporter::KDevPCSImporter( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ) +KDevPCSImporter::KDevPCSImporter( TQObject * parent, const char * name ) + : TQObject( parent, name ) { } @@ -29,7 +29,7 @@ KDevPCSImporter::~ KDevPCSImporter( ) { } -TQWidget * KDevPCSImporter::createSettingsPage( TQWidget * /*tqparent*/, const char * /*name*/ ) +TQWidget * KDevPCSImporter::createSettingsPage( TQWidget * /*parent*/, const char * /*name*/ ) { return 0; } diff --git a/languages/lib/interfaces/kdevpcsimporter.h b/languages/lib/interfaces/kdevpcsimporter.h index 37547252..7253a30b 100644 --- a/languages/lib/interfaces/kdevpcsimporter.h +++ b/languages/lib/interfaces/kdevpcsimporter.h @@ -37,14 +37,14 @@ class KDevPCSImporter: public TQObject Q_OBJECT TQ_OBJECT public: - KDevPCSImporter( TQObject* tqparent=0, const char* name=0 ); + KDevPCSImporter( TQObject* parent=0, const char* name=0 ); virtual ~KDevPCSImporter(); virtual TQString dbName() const = 0; virtual TQStringList includePaths() = 0; virtual TQStringList fileList() = 0; - virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); }; #endif // KDEVPCSIMPORTER_H diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp index d1ed9aec..9738e3c9 100644 --- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp +++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp @@ -21,8 +21,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevdccoptions, KGenericFactory<DccOptionsPlugin>( "kdevdccoptions" ) ) -DccOptionsPlugin::DccOptionsPlugin(TQObject *tqparent, const char *name, const TQStringList/* &args*/) - : KDevCompilerOptions(tqparent, name) +DccOptionsPlugin::DccOptionsPlugin(TQObject *parent, const char *name, const TQStringList/* &args*/) + : KDevCompilerOptions(parent, name) { } @@ -30,9 +30,9 @@ DccOptionsPlugin::~DccOptionsPlugin() { } -TQString DccOptionsPlugin::exec(TQWidget *tqparent, const TQString &flags) +TQString DccOptionsPlugin::exec(TQWidget *parent, const TQString &flags) { - DccOptionsDialog *dlg = new DccOptionsDialog(tqparent, "dcc options dialog"); + DccOptionsDialog *dlg = new DccOptionsDialog(parent, "dcc options dialog"); TQString newFlags = flags; dlg->setFlags(flags); if(dlg->exec() == TQDialog::Accepted) @@ -42,8 +42,8 @@ TQString DccOptionsPlugin::exec(TQWidget *tqparent, const TQString &flags) } -DccOptionsDialog::DccOptionsDialog( TQWidget * tqparent, const char * name ) - : KDialogBase(Tabbed, i18n("Delphi Compiler Options"), Ok|Cancel, Ok, tqparent, name, true) +DccOptionsDialog::DccOptionsDialog( TQWidget * parent, const char * name ) + : KDialogBase(Tabbed, i18n("Delphi Compiler Options"), Ok|Cancel, Ok, parent, name, true) { TQVBox *vbox; diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h index e428a73d..08cdca7f 100644 --- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h +++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h @@ -21,10 +21,10 @@ class DccOptionsPlugin : public KDevCompilerOptions TQ_OBJECT public: - DccOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList/* &args */); + DccOptionsPlugin( TQObject *parent, const char *name, const TQStringList/* &args */); ~DccOptionsPlugin(); - virtual TQString exec(TQWidget *tqparent, const TQString &flags); + virtual TQString exec(TQWidget *parent, const TQString &flags); }; class GeneralTab; @@ -37,7 +37,7 @@ class DebugOptimTab; class DccOptionsDialog : public KDialogBase { public: - DccOptionsDialog( TQWidget *tqparent=0, const char *name=0 ); + DccOptionsDialog( TQWidget *parent=0, const char *name=0 ); ~DccOptionsDialog(); void setFlags(const TQString &flags); diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp index facb96f9..58025ad6 100644 --- a/languages/pascal/compiler/dccoptions/optiontabs.cpp +++ b/languages/pascal/compiler/dccoptions/optiontabs.cpp @@ -21,8 +21,8 @@ #include "optiontabs.h" -LinkerTab::LinkerTab( TQWidget * tqparent, const char * name ) - : TQWidget(tqparent, name), radioController(new FlagRadioButtonController()), +LinkerTab::LinkerTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), radioController(new FlagRadioButtonController()), pathController(new FlagPathEditController()), editController(new FlagEditController()) { @@ -77,8 +77,8 @@ void LinkerTab::writeFlags( TQStringList * str ) -LocationsTab::LocationsTab( TQWidget * tqparent, const char * name ) - :TQWidget(tqparent, name), pathController(new FlagPathEditController()) +LocationsTab::LocationsTab( TQWidget * parent, const char * name ) + :TQWidget(parent, name), pathController(new FlagPathEditController()) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); tqlayout->setAutoAdd(true); @@ -112,8 +112,8 @@ void LocationsTab::writeFlags( TQStringList * str ) -Locations2Tab::Locations2Tab( TQWidget * tqparent, const char * name ) - :TQWidget(tqparent, name), pathController(new FlagPathEditController()) +Locations2Tab::Locations2Tab( TQWidget * parent, const char * name ) + :TQWidget(parent, name), pathController(new FlagPathEditController()) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); tqlayout->setAutoAdd(true); @@ -147,8 +147,8 @@ void Locations2Tab::writeFlags( TQStringList * str ) -GeneralTab::GeneralTab( TQWidget * tqparent, const char * name ) - :TQWidget(tqparent, name), controller(new FlagCheckBoxController()), +GeneralTab::GeneralTab( TQWidget * parent, const char * name ) + :TQWidget(parent, name), controller(new FlagCheckBoxController()), editController(new FlagEditController()) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -210,8 +210,8 @@ void GeneralTab::writeFlags( TQStringList * str ) -CodegenTab::CodegenTab( TQWidget * tqparent, const char * name ) - :TQWidget(tqparent, name), controller(new FlagCheckBoxController()), +CodegenTab::CodegenTab( TQWidget * parent, const char * name ) + :TQWidget(parent, name), controller(new FlagCheckBoxController()), listController(new FlagEditController()), radioController(new FlagRadioButtonController()) { @@ -308,8 +308,8 @@ void CodegenTab::writeFlags( TQStringList * str ) -DebugOptimTab::DebugOptimTab( TQWidget * tqparent, const char * name ) - : TQWidget(tqparent, name), controller(new FlagCheckBoxController()), +DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController()), radioController(new FlagRadioButtonController) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); diff --git a/languages/pascal/compiler/dccoptions/optiontabs.h b/languages/pascal/compiler/dccoptions/optiontabs.h index d96ec71d..beb61a1f 100644 --- a/languages/pascal/compiler/dccoptions/optiontabs.h +++ b/languages/pascal/compiler/dccoptions/optiontabs.h @@ -23,7 +23,7 @@ class FlagCheckBox; class LinkerTab : public TQWidget { public: - LinkerTab( TQWidget *tqparent=0, const char *name=0 ); + LinkerTab( TQWidget *parent=0, const char *name=0 ); ~LinkerTab(); void readFlags(TQStringList *str); @@ -38,7 +38,7 @@ private: class LocationsTab : public TQWidget { public: - LocationsTab( TQWidget *tqparent=0, const char *name=0 ); + LocationsTab( TQWidget *parent=0, const char *name=0 ); ~LocationsTab(); void readFlags(TQStringList *str); @@ -51,7 +51,7 @@ private: class Locations2Tab : public TQWidget { public: - Locations2Tab( TQWidget *tqparent=0, const char *name=0 ); + Locations2Tab( TQWidget *parent=0, const char *name=0 ); ~Locations2Tab(); void readFlags(TQStringList *str); @@ -64,7 +64,7 @@ private: class GeneralTab: public TQWidget { public: - GeneralTab( TQWidget *tqparent=0, const char *name=0 ); + GeneralTab( TQWidget *parent=0, const char *name=0 ); ~GeneralTab(); void readFlags(TQStringList *str); @@ -78,7 +78,7 @@ private: class CodegenTab : public TQWidget { public: - CodegenTab( TQWidget *tqparent=0, const char *name=0 ); + CodegenTab( TQWidget *parent=0, const char *name=0 ); ~CodegenTab(); void readFlags(TQStringList *str); @@ -95,7 +95,7 @@ class DebugOptimTab : public TQWidget Q_OBJECT TQ_OBJECT public: - DebugOptimTab( TQWidget *tqparent=0, const char *name=0 ); + DebugOptimTab( TQWidget *parent=0, const char *name=0 ); ~DebugOptimTab(); void readFlags(TQStringList *str); diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp index edcadaee..567d5c86 100644 --- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp +++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp @@ -18,8 +18,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfpcoptions, KGenericFactory<FpcOptionsPlugin>( "kdevfpcoptions" ) ) -FpcOptionsPlugin::FpcOptionsPlugin(TQObject *tqparent, const char *name, const TQStringList& /*args*/) - : KDevCompilerOptions(tqparent, name) +FpcOptionsPlugin::FpcOptionsPlugin(TQObject *parent, const char *name, const TQStringList& /*args*/) + : KDevCompilerOptions(parent, name) { } @@ -27,9 +27,9 @@ FpcOptionsPlugin::~FpcOptionsPlugin() { } -TQString FpcOptionsPlugin::exec(TQWidget *tqparent, const TQString &flags) +TQString FpcOptionsPlugin::exec(TQWidget *parent, const TQString &flags) { - FpcOptionsDialog *dlg = new FpcOptionsDialog(tqparent, "fpc options dialog"); + FpcOptionsDialog *dlg = new FpcOptionsDialog(parent, "fpc options dialog"); TQString newFlags = flags; dlg->setFlags(flags); if (dlg->exec() == TQDialog::Accepted) @@ -40,8 +40,8 @@ TQString FpcOptionsPlugin::exec(TQWidget *tqparent, const TQString &flags) -FpcOptionsDialog::FpcOptionsDialog( TQWidget *tqparent, const char *name ) - : KDialogBase(Tabbed, i18n("Free Pascal Compiler Options"), Ok|Cancel, Ok, tqparent, name, true) +FpcOptionsDialog::FpcOptionsDialog( TQWidget *parent, const char *name ) + : KDialogBase(Tabbed, i18n("Free Pascal Compiler Options"), Ok|Cancel, Ok, parent, name, true) { TQVBox *vbox; diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h index 6d450569..c42f70b8 100644 --- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h +++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h @@ -21,10 +21,10 @@ class FpcOptionsPlugin : public KDevCompilerOptions TQ_OBJECT public: - FpcOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + FpcOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~FpcOptionsPlugin(); - virtual TQString exec(TQWidget *tqparent, const TQString &flags); + virtual TQString exec(TQWidget *parent, const TQString &flags); }; @@ -36,7 +36,7 @@ class CodegenTab; class FpcOptionsDialog : public KDialogBase { public: - FpcOptionsDialog( TQWidget *tqparent=0, const char *name=0 ); + FpcOptionsDialog( TQWidget *parent=0, const char *name=0 ); ~FpcOptionsDialog(); void setFlags(const TQString &flags); diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp index 5c46ac24..5dd69349 100644 --- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp +++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp @@ -23,8 +23,8 @@ #include "optiontabs.h" -FeedbackTab::FeedbackTab(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v"))) +FeedbackTab::FeedbackTab(TQWidget *parent, const char *name) + : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v"))) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); tqlayout->setAutoAdd(true); @@ -94,8 +94,8 @@ void FeedbackTab::writeFlags(TQStringList *list) -FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * tqparent, const char * name ) - :TQWidget(tqparent, name), controller(new FlagCheckBoxController()), +FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char * name ) + :TQWidget(parent, name), controller(new FlagCheckBoxController()), pathController(new FlagPathEditController()) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -131,8 +131,8 @@ void FilesAndDirectoriesTab::writeFlags( TQStringList * str ) pathController->writeFlags(str); } -FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * tqparent, const char * name ) - :TQWidget(tqparent, name), controller(new FlagCheckBoxController()), +FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char * name ) + :TQWidget(parent, name), controller(new FlagCheckBoxController()), pathController(new FlagPathEditController()) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -182,8 +182,8 @@ void FilesAndDirectoriesTab2::writeFlags( TQStringList * str ) } -LanguageTab::LanguageTab( TQWidget * tqparent, const char * name ) - : TQWidget(tqparent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v"))) +LanguageTab::LanguageTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v"))) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); tqlayout->setAutoAdd(true); @@ -239,8 +239,8 @@ void LanguageTab::writeFlags( TQStringList * str ) controller->writeFlags(str); } -AssemblerTab::AssemblerTab( TQWidget * tqparent, const char * name ) - : TQWidget(tqparent, name), controller(new FlagCheckBoxController()), +AssemblerTab::AssemblerTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController()), asmController(new FlagRadioButtonController) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -324,8 +324,8 @@ void AssemblerTab::writeFlags( TQStringList * str ) -DebugOptimTab::DebugOptimTab( TQWidget * tqparent, const char * name ) - : TQWidget(tqparent, name), controller(new FlagCheckBoxController()), +DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController()), optimController(new FlagRadioButtonController) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -454,8 +454,8 @@ void DebugOptimTab::setDebugOptions() // m_default3->setChecked(true); } -CodegenTab::CodegenTab( TQWidget * tqparent, const char * name ) - : TQWidget(tqparent, name), controller(new FlagCheckBoxController()), +CodegenTab::CodegenTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController()), listController(new FlagEditController()) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -515,8 +515,8 @@ void CodegenTab::writeFlags( TQStringList * str ) listController->writeFlags(str); } -LinkerTab::LinkerTab( TQWidget * tqparent, const char * name ) - : TQWidget(tqparent, name), controller(new FlagCheckBoxController()), +LinkerTab::LinkerTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController()), listController(new FlagEditController()) { TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -577,8 +577,8 @@ void LinkerTab::writeFlags( TQStringList * str ) listController->writeFlags(str); } -MiscTab::MiscTab( TQWidget * tqparent, const char * name ) - : TQWidget(tqparent, name), controller(new FlagCheckBoxController()), +MiscTab::MiscTab( TQWidget * parent, const char * name ) + : TQWidget(parent, name), controller(new FlagCheckBoxController()), radioController(new FlagRadioButtonController()), pathController(new FlagPathEditController()), editController(new FlagEditController()) diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.h b/languages/pascal/compiler/fpcoptions/optiontabs.h index 9d0e0f07..66524b63 100644 --- a/languages/pascal/compiler/fpcoptions/optiontabs.h +++ b/languages/pascal/compiler/fpcoptions/optiontabs.h @@ -24,7 +24,7 @@ class FlagEditController; class FeedbackTab : public TQWidget { public: - FeedbackTab( TQWidget *tqparent=0, const char *name=0 ); + FeedbackTab( TQWidget *parent=0, const char *name=0 ); ~FeedbackTab(); void readFlags(TQStringList *str); @@ -37,7 +37,7 @@ private: class FilesAndDirectoriesTab: public TQWidget { public: - FilesAndDirectoriesTab( TQWidget *tqparent = 0, const char *name = 0); + FilesAndDirectoriesTab( TQWidget *parent = 0, const char *name = 0); ~FilesAndDirectoriesTab(); void readFlags(TQStringList *str); @@ -51,7 +51,7 @@ private: class FilesAndDirectoriesTab2: public TQWidget { public: - FilesAndDirectoriesTab2( TQWidget *tqparent = 0, const char *name = 0); + FilesAndDirectoriesTab2( TQWidget *parent = 0, const char *name = 0); ~FilesAndDirectoriesTab2(); void readFlags(TQStringList *str); @@ -65,7 +65,7 @@ private: class LanguageTab : public TQWidget { public: - LanguageTab( TQWidget *tqparent=0, const char *name=0 ); + LanguageTab( TQWidget *parent=0, const char *name=0 ); ~LanguageTab(); void readFlags(TQStringList *str); @@ -78,7 +78,7 @@ private: class AssemblerTab : public TQWidget { public: - AssemblerTab( TQWidget *tqparent=0, const char *name=0 ); + AssemblerTab( TQWidget *parent=0, const char *name=0 ); ~AssemblerTab(); void readFlags(TQStringList *str); @@ -94,7 +94,7 @@ class DebugOptimTab : public TQWidget Q_OBJECT TQ_OBJECT public: - DebugOptimTab( TQWidget *tqparent=0, const char *name=0 ); + DebugOptimTab( TQWidget *parent=0, const char *name=0 ); ~DebugOptimTab(); void readFlags(TQStringList *str); @@ -118,7 +118,7 @@ private slots: class CodegenTab : public TQWidget { public: - CodegenTab( TQWidget *tqparent=0, const char *name=0 ); + CodegenTab( TQWidget *parent=0, const char *name=0 ); ~CodegenTab(); void readFlags(TQStringList *str); @@ -132,7 +132,7 @@ private: class LinkerTab : public TQWidget { public: - LinkerTab( TQWidget *tqparent=0, const char *name=0 ); + LinkerTab( TQWidget *parent=0, const char *name=0 ); ~LinkerTab(); void readFlags(TQStringList *str); @@ -146,7 +146,7 @@ private: class MiscTab : public TQWidget { public: - MiscTab( TQWidget *tqparent=0, const char *name=0 ); + MiscTab( TQWidget *parent=0, const char *name=0 ); ~MiscTab(); void readFlags(TQStringList *str); diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp index 57ef642d..2b1edd31 100644 --- a/languages/pascal/pascalsupport_part.cpp +++ b/languages/pascal/pascalsupport_part.cpp @@ -47,8 +47,8 @@ typedef KDevGenericFactory<PascalSupportPart> PascalSupportFactory; static const KDevPluginInfo data("kdevpascalsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) ) -PascalSupportPart::PascalSupportPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevLanguageSupport(&data, tqparent, name ? name : "KDevPascalSupport" ), +PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &) + : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ), d( new PascalSupportPartData() ) { setInstance(PascalSupportFactory::instance()); diff --git a/languages/pascal/pascalsupport_part.h b/languages/pascal/pascalsupport_part.h index 3ad9ee39..eddc150c 100644 --- a/languages/pascal/pascalsupport_part.h +++ b/languages/pascal/pascalsupport_part.h @@ -24,7 +24,7 @@ class PascalSupportPart : public KDevLanguageSupport Q_OBJECT TQ_OBJECT public: - PascalSupportPart(TQObject *tqparent, const char *name, const TQStringList &); + PascalSupportPart(TQObject *parent, const char *name, const TQStringList &); ~PascalSupportPart(); virtual Features features(); diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index adb02c63..9d1a9ac6 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -48,13 +48,13 @@ class ProblemItem: public TQListViewItem{ public: - ProblemItem( TQListView* tqparent, const TQString& level, const TQString& problem, + ProblemItem( TQListView* parent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : TQListViewItem( tqparent, level, problem, file, line, column ) {} + : TQListViewItem( parent, level, problem, file, line, column ) {} - ProblemItem( TQListViewItem* tqparent, const TQString& level, const TQString& problem, + ProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : TQListViewItem( tqparent, level, problem, file, line, column ) {} + : TQListViewItem( parent, level, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 3 || column == 4 ){ @@ -69,8 +69,8 @@ public: }; -ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* tqparent, const char* name ) - : TQListView( tqparent, name ), +ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* parent, const char* name ) + : TQListView( parent, name ), m_pascalSupport( part ), m_editor( 0 ), m_document( 0 ), diff --git a/languages/pascal/problemreporter.h b/languages/pascal/problemreporter.h index 196d0b74..82bbdb1e 100644 --- a/languages/pascal/problemreporter.h +++ b/languages/pascal/problemreporter.h @@ -40,7 +40,7 @@ class ProblemReporter: public TQListView{ Q_OBJECT TQ_OBJECT public: - ProblemReporter( PascalSupportPart* part, TQWidget* tqparent=0, const char* name=0 ); + ProblemReporter( PascalSupportPart* part, TQWidget* parent=0, const char* name=0 ); virtual ~ProblemReporter(); virtual void reportError( TQString message, TQString filename, diff --git a/languages/perl/perlconfigwidget.cpp b/languages/perl/perlconfigwidget.cpp index 58730d05..e41def0c 100644 --- a/languages/perl/perlconfigwidget.cpp +++ b/languages/perl/perlconfigwidget.cpp @@ -17,8 +17,8 @@ PerlConfigWidget::PerlConfigWidget(TQDomDocument &projectDom, - TQWidget *tqparent, const char *name) - : PerlConfigWidgetBase(tqparent, name), dom(projectDom) + TQWidget *parent, const char *name) + : PerlConfigWidgetBase(parent, name), dom(projectDom) { interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevperlsupport/run/interpreter")); terminal_box->setChecked(DomUtil::readBoolEntry(dom, "/kdevperlsupport/run/terminal")); diff --git a/languages/perl/perlconfigwidget.h b/languages/perl/perlconfigwidget.h index 11b4503d..0f863ad0 100644 --- a/languages/perl/perlconfigwidget.h +++ b/languages/perl/perlconfigwidget.h @@ -22,7 +22,7 @@ class PerlConfigWidget : public PerlConfigWidgetBase TQ_OBJECT public: - PerlConfigWidget( TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0 ); + PerlConfigWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 ); ~PerlConfigWidget(); public slots: diff --git a/languages/perl/perlparser.cpp b/languages/perl/perlparser.cpp index 520daab3..60cca8f5 100644 --- a/languages/perl/perlparser.cpp +++ b/languages/perl/perlparser.cpp @@ -161,11 +161,11 @@ void perlparser::parseLines(TQStringList* lines,const TQString &fileName) //base matching if ((basere.search(line)>=0) && (!m_inscript)) { - TQString tqparent = basere.cap(1); - //create child & tqparent classes - kdDebug(9016) << "basere match [" << tqparent << "]" << endl; + TQString parent = basere.cap(1); + //create child & parent classes + kdDebug(9016) << "basere match [" << parent << "]" << endl; addClass(fileName,lineNo); - addParentClass(tqparent); + addParentClass(parent); continue; } else { if (libre.search(line)>=0) { @@ -186,11 +186,11 @@ void perlparser::parseLines(TQStringList* lines,const TQString &fileName) } //base if ((isare.search(line)>=0) && (!m_inscript)) { - TQString tqparent = isare.cap(1); - //create child & tqparent classes - kdDebug(9016) << "isare match [" << tqparent << "]" << endl; + TQString parent = isare.cap(1); + //create child & parent classes + kdDebug(9016) << "isare match [" << parent << "]" << endl; addClass(fileName,lineNo); - addParentClass(tqparent); + addParentClass(parent); continue; } //isa @@ -424,11 +424,11 @@ void perlparser::addPackageSub(const TQString& fileName ,int lineNr ,const TQStr m_lastsub=name; } -void perlparser::addParentClass(const TQString& tqparent) +void perlparser::addParentClass(const TQString& parent) { - kdDebug(9016) << "addParentClass[ " << tqparent << "]" << endl; + kdDebug(9016) << "addParentClass[ " << parent << "]" << endl; if (m_lastclass) { - m_lastclass->addBaseClass(tqparent); + m_lastclass->addBaseClass(parent); } else { kdDebug(9016) << "addParentClass[ no m_lastclass]" << endl; } diff --git a/languages/perl/perlparser.h b/languages/perl/perlparser.h index 6a68165e..b536596b 100644 --- a/languages/perl/perlparser.h +++ b/languages/perl/perlparser.h @@ -49,7 +49,7 @@ class perlparser { void addScriptSub(const TQString& fileName ,int lineNr , const TQString& name, bool privatesub); void addClassMethod(const TQString& fileName ,int lineNr , const TQString& name , bool privatesub); void addPackageSub(const TQString& fileName ,int lineNr , const TQString& name, bool privatesub); - void addParentClass(const TQString& tqparent); + void addParentClass(const TQString& parent); void addScript(const TQString& fileName ,int lineNr , const TQString& name); void addUseLib(const TQString& lib); void getPerlINC(); diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index a8c66b66..be725f28 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -48,8 +48,8 @@ typedef KDevGenericFactory<PerlSupportPart> PerlSupportFactory; static const KDevPluginInfo data("kdevperlsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) ) -PerlSupportPart::PerlSupportPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevLanguageSupport(&data, tqparent, name ? name : "PerlSupportPart") +PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &) + : KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart") { setInstance(PerlSupportFactory::instance()); diff --git a/languages/perl/perlsupportpart.h b/languages/perl/perlsupportpart.h index dd3a7bfa..7de6c95f 100644 --- a/languages/perl/perlsupportpart.h +++ b/languages/perl/perlsupportpart.h @@ -22,7 +22,7 @@ class PerlSupportPart : public KDevLanguageSupport TQ_OBJECT public: - PerlSupportPart( TQObject *tqparent, const char *name, const TQStringList & ); + PerlSupportPart( TQObject *parent, const char *name, const TQStringList & ); ~PerlSupportPart(); protected: diff --git a/languages/php/data/phpfunctions b/languages/php/data/phpfunctions index be8667f6..946dfaea 100644 --- a/languages/php/data/phpfunctions +++ b/languages/php/data/phpfunctions @@ -928,7 +928,7 @@ pdf:void pdf_setgray(int pdfdoc, double value) pdf:void pdf_setrgbcolor_fill(int pdfdoc, double red, double green, double blue) pdf:void pdf_setrgbcolor_stroke(int pdfdoc, double red, double green, double blue) pdf:void pdf_setrgbcolor(int pdfdoc, double red, double green, double blue) -pdf:int pdf_add_outline(int pdfdoc, string text [, int tqparent, int open]); +pdf:int pdf_add_outline(int pdfdoc, string text [, int parent, int open]); pdf:void pdf_set_transition(int pdfdoc, int transition) pdf:void pdf_set_duration(int pdfdoc, double duration) pdf:int pdf_open_gif(int pdf, string giffile) @@ -1287,7 +1287,7 @@ file:int fseek(int fp, int offset [, int whence]) file:int mkdir(string pathname, int mode) file:int rmdir(string dirname) file:int readfile(string filename [, int use_include_path]) -file:int umask([int tqmask]) +file:int umask([int mask]) file:int fpassthru(int fp) file:int rename(string old_name, string new_name) file:int unlink(string filename) @@ -1410,8 +1410,8 @@ reg:array spliti(string pattern, string string [, int limit]) reg:string sql_regcase(string string) soundex:string soundex(string str) string:string bin2hex(string data) -string:int strspn(string str, string tqmask) -string:int strcspn(string str, string tqmask) +string:int strspn(string str, string mask) +string:int strcspn(string str, string mask) string:string rtrim(string str) string:string chop(string str) string:string trim(string str) diff --git a/languages/php/doc/php.toc b/languages/php/doc/php.toc index 7a35196d..8da066d4 100644 --- a/languages/php/doc/php.toc +++ b/languages/php/doc/php.toc @@ -1477,7 +1477,7 @@ <entry name="zend_thread_id" url="function.zend-thread-id.php"/> <entry name="zend_version" url="function.zend-version.php"/> <entry name="Runkit_Sandbox" url="runkit.sandbox.php"/> -<entry name="Runkit_Sandbox_Parent" url="runkit.sandbox-tqparent.php"/> +<entry name="Runkit_Sandbox_Parent" url="runkit.sandbox-parent.php"/> <entry name="runkit_class_adopt" url="function.runkit-class-adopt.php"/> <entry name="runkit_class_emancipate" url="function.runkit-class-emancipate.php"/> <entry name="runkit_constant_add" url="function.runkit-constant-add.php"/> @@ -1805,7 +1805,7 @@ <entry name="ncurses_meta" url="function.ncurses-meta.php"/> <entry name="ncurses_mouse_trafo" url="function.ncurses-mouse-trafo.php"/> <entry name="ncurses_mouseinterval" url="function.ncurses-mouseinterval.php"/> -<entry name="ncurses_mousetqmask" url="function.ncurses-mousetqmask.php"/> +<entry name="ncurses_mousemask" url="function.ncurses-mousemask.php"/> <entry name="ncurses_move_panel" url="function.ncurses-move-panel.php"/> <entry name="ncurses_move" url="function.ncurses-move.php"/> <entry name="ncurses_mvaddch" url="function.ncurses-mvaddch.php"/> @@ -4647,7 +4647,7 @@ <entry name="HaruImage::getHeight" url="function.haruimage-getheight.php"/> <entry name="HaruImage::getSize" url="function.haruimage-getsize.php"/> <entry name="HaruImage::getWidth" url="function.haruimage-getwidth.php"/> -<entry name="HaruImage::setColorMask" url="function.haruimage-setcolortqmask.php"/> +<entry name="HaruImage::setColorMask" url="function.haruimage-setcolormask.php"/> <entry name="HaruImage::setMaskImage" url="function.haruimage-setmaskimage.php"/> <entry name="HaruEncoder::getByteType" url="function.haruencoder-getbytetype.php"/> <entry name="HaruEncoder::getType" url="function.haruencoder-gettype.php"/> @@ -4689,7 +4689,7 @@ <entry name="SWFButton->setUp()" url="function.swfbutton.setup.php"/> <entry name="SWFDisplayItem->addAction()" url="function.swfdisplayitem.addaction.php"/> <entry name="SWFDisplayItem->addColor()" url="function.swfdisplayitem.addcolor.php"/> -<entry name="SWFDisplayItem->endMask()" url="function.swfdisplayitem.endtqmask.php"/> +<entry name="SWFDisplayItem->endMask()" url="function.swfdisplayitem.endmask.php"/> <entry name="SWFDisplayItem->getRot()" url="function.swfdisplayitem.getrot.php"/> <entry name="SWFDisplayItem->getX()" url="function.swfdisplayitem.getx.php"/> <entry name="SWFDisplayItem->getXScale()" url="function.swfdisplayitem.getxscale.php"/> @@ -5517,7 +5517,7 @@ <entry name="tidyNode->isJste" url="function.tidynode-isjste.php"/> <entry name="tidyNode->isPhp" url="function.tidynode-isphp.php"/> <entry name="tidyNode->isText" url="function.tidynode-istext.php"/> -<entry name="tidyNode::getParent" url="function.tidynode-gettqparent.php"/> +<entry name="tidyNode::getParent" url="function.tidynode-getparent.php"/> <entry name="token_get_all" url="function.token-get-all.php"/> <entry name="token_name" url="function.token-name.php"/> <entry name="base64_decode" url="function.base64-decode.php"/> @@ -6494,7 +6494,7 @@ <entry name="get_declared_classes" url="function.get-declared-classes.php"/> <entry name="get_declared_interfaces" url="function.get-declared-interfaces.php"/> <entry name="get_object_vars" url="function.get-object-vars.php"/> -<entry name="get_parent_class" url="function.get-tqparent-class.php"/> +<entry name="get_parent_class" url="function.get-parent-class.php"/> <entry name="interface_exists" url="function.interface-exists.php"/> <entry name="is_a" url="function.is-a.php"/> <entry name="is_subclass_of" url="function.is-subclass-of.php"/> @@ -6856,7 +6856,7 @@ <entry name="DomNode->node_type" url="function.domnode-node-type.php"/> <entry name="DomNode->node_value" url="function.domnode-node-value.php"/> <entry name="DomNode->owner_document" url="function.domnode-owner-document.php"/> -<entry name="DomNode->parent_node" url="function.domnode-tqparent-node.php"/> +<entry name="DomNode->parent_node" url="function.domnode-parent-node.php"/> <entry name="DomNode->prefix" url="function.domnode-prefix.php"/> <entry name="DomNode->previous_sibling" url="function.domnode-previous-sibling.php"/> <entry name="DomNode->remove_child" url="function.domnode-remove-child.php"/> diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp index 41f3c2fe..113defb9 100644 --- a/languages/php/phpconfigwidget.cpp +++ b/languages/php/phpconfigwidget.cpp @@ -16,8 +16,8 @@ using namespace std; -PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,TQWidget* tqparent, const char* name, WFlags fl ) - : PHPConfigWidgetBase( tqparent, name, fl ) +PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,TQWidget* parent, const char* name, WFlags fl ) + : PHPConfigWidgetBase( parent, name, fl ) { configData = data; m_phpInfo = ""; diff --git a/languages/php/phpconfigwidget.h b/languages/php/phpconfigwidget.h index 84425de9..6fb4e926 100644 --- a/languages/php/phpconfigwidget.h +++ b/languages/php/phpconfigwidget.h @@ -12,7 +12,7 @@ class PHPConfigWidget : public PHPConfigWidgetBase TQ_OBJECT public: - PHPConfigWidget( PHPConfigData* data,TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + PHPConfigWidget( PHPConfigData* data,TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~PHPConfigWidget(); public slots: diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index c21f9fdc..658812f7 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -56,13 +56,13 @@ class ProblemItem: public KListViewItem { public: - ProblemItem( TQListView* tqparent, const TQString& problem, + ProblemItem( TQListView* parent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( tqparent, problem, file, line, column ) {} + : KListViewItem( parent, problem, file, line, column ) {} - ProblemItem( TQListViewItem* tqparent, const TQString& problem, + ProblemItem( TQListViewItem* parent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( tqparent, problem, file, line, column ) {} + : KListViewItem( parent, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 2 || column == 3 ){ @@ -77,8 +77,8 @@ public: }; -PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ? name : "problemreporter" ), +PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* parent, const char* name ) + : TQWidget( parent, name ? name : "problemreporter" ), m_phpSupport( part ), m_document( 0 ), m_markIface( 0 ) diff --git a/languages/php/phperrorview.h b/languages/php/phperrorview.h index ec41eb51..447506d0 100644 --- a/languages/php/phperrorview.h +++ b/languages/php/phperrorview.h @@ -58,7 +58,7 @@ class PHPErrorView: public TQWidget { Q_OBJECT TQ_OBJECT public: - PHPErrorView( PHPSupportPart* part, TQWidget* tqparent=0, const char* name=0 ); + PHPErrorView( PHPSupportPart* part, TQWidget* parent=0, const char* name=0 ); virtual ~PHPErrorView(); void removeAllProblems( const TQString& filename ); diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index 3e3fbd68..974698d3 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -346,7 +346,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) { while ( it != m_vars.end() ) { Action *p = *it++; - if (p->tqparent() == current && p->name() == varname) { + if (p->parent() == current && p->name() == varname) { rettype = p->args(); } } diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 2b014cfc..282e6c01 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -30,7 +30,7 @@ using namespace std; -PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *tqparent, const char *name) : PHPNewClassDlgBase(tqparent,name,true) { +PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent, const char *name) : PHPNewClassDlgBase(parent,name,true) { m_filenameModified = false; KCompletion *comp = new KCompletion(); comp->setItems(baseClassNames); diff --git a/languages/php/phpnewclassdlg.h b/languages/php/phpnewclassdlg.h index a5bbcb55..23f11577 100644 --- a/languages/php/phpnewclassdlg.h +++ b/languages/php/phpnewclassdlg.h @@ -29,7 +29,7 @@ class PHPNewClassDlg : public PHPNewClassDlgBase { Q_OBJECT TQ_OBJECT public: - PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *tqparent=0, const char *name=0); + PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent=0, const char *name=0); ~PHPNewClassDlg(); protected slots: void classNameTextChanged(const TQString&); diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 4d20a30b..d31bc933 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -69,8 +69,8 @@ using namespace std; static const KDevPluginInfo data("kdevphpsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) ) -PHPSupportPart::PHPSupportPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevLanguageSupport(&data, tqparent, name ? name : "PHPSupportPart") +PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &) + : KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart") { m_htmlView = 0; m_parser = 0; diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h index f2b0d79c..2d3f74a0 100644 --- a/languages/php/phpsupportpart.h +++ b/languages/php/phpsupportpart.h @@ -47,7 +47,7 @@ class PHPSupportPart : public KDevLanguageSupport TQ_OBJECT public: - PHPSupportPart( TQObject *tqparent, const char *name, const TQStringList & ); + PHPSupportPart( TQObject *parent, const char *name, const TQStringList & ); ~PHPSupportPart(); PHPErrorView *ErrorView(); diff --git a/languages/python/pythonconfigwidget.cpp b/languages/python/pythonconfigwidget.cpp index 6cd54700..29103705 100644 --- a/languages/python/pythonconfigwidget.cpp +++ b/languages/python/pythonconfigwidget.cpp @@ -17,8 +17,8 @@ PythonConfigWidget::PythonConfigWidget(TQDomDocument &projectDom, - TQWidget *tqparent, const char *name) - : PythonConfigWidgetBase(tqparent, name), dom(projectDom) + TQWidget *parent, const char *name) + : PythonConfigWidgetBase(parent, name), dom(projectDom) { interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevpythonsupport/run/interpreter")); terminal_box->setChecked(DomUtil::readBoolEntry(dom, "/kdevpythonsupport/run/terminal")); diff --git a/languages/python/pythonconfigwidget.h b/languages/python/pythonconfigwidget.h index 16ed799d..37427c7a 100644 --- a/languages/python/pythonconfigwidget.h +++ b/languages/python/pythonconfigwidget.h @@ -22,7 +22,7 @@ class PythonConfigWidget : public PythonConfigWidgetBase TQ_OBJECT public: - PythonConfigWidget( TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0 ); + PythonConfigWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 ); ~PythonConfigWidget(); public slots: diff --git a/languages/python/pythonimplementationwidget.cpp b/languages/python/pythonimplementationwidget.cpp index 9d9b542a..9aba5441 100644 --- a/languages/python/pythonimplementationwidget.cpp +++ b/languages/python/pythonimplementationwidget.cpp @@ -34,8 +34,8 @@ #include <kdevproject.h> PythonImplementationWidget::PythonImplementationWidget(KDevLanguageSupport* part, - TQWidget* tqparent, const char* name, bool modal) - : ImplementationWidget(part, tqparent, name, modal) + TQWidget* parent, const char* name, bool modal) + : ImplementationWidget(part, parent, name, modal) { } @@ -48,7 +48,7 @@ PythonImplementationWidget::~PythonImplementationWidget() TQStringList PythonImplementationWidget::createClassFiles() { // TQString template_py = "require '$BASEFILENAME$'\n\nclass $CLASSNAME$ < $BASECLASSNAME$\n\n def initialize(*k)\n super(*k)\n end\n\nend\n"; - TQString template_py = "from qt import *\nfrom $BASEFILENAME$ import *\nclass $CLASSNAME$($BASECLASSNAME$):\n\n def __init__(self,tqparent,name):\n $BASECLASSNAME$.__init__(self,tqparent,name)\n \n\n\n"; + TQString template_py = "from qt import *\nfrom $BASEFILENAME$ import *\nclass $CLASSNAME$($BASECLASSNAME$):\n\n def __init__(self,parent,name):\n $BASECLASSNAME$.__init__(self,parent,name)\n \n\n\n"; TQFileInfo formInfo(m_formName); template_py.replace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".py"); diff --git a/languages/python/pythonimplementationwidget.h b/languages/python/pythonimplementationwidget.h index c2ca5cc3..12db23cd 100644 --- a/languages/python/pythonimplementationwidget.h +++ b/languages/python/pythonimplementationwidget.h @@ -27,7 +27,7 @@ class PythonImplementationWidget : public ImplementationWidget Q_OBJECT TQ_OBJECT public: - PythonImplementationWidget(KDevLanguageSupport* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = true); + PythonImplementationWidget(KDevLanguageSupport* part, TQWidget* parent = 0, const char* name = 0, bool modal = true); ~PythonImplementationWidget(); diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index c8aebb6a..f7014bb6 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -42,8 +42,8 @@ typedef KDevGenericFactory<PythonSupportPart> PythonSupportFactory; static const KDevPluginInfo data("kdevpythonsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( data ) ) -PythonSupportPart::PythonSupportPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevLanguageSupport(&data, tqparent, name ? name : "PythonSupportPart") +PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const TQStringList &) + : KDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart") { setInstance(PythonSupportFactory::instance()); @@ -268,7 +268,7 @@ void PythonSupportPart::parse(const TQString &fileName) TQStringList::ConstIterator it; for (it = parentList.begin(); it != parentList.end(); ++it) { TQString baseName = (*it).stripWhiteSpace(); - kdDebug(9014) << "Add tqparent" << baseName << endl; + kdDebug(9014) << "Add parent" << baseName << endl; lastClass->addBaseClass( baseName ); } diff --git a/languages/python/pythonsupportpart.h b/languages/python/pythonsupportpart.h index 01fde048..e9e65bfa 100644 --- a/languages/python/pythonsupportpart.h +++ b/languages/python/pythonsupportpart.h @@ -26,7 +26,7 @@ class PythonSupportPart : public KDevLanguageSupport TQ_OBJECT public: - PythonSupportPart( TQObject *tqparent, const char *name, const TQStringList & ); + PythonSupportPart( TQObject *parent, const char *name, const TQStringList & ); ~PythonSupportPart(); virtual KDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type); diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb index 4c914786..6a49bdab 100644 --- a/languages/ruby/app_templates/kapp/appview.rb +++ b/languages/ruby/app_templates/kapp/appview.rb @@ -25,8 +25,8 @@ class %{APPNAMESC}View < Qt::Widget Q_SLOTS 'slotOnURL(const QString&)', 'slotSetTitle(const QString&)' - def initialize(tqparent) - super(tqparent) + def initialize(parent) + super(parent) # keep a reference to the DCOP Interface so it doesn't get gc'd @dcop = %{APPNAMESC}Iface.new(self) diff --git a/languages/ruby/app_templates/kapp/pref.rb b/languages/ruby/app_templates/kapp/pref.rb index fbdec495..f7f2e312 100644 --- a/languages/ruby/app_templates/kapp/pref.rb +++ b/languages/ruby/app_templates/kapp/pref.rb @@ -17,8 +17,8 @@ end class %{APPNAMESC}PrefPageOne < Qt::Frame - def initialize(tqparent) - super(tqparent) + def initialize(parent) + super(parent) tqlayout = Qt::HBoxLayout.new(self) tqlayout.setAutoAdd(true) @@ -28,8 +28,8 @@ end class %{APPNAMESC}PrefPageTwo < Qt::Frame - def initialize(tqparent) - super(tqparent) + def initialize(parent) + super(parent) tqlayout = Qt::HBoxLayout.new(self) tqlayout.setAutoAdd(true) diff --git a/languages/ruby/app_templates/kxt/appview.rb b/languages/ruby/app_templates/kxt/appview.rb index 0b95fdf1..58327208 100644 --- a/languages/ruby/app_templates/kxt/appview.rb +++ b/languages/ruby/app_templates/kxt/appview.rb @@ -25,8 +25,8 @@ class %{APPNAMESC}View < %{APPNAMESC}view_base Q_SLOTS 'switchColors()', 'settingsChanged()' - def initialize(tqparent) - super(tqparent) + def initialize(parent) + super(parent) settingsChanged() end diff --git a/languages/ruby/debugger/dbgcontroller.h b/languages/ruby/debugger/dbgcontroller.h index 6fe2e0db..b134d213 100644 --- a/languages/ruby/debugger/dbgcontroller.h +++ b/languages/ruby/debugger/dbgcontroller.h @@ -127,7 +127,7 @@ public slots: virtual void slotBPState(const Breakpoint&) = 0; - virtual void slotExpandItem(VarItem *tqparent, + virtual void slotExpandItem(VarItem *parent, const TQCString &userRequest) = 0; virtual void slotSelectFrame(int frame, int thread, const TQString& frameName) = 0; diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index 1389e0f6..be258778 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -51,8 +51,8 @@ namespace RDBDebugger // For use with the internal debugger, but this dialog doesn't know anything // about why it's doing it. -Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *tqparent, const char *name) - : KDialog(tqparent, name, true), // modal +Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) + : KDialog(parent, name, true), // modal psProc_(0), pids_(new TQListBox(this)), heading_(new TQLabel(" ", this)), diff --git a/languages/ruby/debugger/dbgpsdlg.h b/languages/ruby/debugger/dbgpsdlg.h index 1f30d6a7..5ab9ebe1 100644 --- a/languages/ruby/debugger/dbgpsdlg.h +++ b/languages/ruby/debugger/dbgpsdlg.h @@ -39,7 +39,7 @@ class Dbg_PS_Dialog : public KDialog TQ_OBJECT public: - Dbg_PS_Dialog( TQWidget *tqparent=0, const char *name=0 ); + Dbg_PS_Dialog( TQWidget *parent=0, const char *name=0 ); ~Dbg_PS_Dialog(); int pidSelected(); diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index 75264b60..5f24ec46 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -74,7 +74,7 @@ namespace RDBDebugger class DbgMoveHandle : public TQFrame { public: - DbgMoveHandle(DbgToolBar *tqparent=0, const char * name=0, WFlags f=0); + DbgMoveHandle(DbgToolBar *parent=0, const char * name=0, WFlags f=0); virtual ~DbgMoveHandle(); virtual void mousePressEvent(TQMouseEvent *e); @@ -89,9 +89,9 @@ private: // ************************************************************************** -DbgMoveHandle::DbgMoveHandle(DbgToolBar *tqparent, const char * name, WFlags f) - : TQFrame(tqparent, name, f), - toolBar_(tqparent), +DbgMoveHandle::DbgMoveHandle(DbgToolBar *parent, const char * name, WFlags f) + : TQFrame(parent, name, f), + toolBar_(parent), offset_(TQPoint(0,0)), moving_(false) { @@ -117,9 +117,9 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) KPopupMenu *menu = new KPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - tqparent(), TQT_SLOT(slotDock())); + parent(), TQT_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"), - tqparent(), TQT_SLOT(slotIconifyAndDock())); + parent(), TQT_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; @@ -165,7 +165,7 @@ class DbgButton : public TQPushButton { public: DbgButton(const TQPixmap &pixmap, const TQString &text, - DbgToolBar *tqparent, const char *name=0); + DbgToolBar *parent, const char *name=0); virtual ~DbgButton() {}; void drawButtonLabel(TQPainter *painter); TQSize tqsizeHint() const; @@ -177,8 +177,8 @@ private: // ************************************************************************** DbgButton::DbgButton(const TQPixmap& pixmap, const TQString& text, - DbgToolBar* tqparent, const char* name) - : TQPushButton(tqparent, name), + DbgToolBar* parent, const char* name) + : TQPushButton(parent, name), pixmap_(pixmap) { setText(text); @@ -216,8 +216,8 @@ TQSize DbgButton::tqsizeHint() const // ************************************************************************** // ************************************************************************** -DbgDocker::DbgDocker(TQWidget* tqparent, DbgToolBar* toolBar, const TQPixmap& pixmap) : - KSystemTray(tqparent, "DbgDocker"), +DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixmap) : + KSystemTray(parent, "DbgDocker"), toolBar_(toolBar) { setPixmap(pixmap); @@ -257,7 +257,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) // ************************************************************************** DbgToolBar::DbgToolBar(RubyDebuggerPart* part, - TQWidget* tqparent, const char* name) + TQWidget* parent, const char* name) : TQFrame(0, name), part_(part), activeWindow_(0), @@ -267,10 +267,10 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, appIsActive_(false), docked_(false), docker_(0), - dockWindow_(new KSystemTray(tqparent)) + dockWindow_(new KSystemTray(parent)) { winModule_ = new KWinModule(TQT_TQOBJECT(this)); - docker_ = new DbgDocker(tqparent, this, BarIcon("dbgnext")); + docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. diff --git a/languages/ruby/debugger/dbgtoolbar.h b/languages/ruby/debugger/dbgtoolbar.h index 2d059cec..907bda2a 100644 --- a/languages/ruby/debugger/dbgtoolbar.h +++ b/languages/ruby/debugger/dbgtoolbar.h @@ -42,7 +42,7 @@ class DbgDocker : public KSystemTray TQ_OBJECT public: - DbgDocker(TQWidget *tqparent, DbgToolBar *toolBar, const TQPixmap &pixmap); + DbgDocker(TQWidget *parent, DbgToolBar *toolBar, const TQPixmap &pixmap); virtual ~DbgDocker() {}; virtual void mousePressEvent(TQMouseEvent *e); @@ -60,7 +60,7 @@ class DbgToolBar : public TQFrame TQ_OBJECT public: - DbgToolBar(RubyDebuggerPart *part, TQWidget* tqparent, const char* name=0); + DbgToolBar(RubyDebuggerPart *part, TQWidget* parent, const char* name=0); virtual ~DbgToolBar(); private slots: diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index 7a953fe4..4bc0895f 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -72,8 +72,8 @@ static const KDevPluginInfo data("kdevrbdebugger"); typedef KDevGenericFactory<RubyDebuggerPart> RubyDebuggerFactory; K_EXPORT_COMPONENT_FACTORY( libkdevrbdebugger, RubyDebuggerFactory( data ) ) -RubyDebuggerPart::RubyDebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ) : - KDevPlugin( &data, tqparent, name ? name : "RubyDebuggerPart" ), +RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQStringList & ) : + KDevPlugin( &data, parent, name ? name : "RubyDebuggerPart" ), controller(0) { // setObjId("RubyDebuggerInterface"); diff --git a/languages/ruby/debugger/debuggerpart.h b/languages/ruby/debugger/debuggerpart.h index 5f3a06a6..f35970fb 100644 --- a/languages/ruby/debugger/debuggerpart.h +++ b/languages/ruby/debugger/debuggerpart.h @@ -51,7 +51,7 @@ class RubyDebuggerPart : public KDevPlugin TQ_OBJECT public: - RubyDebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ); + RubyDebuggerPart( TQObject *parent, const char *name, const TQStringList & ); ~RubyDebuggerPart(); virtual void restorePartialProjectSession(const TQDomElement* el); virtual void savePartialProjectSession(TQDomElement* el); diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp index d98582c5..1d9b4b2f 100644 --- a/languages/ruby/debugger/framestackwidget.cpp +++ b/languages/ruby/debugger/framestackwidget.cpp @@ -41,8 +41,8 @@ namespace RDBDebugger { -FramestackWidget::FramestackWidget(TQWidget *tqparent, const char *name, WFlags f) - : TQListView(tqparent, name, f), +FramestackWidget::FramestackWidget(TQWidget *parent, const char *name, WFlags f) + : TQListView(parent, name, f), viewedThread_(0) { setRootIsDecorated(true); @@ -211,10 +211,10 @@ FrameStackItem *FramestackWidget::findFrame(int frameNo, int threadNo) // ************************************************************************** -FrameStackItem::FrameStackItem(ThreadStackItem *tqparent, int frameNo, const TQString &frameDesc, const TQString& frameName) - : TQListViewItem(tqparent), +FrameStackItem::FrameStackItem(ThreadStackItem *parent, int frameNo, const TQString &frameDesc, const TQString& frameName) + : TQListViewItem(parent), frameNo_(frameNo), - threadNo_(tqparent->threadNo()), + threadNo_(parent->threadNo()), frameName_(frameName) { setText(0, frameDesc); @@ -239,8 +239,8 @@ TQString FrameStackItem::key(int /*column*/, bool /*ascending*/) const // ************************************************************************** // ************************************************************************** -ThreadStackItem::ThreadStackItem(FramestackWidget *tqparent, int threadNo, const TQString &threadDesc) - : TQListViewItem(tqparent), +ThreadStackItem::ThreadStackItem(FramestackWidget *parent, int threadNo, const TQString &threadDesc) + : TQListViewItem(parent), threadNo_(threadNo) { setText(0, threadDesc); diff --git a/languages/ruby/debugger/framestackwidget.h b/languages/ruby/debugger/framestackwidget.h index 59280f3b..37874fdf 100644 --- a/languages/ruby/debugger/framestackwidget.h +++ b/languages/ruby/debugger/framestackwidget.h @@ -36,7 +36,7 @@ class FramestackWidget; class ThreadStackItem : public TQListViewItem { public: - ThreadStackItem(FramestackWidget *tqparent, int threadNo, const TQString &threadDesc); + ThreadStackItem(FramestackWidget *parent, int threadNo, const TQString &threadDesc); virtual ~ThreadStackItem(); virtual int rtti() const { return RTTI_THREAD_STACK_ITEM; } @@ -55,7 +55,7 @@ private: class FrameStackItem : public TQListViewItem { public: - FrameStackItem(ThreadStackItem * tqparent, int frameNo, const TQString & frameDesc, const TQString & frameName); + FrameStackItem(ThreadStackItem * parent, int frameNo, const TQString & frameDesc, const TQString & frameName); virtual ~FrameStackItem(); virtual int rtti() const { return RTTI_FRAME_STACK_ITEM; } @@ -85,7 +85,7 @@ class FramestackWidget : public TQListView TQ_OBJECT public: - FramestackWidget( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); + FramestackWidget( TQWidget *parent=0, const char *name=0, WFlags f=0 ); virtual ~FramestackWidget(); void clear(); diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index 200f97f4..5fb75098 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -93,9 +93,9 @@ private: /***************************************************************************/ /***************************************************************************/ -BreakpointTableRow::BreakpointTableRow(TQTable* tqparent, EditType editType, +BreakpointTableRow::BreakpointTableRow(TQTable* parent, EditType editType, Breakpoint* bp) : - TQTableItem(tqparent, editType, ""), + TQTableItem(parent, editType, ""), m_breakpoint(bp) { appendEmptyRow(); @@ -168,8 +168,8 @@ void BreakpointTableRow::setRow() /***************************************************************************/ /***************************************************************************/ -RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *tqparent, const char *name) : - TQHBox(tqparent, name) +RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) : + TQHBox(parent, name) { TQFrame* toolbar = new TQFrame( this ); TQVBoxLayout *l = new TQVBoxLayout(toolbar, 0, 0); diff --git a/languages/ruby/debugger/rdbbreakpointwidget.h b/languages/ruby/debugger/rdbbreakpointwidget.h index ad1e0605..b28b31cc 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.h +++ b/languages/ruby/debugger/rdbbreakpointwidget.h @@ -45,7 +45,7 @@ class RDBBreakpointWidget : public TQHBox TQ_OBJECT public: - RDBBreakpointWidget( TQWidget* tqparent=0, const char* name=0 ); + RDBBreakpointWidget( TQWidget* parent=0, const char* name=0 ); virtual ~RDBBreakpointWidget(); void reset(); diff --git a/languages/ruby/debugger/rdbcontroller.h b/languages/ruby/debugger/rdbcontroller.h index af72ddbc..a5dd90e6 100644 --- a/languages/ruby/debugger/rdbcontroller.h +++ b/languages/ruby/debugger/rdbcontroller.h @@ -117,7 +117,7 @@ public slots: void slotBPState( const Breakpoint& ); void slotClearAllBreakpoints(); - void slotExpandItem(VarItem *tqparent, const TQCString &userRequest); + void slotExpandItem(VarItem *parent, const TQCString &userRequest); void slotRubyInspect(const TQString &inspectText); void slotSelectFrame(int frameNo, int threadNo, const TQString& frameName); void slotFetchGlobals(bool fetch); diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp index b1b9deda..7c489ed4 100644 --- a/languages/ruby/debugger/rdboutputwidget.cpp +++ b/languages/ruby/debugger/rdboutputwidget.cpp @@ -44,8 +44,8 @@ namespace RDBDebugger /***************************************************************************/ -RDBOutputWidget::RDBOutputWidget( TQWidget *tqparent, const char *name) : - TQWidget(tqparent, name), +RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) : + TQWidget(parent, name), m_userRDBCmdEditor(0), m_Interrupt(0), m_rdbView(0) diff --git a/languages/ruby/debugger/rdboutputwidget.h b/languages/ruby/debugger/rdboutputwidget.h index 32d53110..efb33536 100644 --- a/languages/ruby/debugger/rdboutputwidget.h +++ b/languages/ruby/debugger/rdboutputwidget.h @@ -40,7 +40,7 @@ class RDBOutputWidget : public TQWidget TQ_OBJECT public: - RDBOutputWidget( TQWidget *tqparent=0, const char *name=0 ); + RDBOutputWidget( TQWidget *parent=0, const char *name=0 ); ~RDBOutputWidget(); void clear(); diff --git a/languages/ruby/debugger/rdbparser.cpp b/languages/ruby/debugger/rdbparser.cpp index d0e8e31b..a517c301 100644 --- a/languages/ruby/debugger/rdbparser.cpp +++ b/languages/ruby/debugger/rdbparser.cpp @@ -34,7 +34,7 @@ namespace RDBDebugger // ************************************************************************** -void RDBParser::parseVariables(LazyFetchItem *tqparent, char *buf) +void RDBParser::parseVariables(LazyFetchItem *parent, char *buf) { static const char *unknown = "?"; @@ -42,7 +42,7 @@ void RDBParser::parseVariables(LazyFetchItem *tqparent, char *buf) TQCString value; int pos; - Q_ASSERT(tqparent); + Q_ASSERT(parent); if (buf == 0 || strlen(buf) == 0) { return; } @@ -84,7 +84,7 @@ void RDBParser::parseVariables(LazyFetchItem *tqparent, char *buf) dataType = VALUE_TYPE; } - setItem(tqparent, varName, dataType, value); + setItem(parent, varName, dataType, value); pos += var_re.matchedLength(); pos = var_re.search(buf, pos); @@ -94,7 +94,7 @@ void RDBParser::parseVariables(LazyFetchItem *tqparent, char *buf) } } -void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf) +void RDBParser::parseExpandedVariable(VarItem *parent, char *buf) { DataType dataType; int pos; @@ -102,7 +102,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf) TQCString value; TQRegExp ppref_re("(#<([^:]|::)+:0x[\\da-f]+)([^\\n>]*)(>?)"); - switch (tqparent->dataType()) { + switch (parent->dataType()) { case REFERENCE_TYPE: { // Look for a reference type which has been printed via a 'pp' command, to @@ -139,7 +139,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf) } dataType = determineType((char *) ppvalue_re.cap(2).latin1()); - setItem(tqparent, varName, dataType, value); + setItem(parent, varName, dataType, value); pos += ppvalue_re.matchedLength(); pos = ppvalue_re.search(buf, pos); @@ -170,7 +170,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf) } DataType dataType = determineType((char *) pparray_re.cap(2).latin1()); - setItem(tqparent, varName, dataType, value); + setItem(parent, varName, dataType, value); pos += pparray_re.matchedLength(); pos = pparray_re.search(buf, pos); @@ -193,7 +193,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf) varName = pphash_re.cap(1); value = pphash_re.cap(2).latin1(); DataType dataType = determineType(value.data()); - setItem(tqparent, varName, dataType, value); + setItem(parent, varName, dataType, value); pos += pphash_re.matchedLength(); pos = pphash_re.search(buf, pos); @@ -235,7 +235,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf) varName = ppvalue_re.cap(1); value = ppvalue_re.cap(2).latin1(); dataType = determineType(value.data()); - setItem(tqparent, varName, dataType, value); + setItem(parent, varName, dataType, value); pos += ppvalue_re.matchedLength(); pos = ppvalue_re.search(buf, pos); @@ -259,7 +259,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf) varName = ppstring_re.cap(1); value = ppstring_re.cap(2).latin1(); DataType dataType = determineType(value.data()); - setItem(tqparent, varName, dataType, value); + setItem(parent, varName, dataType, value); pos += ppstring_re.matchedLength(); pos = ppstring_re.search(buf, pos); @@ -278,12 +278,12 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf) // ************************************************************************** -void RDBParser::setItem(LazyFetchItem *tqparent, const TQString &varName, +void RDBParser::setItem(LazyFetchItem *parent, const TQString &varName, DataType dataType, const TQCString &value) { - VarItem *item = tqparent->findItem(varName); + VarItem *item = parent->findItem(varName); if (item == 0) { - item = new VarItem(tqparent, varName, dataType); + item = new VarItem(parent, varName, dataType); } else { // The dataType of an item can change, so update it item->setDataType(dataType); diff --git a/languages/ruby/debugger/rdbparser.h b/languages/ruby/debugger/rdbparser.h index 2ee59b0a..d57e25d7 100644 --- a/languages/ruby/debugger/rdbparser.h +++ b/languages/ruby/debugger/rdbparser.h @@ -29,10 +29,10 @@ namespace RDBDebugger namespace RDBParser { - void parseVariables(LazyFetchItem *tqparent, char *buf); - void parseExpandedVariable(VarItem *tqparent, char *buf); + void parseVariables(LazyFetchItem *parent, char *buf); + void parseExpandedVariable(VarItem *parent, char *buf); DataType determineType(char *buf); - void setItem( LazyFetchItem *tqparent, const TQString &varName, + void setItem( LazyFetchItem *parent, const TQString &varName, DataType dataType, const TQCString &value ); } diff --git a/languages/ruby/debugger/rdbtable.cpp b/languages/ruby/debugger/rdbtable.cpp index 429654d5..31b7b6d2 100644 --- a/languages/ruby/debugger/rdbtable.cpp +++ b/languages/ruby/debugger/rdbtable.cpp @@ -18,13 +18,13 @@ namespace RDBDebugger { -RDBTable::RDBTable(TQWidget *tqparent, const char *name) - : TQTable(tqparent, name) +RDBTable::RDBTable(TQWidget *parent, const char *name) + : TQTable(parent, name) { } -RDBTable::RDBTable(int nr, int nc, TQWidget * tqparent, const char * name) - : TQTable(nr, nc, tqparent, name) +RDBTable::RDBTable(int nr, int nc, TQWidget * parent, const char * name) + : TQTable(nr, nc, parent, name) { } diff --git a/languages/ruby/debugger/rdbtable.h b/languages/ruby/debugger/rdbtable.h index 5cb72e93..157a9e13 100644 --- a/languages/ruby/debugger/rdbtable.h +++ b/languages/ruby/debugger/rdbtable.h @@ -25,8 +25,8 @@ class RDBTable : public TQTable Q_OBJECT TQ_OBJECT public: - RDBTable(TQWidget *tqparent = 0, const char *name = 0); - RDBTable( int numRows, int numCols, TQWidget * tqparent = 0, const char * name = 0 ); + RDBTable(TQWidget *parent = 0, const char *name = 0); + RDBTable( int numRows, int numCols, TQWidget * parent = 0, const char * name = 0 ); ~RDBTable(); virtual void keyPressEvent ( TQKeyEvent * e ); diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp index f28b32b9..0cdd0eea 100644 --- a/languages/ruby/debugger/stty.cpp +++ b/languages/ruby/debugger/stty.cpp @@ -330,11 +330,11 @@ bool STTY::findExternalTTY(const TQString &termApp) ::exit(1); } - // tqparent process + // parent process if (pid <= 0) ::exit(1); - // Open the communication between us (the tqparent) and the + // Open the communication between us (the parent) and the // child (the process running on a tty console) fifo_fd = ::open(fifo, O_RDONLY); if (fifo_fd < 0) diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index 42a14322..0348e8f9 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -49,8 +49,8 @@ namespace RDBDebugger { -VariableWidget::VariableWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +VariableWidget::VariableWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { varTree_ = new VariableTree(this); TQLabel *label = new TQLabel(i18n("E&xpression to watch:"), this); @@ -127,8 +127,8 @@ void VariableWidget::savePartialProjectSession(TQDomElement* el) // ************************************************************************** // ************************************************************************** -VariableTree::VariableTree(VariableWidget *tqparent, const char *name) - : KListView(tqparent, name), +VariableTree::VariableTree(VariableWidget *parent, const char *name) + : KListView(parent, name), TQToolTip( viewport() ), activationId_(0), currentThread_(-1), @@ -187,7 +187,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) setSelected(item, true); // Need to select this item. - if (item->tqparent() != 0) { + if (item->parent() != 0) { KPopupMenu popup(this); popup.insertTitle(item->text(VAR_NAME_COLUMN)); int idRemoveWatch = -2; @@ -233,7 +233,7 @@ void VariableTree::slotPressed(TQListViewItem * item) } while (item->rtti() == RTTI_VAR_ITEM) { - item = item->tqparent(); + item = item->parent(); } if ( item->rtti() == RTTI_GLOBAL_ROOT @@ -440,8 +440,8 @@ void VariableTree::maybeTip(const TQPoint &p) // ************************************************************************** // ************************************************************************** -LazyFetchItem::LazyFetchItem(VariableTree *tqparent) - : KListViewItem(tqparent), +LazyFetchItem::LazyFetchItem(VariableTree *parent) + : KListViewItem(parent), activationId_(0), waitingForData_(false) { @@ -450,8 +450,8 @@ LazyFetchItem::LazyFetchItem(VariableTree *tqparent) // ************************************************************************** -LazyFetchItem::LazyFetchItem(LazyFetchItem *tqparent) - : KListViewItem(tqparent), +LazyFetchItem::LazyFetchItem(LazyFetchItem *parent) + : KListViewItem(parent), activationId_(0), waitingForData_(false) { @@ -474,7 +474,7 @@ void LazyFetchItem::paintCell(TQPainter *p, const TQColorGroup &cg, } // make toplevel item (watch and frame items) names bold - if (column == VAR_NAME_COLUMN && tqparent() == 0) { + if (column == VAR_NAME_COLUMN && parent() == 0) { TQFont f = p->font(); f.setBold(true); p->setFont(f); @@ -526,8 +526,8 @@ void LazyFetchItem::prune() // ************************************************************************** // ************************************************************************** -VarItem::VarItem(LazyFetchItem *tqparent, const TQString &varName, DataType dataType) - : LazyFetchItem (tqparent), +VarItem::VarItem(LazyFetchItem *parent, const TQString &varName, DataType dataType) + : LazyFetchItem (parent), cache_(TQCString()), dataType_(dataType), highlight_(false) @@ -586,7 +586,7 @@ TQString VarItem::fullName() const TQString vPath(""); const VarItem *item = this; - if (item->tqparent()->rtti() != RTTI_VAR_ITEM) { + if (item->parent()->rtti() != RTTI_VAR_ITEM) { return itemName; } @@ -605,7 +605,7 @@ TQString VarItem::fullName() const vPath.prepend(itemName + "."); } } - item = (VarItem*) item->tqparent(); + item = (VarItem*) item->parent(); } // Change 'self.@foobar' to '@foobar' @@ -746,8 +746,8 @@ TQString VarItem::tipText() const // ************************************************************************** // ************************************************************************** -VarFrameRoot::VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo) - : LazyFetchItem(tqparent), +VarFrameRoot::VarFrameRoot(VariableTree *parent, int frameNo, int threadNo) + : LazyFetchItem(parent), needsVariables_(true), frameNo_(frameNo), threadNo_(threadNo), @@ -828,8 +828,8 @@ bool VarFrameRoot::needsVariables() const // ************************************************************************** -GlobalRoot::GlobalRoot(VariableTree *tqparent) - : LazyFetchItem(tqparent) +GlobalRoot::GlobalRoot(VariableTree *parent) + : LazyFetchItem(parent) { setText(0, i18n("Global")); setExpandable(true); @@ -872,8 +872,8 @@ void GlobalRoot::setOpen(bool open) // ************************************************************************** // ************************************************************************** -WatchVarItem::WatchVarItem( LazyFetchItem *tqparent, const TQString &varName, DataType dataType, int displayId ) - : VarItem(tqparent, varName, dataType), +WatchVarItem::WatchVarItem( LazyFetchItem *parent, const TQString &varName, DataType dataType, int displayId ) + : VarItem(parent, varName, dataType), displayId_(displayId) { } @@ -903,8 +903,8 @@ int WatchVarItem::displayId() // ************************************************************************** // ************************************************************************** -WatchRoot::WatchRoot(VariableTree *tqparent) - : LazyFetchItem(tqparent) +WatchRoot::WatchRoot(VariableTree *parent) + : LazyFetchItem(parent) { setText(VAR_NAME_COLUMN, i18n("Watch")); setOpen(true); diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h index 830acf64..a54fc42e 100644 --- a/languages/ruby/debugger/variablewidget.h +++ b/languages/ruby/debugger/variablewidget.h @@ -66,7 +66,7 @@ class VariableWidget : public TQWidget TQ_OBJECT public: - VariableWidget( TQWidget *tqparent=0, const char *name=0 ); + VariableWidget( TQWidget *parent=0, const char *name=0 ); VariableTree *varTree() const { return varTree_; } @@ -100,7 +100,7 @@ class VariableTree : public KListView, public TQToolTip friend class LazyFetchItem; public: - VariableTree( VariableWidget *tqparent, const char *name=0 ); + VariableTree( VariableWidget *parent, const char *name=0 ); virtual ~VariableTree(); // Clear everything but the Watch frame @@ -172,8 +172,8 @@ private: class LazyFetchItem : public KListViewItem { public: - LazyFetchItem(VariableTree *tqparent); - LazyFetchItem(LazyFetchItem *tqparent); + LazyFetchItem(VariableTree *parent); + LazyFetchItem(LazyFetchItem *parent); virtual ~LazyFetchItem(); @@ -206,7 +206,7 @@ private: class VarItem : public LazyFetchItem { public: - VarItem( LazyFetchItem *tqparent, const TQString &varName, DataType dataType ); + VarItem( LazyFetchItem *parent, const TQString &varName, DataType dataType ); virtual ~VarItem(); @@ -249,7 +249,7 @@ private: class WatchVarItem : public VarItem { public: - WatchVarItem( LazyFetchItem *tqparent, const TQString &varName, DataType dataType, int displayId = -1); + WatchVarItem( LazyFetchItem *parent, const TQString &varName, DataType dataType, int displayId = -1); virtual ~WatchVarItem(); @@ -270,7 +270,7 @@ private: class VarFrameRoot : public LazyFetchItem { public: - VarFrameRoot(VariableTree *tqparent, int frame, int thread); + VarFrameRoot(VariableTree *parent, int frame, int thread); virtual ~VarFrameRoot(); virtual int rtti() const { return RTTI_VAR_FRAME_ROOT; } @@ -305,7 +305,7 @@ private: class WatchRoot : public LazyFetchItem { public: - WatchRoot(VariableTree * tqparent); + WatchRoot(VariableTree * parent); virtual ~WatchRoot(); virtual int rtti() const { return RTTI_WATCH_ROOT; } @@ -328,7 +328,7 @@ public: class GlobalRoot : public LazyFetchItem { public: - GlobalRoot(VariableTree * tqparent); + GlobalRoot(VariableTree * parent); virtual ~GlobalRoot(); virtual int rtti() const { return RTTI_GLOBAL_ROOT; } diff --git a/languages/ruby/rubyconfigwidget.cpp b/languages/ruby/rubyconfigwidget.cpp index 874fe680..a7ec7a7a 100644 --- a/languages/ruby/rubyconfigwidget.cpp +++ b/languages/ruby/rubyconfigwidget.cpp @@ -11,8 +11,8 @@ #include <kurlcompletion.h> #include <kdebug.h> -RubyConfigWidget::RubyConfigWidget(TQDomDocument &projectDom, TQWidget* tqparent, const char* name) -: RubyConfigWidgetBase(tqparent,name), dom (projectDom) { +RubyConfigWidget::RubyConfigWidget(TQDomDocument &projectDom, TQWidget* parent, const char* name) +: RubyConfigWidgetBase(parent,name), dom (projectDom) { kdDebug (9019) << "Creating RubyConfigWidget" << endl; interpreterEdit->setText(DomUtil::readEntry(dom, "/kdevrubysupport/run/interpreter")); if (interpreterEdit->text().isEmpty()) { diff --git a/languages/ruby/rubyconfigwidget.h b/languages/ruby/rubyconfigwidget.h index f4f367d1..46abcbaf 100644 --- a/languages/ruby/rubyconfigwidget.h +++ b/languages/ruby/rubyconfigwidget.h @@ -11,7 +11,7 @@ class RubyConfigWidget : public RubyConfigWidgetBase Q_OBJECT TQ_OBJECT public: - RubyConfigWidget(TQDomDocument &projectDom, TQWidget* tqparent = 0, const char* name = 0); + RubyConfigWidget(TQDomDocument &projectDom, TQWidget* parent = 0, const char* name = 0); public slots: void accept(); diff --git a/languages/ruby/rubyimplementationwidget.cpp b/languages/ruby/rubyimplementationwidget.cpp index 0b54fe2f..b1371a24 100644 --- a/languages/ruby/rubyimplementationwidget.cpp +++ b/languages/ruby/rubyimplementationwidget.cpp @@ -34,8 +34,8 @@ #include <kdevproject.h> RubyImplementationWidget::RubyImplementationWidget(KDevLanguageSupport* part, - TQWidget* tqparent, const char* name, bool modal) - :ImplementationWidget(part, tqparent, name, modal) + TQWidget* parent, const char* name, bool modal) + :ImplementationWidget(part, parent, name, modal) { } diff --git a/languages/ruby/rubyimplementationwidget.h b/languages/ruby/rubyimplementationwidget.h index 5dfaf4a4..48c88679 100644 --- a/languages/ruby/rubyimplementationwidget.h +++ b/languages/ruby/rubyimplementationwidget.h @@ -26,7 +26,7 @@ class RubyImplementationWidget : public ImplementationWidget { Q_OBJECT TQ_OBJECT public: - RubyImplementationWidget(KDevLanguageSupport* part, TQWidget* tqparent = 0, + RubyImplementationWidget(KDevLanguageSupport* part, TQWidget* parent = 0, const char* name = 0, bool modal = true); virtual TQStringList createClassFiles(); diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index cc895770..0cee14b2 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -41,8 +41,8 @@ typedef KDevGenericFactory<RubySupportPart> RubySupportFactory; static const KDevPluginInfo data("kdevrubysupport"); K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( data ) ) -RubySupportPart::RubySupportPart(TQObject *tqparent, const char *name, const TQStringList& ) - : KDevLanguageSupport (&data, tqparent, name ? name : "RubySupportPart" ) +RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStringList& ) + : KDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" ) { setInstance(RubySupportFactory::instance()); setXMLFile("kdevrubysupport.rc"); @@ -261,11 +261,11 @@ void RubySupportPart::parse(const TQString &fileName) m_file->addClass( lastClass ); } - TQString tqparent = classre.cap(5); - if (!tqparent.isEmpty()) + TQString parent = classre.cap(5); + if (!parent.isEmpty()) { - kdDebug() << "Add tqparent " << tqparent << endl; - lastClass->addBaseClass( tqparent ); + kdDebug() << "Add parent " << parent << endl; + lastClass->addBaseClass( parent ); } lastAccess = CodeModelItem::Public; diff --git a/languages/ruby/rubysupport_part.h b/languages/ruby/rubysupport_part.h index 2fbfed42..eb4fbe1e 100644 --- a/languages/ruby/rubysupport_part.h +++ b/languages/ruby/rubysupport_part.h @@ -22,7 +22,7 @@ class RubySupportPart : public KDevLanguageSupport public: - RubySupportPart(TQObject *tqparent, const char *name, const TQStringList &); + RubySupportPart(TQObject *parent, const char *name, const TQStringList &); virtual ~RubySupportPart(); virtual KDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type); diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index 4e0a7d07..cf92721b 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -28,8 +28,8 @@ SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, const KShortcut& cut, const TQObject *receiver, const char *slot, - KActionCollection *tqparent, const char *name) - : KWidgetAction( m_combo = new KComboBox(), text, cut, 0, 0, tqparent, name), m_part(part) + KActionCollection *parent, const char *name) + : KWidgetAction( m_combo = new KComboBox(), text, cut, 0, 0, parent, name), m_part(part) { m_combo->setEditable( false ); m_combo->setAutoCompletion( true ); diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h index a85f3709..1f8ac265 100644 --- a/languages/sql/sqlactions.h +++ b/languages/sql/sqlactions.h @@ -26,7 +26,7 @@ class SqlListAction : public KWidgetAction public: SqlListAction( SQLSupportPart *part, const TQString &text, const KShortcut& cut, const TQObject *receiver, const char *slot, - KActionCollection *tqparent, const char *name ); + KActionCollection *parent, const char *name ); void setCurrentConnectionName(const TQString &name); TQString currentConnectionName() const; void refresh(); diff --git a/languages/sql/sqloutputwidget.cpp b/languages/sql/sqloutputwidget.cpp index 73228dd7..65f95479 100644 --- a/languages/sql/sqloutputwidget.cpp +++ b/languages/sql/sqloutputwidget.cpp @@ -54,8 +54,8 @@ public: }; -SqlOutputWidget::SqlOutputWidget ( TQWidget* tqparent, const char* name ) : - TQWidget( tqparent, name ) +SqlOutputWidget::SqlOutputWidget ( TQWidget* parent, const char* name ) : + TQWidget( parent, name ) { m_stack = new TQWidgetStack( this ); m_table = new TQDataTable( this ); diff --git a/languages/sql/sqloutputwidget.h b/languages/sql/sqloutputwidget.h index c4a58ddf..766a0209 100644 --- a/languages/sql/sqloutputwidget.h +++ b/languages/sql/sqloutputwidget.h @@ -25,7 +25,7 @@ class SqlOutputWidget : public TQWidget TQ_OBJECT public: - SqlOutputWidget( TQWidget* tqparent = 0, const char* name = 0 ); + SqlOutputWidget( TQWidget* parent = 0, const char* name = 0 ); virtual ~SqlOutputWidget(); public: diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index a53f2879..fcbb8ca4 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -33,8 +33,8 @@ typedef KDevGenericFactory<SQLSupportPart> STQLSupportFactory; static const KDevPluginInfo data("kdevsqlsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, STQLSupportFactory( data ) ) -SQLSupportPart::SQLSupportPart( TQObject *tqparent, const char *name, const TQStringList& ) - : KDevLanguageSupport ( &data, tqparent, name ? name : "SQLSupportPart" ) +SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& ) + : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" ) { setInstance( STQLSupportFactory::instance() ); setXMLFile( "kdevsqlsupport.rc" ); diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h index 1e72eca1..d2c99eb0 100644 --- a/languages/sql/sqlsupport_part.h +++ b/languages/sql/sqlsupport_part.h @@ -21,7 +21,7 @@ class SQLSupportPart : public KDevLanguageSupport public: - SQLSupportPart(TQObject *tqparent, const char *name, const TQStringList &); + SQLSupportPart(TQObject *parent, const char *name, const TQStringList &); virtual ~SQLSupportPart(); static TQString cryptStr(const TQString& aStr); diff --git a/lib/antlr/antlr/TokenStreamBasicFilter.hpp b/lib/antlr/antlr/TokenStreamBasicFilter.hpp index 353014a4..bcdb131c 100644 --- a/lib/antlr/antlr/TokenStreamBasicFilter.hpp +++ b/lib/antlr/antlr/TokenStreamBasicFilter.hpp @@ -34,7 +34,7 @@ public: void discard(int ttype); - void discard(const BitSet& tqmask); + void discard(const BitSet& mask); RefToken nextToken(); }; diff --git a/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp b/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp index 867a4101..ed007a7a 100644 --- a/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp +++ b/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp @@ -69,7 +69,7 @@ public: void hide(int m); - void hide(const BitSet& tqmask); + void hide(const BitSet& mask); protected: RefToken LA(int i); diff --git a/lib/antlr/src/TokenStreamBasicFilter.cpp b/lib/antlr/src/TokenStreamBasicFilter.cpp index ac6156da..982e8645 100644 --- a/lib/antlr/src/TokenStreamBasicFilter.cpp +++ b/lib/antlr/src/TokenStreamBasicFilter.cpp @@ -24,9 +24,9 @@ void TokenStreamBasicFilter::discard(int ttype) discardMask.add(ttype); } -void TokenStreamBasicFilter::discard(const BitSet& tqmask) +void TokenStreamBasicFilter::discard(const BitSet& mask) { - discardMask = tqmask; + discardMask = mask; } RefToken TokenStreamBasicFilter::nextToken() diff --git a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp index 90d48d5a..431df0c3 100644 --- a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp +++ b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp @@ -94,9 +94,9 @@ void TokenStreamHiddenTokenFilter::hide(int m) hideMask.add(m); } -void TokenStreamHiddenTokenFilter::hide(const BitSet& tqmask) +void TokenStreamHiddenTokenFilter::hide(const BitSet& mask) { - hideMask = tqmask; + hideMask = mask; } RefToken TokenStreamHiddenTokenFilter::LA(int) diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp index 8fe6b82f..334ac62a 100644 --- a/lib/cppparser/ast.cpp +++ b/lib/cppparser/ast.cpp @@ -178,14 +178,14 @@ void AST::getEndPosition( int* line, int* col ) const * col = m_endColumn; } -void AST::setParent( AST* tqparent ) +void AST::setParent( AST* parent ) { #ifndef CPPPARSER_NO_CHILDREN if( m_parent ) m_parent->removeChild( this ); #endif - m_parent = tqparent; + m_parent = parent; #ifndef CPPPARSER_NO_CHILDREN if( m_parent ) diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h index ccea98e2..3e53a285 100644 --- a/lib/cppparser/ast.h +++ b/lib/cppparser/ast.h @@ -253,8 +253,8 @@ public: int nodeType() const { return m_nodeType; } void setNodeType( int nodeType ) { m_nodeType = nodeType; } - AST* tqparent() { return m_parent; } - void setParent( AST* tqparent ); + AST* parent() { return m_parent; } + void setParent( AST* parent ); void setStartPosition( int line, int col ); void getStartPosition( int* line, int* col ) const; diff --git a/lib/interfaces/codemodel.h b/lib/interfaces/codemodel.h index f85ff4c3..343c6169 100644 --- a/lib/interfaces/codemodel.h +++ b/lib/interfaces/codemodel.h @@ -706,10 +706,10 @@ public: virtual bool isClass() const { return true; } - /**@return The scope of the class. Scope is a string list composed from names of tqparent classes and namespaces.*/ + /**@return The scope of the class. Scope is a string list composed from names of parent classes and namespaces.*/ TQStringList scope() const { return m_scope; } /**Sets the scope of this class. - @param scope The scope - a list of tqparent classes and namespaces.*/ + @param scope The scope - a list of parent classes and namespaces.*/ void setScope( const TQStringList& scope ) { m_scope = scope; } /**@return The list of base class names.*/ @@ -1256,7 +1256,7 @@ public: virtual bool isFunction() const { return true; } /**@return The scope of the function. Scope is a string list composed - from names of tqparent functions, classes and namespaces.*/ + from names of parent functions, classes and namespaces.*/ TQStringList scope() const { return m_scope; } /**Sets the scope of the function. diff --git a/lib/interfaces/extensions/Mainpage.dox b/lib/interfaces/extensions/Mainpage.dox index 5906ccfe..d306a1e8 100644 --- a/lib/interfaces/extensions/Mainpage.dox +++ b/lib/interfaces/extensions/Mainpage.dox @@ -38,8 +38,8 @@ those should be loaded at a time. This can be accomplished by: @code class KDevMyExtension: public KDevPlugin { public: - KDevMyExtension(const KDevPluginInfo *info, QObject* tqparent, const char* name) - :KDevPlugin(info, tqparent, name) {} + KDevMyExtension(const KDevPluginInfo *info, QObject* parent, const char* name) + :KDevPlugin(info, parent, name) {} virtual void doSomething() = 0; }; diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h index 2ce7090b..6084496f 100644 --- a/lib/interfaces/extensions/codebrowserfrontend.h +++ b/lib/interfaces/extensions/codebrowserfrontend.h @@ -30,8 +30,8 @@ class KDevCodeBrowserFrontend : public KDevPlugin { TQ_OBJECT public: - KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 ) - :KDevPlugin(info, tqparent, name ? name : "CodeBrowserFrontend") {} + KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) + :KDevPlugin(info, parent, name ? name : "CodeBrowserFrontend") {} ///Used by the quickopen-plugin to notify extensions that it jumped to a searched item virtual bool jumpedToItem( ItemDom item ) = 0; diff --git a/lib/interfaces/extensions/kdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h index bd6dc559..9bac0ff8 100644 --- a/lib/interfaces/extensions/kdevappfrontend.h +++ b/lib/interfaces/extensions/kdevappfrontend.h @@ -66,11 +66,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevAppFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 ) - :KDevPlugin(info, tqparent, name ? name : "KDevAppFrontend") {} + KDevAppFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) + :KDevPlugin(info, parent, name ? name : "KDevAppFrontend") {} /**@return Whether the application is currently running.*/ virtual bool isRunning() = 0; diff --git a/lib/interfaces/extensions/kdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h index fd11b993..031c7ffc 100644 --- a/lib/interfaces/extensions/kdevcreatefile.h +++ b/lib/interfaces/extensions/kdevcreatefile.h @@ -119,11 +119,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevCreateFile(const KDevPluginInfo *info, TQObject * tqparent = 0, const char * name = 0) - :KDevPlugin(info, tqparent, name) {} + KDevCreateFile(const KDevPluginInfo *info, TQObject * parent = 0, const char * name = 0) + :KDevPlugin(info, parent, name) {} /**Creates a new file, within or without the project. Supply as much information as you know. Leave what you don't know as TQString(). diff --git a/lib/interfaces/extensions/kdevdifffrontend.cpp b/lib/interfaces/extensions/kdevdifffrontend.cpp index a3af79d4..745703e4 100644 --- a/lib/interfaces/extensions/kdevdifffrontend.cpp +++ b/lib/interfaces/extensions/kdevdifffrontend.cpp @@ -21,8 +21,8 @@ #include "kdevdifffrontend.h" -KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *tqparent, const char *name) - : KDevPlugin(info, tqparent, name ? name : "KDevDiffFrontend") +KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *parent, const char *name) + : KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") { } diff --git a/lib/interfaces/extensions/kdevdifffrontend.h b/lib/interfaces/extensions/kdevdifffrontend.h index b1158cb4..ecf360ad 100644 --- a/lib/interfaces/extensions/kdevdifffrontend.h +++ b/lib/interfaces/extensions/kdevdifffrontend.h @@ -55,11 +55,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevDiffFrontend( const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 ) - :KDevPlugin(info, tqparent, name ? name : "KDevDiffFrontend") {} + KDevDiffFrontend( const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) + :KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") {} /**Displays the patch. @param diff A string which contains a patch in unified format.*/ diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h index cc136536..c1d0319b 100644 --- a/lib/interfaces/extensions/kdevmakefrontend.h +++ b/lib/interfaces/extensions/kdevmakefrontend.h @@ -63,11 +63,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevMakeFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 ) - :KDevPlugin(info, tqparent, name ? name : "KDevMakeFrontend") {} + KDevMakeFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) + :KDevPlugin(info, parent, name ? name : "KDevMakeFrontend") {} /**@return The widget where the make output is shown.*/ virtual TQWidget* widget() { return 0L; } diff --git a/lib/interfaces/extensions/kdevquickopen.h b/lib/interfaces/extensions/kdevquickopen.h index e66e01b3..f4f6358c 100644 --- a/lib/interfaces/extensions/kdevquickopen.h +++ b/lib/interfaces/extensions/kdevquickopen.h @@ -51,11 +51,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevQuickOpen(const KDevPluginInfo *info, TQObject* tqparent, const char* name) - :KDevPlugin(info, tqparent, name) {} + KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name) + :KDevPlugin(info, parent, name) {} /**Shows the file selection dialog. @param text A list of urls to open.*/ @@ -116,11 +116,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevQuickOpen(const KDevPluginInfo *info, TQObject* tqparent, const char* name) - :KDevPlugin(info, tqparent, name) {} + KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name) + :KDevPlugin(info, parent, name) {} /**Shows the file selection dialog. @param text A list of urls to open.*/ diff --git a/lib/interfaces/extensions/kdevsourceformatter.h b/lib/interfaces/extensions/kdevsourceformatter.h index 0542fbf1..5ca33079 100644 --- a/lib/interfaces/extensions/kdevsourceformatter.h +++ b/lib/interfaces/extensions/kdevsourceformatter.h @@ -51,11 +51,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevSourceFormatter(const KDevPluginInfo *info, TQObject* tqparent, const char* name) - :KDevPlugin(info, tqparent, name) {} + KDevSourceFormatter(const KDevPluginInfo *info, TQObject* parent, const char* name) + :KDevPlugin(info, parent, name) {} /**Formats the source. @param text A string with a code. diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h index 63656c9e..ba6c0d70 100644 --- a/lib/interfaces/extensions/kdevversioncontrol.h +++ b/lib/interfaces/extensions/kdevversioncontrol.h @@ -144,11 +144,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevVersionControl(const KDevPluginInfo *info, TQObject *tqparent, const char *name ) - :KDevPlugin(info, tqparent, name ) {} + KDevVersionControl(const KDevPluginInfo *info, TQObject *parent, const char *name ) + :KDevPlugin(info, parent, name ) {} /**Creates a new project in the passed path @p dir. This should instantiate VCS infrastructure and import a project into the VCS in that directory. @@ -188,10 +188,10 @@ class KDevVCSFileInfoProvider: public TQObject TQ_OBJECT public: /**Constructor. - @param tqparent The tqparent VCS plugin. + @param parent The parent VCS plugin. @param name The name of a provider object.*/ - KDevVCSFileInfoProvider(KDevVersionControl *tqparent, const char *name) - : TQObject( tqparent, name ), m_owner(tqparent) {} + KDevVCSFileInfoProvider(KDevVersionControl *parent, const char *name) + : TQObject( parent, name ), m_owner(parent) {} /**Gets the status for local files in the specified directory: the info are collected locally so they are necessarily in sync with the repository diff --git a/lib/interfaces/external/designer.cpp b/lib/interfaces/external/designer.cpp index 06c28d50..606fd2b4 100644 --- a/lib/interfaces/external/designer.cpp +++ b/lib/interfaces/external/designer.cpp @@ -20,8 +20,8 @@ namespace KInterfaceDesigner{ -Designer::Designer(TQObject *tqparent, const char *name) - :KParts::ReadWritePart(tqparent, name) +Designer::Designer(TQObject *parent, const char *name) + :KParts::ReadWritePart(parent, name) { } diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h index 72d7508a..9f0c0064 100644 --- a/lib/interfaces/external/designer.h +++ b/lib/interfaces/external/designer.h @@ -67,7 +67,7 @@ class Designer: public KParts::ReadWritePart{ Q_OBJECT TQ_OBJECT public: - Designer(TQObject *tqparent, const char *name); + Designer(TQObject *parent, const char *name); /**Reimplement this to be able to open projects.*/ virtual void openProject(const TQString &projectFile) = 0; diff --git a/lib/interfaces/extras/kdevcompileroptions.cpp b/lib/interfaces/extras/kdevcompileroptions.cpp index 08f5d19f..22c701f1 100644 --- a/lib/interfaces/extras/kdevcompileroptions.cpp +++ b/lib/interfaces/extras/kdevcompileroptions.cpp @@ -1,7 +1,7 @@ #include "kdevcompileroptions.h" -KDevCompilerOptions::KDevCompilerOptions( TQObject * tqparent, const char * name ) - :TQObject(tqparent, name) +KDevCompilerOptions::KDevCompilerOptions( TQObject * parent, const char * name ) + :TQObject(parent, name) { } diff --git a/lib/interfaces/extras/kdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h index 15d9a066..220956f5 100644 --- a/lib/interfaces/extras/kdevcompileroptions.h +++ b/lib/interfaces/extras/kdevcompileroptions.h @@ -34,7 +34,7 @@ Used by build systems to give users a compiler options configuration dialog. Common use case: @code -static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *tqparent ) +static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) @@ -49,7 +49,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec if (prop.isValid()) args = TQStringList::split(" ", prop.toString()); - TQObject *obj = factory->create(tqparent, service->name().latin1(), + TQObject *obj = factory->create(parent, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) @@ -60,11 +60,11 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec } ... -KDevCompilerOptions *plugin = createCompilerOptions(compilerName, tqparent); +KDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent); TQString flags = ""; //old compiler flags if ( plugin ) { - flags = plugin->exec( tqparent, flags ); //new compiler flags are returned + flags = plugin->exec( parent, flags ); //new compiler flags are returned delete plugin; } @endcode @@ -75,7 +75,7 @@ class KDevCompilerOptions : public TQObject TQ_OBJECT public: - KDevCompilerOptions( TQObject *tqparent=0, const char *name=0 ); + KDevCompilerOptions( TQObject *parent=0, const char *name=0 ); /** * Opens a dialog which allows the user to configure the @@ -85,7 +85,7 @@ public: * be returned as a string. If the dialog was cancelled, * TQString() is returned. */ - virtual TQString exec(TQWidget *tqparent, const TQString &flags) = 0; + virtual TQString exec(TQWidget *parent, const TQString &flags) = 0; }; #endif diff --git a/lib/interfaces/extras/kdevvcsintegrator.cpp b/lib/interfaces/extras/kdevvcsintegrator.cpp index cb3cb263..5a6ab429 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.cpp +++ b/lib/interfaces/extras/kdevvcsintegrator.cpp @@ -18,8 +18,8 @@ */ #include "kdevvcsintegrator.h" -KDevVCSIntegrator::KDevVCSIntegrator(TQObject *tqparent, const char *name) - :TQObject(tqparent, name) +KDevVCSIntegrator::KDevVCSIntegrator(TQObject *parent, const char *name) + :TQObject(parent, name) { } diff --git a/lib/interfaces/extras/kdevvcsintegrator.h b/lib/interfaces/extras/kdevvcsintegrator.h index e13798e2..b5098e6c 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.h +++ b/lib/interfaces/extras/kdevvcsintegrator.h @@ -35,7 +35,7 @@ VCS Integration Dialog. Usually it is created as: @code class MyVCSDialog: public TQWidget, public VCSDialog { - MyVCSDialog(TQWidget *tqparent = 0, const char *name = 0); + MyVCSDialog(TQWidget *parent = 0, const char *name = 0); virtual void accept() { ... } virtual void init(const TQString &projectName, const TQString &projectLocation) { ... } virtual TQWidget *self() { @@ -53,7 +53,7 @@ public: /**Init integration dialog with the project name and location.*/ virtual void init(const TQString &projectName, const TQString &projectLocation) = 0; /**Reimplement to return an actual integration widget. Use TQWidgets for that, not - TQDialogs because integrator dialogs are usually have tqparent containers.*/ + TQDialogs because integrator dialogs are usually have parent containers.*/ virtual TQWidget *self() = 0; }; @@ -66,12 +66,12 @@ class KDevVCSIntegrator: public TQObject { Q_OBJECT TQ_OBJECT public: - KDevVCSIntegrator(TQObject *tqparent = 0, const char *name = 0); + KDevVCSIntegrator(TQObject *parent = 0, const char *name = 0); /**Reimplement to return a dialog to fetch the project from VCS.*/ - virtual VCSDialog *fetcher(TQWidget *tqparent) = 0; + virtual VCSDialog *fetcher(TQWidget *parent) = 0; /**Reimplement to return a dialog to integrate the project into VCS.*/ - virtual VCSDialog *integrator(TQWidget *tqparent) = 0; + virtual VCSDialog *integrator(TQWidget *parent) = 0; }; #endif diff --git a/lib/interfaces/kdevcore.cpp b/lib/interfaces/kdevcore.cpp index 700693d6..dda66cbf 100644 --- a/lib/interfaces/kdevcore.cpp +++ b/lib/interfaces/kdevcore.cpp @@ -285,8 +285,8 @@ const ProjectModelItem* ProjectModelItemContext::item() const // class KDevCore /////////////////////////////////////////////////////////////////////////////// -KDevCore::KDevCore( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +KDevCore::KDevCore( TQObject *parent, const char *name ) + : TQObject( parent, name ) { new KDevCoreIface(this); } diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h index 09fba17c..7e3aa6ee 100644 --- a/lib/interfaces/kdevcore.h +++ b/lib/interfaces/kdevcore.h @@ -303,9 +303,9 @@ class KDevCore: public TQObject TQ_OBJECT public: /**Constructor - @param tqparent The TQObject that's the tqparent of this class. + @param parent The TQObject that's the parent of this class. @param name The name of the class.*/ - KDevCore(TQObject *tqparent=0, const char *name=0); + KDevCore(TQObject *parent=0, const char *name=0); /**Destructor.*/ virtual ~KDevCore(); diff --git a/lib/interfaces/kdevdesignerintegration.cpp b/lib/interfaces/kdevdesignerintegration.cpp index c95cfbe9..0ba325ab 100644 --- a/lib/interfaces/kdevdesignerintegration.cpp +++ b/lib/interfaces/kdevdesignerintegration.cpp @@ -24,8 +24,8 @@ public: KDevDesignerIntegrationIface *m_iface; }; -KDevDesignerIntegration::KDevDesignerIntegration(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +KDevDesignerIntegration::KDevDesignerIntegration(TQObject *parent, const char *name) + : TQObject(parent, name) { dptr = new KDevDesignerIntegrationPrivate(); diff --git a/lib/interfaces/kdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h index 6cd8fffb..99b9dbc0 100644 --- a/lib/interfaces/kdevdesignerintegration.h +++ b/lib/interfaces/kdevdesignerintegration.h @@ -54,9 +54,9 @@ Q_OBJECT TQ_OBJECT public: /**Constructor. - @param tqparent Parent object. + @param parent Parent object. @param name Internal name.*/ - KDevDesignerIntegration(TQObject *tqparent = 0, const char *name = 0); + KDevDesignerIntegration(TQObject *parent = 0, const char *name = 0); /**Destructor.*/ ~KDevDesignerIntegration(); diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h index 4199d14a..f928d815 100644 --- a/lib/interfaces/kdevgenericfactory.h +++ b/lib/interfaces/kdevgenericfactory.h @@ -51,8 +51,8 @@ static const KDevPluginInfo data("KDevDummyPlugin"); typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory; K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) ) -DummyPlugin::DummyPlugin(TQObject *tqparent, const char *name, const TQStringList & ) - :KDevPlugin(&data, tqparent, name) +DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & ) + :KDevPlugin(&data, parent, name) { } @endcode diff --git a/lib/interfaces/kdevlanguagesupport.cpp b/lib/interfaces/kdevlanguagesupport.cpp index b0449d6b..aa5b560c 100644 --- a/lib/interfaces/kdevlanguagesupport.cpp +++ b/lib/interfaces/kdevlanguagesupport.cpp @@ -29,8 +29,8 @@ #include "kdevdesignerintegration.h" #include "kdevlanguagesupport.h" -KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *tqparent, const char *name) - : KDevPlugin(info, tqparent, name ? name : "KDevLanguageSupport" ) +KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name) + : KDevPlugin(info, parent, name ? name : "KDevLanguageSupport" ) { } diff --git a/lib/interfaces/kdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h index 765fde79..87c91a41 100644 --- a/lib/interfaces/kdevlanguagesupport.h +++ b/lib/interfaces/kdevlanguagesupport.h @@ -91,10 +91,10 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevLanguageSupport(const KDevPluginInfo *info, TQObject *tqparent, const char *name); + KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name); /**Destructor.*/ ~KDevLanguageSupport(); diff --git a/lib/interfaces/kdevpartcontroller.cpp b/lib/interfaces/kdevpartcontroller.cpp index 09a47493..58f1dc2a 100644 --- a/lib/interfaces/kdevpartcontroller.cpp +++ b/lib/interfaces/kdevpartcontroller.cpp @@ -20,8 +20,8 @@ #include "kdevpartcontroller.h" #include "katedocumentmanagerinterface.h" -KDevPartController::KDevPartController(TQWidget *tqparent) - : KParts::PartManager(tqparent) +KDevPartController::KDevPartController(TQWidget *parent) + : KParts::PartManager(parent) { new KDevPartControllerIface(this); new KateDocumentManagerInterface(this); diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h index e2ff8069..37abf603 100644 --- a/lib/interfaces/kdevpartcontroller.h +++ b/lib/interfaces/kdevpartcontroller.h @@ -60,8 +60,8 @@ class KDevPartController: public KParts::PartManager public: /**Constructor. - @param tqparent The tqparent object.*/ - KDevPartController(TQWidget *tqparent); + @param parent The parent object.*/ + KDevPartController(TQWidget *parent); /**Call this before a call to @ref editDocument to set the encoding of the document to be opened. diff --git a/lib/interfaces/kdevplugin.cpp b/lib/interfaces/kdevplugin.cpp index d2a40332..5b4de199 100644 --- a/lib/interfaces/kdevplugin.cpp +++ b/lib/interfaces/kdevplugin.cpp @@ -54,11 +54,11 @@ struct KDevPlugin::Private // class KDevPlugin /////////////////////////////////////////////////////////////////////////////// -KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *tqparent, const char *name) - :TQObject(tqparent, name), d(new Private) +KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name) + :TQObject(parent, name), d(new Private) { - assert(tqparent->inherits( "KDevApi" )); - m_api = static_cast<KDevApi *>( tqparent ); + assert(parent->inherits( "KDevApi" )); + m_api = static_cast<KDevApi *>( parent ); actionCollection()->setHighlightingEnabled( true ); diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h index 249ff808..36c4e576 100644 --- a/lib/interfaces/kdevplugin.h +++ b/lib/interfaces/kdevplugin.h @@ -116,10 +116,10 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevPlugin(const KDevPluginInfo *info, TQObject *tqparent, const char *name = 0); + KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name = 0); /**Destructs a plugin.*/ virtual ~KDevPlugin(); @@ -183,7 +183,7 @@ public: They belong to the application rc file (kdeveloprc) @note Project session file is useful for settings which cannot be shared between developers. If a setting should be shared, modify projectDom instead. - @param el The tqparent DOM element for plugins session settings.*/ + @param el The parent DOM element for plugins session settings.*/ virtual void restorePartialProjectSession(const TQDomElement* el); /**Saves session settings. diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp index fe495ea1..e8616df1 100644 --- a/lib/interfaces/kdevproject.cpp +++ b/lib/interfaces/kdevproject.cpp @@ -37,8 +37,8 @@ struct KDevProject::Private { KDevProjectIface *m_iface; }; -KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *tqparent, const char *name) - : KDevPlugin(info, tqparent, name), d(new KDevProject::Private()) +KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name) + : KDevPlugin(info, parent, name), d(new KDevProject::Private()) { connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); diff --git a/lib/interfaces/kdevproject.h b/lib/interfaces/kdevproject.h index 62e936b4..edf206bd 100644 --- a/lib/interfaces/kdevproject.h +++ b/lib/interfaces/kdevproject.h @@ -56,10 +56,10 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevProject(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0); + KDevProject(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0); /**Destructor.*/ virtual ~KDevProject(); diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp index 2a99f23b..51845a5c 100644 --- a/lib/util/blockingkprocess.cpp +++ b/lib/util/blockingkprocess.cpp @@ -14,8 +14,8 @@ #include <tqapplication.h> #include <tqtimer.h> -BlockingKProcess::BlockingKProcess(TQObject *tqparent, const char *name) - : KProcess(tqparent, name) +BlockingKProcess::BlockingKProcess(TQObject *parent, const char *name) + : KProcess(parent, name) { m_stdOut = ""; m_stdErr = ""; diff --git a/lib/util/blockingkprocess.h b/lib/util/blockingkprocess.h index dd15002e..3db2c170 100644 --- a/lib/util/blockingkprocess.h +++ b/lib/util/blockingkprocess.h @@ -34,7 +34,7 @@ class BlockingKProcess : public KProcess TQ_OBJECT public: - BlockingKProcess(TQObject *tqparent, const char *name=0); + BlockingKProcess(TQObject *parent, const char *name=0); BlockingKProcess(); virtual ~BlockingKProcess(); diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h index b91bf3f7..1c48d4c7 100644 --- a/lib/util/configwidgetproxy.h +++ b/lib/util/configwidgetproxy.h @@ -105,7 +105,7 @@ signals: /** * The proxy emits this signal to notify the client that a specific config page has been requested. * @param dlg The settings dialog. The client should connect to its okClicked() signal. - * @param page The setting page. The client should use this as tqparent to the config widget. + * @param page The setting page. The client should use this as parent to the config widget. * @param pagenumber The identifier set in createGlobalConfigPage() or createProjectConfigPage(). Identifies the requested config page. */ void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ); diff --git a/lib/util/domutil.h b/lib/util/domutil.h index 394b3600..db9cd184 100644 --- a/lib/util/domutil.h +++ b/lib/util/domutil.h @@ -205,17 +205,17 @@ public: static bool saveDOMFile(TQDomDocument &doc, TQString filename); /** - * Remove all child text nodes of tqparent described in pathExt + * Remove all child text nodes of parent described in pathExt */ static bool removeTextNodes(TQDomDocument doc,TQString pathExt); /** - * Add child text node to tqparent described in pathExt + * Add child text node to parent described in pathExt */ static bool appendText(TQDomDocument doc, TQString pathExt, TQString text); /** - * Replace all chilt text nodes of tqparent described in pathExt with one new. + * Replace all chilt text nodes of parent described in pathExt with one new. */ static bool replaceText(TQDomDocument doc, TQString pathExt, TQString text); diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index e1236474..9692b29e 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -26,8 +26,8 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, const TQString& workingDir, const TQStringList& env, - TQObject* tqparent, const char* name ): - TQObject( tqparent, name ), out( "" ) /* make sure out is not TQString() since that would mean "error" */ + TQObject* parent, const char* name ): + TQObject( parent, name ), out( "" ) /* make sure out is not TQString() since that would mean "error" */ { progressDlg = 0; diff --git a/lib/util/execcommand.h b/lib/util/execcommand.h index 5be67682..ca403cfc 100644 --- a/lib/util/execcommand.h +++ b/lib/util/execcommand.h @@ -49,7 +49,7 @@ class ExecCommand : public TQObject public: ExecCommand( const TQString& executable, const TQStringList& args, const TQString& workingDir = TQString(), - const TQStringList& env = TQStringList(), TQObject* tqparent = 0, const char* name = 0 ); + const TQStringList& env = TQStringList(), TQObject* parent = 0, const char* name = 0 ); ~ExecCommand(); signals: diff --git a/lib/util/kdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp index a4ac7aa2..b0b78250 100644 --- a/lib/util/kdevjobtimer.cpp +++ b/lib/util/kdevjobtimer.cpp @@ -11,8 +11,8 @@ #include "kdevjobtimer.h" -KDevJobTimer::KDevJobTimer( void * payload, TQObject *tqparent, const char *name) - : TQTimer(tqparent, name) +KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name) + : TQTimer(parent, name) { m_payload = payload; connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) ); diff --git a/lib/util/kdevjobtimer.h b/lib/util/kdevjobtimer.h index 5fb9dbba..09c325f3 100644 --- a/lib/util/kdevjobtimer.h +++ b/lib/util/kdevjobtimer.h @@ -25,7 +25,7 @@ signals: void timeout(void*); private: - KDevJobTimer( void * payload, TQObject *tqparent = 0, const char *name = 0); + KDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0); ~KDevJobTimer(); private slots: diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp index 0ea05299..8d217274 100644 --- a/lib/util/kdevshellwidget.cpp +++ b/lib/util/kdevshellwidget.cpp @@ -20,8 +20,8 @@ #include "kdevshellwidget.h" -KDevShellWidget::KDevShellWidget(TQWidget *tqparent, const char *name) - : TQVBox(tqparent, name), m_doAutoActivate( false ), m_isRunning( false ) +KDevShellWidget::KDevShellWidget(TQWidget *parent, const char *name) + : TQVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false ) { } diff --git a/lib/util/kdevshellwidget.h b/lib/util/kdevshellwidget.h index 62dbf171..81e81eff 100644 --- a/lib/util/kdevshellwidget.h +++ b/lib/util/kdevshellwidget.h @@ -30,7 +30,7 @@ Q_OBJECT TQ_OBJECT public: - KDevShellWidget(TQWidget *tqparent = 0, const char *name = 0); + KDevShellWidget(TQWidget *parent = 0, const char *name = 0); virtual ~KDevShellWidget(); /** diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp index 9b764a75..3c906902 100644 --- a/lib/util/kscriptactionmanager.cpp +++ b/lib/util/kscriptactionmanager.cpp @@ -100,7 +100,7 @@ void KScriptAction::activate( ) return; } } - m_interface->run(tqparent(), TQVariant()); + m_interface->run(parent(), TQVariant()); m_timeout->start(60000,FALSE); // after 1 minute unload m_refs++; } @@ -119,7 +119,7 @@ void KScriptAction::scriptFinished() m_refs--; } -KScriptActionManager::KScriptActionManager( TQObject *tqparent, KActionCollection * ac ) : TQObject(tqparent), m_ac(ac) +KScriptActionManager::KScriptActionManager( TQObject *parent, KActionCollection * ac ) : TQObject(parent), m_ac(ac) { m_actions.setAutoDelete(true); } diff --git a/lib/util/kscriptactionmanager.h b/lib/util/kscriptactionmanager.h index 69de43ac..fa2c53ed 100644 --- a/lib/util/kscriptactionmanager.h +++ b/lib/util/kscriptactionmanager.h @@ -99,7 +99,7 @@ public: /** * Create a script manager that is attached to an action collection. */ - KScriptActionManager( TQObject *tqparent, KActionCollection *ac ); + KScriptActionManager( TQObject *parent, KActionCollection *ac ); ~KScriptActionManager(); /** diff --git a/lib/util/urlutil.cpp b/lib/util/urlutil.cpp index d3cbc5e3..a31aa789 100644 --- a/lib/util/urlutil.cpp +++ b/lib/util/urlutil.cpp @@ -82,22 +82,22 @@ TQString URLUtil::getRelativePath(const TQString& basepath, const TQString& dest /////////////////////////////////////////////////////////////////////////////// -TQString URLUtil::relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy) { +TQString URLUtil::relativePath(const KURL & parent, const KURL & child, uint slashPolicy) { bool slashPrefix = slashPolicy & SLASH_PREFIX; bool slashSuffix = slashPolicy & SLASH_SUFFIX; - if (tqparent.equals(child,true)) + if (parent.equals(child,true)) return slashPrefix ? TQString("/") : TQString(""); - if (!tqparent.isParentOf(child)) return TQString(); + if (!parent.isParentOf(child)) return TQString(); int a=slashPrefix ? -1 : 1; int b=slashSuffix ? 1 : -1; - return child.path(b).mid(tqparent.path(a).length()); + return child.path(b).mid(parent.path(a).length()); } /////////////////////////////////////////////////////////////////////////////// -TQString URLUtil::relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy) { - return relativePath(KURL(tqparent), KURL(child), slashPolicy); +TQString URLUtil::relativePath(const TQString & parent, const TQString & child, uint slashPolicy) { + return relativePath(KURL(parent), KURL(child), slashPolicy); } /////////////////////////////////////////////////////////////////////////////// diff --git a/lib/util/urlutil.h b/lib/util/urlutil.h index 39615858..4a063961 100644 --- a/lib/util/urlutil.h +++ b/lib/util/urlutil.h @@ -50,27 +50,27 @@ namespace URLUtil */ TQString directory(const TQString & pathName); /** - * @return The relative path between a tqparent and child URL, or blank if the specified - * child is not a child of tqparent. - * @param tqparent The tqparent URL. + * @return The relative path between a parent and child URL, or blank if the specified + * child is not a child of parent. + * @param parent The parent URL. * @param child The child URL. - * @param slashPolicy If tqparent and child are equal then the function returns "/" if + * @param slashPolicy If parent and child are equal then the function returns "/" if * slashPolicy contains SLASH_PREFIX and otherwise "".\n"/" is appended to a result * if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if * slashPolicy contains SLASH_PREFIX. */ - TQString relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const KURL & parent, const KURL & child, uint slashPolicy = SLASH_PREFIX); /** - * @return The relative path between a tqparent and child URL, or blank if the specified - * child is not a child of tqparent. - * @param tqparent The tqparent URL. + * @return The relative path between a parent and child URL, or blank if the specified + * child is not a child of parent. + * @param parent The parent URL. * @param child The child URL. - * @param slashPolicy If tqparent and child are equal then the function returns "/" if + * @param slashPolicy If parent and child are equal then the function returns "/" if * slashPolicy contains SLASH_PREFIX and otherwise "".\n"/" is appended to a result * if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if * slashPolicy contains SLASH_PREFIX. */ - TQString relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const TQString & parent, const TQString & child, uint slashPolicy = SLASH_PREFIX); /** * @return The relative path between a base path and destination path or. * @param base The base Path. diff --git a/lib/widgets/fancylistviewitem.h b/lib/widgets/fancylistviewitem.h index e61beed2..ab8b3310 100644 --- a/lib/widgets/fancylistviewitem.h +++ b/lib/widgets/fancylistviewitem.h @@ -124,11 +124,11 @@ class TextPaintItem { class FancyListViewItem : public KListViewItem { public: - FancyListViewItem(TextPaintStyleStore& styles, TQListView *tqparent, const TQString &label1, const TQString &label2="") : KListViewItem(tqparent, label1, label2), m_styles(styles) { + FancyListViewItem(TextPaintStyleStore& styles, TQListView *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) { init(label1, label2); } - FancyListViewItem(TextPaintStyleStore& styles, TQListViewItem *tqparent, const TQString &label1, const TQString &label2="") : KListViewItem(tqparent, label1, label2), m_styles(styles) { + FancyListViewItem(TextPaintStyleStore& styles, TQListViewItem *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) { init(label1, label2); } diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp index a12c5092..0f1f9193 100644 --- a/lib/widgets/flagboxes.cpp +++ b/lib/widgets/flagboxes.cpp @@ -54,14 +54,14 @@ TQString TQRegExp_escape( const TQString& str ) class FlagListToolTip : public TQToolTip { public: - FlagListToolTip(TQWidget *tqparent); + FlagListToolTip(TQWidget *parent); protected: void maybeTip(const TQPoint &p); }; -FlagListToolTip::FlagListToolTip(TQWidget *tqparent) - : TQToolTip(tqparent) +FlagListToolTip::FlagListToolTip(TQWidget *parent) + : TQToolTip(parent) {} @@ -76,22 +76,22 @@ void FlagListToolTip::maybeTip(const TQPoint &pos) } -FlagListItem::FlagListItem(FlagListBox *tqparent, const TQString &flagstr, +FlagListItem::FlagListItem(FlagListBox *parent, const TQString &flagstr, const TQString &description) - : TQCheckListItem(tqparent, flagstr, TQCheckListItem::CheckBox), + : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox), flag(flagstr), desc(description) {} -FlagListItem::FlagListItem(FlagListBox *tqparent, const TQString &flagstr, +FlagListItem::FlagListItem(FlagListBox *parent, const TQString &flagstr, const TQString &description, const TQString &offstr) - : TQCheckListItem(tqparent, flagstr, TQCheckListItem::CheckBox), + : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox), flag(flagstr), off(offstr), desc(description) {} -FlagListBox::FlagListBox(TQWidget *tqparent, const char *name) - : TQListView(tqparent, name) +FlagListBox::FlagListBox(TQWidget *parent, const char *name) + : TQListView(parent, name) { setResizeMode(LastColumn); header()->hide(); @@ -130,28 +130,28 @@ void FlagListBox::writeFlags(TQStringList *list) } -FlagCheckBox::FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, +FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description) - : TQCheckBox(description, tqparent), flag(flagstr), includeOff(false), useDef(false), defSet(false) + : TQCheckBox(description, parent), flag(flagstr), includeOff(false), useDef(false), defSet(false) { TQToolTip::add(this, flagstr); controller->addCheckBox(this); } -FlagCheckBox::FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, +FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description, const TQString &offstr) - : TQCheckBox(description, tqparent), flag(flagstr), off(offstr), includeOff(false), useDef(false), defSet(false) + : TQCheckBox(description, parent), flag(flagstr), off(offstr), includeOff(false), useDef(false), defSet(false) { TQToolTip::add(this, flagstr); controller->addCheckBox(this); } -FlagCheckBox::FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, +FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description, const TQString &offstr, const TQString &defstr) - : TQCheckBox(description, tqparent), flag(flagstr), off(offstr), def(defstr), includeOff(false), useDef(true), defSet(false) + : TQCheckBox(description, parent), flag(flagstr), off(offstr), def(defstr), includeOff(false), useDef(true), defSet(false) { TQToolTip::add(this, flagstr); controller->addCheckBox(this); @@ -299,10 +299,10 @@ void FlagPathEditController::addPathEdit( FlagPathEdit * item ) plist.append(item); } -FlagPathEdit::FlagPathEdit( TQWidget * tqparent, TQString pathDelimiter, +FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter, FlagPathEditController * controller, const TQString & flagstr, const TQString & description, KFile::Mode mode ) - : TQWidget(tqparent), delimiter(pathDelimiter), flag(flagstr), m_description(description) + : TQWidget(parent), delimiter(pathDelimiter), flag(flagstr), m_description(description) { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); @@ -379,8 +379,8 @@ bool FlagPathEdit::isEmpty( ) return edit->text().isEmpty(); } -FlagRadioButton::FlagRadioButton( TQWidget * tqparent, FlagRadioButtonController * controller, const TQString & flagstr, const TQString & description ) - : TQRadioButton(description, tqparent), flag(flagstr) +FlagRadioButton::FlagRadioButton( TQWidget * parent, FlagRadioButtonController * controller, const TQString & flagstr, const TQString & description ) + : TQRadioButton(description, parent), flag(flagstr) { TQToolTip::add(this, flagstr); controller->addRadioButton(this); @@ -526,9 +526,9 @@ void FlagEditController::addSpinBox(FlagSpinEdit *item) } -FlagListEdit::FlagListEdit( TQWidget * tqparent, TQString listDelimiter, FlagEditController * controller, +FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditController * controller, const TQString & flagstr, const TQString & description) - : TQWidget(tqparent), delimiter(listDelimiter), flag(flagstr), m_description(description) + : TQWidget(parent), delimiter(listDelimiter), flag(flagstr), m_description(description) { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); @@ -601,8 +601,8 @@ TQStringList FlagListEdit::flags( ) return fl; } -FlagSpinEdit::FlagSpinEdit( TQWidget * tqparent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController * controller, const TQString & flagstr, const TQString & description ) - :TQWidget(tqparent), m_defaultVal(defaultVal), flag(flagstr) +FlagSpinEdit::FlagSpinEdit( TQWidget * parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController * controller, const TQString & flagstr, const TQString & description ) + :TQWidget(parent), m_defaultVal(defaultVal), flag(flagstr) { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); diff --git a/lib/widgets/flagboxes.h b/lib/widgets/flagboxes.h index a2193277..ba04fd10 100644 --- a/lib/widgets/flagboxes.h +++ b/lib/widgets/flagboxes.h @@ -49,9 +49,9 @@ class KURLRequester; class FlagListItem : public TQCheckListItem { public: - FlagListItem(FlagListBox *tqparent, const TQString &flagstr, + FlagListItem(FlagListBox *parent, const TQString &flagstr, const TQString &description); - FlagListItem(FlagListBox *tqparent, const TQString &flagstr, + FlagListItem(FlagListBox *parent, const TQString &flagstr, const TQString &description, const TQString &offstr); ~FlagListItem() {} @@ -70,7 +70,7 @@ class FlagListBox : public TQListView Q_OBJECT TQ_OBJECT public: - FlagListBox( TQWidget *tqparent=0, const char *name=0 ); + FlagListBox( TQWidget *parent=0, const char *name=0 ); ~FlagListBox() {} @@ -85,12 +85,12 @@ class FlagCheckBox : public TQCheckBox Q_OBJECT TQ_OBJECT public: - FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, + FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description); - FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, + FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description, const TQString &offstr); - FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, + FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description, const TQString &offstr, const TQString &defstr); ~FlagCheckBox() @@ -112,7 +112,7 @@ class FlagRadioButton : public TQRadioButton Q_OBJECT TQ_OBJECT public: - FlagRadioButton(TQWidget *tqparent, FlagRadioButtonController *controller, + FlagRadioButton(TQWidget *parent, FlagRadioButtonController *controller, const TQString &flagstr, const TQString &description); ~FlagRadioButton() {} @@ -129,7 +129,7 @@ class FlagPathEdit: public TQWidget TQ_OBJECT public: /**If the pathDelimiter is not empty then path edit can contain a list of paths*/ - FlagPathEdit(TQWidget *tqparent, TQString pathDelimiter, FlagPathEditController *controller, + FlagPathEdit(TQWidget *parent, TQString pathDelimiter, FlagPathEditController *controller, const TQString &flagstr, const TQString &description, KFile::Mode mode = KFile::Directory); ~FlagPathEdit() {} @@ -159,7 +159,7 @@ class FlagListEdit: public TQWidget TQ_OBJECT public: /**If the listDelimiter is not empty then list edit can contain a list of entries*/ - FlagListEdit(TQWidget *tqparent, TQString listDelimiter, FlagEditController *controller, + FlagListEdit(TQWidget *parent, TQString listDelimiter, FlagEditController *controller, const TQString &flagstr, const TQString &description); ~FlagListEdit() {} @@ -187,7 +187,7 @@ private: class FlagSpinEdit: public TQWidget { public: - FlagSpinEdit(TQWidget *tqparent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController *controller, + FlagSpinEdit(TQWidget *parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController *controller, const TQString &flagstr, const TQString &description); ~FlagSpinEdit() {} diff --git a/lib/widgets/kcomboview.cpp b/lib/widgets/kcomboview.cpp index ad4cd188..2576ed0c 100644 --- a/lib/widgets/kcomboview.cpp +++ b/lib/widgets/kcomboview.cpp @@ -25,8 +25,8 @@ #include "kcomboview.h" -KComboView::KComboView( bool rw, int defaultWidth, TQWidget* tqparent, const char* name , CustomCompleter* comp) - :QComboView(rw, tqparent, name), m_comp( comp ), m_defaultWidth(defaultWidth) +KComboView::KComboView( bool rw, int defaultWidth, TQWidget* parent, const char* name , CustomCompleter* comp) + :QComboView(rw, parent, name), m_comp( comp ), m_defaultWidth(defaultWidth) { if (rw) { diff --git a/lib/widgets/kcomboview.h b/lib/widgets/kcomboview.h index e73b73e6..981eaa1a 100644 --- a/lib/widgets/kcomboview.h +++ b/lib/widgets/kcomboview.h @@ -58,7 +58,7 @@ class KComboView: public QComboView TQ_OBJECT public: ///The combo-view takes the ownership of the completer and deletes it on destruction - KComboView( bool rw, int defaultWidth = 100, TQWidget* tqparent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() ); + KComboView( bool rw, int defaultWidth = 100, TQWidget* parent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() ); virtual ~KComboView(); virtual void addItem(TQListViewItem *it); diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp index 4631f16a..a7d12348 100644 --- a/lib/widgets/kdevtabwidget.cpp +++ b/lib/widgets/kdevtabwidget.cpp @@ -18,7 +18,7 @@ #include "kdevtabwidget.h" -KDevTabWidget::KDevTabWidget(TQWidget *tqparent, const char *name) : TQTabWidget(tqparent,name) +KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name) { m_pTabBar = new KTabBar(this, "tabbar"); setTabBar(m_pTabBar); @@ -26,7 +26,7 @@ KDevTabWidget::KDevTabWidget(TQWidget *tqparent, const char *name) : TQTabWidget connect(m_pTabBar, TQT_SIGNAL(closeOthers(TQWidget*)), this, TQT_SIGNAL(closeOthers(TQWidget*))); } -KTabBar::KTabBar(TQWidget *tqparent, const char *name) : TQTabBar(tqparent,name) +KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name) { m_pPopupMenu = new TQPopupMenu(this); @@ -55,7 +55,7 @@ void KTabBar::mousePressEvent(TQMouseEvent *e) TQTab *tab = selectTab(e->pos() ); if( tab == 0L ) return; - m_pPage = ((KDevTabWidget*)tqparent())->page(indexOf(tab->identifier() ) ); + m_pPage = ((KDevTabWidget*)parent())->page(indexOf(tab->identifier() ) ); if(m_pPage == 0L) return; m_pPopupMenu->exec(mapToGlobal(e->pos())); diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp index f439de6b..0a219da5 100644 --- a/lib/widgets/klistviewaction.cpp +++ b/lib/widgets/klistviewaction.cpp @@ -38,8 +38,8 @@ KListViewAction::~KListViewAction() } KListViewAction::KListViewAction(KComboView *view, const TQString & text, const KShortcut & cut, - const TQObject * receiver, const char * slot, KActionCollection * tqparent, const char * name ): - KWidgetAction(view, text, cut, receiver, slot, tqparent, name), m_view(view) + const TQObject * receiver, const char * slot, KActionCollection * parent, const char * name ): + KWidgetAction(view, text, cut, receiver, slot, parent, name), m_view(view) { m_view->setDuplicatesEnabled(false); m_view->setInsertionPolicy(KComboView::NoInsertion); @@ -48,8 +48,8 @@ KListViewAction::KListViewAction(KComboView *view, const TQString & text, const } KListViewAction::KListViewAction( KComboView * view, const TQString & text, const KShortcut & cut, - const TQObject * receiver, const char * slot, KActionCollection * tqparent, const char * name, const bool /*dummy*/ ): - KWidgetAction(new ResizableCombo(view), text, cut, receiver, slot, tqparent, name), m_view(view) + const TQObject * receiver, const char * slot, KActionCollection * parent, const char * name, const bool /*dummy*/ ): + KWidgetAction(new ResizableCombo(view), text, cut, receiver, slot, parent, name), m_view(view) { m_view->setDuplicatesEnabled(false); m_view->setInsertionPolicy(KComboView::NoInsertion); diff --git a/lib/widgets/klistviewaction.h b/lib/widgets/klistviewaction.h index 0334ec30..d8f53eb8 100644 --- a/lib/widgets/klistviewaction.h +++ b/lib/widgets/klistviewaction.h @@ -38,8 +38,8 @@ Can be used on toolbars. It appears as @ref ResizableCombo. class KListViewAction: public KWidgetAction { public: - KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *tqparent, const char *name); - KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *tqparent, const char *name, const bool); + KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name); + KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name, const bool); ~KListViewAction(); diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp index a2c2d87c..0a922b7d 100644 --- a/lib/widgets/ksavealldialog.cpp +++ b/lib/widgets/ksavealldialog.cpp @@ -49,8 +49,8 @@ private: } -KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * tqparent ) : - KDialogBase( tqparent, "SaveAllDialog", true, i18n("Save Modified Files?"), +KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ) : + KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"), Ok | User1 | Close ) { TQVBox *top = makeVBoxMainWidget(); @@ -140,8 +140,8 @@ KURL::List KSaveSelectDialog::filesNotToSave( ) } -KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* tqparent ) : - KDialogBase( tqparent, "SaveAllDialog", true, i18n("Save Modified Files?"), +KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ) : + KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"), Ok | User1 | Close ) { m_result = Cancel; diff --git a/lib/widgets/ksavealldialog.h b/lib/widgets/ksavealldialog.h index 091a3ae0..8aee6870 100644 --- a/lib/widgets/ksavealldialog.h +++ b/lib/widgets/ksavealldialog.h @@ -39,7 +39,7 @@ class KSaveSelectDialog : public KDialogBase TQ_OBJECT public: - KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * tqparent ); + KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ); virtual ~KSaveSelectDialog(); KURL::List filesToSave(); @@ -67,7 +67,7 @@ class KSaveAllDialog : public KDialogBase public: enum SaveAllResult{ SaveAll, Cancel, Revert }; - KSaveAllDialog( const TQStringList& filenames, TQWidget* tqparent ); + KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ); virtual ~KSaveAllDialog(); SaveAllResult result() const { return m_result; } diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index cf13248c..3de31905 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -103,8 +103,8 @@ void ProcessListBoxItem::paint(TQPainter *p) } -ProcessWidget::ProcessWidget(TQWidget *tqparent, const char *name) - : KListBox(tqparent, name) +ProcessWidget::ProcessWidget(TQWidget *parent, const char *name) + : KListBox(parent, name) { setFocusPolicy(TQ_NoFocus); diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h index e4ef0c5d..15ae5b85 100644 --- a/lib/widgets/processwidget.h +++ b/lib/widgets/processwidget.h @@ -61,7 +61,7 @@ class ProcessWidget : public KListBox TQ_OBJECT public: - ProcessWidget(TQWidget *tqparent, const char *name=0); + ProcessWidget(TQWidget *parent, const char *name=0); ~ProcessWidget(); /** diff --git a/lib/widgets/propeditor/childproperty.cpp b/lib/widgets/propeditor/childproperty.cpp index aa1326c9..ac53936a 100644 --- a/lib/widgets/propeditor/childproperty.cpp +++ b/lib/widgets/propeditor/childproperty.cpp @@ -28,16 +28,16 @@ namespace PropertyLib{ -ChildProperty::ChildProperty(MultiProperty *tqparent, int type, ChildPropertyType childType, const TQString &name, +ChildProperty::ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const TQString &name, const TQString &description, const TQVariant &value, bool save, bool readOnly) - :Property(type, name, description, value, save, readOnly), m_parent(tqparent), m_childType(childType) + :Property(type, name, description, value, save, readOnly), m_parent(parent), m_childType(childType) { } -ChildProperty::ChildProperty(MultiProperty *tqparent, const TQString & name, ChildPropertyType childType, +ChildProperty::ChildProperty(MultiProperty *parent, const TQString & name, ChildPropertyType childType, const TQMap<TQString, TQVariant> &v_valueList, const TQString &description, const TQVariant &value, bool save, bool readOnly) - :Property(name, v_valueList, description, value, save, readOnly), m_parent(tqparent), m_childType(childType) + :Property(name, v_valueList, description, value, save, readOnly), m_parent(parent), m_childType(childType) { } diff --git a/lib/widgets/propeditor/childproperty.h b/lib/widgets/propeditor/childproperty.h index 0d1655ae..6e247fd3 100644 --- a/lib/widgets/propeditor/childproperty.h +++ b/lib/widgets/propeditor/childproperty.h @@ -29,7 +29,7 @@ class MultiProperty; /** @short Child property -Child property is a detailed property for complex tqparent properties. +Child property is a detailed property for complex parent properties. For example, to edit a property of Point type one can request two child properties for "x" and "y" components of a point. @@ -60,11 +60,11 @@ public: /**Constructs empty property.*/ ChildProperty() {} /**Constructs property.*/ - ChildProperty(MultiProperty *tqparent, int type, ChildPropertyType childType, const TQString &name, + ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const TQString &name, const TQString &description, const TQVariant &value = TQVariant(), bool save = true, bool readOnly = false); /**Constructs property with @ref ValueFromList type.*/ - ChildProperty(MultiProperty *tqparent, const TQString &name, ChildPropertyType childType, + ChildProperty(MultiProperty *parent, const TQString &name, ChildPropertyType childType, const TQMap<TQString, TQVariant> &v_valueList, const TQString &description, const TQVariant &value = TQVariant(), bool save = true, bool readOnly = false); diff --git a/lib/widgets/propeditor/multiproperty.h b/lib/widgets/propeditor/multiproperty.h index 2330ffa0..49410a04 100644 --- a/lib/widgets/propeditor/multiproperty.h +++ b/lib/widgets/propeditor/multiproperty.h @@ -43,7 +43,7 @@ with many properties of the same name and type at the same type. MultiProperty is also responsible for storing detailed %property editors (instances of @ref ChildProperty class. It's too much overhead to store child properties -with their tqparent properties. MultiProperty provides a way to store child properties +with their parent properties. MultiProperty provides a way to store child properties only once for all properties with the same name and same type. */ class MultiProperty diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp index e4a14389..4a12d575 100644 --- a/lib/widgets/propeditor/pcheckbox.cpp +++ b/lib/widgets/propeditor/pcheckbox.cpp @@ -31,8 +31,8 @@ namespace PropertyLib{ -PCheckBox::PCheckBox(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQCheckBox(this); diff --git a/lib/widgets/propeditor/pcheckbox.h b/lib/widgets/propeditor/pcheckbox.h index 5e593588..8a7ff781 100644 --- a/lib/widgets/propeditor/pcheckbox.h +++ b/lib/widgets/propeditor/pcheckbox.h @@ -33,7 +33,7 @@ class PCheckBox: public PropertyWidget{ Q_OBJECT TQ_OBJECT public: - PCheckBox(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PCheckBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp index aef37f4a..bb927a08 100644 --- a/lib/widgets/propeditor/pcolorbutton.cpp +++ b/lib/widgets/propeditor/pcolorbutton.cpp @@ -33,8 +33,8 @@ namespace PropertyLib { -PColorButton::PColorButton(MultiProperty* property, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name) +PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT diff --git a/lib/widgets/propeditor/pcolorbutton.h b/lib/widgets/propeditor/pcolorbutton.h index a132f0ce..d7b7494e 100644 --- a/lib/widgets/propeditor/pcolorbutton.h +++ b/lib/widgets/propeditor/pcolorbutton.h @@ -38,7 +38,7 @@ class PColorButton: public PropertyWidget Q_OBJECT TQ_OBJECT public: - PColorButton(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PColorButton(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp index 5fee6b1f..b0c82de3 100644 --- a/lib/widgets/propeditor/pcolorcombo.cpp +++ b/lib/widgets/propeditor/pcolorcombo.cpp @@ -26,8 +26,8 @@ namespace PropertyLib{ -PColorCombo::PColorCombo(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KColorCombo(this); diff --git a/lib/widgets/propeditor/pcolorcombo.h b/lib/widgets/propeditor/pcolorcombo.h index 88c5b355..3b189cb6 100644 --- a/lib/widgets/propeditor/pcolorcombo.h +++ b/lib/widgets/propeditor/pcolorcombo.h @@ -33,7 +33,7 @@ class PColorCombo: public PropertyWidget{ Q_OBJECT TQ_OBJECT public: - PColorCombo(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PColorCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp index 7732866c..fa21678b 100644 --- a/lib/widgets/propeditor/pcombobox.cpp +++ b/lib/widgets/propeditor/pcombobox.cpp @@ -24,14 +24,14 @@ namespace PropertyLib{ -PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name), m_valueList(list) +PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name), m_valueList(list) { init(false); } -PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name), m_valueList(list) +PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name), m_valueList(list) { init(rw); } diff --git a/lib/widgets/propeditor/pcombobox.h b/lib/widgets/propeditor/pcombobox.h index 4176e2ed..82ccd220 100644 --- a/lib/widgets/propeditor/pcombobox.h +++ b/lib/widgets/propeditor/pcombobox.h @@ -38,9 +38,9 @@ class PComboBox: public PropertyWidget{ TQ_OBJECT public: /**This constructor is used for read-only selection combo. It provides a value from valueList*/ - PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *tqparent = 0, const char *name = 0); + PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *parent = 0, const char *name = 0); /**This constructor is used for read-write selection combo. It provides a value from valueList*/ - PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *tqparent = 0, const char *name = 0); + PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pcursoredit.cpp b/lib/widgets/propeditor/pcursoredit.cpp index 02a2148c..85aefd5e 100644 --- a/lib/widgets/propeditor/pcursoredit.cpp +++ b/lib/widgets/propeditor/pcursoredit.cpp @@ -24,8 +24,8 @@ namespace PropertyLib{ PCursorEdit::PCursorEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, - TQWidget* tqparent, const char* name) - :PComboBox(property, spValues, tqparent, name) + TQWidget* parent, const char* name) + :PComboBox(property, spValues, parent, name) { } diff --git a/lib/widgets/propeditor/pcursoredit.h b/lib/widgets/propeditor/pcursoredit.h index 82924fd2..34bede80 100644 --- a/lib/widgets/propeditor/pcursoredit.h +++ b/lib/widgets/propeditor/pcursoredit.h @@ -33,7 +33,7 @@ class PCursorEdit: public PComboBox TQ_OBJECT public: PCursorEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, - TQWidget* tqparent = 0, const char* name = 0); + TQWidget* parent = 0, const char* name = 0); virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); }; diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp index 46de4069..64bbde18 100644 --- a/lib/widgets/propeditor/pdateedit.cpp +++ b/lib/widgets/propeditor/pdateedit.cpp @@ -25,8 +25,8 @@ namespace PropertyLib{ -PDateEdit::PDateEdit(MultiProperty* property, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name) +PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateEdit(this); diff --git a/lib/widgets/propeditor/pdateedit.h b/lib/widgets/propeditor/pdateedit.h index a21dbc3f..8348a24d 100644 --- a/lib/widgets/propeditor/pdateedit.h +++ b/lib/widgets/propeditor/pdateedit.h @@ -34,7 +34,7 @@ class PDateEdit : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PDateEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0); + PDateEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp index e7a4b04f..59df2440 100644 --- a/lib/widgets/propeditor/pdatetimeedit.cpp +++ b/lib/widgets/propeditor/pdatetimeedit.cpp @@ -25,7 +25,7 @@ namespace PropertyLib{ -PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name) +PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateTimeEdit(this); diff --git a/lib/widgets/propeditor/pdatetimeedit.h b/lib/widgets/propeditor/pdatetimeedit.h index e44c07d6..57130322 100644 --- a/lib/widgets/propeditor/pdatetimeedit.h +++ b/lib/widgets/propeditor/pdatetimeedit.h @@ -34,7 +34,7 @@ class PDateTimeEdit : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PDateTimeEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0); + PDateTimeEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp index 742180b4..e48475de 100644 --- a/lib/widgets/propeditor/pdoublenuminput.cpp +++ b/lib/widgets/propeditor/pdoublenuminput.cpp @@ -31,8 +31,8 @@ namespace PropertyLib{ -PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT diff --git a/lib/widgets/propeditor/pdoublenuminput.h b/lib/widgets/propeditor/pdoublenuminput.h index a59ae43d..c3ef0d35 100644 --- a/lib/widgets/propeditor/pdoublenuminput.h +++ b/lib/widgets/propeditor/pdoublenuminput.h @@ -38,7 +38,7 @@ class PDoubleNumInput: public PropertyWidget Q_OBJECT TQ_OBJECT public: - PDoubleNumInput(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PDoubleNumInput(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pdummywidget.cpp b/lib/widgets/propeditor/pdummywidget.cpp index 428953f2..5d1b3278 100644 --- a/lib/widgets/propeditor/pdummywidget.cpp +++ b/lib/widgets/propeditor/pdummywidget.cpp @@ -23,8 +23,8 @@ namespace PropertyLib{ -PDummyWidget::PDummyWidget(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PDummyWidget::PDummyWidget(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { } diff --git a/lib/widgets/propeditor/pdummywidget.h b/lib/widgets/propeditor/pdummywidget.h index f58e92b9..55649b45 100644 --- a/lib/widgets/propeditor/pdummywidget.h +++ b/lib/widgets/propeditor/pdummywidget.h @@ -42,7 +42,7 @@ class PDummyWidget: public PropertyWidget Q_OBJECT TQ_OBJECT public: - PDummyWidget(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PDummyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp index d2a10217..e54e401f 100644 --- a/lib/widgets/propeditor/pfontbutton.cpp +++ b/lib/widgets/propeditor/pfontbutton.cpp @@ -33,8 +33,8 @@ namespace PropertyLib{ -PFontButton::PFontButton(MultiProperty* property, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name) +PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KFontRequester(this); diff --git a/lib/widgets/propeditor/pfontbutton.h b/lib/widgets/propeditor/pfontbutton.h index d875f307..91c07d81 100644 --- a/lib/widgets/propeditor/pfontbutton.h +++ b/lib/widgets/propeditor/pfontbutton.h @@ -34,7 +34,7 @@ class PFontButton : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PFontButton(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0); + PFontButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp index 240310c7..51b44e8c 100644 --- a/lib/widgets/propeditor/pfontcombo.cpp +++ b/lib/widgets/propeditor/pfontcombo.cpp @@ -33,8 +33,8 @@ namespace PropertyLib{ -PFontCombo::PFontCombo(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KFontCombo(this); diff --git a/lib/widgets/propeditor/pfontcombo.h b/lib/widgets/propeditor/pfontcombo.h index 63f07f51..ec22f662 100644 --- a/lib/widgets/propeditor/pfontcombo.h +++ b/lib/widgets/propeditor/pfontcombo.h @@ -37,7 +37,7 @@ class PFontCombo: public PropertyWidget{ Q_OBJECT TQ_OBJECT public: - PFontCombo(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PFontCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp index 0d3afa85..2c4fabc9 100644 --- a/lib/widgets/propeditor/plineedit.cpp +++ b/lib/widgets/propeditor/plineedit.cpp @@ -24,8 +24,8 @@ namespace PropertyLib{ -PLineEdit::PLineEdit(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); diff --git a/lib/widgets/propeditor/plineedit.h b/lib/widgets/propeditor/plineedit.h index c4d0c0f1..46ee3963 100644 --- a/lib/widgets/propeditor/plineedit.h +++ b/lib/widgets/propeditor/plineedit.h @@ -33,7 +33,7 @@ class PLineEdit: public PropertyWidget{ Q_OBJECT TQ_OBJECT public: - PLineEdit(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PLineEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp index 13094245..a47dc614 100644 --- a/lib/widgets/propeditor/plinestyleedit.cpp +++ b/lib/widgets/propeditor/plinestyleedit.cpp @@ -127,7 +127,7 @@ namespace PropertyLib { "................................................"}; -PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name) +PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQComboBox(this); diff --git a/lib/widgets/propeditor/plinestyleedit.h b/lib/widgets/propeditor/plinestyleedit.h index 6021cb9c..8d0a5347 100644 --- a/lib/widgets/propeditor/plinestyleedit.h +++ b/lib/widgets/propeditor/plinestyleedit.h @@ -33,7 +33,7 @@ class PLineStyleEdit : public PropertyWidget { Q_OBJECT TQ_OBJECT public: - PLineStyleEdit(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0); + PLineStyleEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp index 0eaec74b..20f943e8 100644 --- a/lib/widgets/propeditor/ppixmapedit.cpp +++ b/lib/widgets/propeditor/ppixmapedit.cpp @@ -41,8 +41,8 @@ namespace PropertyLib{ -PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name) +PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQLabel(this); diff --git a/lib/widgets/propeditor/ppixmapedit.h b/lib/widgets/propeditor/ppixmapedit.h index 09d7ffef..cbffa443 100644 --- a/lib/widgets/propeditor/ppixmapedit.h +++ b/lib/widgets/propeditor/ppixmapedit.h @@ -35,7 +35,7 @@ class PPixmapEdit : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PPixmapEdit(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0); + PPixmapEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/ppointedit.cpp b/lib/widgets/propeditor/ppointedit.cpp index 7f31d92d..4e85d214 100644 --- a/lib/widgets/propeditor/ppointedit.cpp +++ b/lib/widgets/propeditor/ppointedit.cpp @@ -25,7 +25,7 @@ namespace PropertyLib{ -PPointEdit::PPointEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name) +PPointEdit::PPointEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); diff --git a/lib/widgets/propeditor/ppointedit.h b/lib/widgets/propeditor/ppointedit.h index e7de9178..3deb3d94 100644 --- a/lib/widgets/propeditor/ppointedit.h +++ b/lib/widgets/propeditor/ppointedit.h @@ -34,7 +34,7 @@ class PPointEdit : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PPointEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0); + PPointEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/prectedit.cpp b/lib/widgets/propeditor/prectedit.cpp index 562c013b..d7a5fa01 100644 --- a/lib/widgets/propeditor/prectedit.cpp +++ b/lib/widgets/propeditor/prectedit.cpp @@ -25,7 +25,7 @@ namespace PropertyLib{ -PRectEdit::PRectEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name) +PRectEdit::PRectEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); diff --git a/lib/widgets/propeditor/prectedit.h b/lib/widgets/propeditor/prectedit.h index 14381f80..09cf11c7 100644 --- a/lib/widgets/propeditor/prectedit.h +++ b/lib/widgets/propeditor/prectedit.h @@ -34,7 +34,7 @@ class PRectEdit : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PRectEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0); + PRectEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp index c7e5523c..ed7b81f2 100644 --- a/lib/widgets/propeditor/propertyeditor.cpp +++ b/lib/widgets/propeditor/propertyeditor.cpp @@ -42,14 +42,14 @@ namespace PropertyLib{ class PropertyItem: public KListViewItem{ public: - PropertyItem(PropertyEditor *tqparent, MultiProperty *property) - :KListViewItem(tqparent, property->description()), m_editor(tqparent), m_property(property), + PropertyItem(PropertyEditor *parent, MultiProperty *property) + :KListViewItem(parent, property->description()), m_editor(parent), m_property(property), m_changed(false) { } - PropertyItem(PropertyEditor *editor, KListViewItem *tqparent, MultiProperty *property) - :KListViewItem(tqparent, property->description()), m_editor(editor), + PropertyItem(PropertyEditor *editor, KListViewItem *parent, MultiProperty *property) + :KListViewItem(parent, property->description()), m_editor(editor), m_property(property), m_changed(false) { } @@ -120,13 +120,13 @@ private: class PropertyGroupItem: public KListViewItem{ public: - PropertyGroupItem(KListView *tqparent, const TQString &name) - :KListViewItem(tqparent, name) + PropertyGroupItem(KListView *parent, const TQString &name) + :KListViewItem(parent, name) { init(); } - PropertyGroupItem(KListViewItem *tqparent, const TQString &name) - :KListViewItem(tqparent, name) + PropertyGroupItem(KListViewItem *parent, const TQString &name) + :KListViewItem(parent, name) { init(); } @@ -158,14 +158,14 @@ private: class SeparatorItem: public KListViewItem{ public: - SeparatorItem(KListView *tqparent) - :KListViewItem(tqparent) + SeparatorItem(KListView *parent) + :KListViewItem(parent) { setSelectable(false); } }; -PropertyEditor::PropertyEditor(TQWidget *tqparent, const char *name) - :KListView(tqparent, name) +PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) + :KListView(parent, name) { setSorting(-1); @@ -259,9 +259,9 @@ void PropertyEditor::addProperty(const TQString &name) addChildProperties(pitem); } -void PropertyEditor::addChildProperties(PropertyItem *tqparent) +void PropertyEditor::addChildProperties(PropertyItem *parent) { - MultiProperty *prop = tqparent->property(); + MultiProperty *prop = parent->property(); //force machine creation to get detailed properties appended to current multiproperty if ( !m_registeredForType.contains(prop->name()) && (PropertyMachineFactory::getInstance()->hasDetailedEditors(prop->type())) ) @@ -272,11 +272,11 @@ void PropertyEditor::addChildProperties(PropertyItem *tqparent) // qWarning("seeking tqchildren: count: %d", prop->details.count()); - tqparent->setOpen(true); + parent->setOpen(true); for (TQValueList<ChildProperty>::iterator it = prop->details.begin(); it != prop->details.end(); ++it) { // qWarning("found child %s", (*it).name().ascii()); - new PropertyItem(this, tqparent, new MultiProperty(&m_detailedList, &(*it))); + new PropertyItem(this, parent, new MultiProperty(&m_detailedList, &(*it))); } } diff --git a/lib/widgets/propeditor/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h index ee868a55..2fdbe432 100644 --- a/lib/widgets/propeditor/propertyeditor.h +++ b/lib/widgets/propeditor/propertyeditor.h @@ -60,7 +60,7 @@ class PropertyEditor: public KListView{ TQ_OBJECT public: /**Constructs the property editor.*/ - PropertyEditor(TQWidget *tqparent = 0, const char *name = 0); + PropertyEditor(TQWidget *parent = 0, const char *name = 0); ~PropertyEditor(); /**@return @ref Machine for given property. @@ -103,7 +103,7 @@ protected: void addGroup(const TQString &name); void addProperty(PropertyGroupItem *group, const TQString &name); void addProperty(const TQString &name); - void addChildProperties(PropertyItem *tqparent); + void addChildProperties(PropertyItem *parent); private: PropertyList *m_list; diff --git a/lib/widgets/propeditor/propertymachinefactory.h b/lib/widgets/propeditor/propertymachinefactory.h index 84da3e71..fae5569f 100644 --- a/lib/widgets/propeditor/propertymachinefactory.h +++ b/lib/widgets/propeditor/propertymachinefactory.h @@ -74,7 +74,7 @@ public: void registerEditor(int type, createMachine creator); /**Creates and returns the editor for given property type. - Warning: editor and viewer widgets won't have tqparent widget. %Property editor + Warning: editor and viewer widgets won't have parent widget. %Property editor cares about reparenting and deletion of returned widgets in machines.*/ Machine *machineForProperty(MultiProperty *property); bool hasDetailedEditors(int type); diff --git a/lib/widgets/propeditor/propertywidget.cpp b/lib/widgets/propeditor/propertywidget.cpp index df0df75a..38a99c9c 100644 --- a/lib/widgets/propeditor/propertywidget.cpp +++ b/lib/widgets/propeditor/propertywidget.cpp @@ -23,8 +23,8 @@ namespace PropertyLib{ -PropertyWidget::PropertyWidget(MultiProperty *property, TQWidget *tqparent, const char *name) - :TQWidget(tqparent, name), m_property(property) +PropertyWidget::PropertyWidget(MultiProperty *property, TQWidget *parent, const char *name) + :TQWidget(parent, name), m_property(property) { } diff --git a/lib/widgets/propeditor/propertywidget.h b/lib/widgets/propeditor/propertywidget.h index d5a22777..2105a220 100644 --- a/lib/widgets/propeditor/propertywidget.h +++ b/lib/widgets/propeditor/propertywidget.h @@ -51,7 +51,7 @@ class PropertyWidget: public TQWidget{ TQ_OBJECT public: /**Constructs widget for property with name "propertyName".*/ - PropertyWidget(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PropertyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); virtual ~PropertyWidget() {} /**@return the value currently entered in the editor widget.*/ diff --git a/lib/widgets/propeditor/propertywidgetproxy.cpp b/lib/widgets/propeditor/propertywidgetproxy.cpp index 27f2a49c..813708ca 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.cpp +++ b/lib/widgets/propeditor/propertywidgetproxy.cpp @@ -26,8 +26,8 @@ namespace PropertyLib{ -PropertyWidgetProxy::PropertyWidgetProxy(TQWidget *tqparent, const char *name) - :TQWidget(tqparent, name), mp(0), m_propertyType(Property::Invalid), m_editor(0) +PropertyWidgetProxy::PropertyWidgetProxy(TQWidget *parent, const char *name) + :TQWidget(parent, name), mp(0), m_propertyType(Property::Invalid), m_editor(0) { p = new Property(); m_layout = new TQHBoxLayout(this, 0, 0); diff --git a/lib/widgets/propeditor/propertywidgetproxy.h b/lib/widgets/propeditor/propertywidgetproxy.h index 04a2503a..642d7824 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.h +++ b/lib/widgets/propeditor/propertywidgetproxy.h @@ -46,7 +46,7 @@ Q_OBJECT TQ_PROPERTY( int propertyType READ propertyType WRITE setPropertyType DESIGNABLE true ) TQ_PROPERTY( PropertyType propertyType2 READ propertyType2 WRITE setPropertyType2 DESIGNABLE false ) public: - PropertyWidgetProxy(TQWidget *tqparent = 0, const char *name = 0); + PropertyWidgetProxy(TQWidget *parent = 0, const char *name = 0); ~PropertyWidgetProxy(); /**Sets the type of a property editor to appear.*/ diff --git a/lib/widgets/propeditor/psizeedit.cpp b/lib/widgets/propeditor/psizeedit.cpp index 4ce6561c..5558c3f3 100644 --- a/lib/widgets/propeditor/psizeedit.cpp +++ b/lib/widgets/propeditor/psizeedit.cpp @@ -25,8 +25,8 @@ namespace PropertyLib{ -PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); diff --git a/lib/widgets/propeditor/psizeedit.h b/lib/widgets/propeditor/psizeedit.h index 5fbd6d6d..43da3c55 100644 --- a/lib/widgets/propeditor/psizeedit.h +++ b/lib/widgets/propeditor/psizeedit.h @@ -36,7 +36,7 @@ class PSizeEdit: public PropertyWidget Q_OBJECT TQ_OBJECT public: - PSizeEdit(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PSizeEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/psizepolicyedit.cpp b/lib/widgets/propeditor/psizepolicyedit.cpp index 9c417005..94847d2a 100644 --- a/lib/widgets/propeditor/psizepolicyedit.cpp +++ b/lib/widgets/propeditor/psizepolicyedit.cpp @@ -26,8 +26,8 @@ namespace PropertyLib{ -PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name), m_spValues(spValues) +PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name), m_spValues(spValues) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); diff --git a/lib/widgets/propeditor/psizepolicyedit.h b/lib/widgets/propeditor/psizepolicyedit.h index 613c65ea..586b4cba 100644 --- a/lib/widgets/propeditor/psizepolicyedit.h +++ b/lib/widgets/propeditor/psizepolicyedit.h @@ -36,7 +36,7 @@ class PSizePolicyEdit : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* tqparent=0, const char* name=0); + PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* parent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp index 48b36324..e9c25325 100644 --- a/lib/widgets/propeditor/pspinbox.cpp +++ b/lib/widgets/propeditor/pspinbox.cpp @@ -26,8 +26,8 @@ namespace PropertyLib{ -PSpinBox::PSpinBox(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQSpinBox(INT_MIN, INT_MAX, 1, this); @@ -37,8 +37,8 @@ PSpinBox::PSpinBox(MultiProperty *property, TQWidget *tqparent, const char *name connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); } -PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQSpinBox(minValue, maxValue, step, this); diff --git a/lib/widgets/propeditor/pspinbox.h b/lib/widgets/propeditor/pspinbox.h index 28d34ef2..3b6da02a 100644 --- a/lib/widgets/propeditor/pspinbox.h +++ b/lib/widgets/propeditor/pspinbox.h @@ -33,8 +33,8 @@ class PSpinBox: public PropertyWidget{ Q_OBJECT TQ_OBJECT public: - PSpinBox(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); - PSpinBox(MultiProperty *property, int minValue, int maxValue, int step = 1, TQWidget *tqparent = 0, const char *name = 0); + PSpinBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PSpinBox(MultiProperty *property, int minValue, int maxValue, int step = 1, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp index e4eeeccf..fda16a8b 100644 --- a/lib/widgets/propeditor/pstringlistedit.cpp +++ b/lib/widgets/propeditor/pstringlistedit.cpp @@ -36,8 +36,8 @@ namespace PropertyLib{ -PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { l = new TQHBoxLayout(this); diff --git a/lib/widgets/propeditor/pstringlistedit.h b/lib/widgets/propeditor/pstringlistedit.h index 45aa0e4e..7e651e43 100644 --- a/lib/widgets/propeditor/pstringlistedit.h +++ b/lib/widgets/propeditor/pstringlistedit.h @@ -37,7 +37,7 @@ class PStringListEdit: public PropertyWidget Q_OBJECT TQ_OBJECT public: - PStringListEdit(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PStringListEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp index 087f7a8d..7e79945a 100644 --- a/lib/widgets/propeditor/psymbolcombo.cpp +++ b/lib/widgets/propeditor/psymbolcombo.cpp @@ -35,8 +35,8 @@ namespace PropertyLib{ -PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { l = new TQHBoxLayout(this); m_edit = new KLineEdit(this); diff --git a/lib/widgets/propeditor/psymbolcombo.h b/lib/widgets/propeditor/psymbolcombo.h index 9c559844..adb88e78 100644 --- a/lib/widgets/propeditor/psymbolcombo.h +++ b/lib/widgets/propeditor/psymbolcombo.h @@ -36,7 +36,7 @@ class PSymbolCombo: public PropertyWidget{ Q_OBJECT TQ_OBJECT public: - PSymbolCombo(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PSymbolCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp index d27a0552..df8316cd 100644 --- a/lib/widgets/propeditor/purledit.cpp +++ b/lib/widgets/propeditor/purledit.cpp @@ -30,8 +30,8 @@ namespace PropertyLib{ -PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name) +PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT diff --git a/lib/widgets/propeditor/purledit.h b/lib/widgets/propeditor/purledit.h index 4aff51b8..396b16ba 100644 --- a/lib/widgets/propeditor/purledit.h +++ b/lib/widgets/propeditor/purledit.h @@ -47,7 +47,7 @@ public: enum Mode {File,Directory}; #endif - PUrlEdit(Mode mode, MultiProperty* property, TQWidget* tqparent=0, const char* name=0); + PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent=0, const char* name=0); virtual TQVariant value() const; virtual void setValue(const TQVariant& value, bool emitChange); diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp index 9448d672..614b751b 100644 --- a/lib/widgets/propeditor/pyesnobutton.cpp +++ b/lib/widgets/propeditor/pyesnobutton.cpp @@ -31,8 +31,8 @@ namespace PropertyLib{ -PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name) +PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQPushButton(this); diff --git a/lib/widgets/propeditor/pyesnobutton.h b/lib/widgets/propeditor/pyesnobutton.h index efe33584..412d167d 100644 --- a/lib/widgets/propeditor/pyesnobutton.h +++ b/lib/widgets/propeditor/pyesnobutton.h @@ -34,7 +34,7 @@ class PYesNoButton : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PYesNoButton(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0); + PYesNoButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp index 0c3119da..fda5a006 100644 --- a/lib/widgets/propeditor/qeditlistbox.cpp +++ b/lib/widgets/propeditor/qeditlistbox.cpp @@ -46,24 +46,24 @@ public: int buttons; }; -QEditListBox::QEditListBox(TQWidget *tqparent, const char *name, +QEditListBox::QEditListBox(TQWidget *parent, const char *name, bool checkAtEntering, int buttons ) - :TQGroupBox(tqparent, name ) + :TQGroupBox(parent, name ) { init( checkAtEntering, buttons ); } -QEditListBox::QEditListBox(const TQString& title, TQWidget *tqparent, +QEditListBox::QEditListBox(const TQString& title, TQWidget *parent, const char *name, bool checkAtEntering, int buttons) - :TQGroupBox(title, tqparent, name ) + :TQGroupBox(title, parent, name ) { init( checkAtEntering, buttons ); } QEditListBox::QEditListBox(const TQString& title, const CustomEditor& custom, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool checkAtEntering, int buttons) - :TQGroupBox(title, tqparent, name ) + :TQGroupBox(title, parent, name ) { m_lineEdit = custom.lineEdit(); init( checkAtEntering, buttons, custom.representationWidget() ); diff --git a/lib/widgets/propeditor/qeditlistbox.h b/lib/widgets/propeditor/qeditlistbox.h index 78a61bfc..2750623b 100644 --- a/lib/widgets/propeditor/qeditlistbox.h +++ b/lib/widgets/propeditor/qeditlistbox.h @@ -101,7 +101,7 @@ public: * it will be checked if you press the Add-button. It is not * possible to enter items twice into the listbox. */ - QEditListBox(TQWidget *tqparent = 0, const char *name = 0, + QEditListBox(TQWidget *parent = 0, const char *name = 0, bool checkAtEntering=false, int buttons = All ); /** * Create an editable listbox. @@ -109,7 +109,7 @@ public: * The same as the other constructor, additionally it takes * @p title, which will be the title of the frame around the listbox. */ - QEditListBox(const TQString& title, TQWidget *tqparent = 0, + QEditListBox(const TQString& title, TQWidget *parent = 0, const char *name = 0, bool checkAtEntering=false, int buttons = All ); @@ -127,7 +127,7 @@ public: */ QEditListBox( const TQString& title, const CustomEditor &customEditor, - TQWidget *tqparent = 0, const char *name = 0, + TQWidget *parent = 0, const char *name = 0, bool checkAtEntering = false, int buttons = All ); virtual ~QEditListBox(); diff --git a/lib/widgets/propeditor/qfloatinput.cpp b/lib/widgets/propeditor/qfloatinput.cpp index d14ea9c7..1922ea6a 100644 --- a/lib/widgets/propeditor/qfloatinput.cpp +++ b/lib/widgets/propeditor/qfloatinput.cpp @@ -23,10 +23,10 @@ #include <math.h> TQFloatInput::TQFloatInput( int min, int max, float step, int digits, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) : TQSpinBox( (int) (min*pow(digits,10)), (int) (max*pow(digits,10)), - (int) (step*pow(digits,10)), tqparent, name ), + (int) (step*pow(digits,10)), parent, name ), m_digits( digits ) { setValue( (int) (min*pow(digits,10)) ); diff --git a/lib/widgets/propeditor/qfloatinput.h b/lib/widgets/propeditor/qfloatinput.h index dececcbf..23fb10d2 100644 --- a/lib/widgets/propeditor/qfloatinput.h +++ b/lib/widgets/propeditor/qfloatinput.h @@ -29,7 +29,7 @@ class TQFloatInput : public TQSpinBox { public: TQFloatInput( int min, int max, float step, int digits, - TQWidget *tqparent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); virtual TQString mapValueToText( int value ); diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index 793c52d2..68e940ae 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -133,13 +133,13 @@ static inline bool checkIndex( const char *method, const char * name, The input field can be edited if \a rw is TRUE, otherwise the user may only choose one of the items in the combobox. - The \a tqparent and \a name arguments are passed on to the TQWidget + The \a parent and \a name arguments are passed on to the TQWidget constructor. */ -QComboView::QComboView( bool rw, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, WResizeNoErase ) +QComboView::QComboView( bool rw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, WResizeNoErase ) { d = new QComboViewData( this ); setUpListView(); @@ -1430,7 +1430,7 @@ void QComboView::setLineEdit( TQLineEdit *edit ) d->ed = edit; - if ( TQT_BASE_OBJECT(edit->tqparent()) != TQT_BASE_OBJECT(this) ) { + if ( TQT_BASE_OBJECT(edit->parent()) != TQT_BASE_OBJECT(this) ) { edit->reparent( this, TQPoint(0,0), FALSE ); edit->setFont( font() ); } diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h index 213c278f..4cdf6754 100644 --- a/lib/widgets/qcomboview.h +++ b/lib/widgets/qcomboview.h @@ -58,8 +58,8 @@ class TQ_EXPORT QComboView : public TQWidget TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: -// QComboView( TQWidget* tqparent=0, const char* name=0 ); - QComboView( bool rw, TQWidget* tqparent=0, const char* name=0 ); +// QComboView( TQWidget* parent=0, const char* name=0 ); + QComboView( bool rw, TQWidget* parent=0, const char* name=0 ); ~QComboView(); int childCount() const; diff --git a/lib/widgets/resizablecombo.cpp b/lib/widgets/resizablecombo.cpp index eeeba8d0..aba2f658 100644 --- a/lib/widgets/resizablecombo.cpp +++ b/lib/widgets/resizablecombo.cpp @@ -51,8 +51,8 @@ static const char * resize_xpm[] = { " . ", " "}; -ResizableCombo::ResizableCombo(KComboView *view, TQWidget *tqparent, const char *name): - TQWidget(tqparent, name), m_sizer(0), m_combo(view) +ResizableCombo::ResizableCombo(KComboView *view, TQWidget *parent, const char *name): + TQWidget(parent, name), m_sizer(0), m_combo(view) { TQHBoxLayout *l = new TQHBoxLayout(this); view->reparent(this, TQPoint(0,0)); @@ -86,8 +86,8 @@ void MyPushButton::mouseMoveEvent( TQMouseEvent * e ) TQPushButton::mouseMoveEvent(e); } -MyPushButton::MyPushButton( ResizableCombo * tqparent, const char * name ) - :TQPushButton(tqparent, name), m_resizing(false), m_combo(tqparent) +MyPushButton::MyPushButton( ResizableCombo * parent, const char * name ) + :TQPushButton(parent, name), m_resizing(false), m_combo(parent) { setFocusPolicy(TQ_NoFocus); setFlat(true); diff --git a/lib/widgets/resizablecombo.h b/lib/widgets/resizablecombo.h index bafefe33..ecaa2058 100644 --- a/lib/widgets/resizablecombo.h +++ b/lib/widgets/resizablecombo.h @@ -39,7 +39,7 @@ class ResizableCombo: public TQWidget{ Q_OBJECT TQ_OBJECT public: - ResizableCombo(KComboView *view, TQWidget *tqparent = 0, const char *name = 0); + ResizableCombo(KComboView *view, TQWidget *parent = 0, const char *name = 0); private: MyPushButton *m_sizer; @@ -51,7 +51,7 @@ friend class MyPushButton; class MyPushButton: public TQPushButton { public: - MyPushButton(ResizableCombo *tqparent = 0, const char *name = 0 ); + MyPushButton(ResizableCombo *parent = 0, const char *name = 0 ); TQPoint pressedPos() { diff --git a/parts/abbrev/abbrevconfigwidget.cpp b/parts/abbrev/abbrevconfigwidget.cpp index 675145b5..6e174603 100644 --- a/parts/abbrev/abbrevconfigwidget.cpp +++ b/parts/abbrev/abbrevconfigwidget.cpp @@ -25,8 +25,8 @@ #include "addtemplatedlg.h" #include "abbrevpart.h" -AbbrevConfigWidget::AbbrevConfigWidget(AbbrevPart *part, TQWidget *tqparent, const char *name) - : AbbrevConfigWidgetBase(tqparent, name) +AbbrevConfigWidget::AbbrevConfigWidget(AbbrevPart *part, TQWidget *parent, const char *name) + : AbbrevConfigWidgetBase(parent, name) { m_part = part; diff --git a/parts/abbrev/abbrevconfigwidget.h b/parts/abbrev/abbrevconfigwidget.h index 514c53c4..071bff70 100644 --- a/parts/abbrev/abbrevconfigwidget.h +++ b/parts/abbrev/abbrevconfigwidget.h @@ -26,7 +26,7 @@ class AbbrevConfigWidget : public AbbrevConfigWidgetBase TQ_OBJECT public: - AbbrevConfigWidget(AbbrevPart *part, TQWidget *tqparent=0, const char *name=0); + AbbrevConfigWidget(AbbrevPart *part, TQWidget *parent=0, const char *name=0); ~AbbrevConfigWidget(); public slots: diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index a5d6c777..5a13a32a 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -65,8 +65,8 @@ public: K_EXPORT_COMPONENT_FACTORY( libkdevabbrev, AbbrevFactory ) -AbbrevPart::AbbrevPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "AbbrevPart") +AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "AbbrevPart") { setInstance(AbbrevFactory::instance()); setXMLFile("kdevabbrev.rc"); diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h index 566e7896..2a1f9416 100644 --- a/parts/abbrev/abbrevpart.h +++ b/parts/abbrev/abbrevpart.h @@ -66,7 +66,7 @@ class AbbrevPart : public KDevPlugin TQ_OBJECT public: - AbbrevPart( TQObject *tqparent, const char *name, const TQStringList & ); + AbbrevPart( TQObject *parent, const char *name, const TQStringList & ); ~AbbrevPart(); bool autoWordCompletionEnabled() const; diff --git a/parts/abbrev/addtemplatedlg.cpp b/parts/abbrev/addtemplatedlg.cpp index 6be8c703..a837c08a 100644 --- a/parts/abbrev/addtemplatedlg.cpp +++ b/parts/abbrev/addtemplatedlg.cpp @@ -22,8 +22,8 @@ #include <klineedit.h> #include <tqpushbutton.h> -AddTemplateDialog::AddTemplateDialog( TQStringList suffixesList, TQWidget *tqparent, const char *name ) - : AddTemplateDialogBase( tqparent, name ) +AddTemplateDialog::AddTemplateDialog( TQStringList suffixesList, TQWidget *parent, const char *name ) + : AddTemplateDialogBase( parent, name ) { setFocusProxy( editTemplate ); comboSuffixes->insertStringList(suffixesList); diff --git a/parts/abbrev/addtemplatedlg.h b/parts/abbrev/addtemplatedlg.h index 04298214..2721ec3b 100644 --- a/parts/abbrev/addtemplatedlg.h +++ b/parts/abbrev/addtemplatedlg.h @@ -29,7 +29,7 @@ class AddTemplateDialog: public AddTemplateDialogBase TQ_OBJECT public: - AddTemplateDialog( TQStringList suffixesList, TQWidget *tqparent=0, const char *name=0 ); + AddTemplateDialog( TQStringList suffixesList, TQWidget *parent=0, const char *name=0 ); virtual ~AddTemplateDialog(); TQString templ() const; diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index bfcdc91b..1799c2e9 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -90,8 +90,8 @@ #include "propeditor/propertylist.h" #include "propeditor/propertyeditor.h" -AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *tqparent, const char *name) - : AppWizardDialogBase(tqparent, name,true), m_pCurrentAppInfo(0), +AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const char *name) + : AppWizardDialogBase(parent, name,true), m_pCurrentAppInfo(0), m_profileSupport(new ProfileSupport(part)) { kdDebug( 9010 ) << " ** AppWizardDialog::AppWizardDialog()" << endl; diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h index d1892c7a..d441fb6e 100644 --- a/parts/appwizard/appwizarddlg.h +++ b/parts/appwizard/appwizarddlg.h @@ -124,7 +124,7 @@ class AppWizardDialog : public AppWizardDialogBase TQ_OBJECT public: - AppWizardDialog( AppWizardPart *part, TQWidget *tqparent=0, const char *name=0 ); + AppWizardDialog( AppWizardPart *part, TQWidget *parent=0, const char *name=0 ); ~AppWizardDialog(); TQString getProjectName() { return appname_edit->text(); } TQString getProjectLocation() { return finalLoc_label->text(); } diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp index e29fd98b..6b57b320 100644 --- a/parts/appwizard/appwizardpart.cpp +++ b/parts/appwizard/appwizardpart.cpp @@ -34,8 +34,8 @@ #include <kdevcore.h> #include <codemodel.h> -AppWizardPart::AppWizardPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(AppWizardFactory::info(), tqparent, name ? name : "AppWizardPart") +AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart") { setInstance(AppWizardFactory::instance()); setXMLFile("kdevappwizard.rc"); diff --git a/parts/appwizard/appwizardpart.h b/parts/appwizard/appwizardpart.h index 66894790..c8731f4a 100644 --- a/parts/appwizard/appwizardpart.h +++ b/parts/appwizard/appwizardpart.h @@ -27,7 +27,7 @@ class AppWizardPart : public KDevPlugin TQ_OBJECT public: - AppWizardPart( TQObject *tqparent, const char *name, const TQStringList & ); + AppWizardPart( TQObject *parent, const char *name, const TQStringList & ); ~AppWizardPart(); void openFilesAfterGeneration(const KURL::List urlsToOpen); diff --git a/parts/appwizard/common/incadmin/config.guess b/parts/appwizard/common/incadmin/config.guess index 3ddf6182..1d9f4294 100755 --- a/parts/appwizard/common/incadmin/config.guess +++ b/parts/appwizard/common/incadmin/config.guess @@ -247,7 +247,7 @@ main: .prologue 1 .long 0x47e03d80 # implver \$0 lda \$2,-1 - .long 0x47e20c21 # atqmask \$2,\$1 + .long 0x47e20c21 # amask \$2,\$1 lda \$16,\$Lformat mov \$0,\$17 not \$1,\$18 diff --git a/parts/appwizard/common/kde-index.docbook b/parts/appwizard/common/kde-index.docbook index b84a9430..c79adfeb 100644 --- a/parts/appwizard/common/kde-index.docbook +++ b/parts/appwizard/common/kde-index.docbook @@ -265,7 +265,7 @@ taken from that reference and shortened a bit for readability. --> <refnamediv> <refname>XtUnmanageChildren </refname> -<refpurpose>remove a list of tqchildren from a tqparent widget's managed +<refpurpose>remove a list of tqchildren from a parent widget's managed list. <indexterm id="ix-1007-unmanagetqchildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm> <indexterm id="ix-1007-unmanagetqchildren-2"><primary>XtUnmanageChildren</primary></indexterm> @@ -309,13 +309,13 @@ class RectObj or any subclass thereof. <title>Description </title> <para><function>XtUnmanageChildren()</function> unmaps the specified widgets -and removes them from their tqparent's tqgeometry management. +and removes them from their parent's tqgeometry management. The widgets will disappear from the screen, and (depending -on its tqparent) may no longer have screen space allocated for +on its parent) may no longer have screen space allocated for them. </para> <para>Each of the widgets in the <replaceable class="parameter">tqchildren</replaceable> array must have -the same tqparent. +the same parent. </para> <para>See the “Algorithm” section below for full details of the widget unmanagement procedure. @@ -340,7 +340,7 @@ often more convenient to call <function>XtUnmanageChild()</function> several times than it is to declare and initialize an array of widgets to pass to <function>XtUnmanageChildren()</function>. Calling <function>XtUnmanageChildren()</function> is more efficient, however, -because it only calls the tqparent's <function>change_managed()</function> +because it only calls the parent's <function>change_managed()</function> method once. </para> </refsect1> diff --git a/parts/appwizard/filepropspage.cpp b/parts/appwizard/filepropspage.cpp index 1ec0b6df..3e946abf 100644 --- a/parts/appwizard/filepropspage.cpp +++ b/parts/appwizard/filepropspage.cpp @@ -7,11 +7,11 @@ #include <tqmultilineedit.h> /* - * Constructs a FilePropsPage which is a child of 'tqparent', with the + * Constructs a FilePropsPage which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -FilePropsPage::FilePropsPage( TQWidget* tqparent, const char* name, WFlags fl ) - : FilePropsPageBase( tqparent, name, fl ){ +FilePropsPage::FilePropsPage( TQWidget* parent, const char* name, WFlags fl ) + : FilePropsPageBase( parent, name, fl ){ m_props = new TQPtrList<ClassFileProp>; m_current_class = 9999; // no current } diff --git a/parts/appwizard/filepropspage.h b/parts/appwizard/filepropspage.h index adb8f758..99424100 100644 --- a/parts/appwizard/filepropspage.h +++ b/parts/appwizard/filepropspage.h @@ -23,7 +23,7 @@ class FilePropsPage : public FilePropsPageBase TQ_OBJECT public: - FilePropsPage( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + FilePropsPage( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~FilePropsPage(); void setClassFileProps(TQPtrList<ClassFileProp> props,bool different_header_impl=true); TQPtrList<ClassFileProp> getClassFileProps(); diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index 8d0ca20d..4fc8a6e3 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -51,8 +51,8 @@ #include "misc.h" -ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *tqparent, const char *name) - : ImportDialogBase(tqparent, name, true), m_part(part) +ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *name) + : ImportDialogBase(parent, name, true), m_part(part) { TQString author, email; AppWizardUtil::guessAuthorAndEmail(&author, &email); diff --git a/parts/appwizard/importdlg.h b/parts/appwizard/importdlg.h index aa7721e3..0b5cd578 100644 --- a/parts/appwizard/importdlg.h +++ b/parts/appwizard/importdlg.h @@ -31,7 +31,7 @@ class ImportDialog : public ImportDialogBase TQ_OBJECT public: - ImportDialog( AppWizardPart *part, TQWidget *tqparent=0, const char *name=0 ); + ImportDialog( AppWizardPart *part, TQWidget *parent=0, const char *name=0 ); ~ImportDialog(); protected: diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp index 828b54e9..084156f5 100644 --- a/parts/appwizard/profilesupport.cpp +++ b/parts/appwizard/profilesupport.cpp @@ -26,9 +26,9 @@ #include <kdevplugincontroller.h> -ProfileSupport::ProfileSupport(KDevPlugin *tqparent) +ProfileSupport::ProfileSupport(KDevPlugin *parent) { - KURL::List resources = tqparent->pluginController()->profileResourcesRecursive("*.appwizard"); + KURL::List resources = parent->pluginController()->profileResourcesRecursive("*.appwizard"); for (KURL::List::const_iterator it = resources.constBegin(); it != resources.constEnd(); ++it) { diff --git a/parts/appwizard/profilesupport.h b/parts/appwizard/profilesupport.h index bc98d981..b18a9620 100644 --- a/parts/appwizard/profilesupport.h +++ b/parts/appwizard/profilesupport.h @@ -24,7 +24,7 @@ class ProfileSupport{ public: - ProfileSupport(KDevPlugin *tqparent); + ProfileSupport(KDevPlugin *parent); bool isInTemplateList(const TQString &templateUrl); private: diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 59cb1666..c8ff8dda 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -43,8 +43,8 @@ namespace { typedef KDevGenericFactory<AStylePart> AStyleFactory; K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) ) -AStylePart::AStylePart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevSourceFormatter(&data, tqparent, name ? name : "AStylePart") +AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) + : KDevSourceFormatter(&data, parent, name ? name : "AStylePart") { setInstance(AStyleFactory::instance()); diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h index b805b0b2..ab39ec62 100644 --- a/parts/astyle/astyle_part.h +++ b/parts/astyle/astyle_part.h @@ -27,7 +27,7 @@ class AStylePart : public KDevSourceFormatter public: - AStylePart(TQObject *tqparent, const char *name, const TQStringList &); + AStylePart(TQObject *parent, const char *name, const TQStringList &); ~AStylePart(); TQString formatSource(const TQString text, AStyleWidget * widget, const TQMap<TQString, TQVariant>& options); diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp index 49177eb2..0cb26abb 100644 --- a/parts/astyle/astyle_widget.cpp +++ b/parts/astyle/astyle_widget.cpp @@ -13,8 +13,8 @@ #include <kdevcore.h> -AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *tqparent, const char *name) - : AStyleConfig(tqparent, name), m_part(part), isGlobalWidget(global) +AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, const char *name) + : AStyleConfig(parent, name), m_part(part), isGlobalWidget(global) { // which style changed - disable the other pages. connect(StyleGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); diff --git a/parts/astyle/astyle_widget.h b/parts/astyle/astyle_widget.h index 2a6bf85e..d569a4d6 100644 --- a/parts/astyle/astyle_widget.h +++ b/parts/astyle/astyle_widget.h @@ -14,7 +14,7 @@ class AStyleWidget : public AStyleConfig public: - AStyleWidget( AStylePart * part, bool global, TQWidget *tqparent=0, const char *name=0 ); + AStyleWidget( AStylePart * part, bool global, TQWidget *parent=0, const char *name=0 ); ~AStyleWidget(); diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index 5edfa5a3..965b359b 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -44,8 +44,8 @@ typedef KDevGenericFactory<BookmarksPart> BookmarksFactory; static const KDevPluginInfo data("kdevbookmarks"); K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) ) -BookmarksPart::BookmarksPart(TQObject *tqparent, const char *name, const TQStringList& ) - : KDevPlugin(&data, tqparent, name ? name : "BookmarksPart" ) +BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& ) + : KDevPlugin(&data, parent, name ? name : "BookmarksPart" ) { setInstance(BookmarksFactory::instance()); diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h index 850e1aef..fe3ae343 100644 --- a/parts/bookmarks/bookmarks_part.h +++ b/parts/bookmarks/bookmarks_part.h @@ -45,7 +45,7 @@ class BookmarksPart : public KDevPlugin public: - BookmarksPart(TQObject *tqparent, const char *name, const TQStringList &); + BookmarksPart(TQObject *parent, const char *name, const TQStringList &); ~BookmarksPart(); // reimplemented from KDevPlugin diff --git a/parts/bookmarks/bookmarks_settings.cpp b/parts/bookmarks/bookmarks_settings.cpp index 5fecbc4e..58369d92 100644 --- a/parts/bookmarks/bookmarks_settings.cpp +++ b/parts/bookmarks/bookmarks_settings.cpp @@ -19,8 +19,8 @@ #include "bookmarks_settings.h" -BookmarkSettings::BookmarkSettings( BookmarksPart * part, TQWidget* tqparent, const char* name, WFlags fl ) -: BookmarkSettingsBase( tqparent, name, fl ), m_part( part ) +BookmarkSettings::BookmarkSettings( BookmarksPart * part, TQWidget* parent, const char* name, WFlags fl ) +: BookmarkSettingsBase( parent, name, fl ), m_part( part ) { m_part->config()->readConfig(); diff --git a/parts/bookmarks/bookmarks_settings.h b/parts/bookmarks/bookmarks_settings.h index aa517db1..edff1a4e 100644 --- a/parts/bookmarks/bookmarks_settings.h +++ b/parts/bookmarks/bookmarks_settings.h @@ -22,7 +22,7 @@ class BookmarkSettings : public BookmarkSettingsBase TQ_OBJECT public: - BookmarkSettings( BookmarksPart * part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + BookmarkSettings( BookmarksPart * part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~BookmarkSettings(); public slots: diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index 99e8715d..63a61c1e 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -59,13 +59,13 @@ static const char* const bookmark_xpm[]={ class BookmarkItem : public TQListViewItem { public: - BookmarkItem( TQListView * tqparent, KURL const & url ) - : TQListViewItem( tqparent, url.fileName() ), + BookmarkItem( TQListView * parent, KURL const & url ) + : TQListViewItem( parent, url.fileName() ), _url( url ), _line( -1 ), _isBookmark( false ) {} - BookmarkItem( TQListViewItem * tqparent, KURL const & url, TQPair<int,TQString> mark ) - : TQListViewItem( tqparent, TQString::number( mark.first +1 ).rightJustify( 5 ) ), + BookmarkItem( TQListViewItem * parent, KURL const & url, TQPair<int,TQString> mark ) + : TQListViewItem( parent, TQString::number( mark.first +1 ).rightJustify( 5 ) ), _url( url ), _line( mark.first ), _isBookmark( true ) { BookmarksWidget * lv = static_cast<BookmarksWidget*>( listView() ); diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp index 2817db82..5aefe6e5 100644 --- a/parts/classview/classtoolwidget.cpp +++ b/parts/classview/classtoolwidget.cpp @@ -20,8 +20,8 @@ #include "classstore.h" -ClassToolWidget::ClassToolWidget(ClassViewPart *part, TQWidget *tqparent) - : ClassTreeBase(part, tqparent, "class tool widget") +ClassToolWidget::ClassToolWidget(ClassViewPart *part, TQWidget *parent) + : ClassTreeBase(part, parent, "class tool widget") {} diff --git a/parts/classview/classtoolwidget.h b/parts/classview/classtoolwidget.h index 9ad4ef4a..41af01e0 100644 --- a/parts/classview/classtoolwidget.h +++ b/parts/classview/classtoolwidget.h @@ -23,7 +23,7 @@ class ClassToolWidget : public ClassTreeBase TQ_OBJECT public: - ClassToolWidget(ClassViewPart *part, TQWidget *tqparent=0); + ClassToolWidget(ClassViewPart *part, TQWidget *parent=0); ~ClassToolWidget(); void insertClassAndClasses(ParsedClass *parsedClass, TQValueList<ParsedClass*> classList); diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp index f4e21f2a..f9074510 100644 --- a/parts/classview/classtreebase.cpp +++ b/parts/classview/classtreebase.cpp @@ -272,9 +272,9 @@ void ClassTreeClassItem::setOpen(bool o) ClassTreeItem::setOpen(o); } -ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling, +ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedMethod *parsedMethod) - : ClassTreeItem(tqparent, lastSibling, parsedMethod) + : ClassTreeItem(parent, lastSibling, parsedMethod) { TQString icon; @@ -336,9 +336,9 @@ TQString ClassTreeMethodItem::text( int ) const } -ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling, +ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedAttribute *parsedAttr) - : ClassTreeItem(tqparent, lastSibling, parsedAttr) + : ClassTreeItem(parent, lastSibling, parsedAttr) { TQString icon; @@ -367,9 +367,9 @@ TQString ClassTreeAttrItem::text( int ) const return m_item->name(); } -ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling, +ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedScript *parsedScript) - : ClassTreeItem(tqparent, lastSibling, parsedScript) + : ClassTreeItem(parent, lastSibling, parsedScript) { TQString icon; @@ -422,8 +422,8 @@ void ClassTreeScriptItem::setOpen(bool o) class ClassToolTip : public TQToolTip { public: - ClassToolTip( TQWidget *tqparent ) - : TQToolTip(tqparent) + ClassToolTip( TQWidget *parent ) + : TQToolTip(parent) {} protected: @@ -447,8 +447,8 @@ void ClassToolTip::maybeTip(const TQPoint &p) } -ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char *name) + : KListView(parent, name) { setFocusPolicy(ClickFocus); setRootIsDecorated(true); @@ -488,7 +488,7 @@ ClassTreeBase::TreeState ClassTreeBase::treeState() const TQListViewItem *item = it.current(); while (item) { path.prepend(item->text(0)); - item = item->tqparent(); + item = item->parent(); } state.append(path); } @@ -507,7 +507,7 @@ void ClassTreeBase::setTreeState(TreeState state) TQListViewItem *item = it.current(); while (item) { path.prepend(item->text(0)); - item = item->tqparent(); + item = item->parent(); } if (*tsit == path) { it.current()->setOpen(true); diff --git a/parts/classview/classtreebase.h b/parts/classview/classtreebase.h index 5274d9e8..0c9a7d0f 100644 --- a/parts/classview/classtreebase.h +++ b/parts/classview/classtreebase.h @@ -33,7 +33,7 @@ class ClassTreeBase : public KListView TQ_OBJECT public: - ClassTreeBase( ClassViewPart *part, TQWidget *tqparent=0, const char *name=0 ); + ClassTreeBase( ClassViewPart *part, TQWidget *parent=0, const char *name=0 ); ~ClassTreeBase(); protected: @@ -67,18 +67,18 @@ protected: class ClassTreeItem : public TQListViewItem, public NotifyClient { public: - ClassTreeItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) - : TQListViewItem(tqparent, lastSibling), NotifyClient(), m_item(parsedItem) + ClassTreeItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) + : TQListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem) { init(); } - ClassTreeItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) - : TQListViewItem(tqparent, lastSibling), NotifyClient(), m_item(parsedItem) + ClassTreeItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) + : TQListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem) { init(); } ClassTreeItem( const ClassTreeItem& other ) - : TQListViewItem( other.tqparent(), other.nextSibling()), NotifyClient() + : TQListViewItem( other.parent(), other.nextSibling()), NotifyClient() { m_item = other.m_item; init(); @@ -123,14 +123,14 @@ protected: class ClassTreeOrganizerItem : public ClassTreeItem { public: - ClassTreeOrganizerItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, + ClassTreeOrganizerItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, const TQString &text ) - : ClassTreeItem(tqparent, lastSibling, 0 ) + : ClassTreeItem(parent, lastSibling, 0 ) , m_text( text ) { init(); } - ClassTreeOrganizerItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, + ClassTreeOrganizerItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, const TQString &text ) - : ClassTreeItem(tqparent, lastSibling, 0 ) + : ClassTreeItem(parent, lastSibling, 0 ) , m_text( text ) { init(); } ~ClassTreeOrganizerItem() @@ -148,15 +148,15 @@ private: class ClassTreeScopeItem : public ClassTreeItem { public: - ClassTreeScopeItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, + ClassTreeScopeItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, ParsedScopeContainer *parsedScope ) - : ClassTreeItem(tqparent, lastSibling, parsedScope) + : ClassTreeItem(parent, lastSibling, parsedScope) { init(); } - ClassTreeScopeItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, + ClassTreeScopeItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedScopeContainer *parsedScope ) - : ClassTreeItem(tqparent, lastSibling, parsedScope) + : ClassTreeItem(parent, lastSibling, parsedScope) { init(); } @@ -175,15 +175,15 @@ private: class ClassTreeClassItem : public ClassTreeItem { public: - ClassTreeClassItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, + ClassTreeClassItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, ParsedClass *parsedClass, bool isStruct=false ) - : ClassTreeItem(tqparent, lastSibling, parsedClass), m_isStruct( isStruct ) + : ClassTreeItem(parent, lastSibling, parsedClass), m_isStruct( isStruct ) { init(); } - ClassTreeClassItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, + ClassTreeClassItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedClass *parsedClass, bool isStruct=false ) - : ClassTreeItem(tqparent, lastSibling, parsedClass), m_isStruct( isStruct ) + : ClassTreeItem(parent, lastSibling, parsedClass), m_isStruct( isStruct ) { init(); } @@ -204,7 +204,7 @@ private: class ClassTreeMethodItem : public ClassTreeItem { public: - ClassTreeMethodItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, + ClassTreeMethodItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedMethod *parsedMethod ); ~ClassTreeMethodItem() { @@ -217,7 +217,7 @@ public: class ClassTreeAttrItem : public ClassTreeItem { public: - ClassTreeAttrItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, + ClassTreeAttrItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedAttribute *parsedAttr ); ~ClassTreeAttrItem() { @@ -229,7 +229,7 @@ public: class ClassTreeScriptItem : public ClassTreeItem { public: - ClassTreeScriptItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, + ClassTreeScriptItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedScript *parsedScript ); ~ClassTreeScriptItem() { diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index 200ef9bb..b26ea30b 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -142,9 +142,9 @@ typedef KDevGenericFactory<ClassViewPart> ClassViewFactory; static const KDevPluginInfo data("kdevclassview"); K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) ) -ClassViewPart::ClassViewPart(TQObject *tqparent, const char *name, const TQStringList& ) - :/// KDevPlugin( &data, tqparent, name ? name : "ClassViewPart" ), - KDevCodeBrowserFrontend( &data, tqparent, name ? name : "ClassViewPart" ), +ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& ) + :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ), + KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ), m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0) { setInstance(ClassViewFactory::instance()); diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h index 65044346..3bd2b259 100644 --- a/parts/classview/classviewpart.h +++ b/parts/classview/classviewpart.h @@ -57,7 +57,7 @@ class ClassViewPart : public Extensions::KDevCodeBrowserFrontend Q_OBJECT TQ_OBJECT public: - ClassViewPart(TQObject *tqparent, const char *name, const TQStringList &); + ClassViewPart(TQObject *parent, const char *name, const TQStringList &); virtual ~ClassViewPart(); bool langHasFeature(KDevLanguageSupport::Features feature); diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index a06948ab..a7a2fea3 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -1277,7 +1277,7 @@ void ClassViewWidget::slotCreateAccessMethods( ) if (item == 0) return; - m_part->languageSupport()->createAccessMethods(static_cast<ClassModel*>(static_cast<ClassDomBrowserItem*>(item->tqparent())->dom()),static_cast<VariableModel*>(item->dom())); + m_part->languageSupport()->createAccessMethods(static_cast<ClassModel*>(static_cast<ClassDomBrowserItem*>(item->parent())->dom()),static_cast<VariableModel*>(item->dom())); } } diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h index 29276a31..bef2e5a0 100644 --- a/parts/classview/classviewwidget.h +++ b/parts/classview/classviewwidget.h @@ -121,10 +121,10 @@ class ClassViewItem: public FancyListViewItem { private: public: - ClassViewItem( TQListView* tqparent, const TQString& text=TQString() ) - : FancyListViewItem( static_cast<ClassViewWidget*>( tqparent )->m_paintStyles, tqparent, text ) {} - ClassViewItem( TQListViewItem* tqparent, const TQString& text=TQString() ) - : FancyListViewItem( static_cast<ClassViewWidget*>( tqparent->listView() )->m_paintStyles, tqparent, text ) {} + ClassViewItem( TQListView* parent, const TQString& text=TQString() ) + : FancyListViewItem( static_cast<ClassViewWidget*>( parent )->m_paintStyles, parent, text ) {} + ClassViewItem( TQListViewItem* parent, const TQString& text=TQString() ) + : FancyListViewItem( static_cast<ClassViewWidget*>( parent->listView() )->m_paintStyles, parent, text ) {} virtual const CodeModelItem* model() const { return 0; } @@ -153,10 +153,10 @@ public: class FolderBrowserItem: public ClassViewItem { public: - FolderBrowserItem( ClassViewWidget* widget, TQListView* tqparent, const TQString& name=TQString() ) - : ClassViewItem( tqparent, name ), m_widget(widget) {} - FolderBrowserItem( ClassViewWidget* widget, TQListViewItem* tqparent, const TQString& name=TQString() ) - : ClassViewItem( tqparent, name ), m_widget(widget) {} + FolderBrowserItem( ClassViewWidget* widget, TQListView* parent, const TQString& name=TQString() ) + : ClassViewItem( parent, name ), m_widget(widget) {} + FolderBrowserItem( ClassViewWidget* widget, TQListViewItem* parent, const TQString& name=TQString() ) + : ClassViewItem( parent, name ), m_widget(widget) {} virtual bool isFolder() const { return true; } @@ -185,10 +185,10 @@ private: class NamespaceDomBrowserItem: public ClassViewItem { public: - NamespaceDomBrowserItem( TQListView* tqparent, NamespaceDom dom ) - : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} - NamespaceDomBrowserItem( TQListViewItem* tqparent, NamespaceDom dom ) - : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + NamespaceDomBrowserItem( TQListView* parent, NamespaceDom dom ) + : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + NamespaceDomBrowserItem( TQListViewItem* parent, NamespaceDom dom ) + : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } @@ -219,10 +219,10 @@ private: class ClassDomBrowserItem: public ClassViewItem { public: - ClassDomBrowserItem( TQListView* tqparent, ClassDom dom ) - : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} - ClassDomBrowserItem( TQListViewItem* tqparent, ClassDom dom ) - : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + ClassDomBrowserItem( TQListView* parent, ClassDom dom ) + : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + ClassDomBrowserItem( TQListViewItem* parent, ClassDom dom ) + : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } virtual bool isClass() const { return true; } @@ -257,10 +257,10 @@ private: class TypeAliasDomBrowserItem: public ClassViewItem { public: - TypeAliasDomBrowserItem( TQListView* tqparent, TypeAliasDom dom ) - : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} - TypeAliasDomBrowserItem( TQListViewItem* tqparent, TypeAliasDom dom ) - : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + TypeAliasDomBrowserItem( TQListView* parent, TypeAliasDom dom ) + : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + TypeAliasDomBrowserItem( TQListViewItem* parent, TypeAliasDom dom ) + : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } virtual bool isTypeAlias() const { return true; } @@ -285,10 +285,10 @@ private: class FunctionDomBrowserItem: public ClassViewItem { public: - FunctionDomBrowserItem( TQListView* tqparent, FunctionDom dom ) - : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} - FunctionDomBrowserItem( TQListViewItem* tqparent, FunctionDom dom ) - : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + FunctionDomBrowserItem( TQListView* parent, FunctionDom dom ) + : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + FunctionDomBrowserItem( TQListViewItem* parent, FunctionDom dom ) + : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } virtual bool isFunction() const { return true; } @@ -316,10 +316,10 @@ private: class VariableDomBrowserItem: public ClassViewItem { public: - VariableDomBrowserItem( TQListView* tqparent, VariableDom dom ) - : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} - VariableDomBrowserItem( TQListViewItem* tqparent, VariableDom dom ) - : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + VariableDomBrowserItem( TQListView* parent, VariableDom dom ) + : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + VariableDomBrowserItem( TQListViewItem* parent, VariableDom dom ) + : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } virtual bool isVariable() const { return true; } diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp index 6374ce50..32463042 100644 --- a/parts/classview/digraphview.cpp +++ b/parts/classview/digraphview.cpp @@ -43,8 +43,8 @@ struct DigraphEdge }; -DigraphView::DigraphView(TQWidget *tqparent, const char *name) - : TQScrollView(tqparent, name, WRepaintNoErase|WStaticContents|WResizeNoErase) +DigraphView::DigraphView(TQWidget *parent, const char *name) + : TQScrollView(parent, name, WRepaintNoErase|WStaticContents|WResizeNoErase) { viewport()->setBackgroundMode(PaletteBase); diff --git a/parts/classview/digraphview.h b/parts/classview/digraphview.h index 216e972e..b04f5306 100644 --- a/parts/classview/digraphview.h +++ b/parts/classview/digraphview.h @@ -27,7 +27,7 @@ class DigraphView : public TQScrollView TQ_OBJECT public: - DigraphView(TQWidget *tqparent, const char *name); + DigraphView(TQWidget *parent, const char *name); ~DigraphView(); void addEdge(const TQString &name1, const TQString &name2); diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index 01bfe2d0..6c9f65f9 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -85,10 +85,10 @@ private: public: enum Type { Declaration, Definition }; - FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListView *tqparent, TQString name, Type type) - :FancyListViewItem(styles, tqparent, name, ""), m_part(part), m_type(type) {} - FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListViewItem *tqparent, TQString name, Type type) - :FancyListViewItem(styles, tqparent, name, ""), m_part(part), m_type(type) {} + FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListView *parent, TQString name, Type type) + :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {} + FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListViewItem *parent, TQString name, Type type) + :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {} ~FunctionNavItem() {} virtual void setup() @@ -104,8 +104,8 @@ private: }; -Navigator::Navigator(ClassViewPart *tqparent, const char *name) - : TQObject(tqparent, name), m_part(tqparent) +Navigator::Navigator(ClassViewPart *parent, const char *name) + : TQObject(parent, name), m_part(parent) { m_state = GoToDefinitions; m_navNoDefinition = true; diff --git a/parts/classview/navigator.h b/parts/classview/navigator.h index 3338e4b1..d8482eb9 100644 --- a/parts/classview/navigator.h +++ b/parts/classview/navigator.h @@ -43,7 +43,7 @@ Q_OBJECT public: enum NavigationState { GoToDefinitions, GoToDeclarations }; - Navigator(ClassViewPart *tqparent, const char *name = 0); + Navigator(ClassViewPart *parent, const char *name = 0); ~Navigator(); void stopTimer(); diff --git a/parts/classview/viewcombos.cpp b/parts/classview/viewcombos.cpp index bc1c4f3b..bb7bf01d 100644 --- a/parts/classview/viewcombos.cpp +++ b/parts/classview/viewcombos.cpp @@ -27,13 +27,13 @@ #include "viewcombos.h" #include "classviewpart.h" -NamespaceItem::NamespaceItem(ClassViewPart *part, TQListView *tqparent, TQString name, NamespaceDom dom) - :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) +NamespaceItem::NamespaceItem(ClassViewPart *part, TQListView *parent, TQString name, NamespaceDom dom) + :TQListViewItem(parent, name), m_dom(dom), m_part(part) { } -NamespaceItem::NamespaceItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, NamespaceDom dom) - :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) +NamespaceItem::NamespaceItem(ClassViewPart *part, TQListViewItem *parent, TQString name, NamespaceDom dom) + :TQListViewItem(parent, name), m_dom(dom), m_part(part) { } @@ -53,13 +53,13 @@ void NamespaceItem::setup() } -ClassItem::ClassItem(ClassViewPart *part, TQListView *tqparent, TQString name, ClassDom dom) - :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) +ClassItem::ClassItem(ClassViewPart *part, TQListView *parent, TQString name, ClassDom dom) + :TQListViewItem(parent, name), m_dom(dom), m_part(part) { } -ClassItem::ClassItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, ClassDom dom) - :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) +ClassItem::ClassItem(ClassViewPart *part, TQListViewItem *parent, TQString name, ClassDom dom) + :TQListViewItem(parent, name), m_dom(dom), m_part(part) { } @@ -79,13 +79,13 @@ void ClassItem::setup() } -FunctionItem::FunctionItem(ClassViewPart *part, TQListView *tqparent, TQString name, FunctionDom dom) - :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) +FunctionItem::FunctionItem(ClassViewPart *part, TQListView *parent, TQString name, FunctionDom dom) + :TQListViewItem(parent, name), m_dom(dom), m_part(part) { } -FunctionItem::FunctionItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, FunctionDom dom) - :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) +FunctionItem::FunctionItem(ClassViewPart *part, TQListViewItem *parent, TQString name, FunctionDom dom) + :TQListViewItem(parent, name), m_dom(dom), m_part(part) { } diff --git a/parts/classview/viewcombos.h b/parts/classview/viewcombos.h index c3ea79a2..14a44eaf 100644 --- a/parts/classview/viewcombos.h +++ b/parts/classview/viewcombos.h @@ -34,8 +34,8 @@ const TQString EmptyFunctions = i18n("(Functions)"); class NamespaceItem: public TQListViewItem{ public: - NamespaceItem(ClassViewPart *part, TQListView *tqparent, TQString name, NamespaceDom dom); - NamespaceItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, NamespaceDom dom); + NamespaceItem(ClassViewPart *part, TQListView *parent, TQString name, NamespaceDom dom); + NamespaceItem(ClassViewPart *part, TQListViewItem *parent, TQString name, NamespaceDom dom); ~NamespaceItem(); NamespaceDom dom() const; virtual void setup(); @@ -46,8 +46,8 @@ private: class ClassItem: public TQListViewItem{ public: - ClassItem(ClassViewPart *part, TQListView *tqparent, TQString name, ClassDom dom); - ClassItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, ClassDom dom); + ClassItem(ClassViewPart *part, TQListView *parent, TQString name, ClassDom dom); + ClassItem(ClassViewPart *part, TQListViewItem *parent, TQString name, ClassDom dom); ~ClassItem(); ClassDom dom() const; virtual void setup(); @@ -58,8 +58,8 @@ private: class FunctionItem: public TQListViewItem{ public: - FunctionItem(ClassViewPart *part, TQListView *tqparent, TQString name, FunctionDom dom); - FunctionItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, FunctionDom dom); + FunctionItem(ClassViewPart *part, TQListView *parent, TQString name, FunctionDom dom); + FunctionItem(ClassViewPart *part, TQListViewItem *parent, TQString name, FunctionDom dom); ~FunctionItem(); FunctionDom dom() const; virtual void setup(); diff --git a/parts/ctags2/ctags2_createtagfile.cpp b/parts/ctags2/ctags2_createtagfile.cpp index ab9febc4..e066a136 100644 --- a/parts/ctags2/ctags2_createtagfile.cpp +++ b/parts/ctags2/ctags2_createtagfile.cpp @@ -16,8 +16,8 @@ #include "ctags2_part.h" -CreateTagFile::CreateTagFile(TQWidget* tqparent, const char* name, bool modal, WFlags fl) -: CTags2CreateTagFileBase( tqparent, name, modal, fl ) +CreateTagFile::CreateTagFile(TQWidget* parent, const char* name, bool modal, WFlags fl) +: CTags2CreateTagFileBase( parent, name, modal, fl ) { dirToTag->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly); newTagFilePath->setMode( KFile::File | KFile::LocalOnly ); diff --git a/parts/ctags2/ctags2_createtagfile.h b/parts/ctags2/ctags2_createtagfile.h index 61cc6448..4d581b9a 100644 --- a/parts/ctags2/ctags2_createtagfile.h +++ b/parts/ctags2/ctags2_createtagfile.h @@ -22,7 +22,7 @@ Q_OBJECT TQ_OBJECT public: - CreateTagFile(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreateTagFile(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreateTagFile(); TQString name(); TQString tagsfilePath(); diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 93270a78..2ea9c643 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -58,8 +58,8 @@ typedef KDevGenericFactory<CTags2Part> CTags2Factory; static const KDevPluginInfo data("kdevctags2"); K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) ) -CTags2Part::CTags2Part(TQObject *tqparent, const char *name, const TQStringList& ) - : KDevPlugin(&data, tqparent, name ? name : "ctags2Part" ) +CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) + : KDevPlugin(&data, parent, name ? name : "ctags2Part" ) { setInstance(CTags2Factory::instance()); setXMLFile("kdevpart_ctags2.rc"); diff --git a/parts/ctags2/ctags2_part.h b/parts/ctags2/ctags2_part.h index 648c6ded..0ad8197b 100644 --- a/parts/ctags2/ctags2_part.h +++ b/parts/ctags2/ctags2_part.h @@ -33,7 +33,7 @@ class CTags2Part : public KDevPlugin public: - CTags2Part(TQObject *tqparent, const char *name, const TQStringList &); + CTags2Part(TQObject *parent, const char *name, const TQStringList &); ~CTags2Part(); int getFileLineFromPattern( KURL const & url, TQString const & pattern); diff --git a/parts/ctags2/ctags2_selecttagfile.cpp b/parts/ctags2/ctags2_selecttagfile.cpp index 38227d1d..c1a8d617 100644 --- a/parts/ctags2/ctags2_selecttagfile.cpp +++ b/parts/ctags2/ctags2_selecttagfile.cpp @@ -15,8 +15,8 @@ #include "ctags2_selecttagfile.h" -SelectTagFile::SelectTagFile( TQWidget* tqparent, const char* name, bool modal, WFlags fl) -: SelectTagFileBase( tqparent, name, modal, fl ) +SelectTagFile::SelectTagFile( TQWidget* parent, const char* name, bool modal, WFlags fl) +: SelectTagFileBase( parent, name, modal, fl ) { tagFile->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); okButton->setEnabled( false ); diff --git a/parts/ctags2/ctags2_selecttagfile.h b/parts/ctags2/ctags2_selecttagfile.h index a069743e..5da1420b 100644 --- a/parts/ctags2/ctags2_selecttagfile.h +++ b/parts/ctags2/ctags2_selecttagfile.h @@ -19,7 +19,7 @@ class SelectTagFile : public SelectTagFileBase { TQ_OBJECT public: - SelectTagFile( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SelectTagFile( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SelectTagFile(); TQString name(); TQString tagsfilePath(); diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp index da50a317..d7458a85 100644 --- a/parts/ctags2/ctags2_settingswidget.cpp +++ b/parts/ctags2/ctags2_settingswidget.cpp @@ -30,8 +30,8 @@ #include "ctags2_createtagfile.h" -CTags2SettingsWidget::CTags2SettingsWidget( CTags2Part * part, TQWidget* tqparent, const char* name, WFlags fl ) - : CTags2SettingsWidgetBase( tqparent, name, fl ), m_part( part ) +CTags2SettingsWidget::CTags2SettingsWidget( CTags2Part * part, TQWidget* parent, const char* name, WFlags fl ) + : CTags2SettingsWidgetBase( parent, name, fl ), m_part( part ) { binaryPath->completionObject()->setMode( KURLCompletion::FileCompletion ); binaryPath->setMode( KFile::File | KFile::LocalOnly ); diff --git a/parts/ctags2/ctags2_settingswidget.h b/parts/ctags2/ctags2_settingswidget.h index 1ee3ede0..78fb9edd 100644 --- a/parts/ctags2/ctags2_settingswidget.h +++ b/parts/ctags2/ctags2_settingswidget.h @@ -21,8 +21,8 @@ class CTags2Part; class TagsItem : public TQCheckListItem { public: - TagsItem( TQListView * tqparent, TQString name, TQString tagsfilePath, bool active ) - : TQCheckListItem( tqparent, name, TQCheckListItem::CheckBox ), m_name( name ), m_tagsfilePath( tagsfilePath ) + TagsItem( TQListView * parent, TQString name, TQString tagsfilePath, bool active ) + : TQCheckListItem( parent, name, TQCheckListItem::CheckBox ), m_name( name ), m_tagsfilePath( tagsfilePath ) { setOn( active ); setText( 1, tagsfilePath ); @@ -43,7 +43,7 @@ class CTags2SettingsWidget : public CTags2SettingsWidgetBase TQ_OBJECT public: - CTags2SettingsWidget( CTags2Part * part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + CTags2SettingsWidget( CTags2Part * part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~CTags2SettingsWidget(); signals: diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp index aba0f07f..f461182e 100644 --- a/parts/diff/diffdlg.cpp +++ b/parts/diff/diffdlg.cpp @@ -16,8 +16,8 @@ #include "diffdlg.h" #include "diffwidget.h" -DiffDlg::DiffDlg( TQWidget *tqparent, const char *name ): - KDialogBase( tqparent, name, true, i18n("Difference Viewer"), Ok ) +DiffDlg::DiffDlg( TQWidget *parent, const char *name ): + KDialogBase( parent, name, true, i18n("Difference Viewer"), Ok ) { diffWidget = new DiffWidget( this, "Main Diff Widget" ); setMainWidget( diffWidget ); diff --git a/parts/diff/diffdlg.h b/parts/diff/diffdlg.h index 574ffaef..15f997f8 100644 --- a/parts/diff/diffdlg.h +++ b/parts/diff/diffdlg.h @@ -23,7 +23,7 @@ class DiffDlg : public KDialogBase TQ_OBJECT public: - DiffDlg( TQWidget *tqparent = 0, const char *name = 0 ); + DiffDlg( TQWidget *parent = 0, const char *name = 0 ); virtual ~DiffDlg(); public slots: diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index 0943a092..932ea86e 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -41,8 +41,8 @@ static const KDevPluginInfo data("kdevdiff"); typedef KDevGenericFactory<DiffPart> DiffFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) ) -DiffPart::DiffPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevDiffFrontend(&data, tqparent, name ? name : "DiffPart"), proc(0) +DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &) + : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0) { setInstance(DiffFactory::instance()); setXMLFile("kdevdiff.rc"); diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h index 6cbd8b28..be238399 100644 --- a/parts/diff/diffpart.h +++ b/parts/diff/diffpart.h @@ -30,7 +30,7 @@ class DiffPart : public KDevDiffFrontend TQ_OBJECT public: - DiffPart( TQObject *tqparent, const char *name, const TQStringList & ); + DiffPart( TQObject *parent, const char *name, const TQStringList & ); virtual ~DiffPart(); void openURL( const KURL& url ); diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index 21e7709f..4ed1f807 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -42,7 +42,7 @@ static const int POPUP_BASE = 130977; TQStringList KDiffTextEdit::extParts; TQStringList KDiffTextEdit::extPartsTranslated; -KDiffTextEdit::KDiffTextEdit( TQWidget* tqparent, const char* name ): TQTextEdit( tqparent, name ) +KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name ) { KConfig* config = kapp->config(); config->setGroup( "Diff" ); @@ -90,7 +90,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) popup->insertSeparator( 3 ); popup->insertSeparator(); - popup->insertItem( i18n("Hide view"), tqparent(), TQT_SLOT(hideView()) ); + popup->insertItem( i18n("Hide view"), parent(), TQT_SLOT(hideView()) ); return popup; } @@ -180,8 +180,8 @@ void KDiffTextEdit::popupActivated( int id ) emit externalPartRequested( extParts[ id ] ); } -DiffWidget::DiffWidget( DiffPart * part, TQWidget *tqparent, const char *name, WFlags f ): - TQWidget( tqparent, name, f ), m_part( part ), tempFile( 0 ) +DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFlags f ): + TQWidget( parent, name, f ), m_part( part ), tempFile( 0 ) { job = 0; extPart = 0; diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h index 638073d0..abab5a8f 100644 --- a/parts/diff/diffwidget.h +++ b/parts/diff/diffwidget.h @@ -35,7 +35,7 @@ class KDiffTextEdit: public TQTextEdit Q_OBJECT TQ_OBJECT public: - KDiffTextEdit( TQWidget* tqparent = 0, const char* name = 0 ); + KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 ); virtual ~KDiffTextEdit(); void applySyntaxHighlight(); void clearSyntaxHighlight(); @@ -65,7 +65,7 @@ class DiffWidget : public TQWidget TQ_OBJECT public: - DiffWidget( DiffPart * part, TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + DiffWidget( DiffPart * part, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~DiffWidget(); public slots: diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp index 33b74c80..77e69705 100644 --- a/parts/distpart/distpart_part.cpp +++ b/parts/distpart/distpart_part.cpp @@ -37,8 +37,8 @@ typedef KDevGenericFactory<DistpartPart> DistpartFactory; static const KDevPluginInfo data("kdevdistpart"); K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) ) -DistpartPart::DistpartPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "DistpartPart") { +DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "DistpartPart") { kdDebug(9007) << "DistpartPart::DistpartPart()" << endl; setInstance(DistpartFactory::instance()); diff --git a/parts/distpart/distpart_part.h b/parts/distpart/distpart_part.h index 870ba792..161be198 100644 --- a/parts/distpart/distpart_part.h +++ b/parts/distpart/distpart_part.h @@ -38,7 +38,7 @@ class DistpartPart : public KDevPlugin { public: - DistpartPart(TQObject *tqparent, const char *name, const TQStringList &); + DistpartPart(TQObject *parent, const char *name, const TQStringList &); ~DistpartPart(); public slots: diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index 60316c25..828bbb89 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -51,8 +51,8 @@ #include "specsupport.h" #include "lsmsupport.h" -DistpartDialog::DistpartDialog(DistpartPart *part, TQWidget *tqparent) - :distpart_ui(tqparent, "dist_widget"), m_part(part) { +DistpartDialog::DistpartDialog(DistpartPart *part, TQWidget *parent) + :distpart_ui(parent, "dist_widget"), m_part(part) { m_spec = new SpecSupport(m_part); connect( customProjectCheckBox, TQT_SIGNAL(toggled(bool) ), diff --git a/parts/distpart/distpart_widget.h b/parts/distpart/distpart_widget.h index 36f70582..017a3049 100644 --- a/parts/distpart/distpart_widget.h +++ b/parts/distpart/distpart_widget.h @@ -50,7 +50,7 @@ class DistpartDialog : public distpart_ui { public: - DistpartDialog(DistpartPart *part, TQWidget *tqparent); + DistpartDialog(DistpartPart *part, TQWidget *parent); ~DistpartDialog(); signals: diff --git a/parts/documentation/addcatalogdlg.cpp b/parts/documentation/addcatalogdlg.cpp index 28be5a8c..21913089 100644 --- a/parts/documentation/addcatalogdlg.cpp +++ b/parts/documentation/addcatalogdlg.cpp @@ -32,8 +32,8 @@ #include "kdevdocumentationplugin.h" AddCatalogDlg::AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, - TQWidget* tqparent, const char* name, bool modal, WFlags fl) - :AddCatalogDlgBase(tqparent,name, modal,fl), m_plugins( plugins ) + TQWidget* parent, const char* name, bool modal, WFlags fl) + :AddCatalogDlgBase(parent,name, modal,fl), m_plugins( plugins ) { for (TQValueList<DocumentationPlugin*>::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it) { diff --git a/parts/documentation/addcatalogdlg.h b/parts/documentation/addcatalogdlg.h index ec5654fa..b0c44a5d 100644 --- a/parts/documentation/addcatalogdlg.h +++ b/parts/documentation/addcatalogdlg.h @@ -31,7 +31,7 @@ class AddCatalogDlg: public AddCatalogDlgBase Q_OBJECT TQ_OBJECT public: - AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~AddCatalogDlg(); TQString title() const; diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index c361947e..6ee782ee 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -84,16 +84,16 @@ TQString DocBookmarkOwner::currentTitle() const class DocBookmarkItem: public DocumentationItem { public: - DocBookmarkItem(Type type, KListView *tqparent, const TQString &name) - :DocumentationItem(type, tqparent, name) + DocBookmarkItem(Type type, KListView *parent, const TQString &name) + :DocumentationItem(type, parent, name) { } - DocBookmarkItem(Type type, KListView *tqparent, DocumentationItem *after, const TQString &name) - :DocumentationItem(type, tqparent, after, name) + DocBookmarkItem(Type type, KListView *parent, DocumentationItem *after, const TQString &name) + :DocumentationItem(type, parent, after, name) { } - DocBookmarkItem(Type type, DocumentationItem *tqparent, const TQString &name) - :DocumentationItem(type, tqparent, name) + DocBookmarkItem(Type type, DocumentationItem *parent, const TQString &name) + :DocumentationItem(type, parent, name) { } void setBookmark(const KBookmark &bm) { m_bm = bm; } @@ -107,8 +107,8 @@ private: //class BookmarkView -BookmarkView::BookmarkView(DocumentationWidget *tqparent, const char *name) - :TQWidget(tqparent, name), m_widget(tqparent) +BookmarkView::BookmarkView(DocumentationWidget *parent, const char *name) + :TQWidget(parent, name), m_widget(parent) { m_bmManager = new DocBookmarkManager(m_widget->part()); m_bmOwner = new DocBookmarkOwner(m_widget->part()); diff --git a/parts/documentation/bookmarkview.h b/parts/documentation/bookmarkview.h index b180478c..3dbe016a 100644 --- a/parts/documentation/bookmarkview.h +++ b/parts/documentation/bookmarkview.h @@ -52,7 +52,7 @@ class BookmarkView : public TQWidget Q_OBJECT TQ_OBJECT public: - BookmarkView(DocumentationWidget *tqparent = 0, const char *name = 0); + BookmarkView(DocumentationWidget *parent = 0, const char *name = 0); ~BookmarkView(); public slots: diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index 074f6e2b..2581f5a0 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -33,8 +33,8 @@ #include "documentation_part.h" #include "docutils.h" -ContentsView::ContentsView(DocumentationWidget *tqparent, const char *name) - :TQWidget(tqparent, name), m_widget(tqparent) +ContentsView::ContentsView(DocumentationWidget *parent, const char *name) + :TQWidget(parent, name), m_widget(parent) { TQVBoxLayout *cl = new TQVBoxLayout(this, 0, 0); m_view = new KListView(this); diff --git a/parts/documentation/contentsview.h b/parts/documentation/contentsview.h index ad323d01..34e74194 100644 --- a/parts/documentation/contentsview.h +++ b/parts/documentation/contentsview.h @@ -32,7 +32,7 @@ class ContentsView : public TQWidget Q_OBJECT TQ_OBJECT public: - ContentsView(DocumentationWidget *tqparent, const char *name = 0); + ContentsView(DocumentationWidget *parent, const char *name = 0); ~ContentsView(); KListView *view() const { return m_view; } diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp index 9068c188..b8d6071c 100644 --- a/parts/documentation/docconfiglistview.cpp +++ b/parts/documentation/docconfiglistview.cpp @@ -23,8 +23,8 @@ #include "kdevdocumentationplugin.h" -DocConfigListView::DocConfigListView(TQWidget *tqparent, const char *name) - :KListView(tqparent, name) +DocConfigListView::DocConfigListView(TQWidget *parent, const char *name) + :KListView(parent, name) { // setSorting(-1); addColumn(i18n("TOC")); diff --git a/parts/documentation/docconfiglistview.h b/parts/documentation/docconfiglistview.h index b81b0203..22cd1eb9 100644 --- a/parts/documentation/docconfiglistview.h +++ b/parts/documentation/docconfiglistview.h @@ -27,7 +27,7 @@ class DocConfigListView : public KListView Q_OBJECT TQ_OBJECT public: - DocConfigListView(TQWidget *tqparent = 0, const char *name = 0); + DocConfigListView(TQWidget *parent = 0, const char *name = 0); ~DocConfigListView(); protected slots: diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 69908881..0184c4c9 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -51,8 +51,8 @@ #include "docutils.h" DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, - DocumentationWidget *widget, TQWidget *tqparent, const char *name, WFlags fl) - :DocGlobalConfigWidgetBase(tqparent, name, fl), m_part(part), m_widget(widget) + DocumentationWidget *widget, TQWidget *parent, const char *name, WFlags fl) + :DocGlobalConfigWidgetBase(parent, name, fl), m_part(part), m_widget(widget) { m_View = new DocConfigListView( viewHolder ); viewHolder->addWidget( m_View ); diff --git a/parts/documentation/docglobalconfigwidget.h b/parts/documentation/docglobalconfigwidget.h index dc2ab3f0..2d0ec0c3 100644 --- a/parts/documentation/docglobalconfigwidget.h +++ b/parts/documentation/docglobalconfigwidget.h @@ -35,7 +35,7 @@ class DocGlobalConfigWidget : public DocGlobalConfigWidgetBase TQ_OBJECT public: DocGlobalConfigWidget(DocumentationPart *part, DocumentationWidget *widget, - TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0); + TQWidget *parent = 0, const char *name = 0, WFlags fl = 0); ~DocGlobalConfigWidget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/documentation/docprojectconfigwidget.cpp b/parts/documentation/docprojectconfigwidget.cpp index 910cd5d4..a37ad5cb 100644 --- a/parts/documentation/docprojectconfigwidget.cpp +++ b/parts/documentation/docprojectconfigwidget.cpp @@ -33,8 +33,8 @@ #include "documentation_part.h" #include "documentation_widget.h" -DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget *tqparent, const char *name) - :DocProjectConfigWidgetBase(tqparent, name), m_part(part) +DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent, const char *name) + :DocProjectConfigWidgetBase(parent, name), m_part(part) { for (TQValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin(); it != m_part->m_plugins.constEnd(); ++it) diff --git a/parts/documentation/docprojectconfigwidget.h b/parts/documentation/docprojectconfigwidget.h index 8a925a50..e770062d 100644 --- a/parts/documentation/docprojectconfigwidget.h +++ b/parts/documentation/docprojectconfigwidget.h @@ -29,7 +29,7 @@ class DocProjectConfigWidget: public DocProjectConfigWidgetBase { Q_OBJECT TQ_OBJECT public: - DocProjectConfigWidget(DocumentationPart *part, TQWidget *tqparent = 0, const char *name = 0); + DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); public slots: virtual void changeDocSystem(const TQString &text); diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index b17216d1..1e9727d1 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -76,8 +76,8 @@ static const KDevPluginInfo data("kdevdocumentation"); typedef KDevGenericFactory<DocumentationPart> DocumentationFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) ) -DocumentationPart::DocumentationPart(TQObject *tqparent, const char *name, const TQStringList& ) - :KDevPlugin(&data, tqparent, name ? name : "DocumentationPart" ), +DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& ) + :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ), m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false) { setInstance(DocumentationFactory::instance()); diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h index 1334b8ca..586002c5 100644 --- a/parts/documentation/documentation_part.h +++ b/parts/documentation/documentation_part.h @@ -46,7 +46,7 @@ class DocumentationPart : public KDevPlugin public: enum ContextFeature { Finder, IndexLookup, FullTextSearch, GotoMan, GotoInfo }; - DocumentationPart(TQObject *tqparent, const char *name, const TQStringList &); + DocumentationPart(TQObject *parent, const char *name, const TQStringList &); ~DocumentationPart(); void emitIndexSelected(IndexBox *indexBox); diff --git a/parts/documentation/editcatalogdlg.cpp b/parts/documentation/editcatalogdlg.cpp index ed8c2467..8bdc19d5 100644 --- a/parts/documentation/editcatalogdlg.cpp +++ b/parts/documentation/editcatalogdlg.cpp @@ -28,9 +28,9 @@ #include "docutils.h" #include "kdevdocumentationplugin.h" -EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* tqparent, +EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* parent, const char* name, bool modal, WFlags fl) - :EditCatalogBase(tqparent,name, modal,fl), m_plugin(plugin) + :EditCatalogBase(parent,name, modal,fl), m_plugin(plugin) { if (m_plugin->hasCapability(DocumentationPlugin::CustomDocumentationTitles)) { diff --git a/parts/documentation/editcatalogdlg.h b/parts/documentation/editcatalogdlg.h index 9f54faf8..6ee793fc 100644 --- a/parts/documentation/editcatalogdlg.h +++ b/parts/documentation/editcatalogdlg.h @@ -30,7 +30,7 @@ class EditCatalogDlg : public EditCatalogBase TQ_OBJECT public: EditCatalogDlg(DocumentationPlugin *plugin, - TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~EditCatalogDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index 5e3b72f8..594c07c5 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -41,10 +41,10 @@ #include <klocale.h> -FindDocumentation::FindDocumentation(DocumentationWidget* tqparent, const char* name) - :FindDocumentationBase(tqparent, name), +FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* name) + :FindDocumentationBase(parent, name), man_item(0), info_item(0), index_item(0), google_item(0), contents_item(0), - last_item(0), m_widget(tqparent) + last_item(0), m_widget(parent) { TQWidget* tmp = TQT_TQWIDGET(TQApplication::desktop()); setGeometry(tmp->width()/2 - width()/2, tmp->height()/2 - height()/2, width(), height()); @@ -94,11 +94,11 @@ void FindDocumentation::clickOnItem( TQListViewItem * item ) DocumentationItem* doc_item = dynamic_cast<DocumentationItem*>(item); - if(item->tqparent() == man_item || - item->tqparent() == info_item || - item->tqparent() == google_item || - item->tqparent() == index_item || - item->tqparent() == contents_item) + if(item->parent() == man_item || + item->parent() == info_item || + item->parent() == google_item || + item->parent() == index_item || + item->parent() == contents_item) m_widget->part()->partController()->showDocument(doc_item->url()); } diff --git a/parts/documentation/find_documentation.h b/parts/documentation/find_documentation.h index 25088d9a..2a9af12d 100644 --- a/parts/documentation/find_documentation.h +++ b/parts/documentation/find_documentation.h @@ -33,7 +33,7 @@ class FindDocumentation : public FindDocumentationBase Q_OBJECT TQ_OBJECT public: - FindDocumentation(DocumentationWidget* tqparent, const char* name = 0); + FindDocumentation(DocumentationWidget* parent, const char* name = 0); ~FindDocumentation(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp index 823aad2c..df04ca81 100644 --- a/parts/documentation/find_documentation_options.cpp +++ b/parts/documentation/find_documentation_options.cpp @@ -28,8 +28,8 @@ #include <kconfig.h> #include <kapplication.h> -FindDocumentationOptions::FindDocumentationOptions(TQWidget* tqparent, const char* name, bool modal) - :FindDocumentationOptionsBase(tqparent,name, modal), +FindDocumentationOptions::FindDocumentationOptions(TQWidget* parent, const char* name, bool modal) + :FindDocumentationOptionsBase(parent,name, modal), m_man_item(0), m_info_item(0), m_index_item(0), m_google_item(0), m_contents_item(0) { readOptions(); diff --git a/parts/documentation/find_documentation_options.h b/parts/documentation/find_documentation_options.h index 3fb2ed7c..1337a870 100644 --- a/parts/documentation/find_documentation_options.h +++ b/parts/documentation/find_documentation_options.h @@ -31,7 +31,7 @@ class FindDocumentationOptions : public FindDocumentationOptionsBase Q_OBJECT TQ_OBJECT public: - FindDocumentationOptions(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE); + FindDocumentationOptions(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE); ~FindDocumentationOptions(); /*$PUBLIC_FUNCTIONS$*/ virtual bool isContents( TQCheckListItem * item ); diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp index a9e240be..3f323fc5 100644 --- a/parts/documentation/indexview.cpp +++ b/parts/documentation/indexview.cpp @@ -38,8 +38,8 @@ #include "documentation_part.h" #include "documentation_widget.h" -IndexView::IndexView(DocumentationWidget *tqparent, const char *name) - :TQWidget(tqparent, name), m_widget(tqparent) +IndexView::IndexView(DocumentationWidget *parent, const char *name) + :TQWidget(parent, name), m_widget(parent) { TQVBoxLayout *l = new TQVBoxLayout(this, 0, 0); diff --git a/parts/documentation/indexview.h b/parts/documentation/indexview.h index 8fb04e4d..9ff1e12d 100644 --- a/parts/documentation/indexview.h +++ b/parts/documentation/indexview.h @@ -33,7 +33,7 @@ class IndexView : public TQWidget Q_OBJECT TQ_OBJECT public: - IndexView(DocumentationWidget *tqparent = 0, const char *name = 0); + IndexView(DocumentationWidget *parent = 0, const char *name = 0); ~IndexView(); virtual bool eventFilter(TQObject *watched, TQEvent *e); diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 14a72900..a7db4555 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -33,30 +33,30 @@ //class DocumentationItem -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *tqparent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent, const TQString &name) - :KListViewItem(tqparent, name), m_type(type) + :KListViewItem(parent, name), m_type(type) { init(); } -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem *tqparent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem *parent, const TQString &name) - :KListViewItem(tqparent, name), m_type(type) + :KListViewItem(parent, name), m_type(type) { init(); } -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *tqparent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent, KListViewItem *after, const TQString &name) - :KListViewItem(tqparent, after, name), m_type(type) + :KListViewItem(parent, after, name), m_type(type) { init(); } -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem * tqparent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem * parent, KListViewItem * after, const TQString & name ) - :KListViewItem(tqparent, after, name), m_type(type) + :KListViewItem(parent, after, name), m_type(type) { init(); } @@ -90,8 +90,8 @@ void DocumentationItem::init( ) DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, - KListView *tqparent, const TQString &name) - :DocumentationItem(DocumentationItem::Catalog, tqparent, name), m_plugin(plugin), + KListView *parent, const TQString &name) + :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin), isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false) { setExpandable(true); @@ -99,8 +99,8 @@ DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, } DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, - DocumentationItem *tqparent, const TQString &name) - :DocumentationItem(DocumentationItem::Catalog, tqparent, name), m_plugin(plugin), + DocumentationItem *parent, const TQString &name) + :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin), isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false) { setExpandable(true); @@ -181,9 +181,9 @@ IndexItem::List IndexItem::urls() const //class ConfigurationItem -ConfigurationItem::ConfigurationItem(TQListView *tqparent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, +ConfigurationItem::ConfigurationItem(TQListView *parent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, bool indexPossible, bool fullTextSearchPossible) - :TQCheckListItem(tqparent, "", TQCheckListItem::CheckBox), m_title(title), m_url(url), + :TQCheckListItem(parent, "", TQCheckListItem::CheckBox), m_title(title), m_url(url), m_origTitle(title), m_contents(true), m_index(false), m_fullTextSearch(false), m_indexPossible(indexPossible), m_fullTextSearchPossible(fullTextSearchPossible), m_docPlugin( plugin ) @@ -253,8 +253,8 @@ int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int //class DocumentationPlugin -DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, TQObject *tqparent, const char *name) - :TQObject(tqparent, name), config(pluginConfig), m_indexCreated(false) +DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, TQObject *parent, const char *name) + :TQObject(parent, name), config(pluginConfig), m_indexCreated(false) { } @@ -613,8 +613,8 @@ void DocumentationPlugin::setCatalogEnabled(const TQString &name, bool e) //class IndexBox -IndexBox::IndexBox(TQWidget *tqparent, const char *name) - :KListBox(tqparent, name), m_dirty(false) +IndexBox::IndexBox(TQWidget *parent, const char *name) + :KListBox(parent, name), m_dirty(false) { } diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h index fc7af7e3..1e70b968 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.h +++ b/parts/documentation/interfaces/kdevdocumentationplugin.h @@ -43,10 +43,10 @@ public: Document /**<Document.*/ }; - DocumentationItem(Type type, KListView *tqparent, const TQString &name); - DocumentationItem(Type type, KListView *tqparent, KListViewItem *after, const TQString &name); - DocumentationItem(Type type, KListViewItem *tqparent, const TQString &name); - DocumentationItem(Type type, KListViewItem *tqparent, KListViewItem *after, const TQString &name); + DocumentationItem(Type type, KListView *parent, const TQString &name); + DocumentationItem(Type type, KListView *parent, KListViewItem *after, const TQString &name); + DocumentationItem(Type type, KListViewItem *parent, const TQString &name); + DocumentationItem(Type type, KListViewItem *parent, KListViewItem *after, const TQString &name); virtual void setURL(const KURL &url) { m_url = url; } virtual KURL url() const { return m_url; } @@ -72,8 +72,8 @@ class DocumentationPlugin; class DocumentationCatalogItem: public DocumentationItem { public: - DocumentationCatalogItem(DocumentationPlugin* plugin, KListView *tqparent, const TQString &name); - DocumentationCatalogItem(DocumentationPlugin* plugin, DocumentationItem *tqparent, const TQString &name); + DocumentationCatalogItem(DocumentationPlugin* plugin, KListView *parent, const TQString &name); + DocumentationCatalogItem(DocumentationPlugin* plugin, DocumentationItem *parent, const TQString &name); virtual ~DocumentationCatalogItem(); DocumentationPlugin* plugin() const { return m_plugin; } @@ -136,7 +136,7 @@ private: /**Documentation index view.*/ class IndexBox: public KListBox{ public: - IndexBox(TQWidget *tqparent = 0, const char *name = 0); + IndexBox(TQWidget *parent = 0, const char *name = 0); virtual void addIndexItem(IndexItemProto *item); virtual void removeIndexItem(IndexItemProto *item); @@ -161,7 +161,7 @@ class DocumentationPlugin; class ConfigurationItem: public TQCheckListItem { public: - ConfigurationItem(TQListView *tqparent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, + ConfigurationItem(TQListView *parent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, bool indexPossible, bool fullTextSearchPossible); virtual TQString title() const { return m_title; } @@ -234,7 +234,7 @@ public: setCapabilities(Index | FullTextSearch); @endcode */ - DocumentationPlugin(KConfig *pluginConfig, TQObject *tqparent =0, const char *name =0); + DocumentationPlugin(KConfig *pluginConfig, TQObject *parent =0, const char *name =0); virtual ~DocumentationPlugin(); /**Returns the i18n name of the plugin.*/ diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index 83263fce..21b07207 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -38,9 +38,9 @@ static const KDevPluginInfo data("docchmplugin"); typedef KDevGenericFactory<DocCHMPlugin> DocCHMPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocchmplugin, DocCHMPluginFactory(data) ) -DocCHMPlugin::DocCHMPlugin(TQObject* tqparent, const char* name, TQStringList // args +DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // args ) - :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), tqparent, name) + :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), parent, name) { setCapabilities(CustomDocumentationTitles); // | Index | FullTextSearch | ProjectDocumentation autoSetup(); @@ -127,9 +127,9 @@ void DocCHMPlugin::createIndex(IndexBox* // index } -static KListViewItem* chainEnd(KListViewItem *tqparent) { - if(tqparent == 0) return 0; - KListViewItem* ret = dynamic_cast<KListViewItem*>(tqparent->firstChild()); +static KListViewItem* chainEnd(KListViewItem *parent) { + if(parent == 0) return 0; + KListViewItem* ret = dynamic_cast<KListViewItem*>(parent->firstChild()); if(ret == 0) return 0; while(ret->nextSibling() != 0) { ret = dynamic_cast<KListViewItem*>(ret->nextSibling()); @@ -163,11 +163,11 @@ void DocCHMPlugin::createTOC(DocumentationCatalogItem* item) items.push_back(item); for(TQStringList::Iterator it = lines.begin(); it != lines.end();) { bool ok1 = true, ok2 = true; - int tqparent = (*it).toInt(&ok1); + int parent = (*it).toInt(&ok1); ++it; int current = (*it).toInt(&ok2); ++it; - if(int(items.size()) != current || !ok1 || !ok2 || tqparent < 0 || tqparent >= int(items.size()) || current < 0 || current != int(items.size())) { + if(int(items.size()) != current || !ok1 || !ok2 || parent < 0 || parent >= int(items.size()) || current < 0 || current != int(items.size())) { kdDebug(9002) << "DocCHMPlugin::createTOC error while parsing output of ioslave" << endl; break; } @@ -178,9 +178,9 @@ void DocCHMPlugin::createTOC(DocumentationCatalogItem* item) ++it; items.push_back(new DocumentationItem( - DocumentationItem::Document, items[tqparent], chainEnd(items[tqparent]), decodeHTML(name))); + DocumentationItem::Document, items[parent], chainEnd(items[parent]), decodeHTML(name))); items[current]->setURL(url); - if(tqparent != 0) items[tqparent]->setType(DocumentationItem::Book); + if(parent != 0) items[parent]->setType(DocumentationItem::Book); } diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h index 3f069faf..f9d9be61 100644 --- a/parts/documentation/plugins/chm/docchmplugin.h +++ b/parts/documentation/plugins/chm/docchmplugin.h @@ -27,7 +27,7 @@ class DocCHMPlugin :public DocumentationPlugin Q_OBJECT TQ_OBJECT public: - DocCHMPlugin(TQObject* tqparent, const char* name, TQStringList args = TQStringList()); + DocCHMPlugin(TQObject* parent, const char* name, TQStringList args = TQStringList()); ~DocCHMPlugin(); virtual TQString pluginName() const; diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp index 47012a2b..fb1a028b 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.cpp +++ b/parts/documentation/plugins/custom/doccustomplugin.cpp @@ -32,9 +32,9 @@ static const KDevPluginInfo data("doccustomplugin"); typedef KDevGenericFactory<DocCustomPlugin> DocCustomPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdoccustomplugin, DocCustomPluginFactory(data) ) -DocCustomPlugin::DocCustomPlugin(TQObject* tqparent, const char* name, const TQStringList // args +DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStringList // args ) - :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), tqparent, name) + :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), parent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h index 33efec8f..cabd2554 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.h +++ b/parts/documentation/plugins/custom/doccustomplugin.h @@ -24,7 +24,7 @@ class DocCustomPlugin : public DocumentationPlugin { public: - DocCustomPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + DocCustomPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocCustomPlugin(); virtual TQString pluginName() const; diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp index 21e450a6..33a1fc77 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp @@ -41,13 +41,13 @@ class DevHelpDocumentationCatalogItem: public DocumentationCatalogItem { public: DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin, - KListView *tqparent, const TQString &name) - :DocumentationCatalogItem(plugin, tqparent, name), m_devHelpFile(devHelpFile) + KListView *parent, const TQString &name) + :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile) { } DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin, - DocumentationItem *tqparent, const TQString &name) - :DocumentationCatalogItem(plugin, tqparent, name), m_devHelpFile(devHelpFile) + DocumentationItem *parent, const TQString &name) + :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile) { } TQString devHelpFile() const { return m_devHelpFile; } @@ -73,9 +73,9 @@ static const KDevPluginInfo data("docdevhelpplugin"); typedef KDevGenericFactory<DocDevHelpPlugin> DocDevHelpPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdevhelpplugin, DocDevHelpPluginFactory(data) ) -DocDevHelpPlugin::DocDevHelpPlugin(TQObject* tqparent, const char* name, +DocDevHelpPlugin::DocDevHelpPlugin(TQObject* parent, const char* name, const TQStringList /*args*/) - :DocumentationPlugin(DocDevHelpPluginFactory::instance()->config(), tqparent, name) + :DocumentationPlugin(DocDevHelpPluginFactory::instance()->config(), parent, name) { setCapabilities(Index | FullTextSearch | ProjectDocumentation); autoSetup(); @@ -320,7 +320,7 @@ void DocDevHelpPlugin::createTOC(DocumentationCatalogItem* item) addTocSect(dhItem, childEl, baseUrl, true); } -void DocDevHelpPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement childEl, +void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, TQString baseUrl, bool book) { while (!childEl.isNull()) @@ -334,7 +334,7 @@ void DocDevHelpPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement chil name = "Index"; DocumentationItem *item = new DocumentationItem( - book ? DocumentationItem::Book : DocumentationItem::Document, tqparent, name); + book ? DocumentationItem::Book : DocumentationItem::Document, parent, name); item->setURL(KURL(baseUrl+"/"+url)); TQDomElement grandchildEl = childEl.lastChild().toElement(); diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h index dde545d3..f5deb763 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h @@ -30,7 +30,7 @@ class DocDevHelpPlugin: public DocumentationPlugin Q_OBJECT TQ_OBJECT public: - DocDevHelpPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + DocDevHelpPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocDevHelpPlugin(); virtual TQString pluginName() const; @@ -55,7 +55,7 @@ public: protected: void pushToScanStack(TQValueStack<TQString> &stack, const TQString &value); void scanDevHelpDir(const TQString &path); - void addTocSect(DocumentationItem *tqparent, TQDomElement childEl, TQString baseUrl, bool book=false); + void addTocSect(DocumentationItem *parent, TQDomElement childEl, TQString baseUrl, bool book=false); }; #endif diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp index 77997d6b..c93812ad 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp +++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp @@ -31,8 +31,8 @@ static const KAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plug typedef KDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) ) -DocDjvuPlugin::DocDjvuPlugin(TQObject* tqparent, const char* name, const TQStringList args) - :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), tqparent, name) +DocDjvuPlugin::DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args) + :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), parent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h index ec99e024..4dda28fc 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.h +++ b/parts/documentation/plugins/djvu/docdjvuplugin.h @@ -24,7 +24,7 @@ class DocDjvuPlugin : public DocumentationPlugin { public: - DocDjvuPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocDjvuPlugin(); virtual TQString pluginName() const; diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp index 999eaf4a..617988e9 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp @@ -44,13 +44,13 @@ class DoxyDocumentationCatalogItem: public DocumentationCatalogItem { public: DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin, - KListView *tqparent, const TQString &name) - :DocumentationCatalogItem(plugin, tqparent, name), m_origUrl(origUrl) + KListView *parent, const TQString &name) + :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl) { } DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin, - DocumentationItem *tqparent, const TQString &name) - :DocumentationCatalogItem(plugin, tqparent, name), m_origUrl(origUrl) + DocumentationItem *parent, const TQString &name) + :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl) { } TQString origUrl() const { return m_origUrl; } @@ -64,8 +64,8 @@ static const KDevPluginInfo data("docdoxygenplugin"); typedef KDevGenericFactory<DocDoxygenPlugin> DocDoxygenPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) ) -DocDoxygenPlugin::DocDoxygenPlugin(TQObject* tqparent, const char* name, const TQStringList) - :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), tqparent, name) +DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList) + :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), parent, name) { setCapabilities(Index | FullTextSearch | ProjectDocumentation | CustomDocumentationTitles ); autoSetup(); diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h index b3755cbe..2a593655 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h @@ -30,7 +30,7 @@ class DocDoxygenPlugin: public DocumentationPlugin Q_OBJECT TQ_OBJECT public: - DocDoxygenPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocDoxygenPlugin(); virtual TQString pluginName() const; diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp index 5829b0bb..6fc8a78e 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp @@ -43,13 +43,13 @@ class TOCDocumentationCatalogItem: public DocumentationCatalogItem { public: TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin, - KListView *tqparent, const TQString &name) - :DocumentationCatalogItem(plugin, tqparent, name), m_tocFile(tocFile) + KListView *parent, const TQString &name) + :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile) { } TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin, - DocumentationItem *tqparent, const TQString &name) - :DocumentationCatalogItem(plugin, tqparent, name), m_tocFile(tocFile) + DocumentationItem *parent, const TQString &name) + :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile) { } TQString tocFile() const { return m_tocFile; } @@ -63,9 +63,9 @@ static const KDevPluginInfo data("dockdevtocplugin"); typedef KDevGenericFactory<DocKDevTOCPlugin> DocKDevTOCPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdockdevtocplugin, DocKDevTOCPluginFactory(data) ) -DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* tqparent, const char* name, +DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList /*args*/) - :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), tqparent, name) + :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), parent, name) { setCapabilities(Index); autoSetup(); @@ -210,7 +210,7 @@ void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item) addTocSect(tocItem, childEl, base, 1); } -void DocKDevTOCPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement childEl, const TQString &base, uint level) +void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level) { while (!childEl.isNull()) { @@ -219,7 +219,7 @@ void DocKDevTOCPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement chil TQString name = childEl.attribute("name"); TQString url = childEl.attribute("url"); - DocumentationItem *item = new DocumentationItem(level == 1 ? DocumentationItem::Book : DocumentationItem::Document, tqparent, name); + DocumentationItem *item = new DocumentationItem(level == 1 ? DocumentationItem::Book : DocumentationItem::Document, parent, name); item->setURL(KURL(constructURL(base, url))); TQDomElement grandchildEl = childEl.lastChild().toElement(); diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h index fc980247..4fa08a38 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h @@ -29,7 +29,7 @@ class DocKDevTOCPlugin : public DocumentationPlugin Q_OBJECT TQ_OBJECT public: - DocKDevTOCPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocKDevTOCPlugin(); virtual TQString pluginName() const; @@ -48,7 +48,7 @@ public: virtual void autoSetupPlugin(); protected: - void addTocSect(DocumentationItem *tqparent, TQDomElement childEl, const TQString &base, uint level); + void addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level); static TQString constructURL(const TQString &base, const TQString &url) ; }; diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp index 17089c89..cddc9106 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.cpp +++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp @@ -31,8 +31,8 @@ static const KAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation pl typedef KDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) ) -DocPDBPlugin::DocPDBPlugin(TQObject* tqparent, const char* name, const TQStringList args) - :DocumentationPlugin(DocPDBPluginFactory::instance()->config(), tqparent, name) +DocPDBPlugin::DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args) + :DocumentationPlugin(DocPDBPluginFactory::instance()->config(), parent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); diff --git a/parts/documentation/plugins/pdb/docpdbplugin.h b/parts/documentation/plugins/pdb/docpdbplugin.h index 33bb5ded..5fb85cdd 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.h +++ b/parts/documentation/plugins/pdb/docpdbplugin.h @@ -24,7 +24,7 @@ class DocPDBPlugin : public DocumentationPlugin { public: - DocPDBPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocPDBPlugin(); virtual TQString pluginName() const; diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp index 8fa76deb..898fcc0e 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.cpp +++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp @@ -31,8 +31,8 @@ static const KAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin typedef KDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) ) -DocPDFPlugin::DocPDFPlugin(TQObject* tqparent, const char* name, const TQStringList args) - :DocumentationPlugin(DocPDFPluginFactory::instance()->config(), tqparent, name) +DocPDFPlugin::DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args) + :DocumentationPlugin(DocPDFPluginFactory::instance()->config(), parent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); diff --git a/parts/documentation/plugins/pdf/docpdfplugin.h b/parts/documentation/plugins/pdf/docpdfplugin.h index e3a9c099..0d97101b 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.h +++ b/parts/documentation/plugins/pdf/docpdfplugin.h @@ -24,7 +24,7 @@ class DocPDFPlugin : public DocumentationPlugin { public: - DocPDFPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocPDFPlugin(); virtual TQString pluginName() const; diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp index ee90caa0..257a8cc2 100644 --- a/parts/documentation/plugins/qt/docqtplugin.cpp +++ b/parts/documentation/plugins/qt/docqtplugin.cpp @@ -41,13 +41,13 @@ class TQtDocumentationCatalogItem: public DocumentationCatalogItem { public: TQtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, - KListView *tqparent, const TQString &name) - :DocumentationCatalogItem(plugin, tqparent, name), m_dcfFile(dcfFile) + KListView *parent, const TQString &name) + :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile) { } TQtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, - DocumentationItem *tqparent, const TQString &name) - :DocumentationCatalogItem(plugin, tqparent, name), m_dcfFile(dcfFile) + DocumentationItem *parent, const TQString &name) + :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile) { } TQString dcfFile() const { return m_dcfFile; } @@ -60,8 +60,8 @@ static const KDevPluginInfo data("docqtplugin"); typedef KDevGenericFactory<DocQtPlugin> DocQtPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) ) -DocQtPlugin::DocQtPlugin(TQObject* tqparent, const char* name, const TQStringList) - :DocumentationPlugin(DocQtPluginFactory::instance()->config(), tqparent, name) +DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList) + :DocumentationPlugin(DocQtPluginFactory::instance()->config(), parent, name) { setCapabilities(Index | FullTextSearch | CustomDocumentationTitles); autoSetup(); diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h index afc7cf76..256be733 100644 --- a/parts/documentation/plugins/qt/docqtplugin.h +++ b/parts/documentation/plugins/qt/docqtplugin.h @@ -30,7 +30,7 @@ class DocQtPlugin : public DocumentationPlugin Q_OBJECT TQ_OBJECT public: - DocQtPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + DocQtPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~DocQtPlugin(); virtual TQString pluginName() const; diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index e40ad5a9..e1528d03 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -76,7 +76,7 @@ ChmProtocol::~ChmProtocol() void ChmProtocol::get( const KURL& url ) { /** When :catalog is appended to the end, a plain-text representation of the catalog - * is given out where each entry consists of four lines, an integer representing the tqparent + * is given out where each entry consists of four lines, an integer representing the parent * of the node, an integer representing a node's ID, the Title of the Node, and it's hyperlink. * When :contents is appended, all contained htm- and html-files will be printed, each in a line. */ diff --git a/parts/documentation/protocols/chm/decompress.cpp b/parts/documentation/protocols/chm/decompress.cpp index 212eb244..f411e8ec 100644 --- a/parts/documentation/protocols/chm/decompress.cpp +++ b/parts/documentation/protocols/chm/decompress.cpp @@ -228,7 +228,7 @@ int LZXinit(int window) { * REMOVE_BITS(n) removes N bits from the bit buffer * * These bit access routines work by using the area beyond the MSB and the - * LSB as a free source of zeroes. This avoids having to tqmask any bits. + * LSB as a free source of zeroes. This avoids having to mask any bits. * So we have to know the bit width of the bitbuffer variable. This is * sizeof(ULONG) * 8, also defined as ULONG_BITS */ @@ -328,9 +328,9 @@ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) { register UBYTE bit_num = 1; ULONG fill; ULONG pos = 0; /* the current position in the decode table */ - ULONG table_tqmask = 1 << nbits; - ULONG bit_tqmask = table_tqmask >> 1; /* don't do 0 length codes */ - ULONG next_symbol = bit_tqmask; /* base of allocation for long codes */ + ULONG table_mask = 1 << nbits; + ULONG bit_mask = table_mask >> 1; /* don't do 0 length codes */ + ULONG next_symbol = bit_mask; /* base of allocation for long codes */ /* fill entries for codes short enough for a direct mapping */ while (bit_num <= nbits) @@ -341,27 +341,27 @@ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) { { leaf = pos; - if ((pos += bit_tqmask) > table_tqmask) return 1; /* table overrun */ + if ((pos += bit_mask) > table_mask) return 1; /* table overrun */ /* fill all possible lookups of this symbol with the symbol itself */ - fill = bit_tqmask; + fill = bit_mask; while (fill-- > 0) table[leaf++] = sym; } } - bit_tqmask >>= 1; + bit_mask >>= 1; bit_num++; } /* if there are any codes longer than nbits */ - if (pos != table_tqmask) + if (pos != table_mask) { /* clear the remainder of the table */ - for (sym = pos; sym < table_tqmask; sym++) table[sym] = 0; + for (sym = pos; sym < table_mask; sym++) table[sym] = 0; /* give ourselves room for codes to grow by up to 16 more bits */ pos <<= 16; - table_tqmask <<= 16; - bit_tqmask = 1 << 15; + table_mask <<= 16; + bit_mask = 1 << 15; while (bit_num <= 16) { @@ -385,16 +385,16 @@ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) { } table[leaf] = sym; - if ((pos += bit_tqmask) > table_tqmask) return 1; /* table overflow */ + if ((pos += bit_mask) > table_mask) return 1; /* table overflow */ } } - bit_tqmask >>= 1; + bit_mask >>= 1; bit_num++; } } /* full table? */ - if (pos == table_tqmask) return 0; + if (pos == table_mask) return 0; /* either erroneous table, or all elements are 0 - let's find out. */ for (sym = 0; sym < nsyms; sym++) if (length[sym]) return 1; @@ -555,7 +555,7 @@ int LZXdecompress(UBYTE* inpos, int inlen, UBYTE* outpos, int outlen) { togo -= this_run; LZX(block_remaining) -= this_run; - /* apply 2^x-1 tqmask */ + /* apply 2^x-1 mask */ window_posn &= window_size - 1; /* runs can't straddle the window wraparound */ if ((window_posn + this_run) > window_size) diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index 951c718a..b1d9d166 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -35,8 +35,8 @@ extern "C" KInstance* KChmPartFactory::s_instance = 0L; KAboutData* KChmPartFactory::s_about = 0L; -KChmPartFactory::KChmPartFactory( TQObject* tqparent, const char* name ) - : KParts::Factory( tqparent, name ) +KChmPartFactory::KChmPartFactory( TQObject* parent, const char* name ) + : KParts::Factory( parent, name ) { } @@ -66,7 +66,7 @@ KInstance* KChmPartFactory::instance() } -KChmPart::KChmPart( TQWidget * tqparent, const char * name ) +KChmPart::KChmPart( TQWidget * parent, const char * name ) : KDevHTMLPart( ), m_job(0) { KInstance * instance = new KInstance( "kchmpart" ); diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 7cbda958..7b5209fd 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -35,12 +35,12 @@ class KChmPartFactory: public KParts::Factory Q_OBJECT TQ_OBJECT public: - KChmPartFactory( TQObject *tqparent = 0, const char *name = 0 ); + KChmPartFactory( TQObject *parent = 0, const char *name = 0 ); virtual ~KChmPartFactory(); virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ); static KInstance *instance(); diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 51700470..73afd9d0 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -49,8 +49,8 @@ #include "documentation_part.h" #include "docutils.h" -SearchView::SearchView(DocumentationPart *part, TQWidget *tqparent, const char *name) - :TQWidget(tqparent, name), m_part(part) +SearchView::SearchView(DocumentationPart *part, TQWidget *parent, const char *name) + :TQWidget(parent, name), m_part(part) { TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); diff --git a/parts/documentation/searchview.h b/parts/documentation/searchview.h index e1d9d106..b2820eb3 100644 --- a/parts/documentation/searchview.h +++ b/parts/documentation/searchview.h @@ -35,7 +35,7 @@ class SearchView: public TQWidget Q_OBJECT TQ_OBJECT public: - SearchView(DocumentationPart *part, TQWidget *tqparent = 0, const char *name = 0); + SearchView(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); ~SearchView(); public slots: diff --git a/parts/documentation/selecttopic.cpp b/parts/documentation/selecttopic.cpp index ef35a2a1..4dab4d83 100644 --- a/parts/documentation/selecttopic.cpp +++ b/parts/documentation/selecttopic.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "selecttopic.h" -SelectTopic::SelectTopic(IndexItem::List &urls, TQWidget *tqparent, const char *name) - :SelectTopicBase(tqparent, name), m_urls(urls) +SelectTopic::SelectTopic(IndexItem::List &urls, TQWidget *parent, const char *name) + :SelectTopicBase(parent, name), m_urls(urls) { for (IndexItem::List::const_iterator it = m_urls.begin(); it != m_urls.end(); ++it) topicBox->insertItem((*it).first); diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h index e90f893c..df45365a 100644 --- a/parts/documentation/selecttopic.h +++ b/parts/documentation/selecttopic.h @@ -28,7 +28,7 @@ class SelectTopic: public SelectTopicBase{ Q_OBJECT TQ_OBJECT public: - SelectTopic(IndexItem::List &urls, TQWidget *tqparent = 0, const char *name = 0); + SelectTopic(IndexItem::List &urls, TQWidget *parent = 0, const char *name = 0); KURL selectedURL(); public slots: diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index cec37b02..56877315 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -39,9 +39,9 @@ #define INDEXER -ProgressDialog::ProgressDialog(bool index, TQWidget *tqparent, const char *name) +ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) :KDialogBase(KDialogBase::Plain, i18n("Generating Search Index"), Cancel | Ok, Close, - tqparent, name, false) + parent, name, false) { proc = 0; diff --git a/parts/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h index 06746ad5..661eed74 100644 --- a/parts/documentation/tools/htdig/htdigindex.h +++ b/parts/documentation/tools/htdig/htdigindex.h @@ -27,7 +27,7 @@ class ProgressDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ProgressDialog(bool index, TQWidget *tqparent=0, const char *name=0); + ProgressDialog(bool index, TQWidget *parent=0, const char *name=0); ~ProgressDialog(); void addDir(const TQString &dir); diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp index f1f28473..4bf4a217 100644 --- a/parts/doxygen/doxygenconfigwidget.cpp +++ b/parts/doxygen/doxygenconfigwidget.cpp @@ -27,8 +27,8 @@ #include "messages.h" -DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *tqparent, const char *name) - : TQTabWidget(tqparent, name) +DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *parent, const char *name) + : TQTabWidget(parent, name) { m_hasChanged = false; m_dependencies = new TQDict< TQPtrList<IInput> >(257); @@ -184,12 +184,12 @@ void DoxygenConfigWidget::addDependency(TQDict<TQObject> *switches, if (dep.isEmpty()) return; - IInput *tqparent = m_inputWidgets->find(dep); - Q_ASSERT(tqparent!=0); + IInput *parent = m_inputWidgets->find(dep); + Q_ASSERT(parent!=0); IInput *child = m_inputWidgets->find(name); Q_ASSERT(child!=0); if (!switches->find(dep)) - switches->insert(dep, tqparent->qobject()); + switches->insert(dep, parent->qobject()); TQPtrList<IInput> *list = m_dependencies->find(dep); if (!list) { list = new TQPtrList<IInput>; diff --git a/parts/doxygen/doxygenconfigwidget.h b/parts/doxygen/doxygenconfigwidget.h index 54584f07..d2b15a6d 100644 --- a/parts/doxygen/doxygenconfigwidget.h +++ b/parts/doxygen/doxygenconfigwidget.h @@ -27,7 +27,7 @@ class DoxygenConfigWidget : public TQTabWidget TQ_OBJECT public: - DoxygenConfigWidget( const TQString &fileName, TQWidget *tqparent=0, const char *name=0 ); + DoxygenConfigWidget( const TQString &fileName, TQWidget *parent=0, const char *name=0 ); ~DoxygenConfigWidget(); public slots: diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index 29265ceb..ec01df98 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -51,8 +51,8 @@ typedef KDevGenericFactory<DoxygenPart> DoxygenFactory; static const KDevPluginInfo data("kdevdoxygen"); K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) ) -DoxygenPart::DoxygenPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) +DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) { setInstance(DoxygenFactory::instance()); setXMLFile("kdevdoxygen.rc"); diff --git a/parts/doxygen/doxygenpart.h b/parts/doxygen/doxygenpart.h index a77545c9..307ead18 100644 --- a/parts/doxygen/doxygenpart.h +++ b/parts/doxygen/doxygenpart.h @@ -43,7 +43,7 @@ class DoxygenPart : public KDevPlugin TQ_OBJECT public: - DoxygenPart( TQObject *tqparent, const char *name, const TQStringList & ); + DoxygenPart( TQObject *parent, const char *name, const TQStringList & ); ~DoxygenPart(); private slots: diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp index de1577f1..2904ca0a 100644 --- a/parts/doxygen/input.cpp +++ b/parts/doxygen/input.cpp @@ -110,8 +110,8 @@ static const char* const update_xpm_data[] = const char **update_xpm = (const char **)update_xpm_data; -InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * tqparent, bool &flag) - : TQWidget(tqparent), state(flag), key(k) +InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent, bool &flag) + : TQWidget(parent), state(flag), key(k) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); cb = new TQCheckBox(text,this); @@ -151,8 +151,8 @@ void InputBool::setEnabled(bool b) } -InputInt::InputInt(const TQString &label, TQWidget *tqparent, int &val, int minVal, int maxVal) - : TQWidget(tqparent), m_val(val), m_minVal(minVal), m_maxVal(maxVal) +InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal, int maxVal) + : TQWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5); @@ -197,8 +197,8 @@ void InputInt::setEnabled(bool state) InputString::InputString(const TQString & label, - TQWidget *tqparent, TQCString &s, StringMode m) - : TQWidget(tqparent), str(s), sm(m), m_values(0), m_index(0) + TQWidget *parent, TQCString &s, StringMode m) + : TQWidget(parent), str(s), sm(m), m_values(0), m_index(0) { le = 0; br = 0; com = 0; @@ -324,8 +324,8 @@ void InputString::browse() InputStrList::InputStrList(const TQString & label, - TQWidget *tqparent, TQStrList &sl, ListMode lm) - : TQWidget(tqparent), strList(sl) + TQWidget *parent, TQStrList &sl, ListMode lm) + : TQWidget(parent), strList(sl) { TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2, 5); diff --git a/parts/doxygen/input.h b/parts/doxygen/input.h index ac73ce20..2ce85a3d 100644 --- a/parts/doxygen/input.h +++ b/parts/doxygen/input.h @@ -39,7 +39,7 @@ class InputBool : public TQWidget, public IInput TQ_OBJECT public: - InputBool(const TQCString &key, const TQString &text, TQWidget *tqparent, bool &flag); + InputBool(const TQCString &key, const TQString &text, TQWidget *parent, bool &flag); ~InputBool(); void init(); @@ -67,7 +67,7 @@ class InputInt : public TQWidget, public IInput TQ_OBJECT public: - InputInt(const TQString &text, TQWidget *tqparent, + InputInt(const TQString &text, TQWidget *parent, int &val, int minVal, int maxVal); ~InputInt(); @@ -102,7 +102,7 @@ public: StringFixed=3 }; - InputString(const TQString &text, TQWidget *tqparent, + InputString(const TQString &text, TQWidget *parent, TQCString &s, StringMode m=StringFree); ~InputString(); @@ -143,7 +143,7 @@ public: ListFileDir=ListFile|ListDir }; - InputStrList(const TQString &text, TQWidget *tqparent, + InputStrList(const TQString &text, TQWidget *parent, TQStrList &sl, ListMode v=ListString); ~InputStrList(); diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp index ca31669f..93914a2f 100644 --- a/parts/filecreate/addglobaldlg.cpp +++ b/parts/filecreate/addglobaldlg.cpp @@ -21,14 +21,14 @@ #include <klocale.h> /* - * Constructs a AddGlobalDlg as a child of 'tqparent', with the + * Constructs a AddGlobalDlg as a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -AddGlobalDlg::AddGlobalDlg( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : TQDialog( tqparent, name, modal, fl ) +AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ) { if ( !name ) diff --git a/parts/filecreate/addglobaldlg.h b/parts/filecreate/addglobaldlg.h index 2e7435dc..32605ace 100644 --- a/parts/filecreate/addglobaldlg.h +++ b/parts/filecreate/addglobaldlg.h @@ -26,7 +26,7 @@ class AddGlobalDlg : public TQDialog TQ_OBJECT public: - AddGlobalDlg( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + AddGlobalDlg( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddGlobalDlg(); TQPushButton* buttonHelp; diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp index 201fb65f..d670c8e3 100644 --- a/parts/filecreate/fcconfigwidget.cpp +++ b/parts/filecreate/fcconfigwidget.cpp @@ -39,8 +39,8 @@ #include "kdevpartcontroller.h" -FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *tqparent, const char *name): - FCConfigWidgetBase(tqparent, name), m_part(part), m_global(global) +FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name): + FCConfigWidgetBase(parent, name), m_part(part), m_global(global) { fc_view->setSorting(-1, FALSE); fcglobal_view->setSorting(-1, FALSE); @@ -217,7 +217,7 @@ void FCConfigWidget::saveProjectConfig() TQListViewItemIterator it( fcglobal_view ); for( ; it.current( ); ++it ){ - if (!it.current()->tqparent()) + if (!it.current()->parent()) { TQCheckListItem *chit = dynamic_cast<TQCheckListItem*>(it.current()); if ( !chit ) continue; @@ -271,7 +271,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element { TQListViewItemIterator it( fc_view ); for( ; it.current( ); ++it ){ - if (!it.current()->tqparent()) + if (!it.current()->parent()) { TQDomElement type = dom.createElement( "type" ); type.setAttribute( "ext", it.current()->text(0) ); @@ -434,15 +434,15 @@ void FCConfigWidget::copyToProject_button_clicked() { TQListViewItem *it_copy_parent = 0; TQString destParent; - if (it->tqparent()) + if (it->parent()) { - it_copy_parent = new TQListViewItem(fc_view, it->tqparent()->text(0), - it->tqparent()->text(1), - it->tqparent()->text(2), - it->tqparent()->text(3), - locate("data", "kdevfilecreate/file-templates/"+ it->tqparent()->text(0))); - destParent += it->tqparent()->text(0) + "-"; - TQCheckListItem *chk = dynamic_cast<TQCheckListItem*>(it->tqparent()); + it_copy_parent = new TQListViewItem(fc_view, it->parent()->text(0), + it->parent()->text(1), + it->parent()->text(2), + it->parent()->text(3), + locate("data", "kdevfilecreate/file-templates/"+ it->parent()->text(0))); + destParent += it->parent()->text(0) + "-"; + TQCheckListItem *chk = dynamic_cast<TQCheckListItem*>(it->parent()); if (chk) chk->setOn(false); } @@ -497,7 +497,7 @@ void FCConfigWidget::newtype_button_clicked() void FCConfigWidget::newsubtype_button_clicked() { - if (fc_view->currentItem() && (!fc_view->currentItem()->tqparent())) + if (fc_view->currentItem() && (!fc_view->currentItem()->parent())) { FCTypeEdit *te = new FCTypeEdit(this); if (te->exec() == TQDialog::Accepted ) @@ -541,10 +541,10 @@ void FCConfigWidget::moveup_button_clicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); + TQListViewItem *parent = i->parent(); --it; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; --it; } @@ -564,10 +564,10 @@ void FCConfigWidget::movedown_button_clicked() return; TQListViewItemIterator it( i ); - TQListViewItem *tqparent = i->tqparent(); + TQListViewItem *parent = i->parent(); it++; while ( it.current() ) { - if ( it.current()->tqparent() == tqparent ) + if ( it.current()->parent() == parent ) break; it++; } @@ -662,8 +662,8 @@ void FCConfigWidget::edit_type_content_button_clicked( ) return; TQListViewItem *it = fc_view->currentItem(); TQString type_name = it->text(0); - if (it->tqparent()) - type_name.prepend(it->tqparent()->text(0) + "-"); + if (it->parent()) + type_name.prepend(it->parent()->text(0) + "-"); if (!m_global) { TQString typePath = m_part->project()->projectDirectory() + "/templates/" + type_name; diff --git a/parts/filecreate/fcconfigwidget.h b/parts/filecreate/fcconfigwidget.h index 19087ba6..24e97932 100644 --- a/parts/filecreate/fcconfigwidget.h +++ b/parts/filecreate/fcconfigwidget.h @@ -31,7 +31,7 @@ class FCConfigWidget : public FCConfigWidgetBase Q_OBJECT TQ_OBJECT public: - FCConfigWidget(FileCreatePart * part, bool global, TQWidget *tqparent, const char *name); + FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name); ~FCConfigWidget(); diff --git a/parts/filecreate/fctemplateedit.cpp b/parts/filecreate/fctemplateedit.cpp index 1fcc6e02..b019ddb9 100644 --- a/parts/filecreate/fctemplateedit.cpp +++ b/parts/filecreate/fctemplateedit.cpp @@ -11,8 +11,8 @@ #include "fctemplateedit.h" #include <tqpushbutton.h> -FCTemplateEdit::FCTemplateEdit(TQWidget *tqparent, const char *name): - FCTemplateEditBase(tqparent, name) +FCTemplateEdit::FCTemplateEdit(TQWidget *parent, const char *name): + FCTemplateEditBase(parent, name) { connect( templatename_edit, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT( slotTemplateNameChanged( ))); diff --git a/parts/filecreate/fctemplateedit.h b/parts/filecreate/fctemplateedit.h index a5a0c2f6..a1fe6e2e 100644 --- a/parts/filecreate/fctemplateedit.h +++ b/parts/filecreate/fctemplateedit.h @@ -19,7 +19,7 @@ class FCTemplateEdit : public FCTemplateEditBase Q_OBJECT TQ_OBJECT public: - FCTemplateEdit(TQWidget *tqparent=0, const char *name=0); + FCTemplateEdit(TQWidget *parent=0, const char *name=0); ~FCTemplateEdit(); diff --git a/parts/filecreate/fctypeedit.cpp b/parts/filecreate/fctypeedit.cpp index dfb29ef6..5ee4eb0d 100644 --- a/parts/filecreate/fctypeedit.cpp +++ b/parts/filecreate/fctypeedit.cpp @@ -13,8 +13,8 @@ #include "fctypeedit.h" -FCTypeEdit::FCTypeEdit(TQWidget *tqparent, char *name) - : FCTypeEditBase(tqparent, name) +FCTypeEdit::FCTypeEdit(TQWidget *parent, char *name) + : FCTypeEditBase(parent, name) { connect( typeext_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged())); connect( typename_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged( ))); diff --git a/parts/filecreate/fctypeedit.h b/parts/filecreate/fctypeedit.h index 122b0b57..40bee906 100644 --- a/parts/filecreate/fctypeedit.h +++ b/parts/filecreate/fctypeedit.h @@ -19,7 +19,7 @@ class FCTypeEdit : public FCTypeEditBase Q_OBJECT TQ_OBJECT public: - FCTypeEdit(TQWidget *tqparent = 0, char *name = 0); + FCTypeEdit(TQWidget *parent = 0, char *name = 0); ~FCTypeEdit(); diff --git a/parts/filecreate/filecreate_filedialog.cpp b/parts/filecreate/filecreate_filedialog.cpp index 1baa2132..ecc8df42 100644 --- a/parts/filecreate/filecreate_filedialog.cpp +++ b/parts/filecreate/filecreate_filedialog.cpp @@ -21,9 +21,9 @@ namespace FileCreate { FileDialog::FileDialog(const TQString& startDir, const TQString& filter, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal, TQWidget * extraWidget) : - KFileDialog(startDir, filter, tqparent, name, modal, extraWidget) { + KFileDialog(startDir, filter, parent, name, modal, extraWidget) { setOperationMode(Saving); diff --git a/parts/filecreate/filecreate_filedialog.h b/parts/filecreate/filecreate_filedialog.h index 26852cfc..a2785b54 100644 --- a/parts/filecreate/filecreate_filedialog.h +++ b/parts/filecreate/filecreate_filedialog.h @@ -25,7 +25,7 @@ namespace FileCreate { public: FileDialog(const TQString& startDir, const TQString& filter, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal, TQWidget * extraWidget); virtual ~FileDialog(); diff --git a/parts/filecreate/filecreate_newfile.cpp b/parts/filecreate/filecreate_newfile.cpp index 6b41bb0b..b4b84de1 100644 --- a/parts/filecreate/filecreate_newfile.cpp +++ b/parts/filecreate/filecreate_newfile.cpp @@ -29,9 +29,9 @@ namespace FileCreate { - NewFileChooser::NewFileChooser(TQWidget * tqparent) : + NewFileChooser::NewFileChooser(TQWidget * parent) : KDialogBase(KDialogBase::Plain, i18n("New file dialog (title)", "New File"), KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, tqparent, "New file", true) + KDialogBase::Ok, parent, "New file", true) { TQVBoxLayout* lay = new TQVBoxLayout( plainPage(), 5, 5 ); diff --git a/parts/filecreate/filecreate_newfile.h b/parts/filecreate/filecreate_newfile.h index 04239e90..ab04dec9 100644 --- a/parts/filecreate/filecreate_newfile.h +++ b/parts/filecreate/filecreate_newfile.h @@ -28,7 +28,7 @@ namespace FileCreate { Q_OBJECT TQ_OBJECT public: - NewFileChooser(TQWidget *tqparent=0); + NewFileChooser(TQWidget *parent=0); virtual ~NewFileChooser(); void setFileTypes(TQPtrList<FileType> typelist); KURL url() const; diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index e7ad379e..75523c5d 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -61,9 +61,9 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) ) using namespace FileCreate; -FileCreatePart::FileCreatePart(TQObject *tqparent, const char *name, const TQStringList & ) -// : KDevCreateFile(&data, tqparent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) - : KDevCreateFile(&data, tqparent, name ? name : "FileCreatePart"), m_subPopups(0) +FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & ) +// : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) + : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0) { setInstance(FileCreateFactory::instance()); setXMLFile("kdevpart_filecreate.rc"); @@ -483,7 +483,7 @@ void FileCreatePart::slotInitialize( ) } } else { // if an extension + subtype have been specified, enable - // the subtype and the extension (the 'tqparent') + // the subtype and the extension (the 'parent') FileType * filetype = getType(ext); FileType * subtype = getType(ext,subtyperef); if (filetype && subtype) { diff --git a/parts/filecreate/filecreate_part.h b/parts/filecreate/filecreate_part.h index c8da5b27..574541fb 100644 --- a/parts/filecreate/filecreate_part.h +++ b/parts/filecreate/filecreate_part.h @@ -43,7 +43,7 @@ class FileCreatePart : public KDevCreateFile friend class FCConfigWidget; public: - FileCreatePart(TQObject *tqparent, const char *name, const TQStringList &); + FileCreatePart(TQObject *parent, const char *name, const TQStringList &); virtual ~FileCreatePart(); /** diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp index ca37957a..840d62b4 100644 --- a/parts/filecreate/filecreate_widget2.cpp +++ b/parts/filecreate/filecreate_widget2.cpp @@ -67,7 +67,7 @@ namespace FileCreate { else kdDebug(9034) << "No match!" << endl; } - // If an exact match is not found (e.g. current points to a 'tqparent' type) then + // If an exact match is not found (e.g. current points to a 'parent' type) then // look instead for an extension match if (changeToRow==-1) { for(it = typeForRow.begin(); it!= typeForRow.end() && changeToRow==-1; ++it) { diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp index 282426c0..5d307bff 100644 --- a/parts/filecreate/filecreate_widget3.cpp +++ b/parts/filecreate/filecreate_widget3.cpp @@ -70,7 +70,7 @@ namespace FileCreate { lvi = lvi->nextSibling(); else { while (lvi && !lvi->nextSibling()) - lvi = lvi->tqparent(); + lvi = lvi->parent(); } } diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp index 4e53e9f3..9fd8fe31 100644 --- a/parts/filelist/filelist_item.cpp +++ b/parts/filelist/filelist_item.cpp @@ -20,8 +20,8 @@ FileListItem * FileListItem::s_activeItem = 0; -FileListItem::FileListItem( TQListView * tqparent, KURL const & url, DocumentState state ) - : TQListViewItem( tqparent, url.fileName() ), +FileListItem::FileListItem( TQListView * parent, KURL const & url, DocumentState state ) + : TQListViewItem( parent, url.fileName() ), _url( url ) { diff --git a/parts/filelist/filelist_item.h b/parts/filelist/filelist_item.h index fd0d0a77..6b88b09e 100644 --- a/parts/filelist/filelist_item.h +++ b/parts/filelist/filelist_item.h @@ -23,7 +23,7 @@ class FileListItem : public TQListViewItem { public: - FileListItem( TQListView * tqparent, KURL const & url, DocumentState = Clean ); + FileListItem( TQListView * parent, KURL const & url, DocumentState = Clean ); KURL url(); diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp index 5f026628..49fed3bf 100644 --- a/parts/filelist/filelist_widget.cpp +++ b/parts/filelist/filelist_widget.cpp @@ -34,8 +34,8 @@ * @param part * @return */ -FileListWidget::FileListWidget(ProjectviewPart *part, TQWidget *tqparent) - : KListView(tqparent), TQToolTip( viewport() ), _part( part ) +FileListWidget::FileListWidget(ProjectviewPart *part, TQWidget *parent) + : KListView(parent), TQToolTip( viewport() ), _part( part ) { addColumn( "" ); header()->hide(); diff --git a/parts/filelist/filelist_widget.h b/parts/filelist/filelist_widget.h index f2c2bd51..3de67a57 100644 --- a/parts/filelist/filelist_widget.h +++ b/parts/filelist/filelist_widget.h @@ -37,7 +37,7 @@ class FileListWidget : public KListView, public TQToolTip public: - FileListWidget(ProjectviewPart *part, TQWidget *tqparent=0); + FileListWidget(ProjectviewPart *part, TQWidget *parent=0); ~FileListWidget(); protected: diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp index c552a5fd..0f138e1a 100644 --- a/parts/filelist/projectviewconfig.cpp +++ b/parts/filelist/projectviewconfig.cpp @@ -25,8 +25,8 @@ #include <kapplication.h> -ProjectviewConfig::ProjectviewConfig(TQWidget *tqparent, const char *name) - : ProjectviewConfigBase(tqparent, name) +ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name) + : ProjectviewConfigBase(parent, name) { KConfig * config = kapp->config(); config->setGroup("File List Plugin"); diff --git a/parts/filelist/projectviewconfig.h b/parts/filelist/projectviewconfig.h index d81de3a9..6ebf2ef5 100644 --- a/parts/filelist/projectviewconfig.h +++ b/parts/filelist/projectviewconfig.h @@ -29,7 +29,7 @@ class ProjectviewConfig: public ProjectviewConfigBase Q_OBJECT TQ_OBJECT public: - ProjectviewConfig(TQWidget *tqparent = 0, const char *name = 0); + ProjectviewConfig(TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 2fa329dd..903f1dd1 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -68,8 +68,8 @@ K_EXPORT_COMPONENT_FACTORY(libkdevfilelist, projectviewFactory(data)) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -ProjectviewPart::ProjectviewPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, tqparent, name ? name : "FileListPart") +ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, parent, name ? name : "FileListPart") { setInstance(projectviewFactory::instance()); setXMLFile("kdevfilelist.rc"); diff --git a/parts/filelist/projectviewpart.h b/parts/filelist/projectviewpart.h index c8555f8b..dc0287b7 100644 --- a/parts/filelist/projectviewpart.h +++ b/parts/filelist/projectviewpart.h @@ -63,7 +63,7 @@ public: // typedef TQMap<KURL, FileInfo> FileInfoMap; - ProjectviewPart(TQObject *tqparent, const char *name, const TQStringList &args); + ProjectviewPart(TQObject *parent, const char *name, const TQStringList &args); ~ProjectviewPart(); // reimplemented from KDevPlugin diff --git a/parts/filelist/projectviewprojectconfig.cpp b/parts/filelist/projectviewprojectconfig.cpp index 0b471ff1..b411dbbd 100644 --- a/parts/filelist/projectviewprojectconfig.cpp +++ b/parts/filelist/projectviewprojectconfig.cpp @@ -24,8 +24,8 @@ #include "projectviewpart.h" -ProjectviewProjectConfig::ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *tqparent, const char *name) - : ProjectviewProjectConfigBase(tqparent, name), m_part(part) +ProjectviewProjectConfig::ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *parent, const char *name) + : ProjectviewProjectConfigBase(parent, name), m_part(part) { kComboDefault->clear(); kComboDefault->insertItem(""); diff --git a/parts/filelist/projectviewprojectconfig.h b/parts/filelist/projectviewprojectconfig.h index 2a7ee5c5..f24a3028 100644 --- a/parts/filelist/projectviewprojectconfig.h +++ b/parts/filelist/projectviewprojectconfig.h @@ -30,7 +30,7 @@ class ProjectviewProjectConfig: public ProjectviewProjectConfigBase Q_OBJECT TQ_OBJECT public: - ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *tqparent = 0, const char *name = 0); + ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/parts/filelist/toolbarguibuilder.cpp b/parts/filelist/toolbarguibuilder.cpp index f2123d60..b4e1a993 100644 --- a/parts/filelist/toolbarguibuilder.cpp +++ b/parts/filelist/toolbarguibuilder.cpp @@ -22,8 +22,8 @@ #include <ktoolbar.h> -ToolbarGUIBuilder::ToolbarGUIBuilder(TQWidget *tqparent, TQWidget *widget) - : KXMLGUIBuilder(widget), KToolBar(tqparent, "ToolbarGUIbuilder"), m_parent(tqparent) +ToolbarGUIBuilder::ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget) + : KXMLGUIBuilder(widget), KToolBar(parent, "ToolbarGUIbuilder"), m_parent(parent) { // setHidden(true); setFrameStyle(0); @@ -34,7 +34,7 @@ ToolbarGUIBuilder::~ToolbarGUIBuilder() { } -TQWidget * ToolbarGUIBuilder::createContainer(TQWidget *tqparent, int index, const TQDomElement &element, int &id) +TQWidget * ToolbarGUIBuilder::createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id) { if (element.tagName().lower() == "toolbar") { @@ -42,11 +42,11 @@ TQWidget * ToolbarGUIBuilder::createContainer(TQWidget *tqparent, int index, con return this; } else { - return KXMLGUIBuilder::createContainer(tqparent, index, element, id); + return KXMLGUIBuilder::createContainer(parent, index, element, id); } } -void ToolbarGUIBuilder::removeContainer(TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id) +void ToolbarGUIBuilder::removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id) { if (container == this) { @@ -54,6 +54,6 @@ void ToolbarGUIBuilder::removeContainer(TQWidget *container, TQWidget *tqparent, reparent(0, TQPoint(0, 0)); } else - KXMLGUIBuilder::removeContainer(container, tqparent, element, id); + KXMLGUIBuilder::removeContainer(container, parent, element, id); } diff --git a/parts/filelist/toolbarguibuilder.h b/parts/filelist/toolbarguibuilder.h index c3b6ef51..ec02c371 100644 --- a/parts/filelist/toolbarguibuilder.h +++ b/parts/filelist/toolbarguibuilder.h @@ -34,20 +34,20 @@ class ToolbarGUIBuilder : public KXMLGUIBuilder, public KToolBar { public: - ToolbarGUIBuilder(TQWidget *tqparent, TQWidget *widget); + ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget); virtual ~ToolbarGUIBuilder(); /** * Called when a new XML gui client is added to the gui factory. */ - virtual TQWidget *createContainer(TQWidget *tqparent, int index, const TQDomElement &element, int &id); + virtual TQWidget *createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id); /** * Called when a XML gui client is removed the gui factory. * Reimplemented from KXMLGUIBuilder in order to remove our custom toolbar. */ - virtual void removeContainer(TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id); + virtual void removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id); private: TQWidget * m_parent; diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index baf4dc86..4e30fe50 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -34,8 +34,8 @@ typedef KDevGenericFactory<FileSelectorPart> FileSelectorFactory; static const KDevPluginInfo data("kdevfileselector"); K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) ) -FileSelectorPart::FileSelectorPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "FileSelectorPart") +FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "FileSelectorPart") { setInstance(FileSelectorFactory::instance()); diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h index d2e8d9ec..90c25f11 100644 --- a/parts/fileselector/fileselector_part.h +++ b/parts/fileselector/fileselector_part.h @@ -16,7 +16,7 @@ class FileSelectorPart : public KDevPlugin Q_OBJECT TQ_OBJECT public: - FileSelectorPart(TQObject *tqparent, const char *name, const TQStringList &); + FileSelectorPart(TQObject *parent, const char *name, const TQStringList &); virtual ~FileSelectorPart(); KAction *newFileAction() const { return m_newFileAction; } diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index eacc513a..d2646cc4 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -76,8 +76,8 @@ static void silenceTQToolBar(TQtMsgType, const char *) {} -KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *tqparent) - : KToolBar( tqparent, "KDev FileSelector Toolbar", true ) +KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *parent) + : KToolBar( parent, "KDev FileSelector Toolbar", true ) { setMinimumWidth(10); } @@ -91,8 +91,8 @@ void KDevFileSelectorToolBar::setMovingEnabled( bool) } -KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *tqparent) - :TQFrame(tqparent),m_tb(0) +KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *parent) + :TQFrame(parent),m_tb(0) {} KDevFileSelectorToolBarParent::~KDevFileSelectorToolBarParent() {} @@ -115,8 +115,8 @@ void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow, KDevPartController *partController, - TQWidget * tqparent, const char * name ) - : TQWidget(tqparent, name), + TQWidget * parent, const char * name ) + : TQWidget(parent, name), m_part(part), mainwin(mainWindow), partController(partController) @@ -575,8 +575,8 @@ KURL KDevFileSelector::activeDocumentUrl( ) //////////////////////////////////////////////////////////////////////////////// // KFSConfigPage implementation //////////////////////////////////////////////////////////////////////////////// -KFSConfigPage::KFSConfigPage( TQWidget *tqparent, const char *name, KDevFileSelector *kfs ) - : TQWidget( tqparent, name ), +KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelector *kfs ) + : TQWidget( parent, name ), fileSelector( kfs ), bDirty( false ) { diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h index cf06d42a..6fbc3d6a 100644 --- a/parts/fileselector/fileselector_widget.h +++ b/parts/fileselector/fileselector_widget.h @@ -62,7 +62,7 @@ class KDevFileSelectorToolBar: public KToolBar Q_OBJECT TQ_OBJECT public: - KDevFileSelectorToolBar(TQWidget *tqparent); + KDevFileSelectorToolBar(TQWidget *parent); virtual ~KDevFileSelectorToolBar(); virtual void setMovingEnabled( bool b ); @@ -73,7 +73,7 @@ class KDevFileSelectorToolBarParent: public TQFrame Q_OBJECT TQ_OBJECT public: - KDevFileSelectorToolBarParent(TQWidget *tqparent); + KDevFileSelectorToolBarParent(TQWidget *parent); ~KDevFileSelectorToolBarParent(); void setToolBar(KDevFileSelectorToolBar *tb); @@ -89,8 +89,8 @@ class KDevDirOperator: public KDirOperator Q_OBJECT TQ_OBJECT public: - KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *tqparent=0, const char *name=0) - :KDirOperator(urlName, tqparent, name), m_part(part) + KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0) + :KDirOperator(urlName, parent, name), m_part(part) { } @@ -113,7 +113,7 @@ public: enum AutoSyncEvent { DocumentChanged=1, DocumentOpened=2, GotVisible=4 }; KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow=0, KDevPartController *partController=0, - TQWidget * tqparent = 0, const char * name = 0 ); + TQWidget * parent = 0, const char * name = 0 ); ~KDevFileSelector(); void readConfig( KConfig *, const TQString & ); @@ -183,7 +183,7 @@ class KFSConfigPage : public TQWidget Q_OBJECT TQ_OBJECT public: - KFSConfigPage( TQWidget* tqparent=0, const char *name=0, KDevFileSelector *kfs=0); + KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0); virtual ~KFSConfigPage() {}; public slots: diff --git a/parts/fileselector/kactionselector.cpp b/parts/fileselector/kactionselector.cpp index 3bf21922..3d2a67c3 100644 --- a/parts/fileselector/kactionselector.cpp +++ b/parts/fileselector/kactionselector.cpp @@ -46,8 +46,8 @@ class KActionSelectorPrivate { //BEGIN Constructor/destructor -KActionSelector::KActionSelector( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +KActionSelector::KActionSelector( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { d = new KActionSelectorPrivate(); d->moveOnDoubleClick = true; diff --git a/parts/fileselector/kactionselector.h b/parts/fileselector/kactionselector.h index 9bcbeeea..3ba60c11 100644 --- a/parts/fileselector/kactionselector.h +++ b/parts/fileselector/kactionselector.h @@ -87,7 +87,7 @@ class KActionSelector : public TQWidget { TQ_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons ) public: - KActionSelector( TQWidget *tqparent=0, const char *name=0 ); + KActionSelector( TQWidget *parent=0, const char *name=0 ); ~KActionSelector(); /** diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp index 68ce3189..6467b83f 100644 --- a/parts/fileselector/kbookmarkhandler.cpp +++ b/parts/fileselector/kbookmarkhandler.cpp @@ -35,15 +35,15 @@ #include "kbookmarkhandler.moc" -KBookmarkHandler::KBookmarkHandler( KDevFileSelector *tqparent, KPopupMenu* kpopupmenu ) - : TQObject( tqparent, "KBookmarkHandler" ), +KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, KPopupMenu* kpopupmenu ) + : TQObject( parent, "KBookmarkHandler" ), KBookmarkOwner(), - mParent( tqparent ), + mParent( parent ), m_menu( kpopupmenu ), m_importStream( 0L ) { if (!m_menu) - m_menu = new KPopupMenu( tqparent, "bookmark menu" ); + m_menu = new KPopupMenu( parent, "bookmark menu" ); TQString file = locate( "data", "kdevfileselector/fsbookmarks.xml" ); if ( file.isEmpty() ) diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h index a9ec5ad1..89015d55 100644 --- a/parts/fileselector/kbookmarkhandler.h +++ b/parts/fileselector/kbookmarkhandler.h @@ -34,7 +34,7 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner TQ_OBJECT public: - KBookmarkHandler( KDevFileSelector *tqparent, KPopupMenu *kpopupmenu=0 ); + KBookmarkHandler( KDevFileSelector *parent, KPopupMenu *kpopupmenu=0 ); ~KBookmarkHandler(); // KBookmarkOwner interface: diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp index 112eec4a..9e45d1ae 100644 --- a/parts/fileview/addfilegroupdlg.cpp +++ b/parts/fileview/addfilegroupdlg.cpp @@ -20,8 +20,8 @@ #include "addfilegroupdlg.h" -AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString& old_pattern, TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, true) +AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString& old_pattern, TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { TQLabel *title_label = new TQLabel(i18n("&Title:"), this); title_edit = new KLineEdit(old_title, this); diff --git a/parts/fileview/addfilegroupdlg.h b/parts/fileview/addfilegroupdlg.h index 20c54d37..f531d1a3 100644 --- a/parts/fileview/addfilegroupdlg.h +++ b/parts/fileview/addfilegroupdlg.h @@ -22,7 +22,7 @@ class AddFileGroupDialog : public TQDialog TQ_OBJECT public: - AddFileGroupDialog( const TQString& old_title="", const TQString& old_pattern="", TQWidget *tqparent=0, const char *name=0 ); + AddFileGroupDialog( const TQString& old_title="", const TQString& old_pattern="", TQWidget *parent=0, const char *name=0 ); ~AddFileGroupDialog(); TQString title() const diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp index 277bab4e..c1a4f5bc 100644 --- a/parts/fileview/filegroupsconfigwidget.cpp +++ b/parts/fileview/filegroupsconfigwidget.cpp @@ -21,8 +21,8 @@ FileGroupsConfigWidget::FileGroupsConfigWidget(FileGroupsPart *part, - TQWidget *tqparent, const char *name) - : FileGroupsConfigWidgetBase(tqparent, name) + TQWidget *parent, const char *name) + : FileGroupsConfigWidgetBase(parent, name) { m_part = part; diff --git a/parts/fileview/filegroupsconfigwidget.h b/parts/fileview/filegroupsconfigwidget.h index c236aa43..f3f530ad 100644 --- a/parts/fileview/filegroupsconfigwidget.h +++ b/parts/fileview/filegroupsconfigwidget.h @@ -23,7 +23,7 @@ class FileGroupsConfigWidget : public FileGroupsConfigWidgetBase TQ_OBJECT public: - FileGroupsConfigWidget( FileGroupsPart *widget, TQWidget *tqparent, const char *name=0 ); + FileGroupsConfigWidget( FileGroupsPart *widget, TQWidget *parent, const char *name=0 ); ~FileGroupsConfigWidget(); public slots: diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp index 29dccd55..4451ff2a 100644 --- a/parts/fileview/filegroupspart.cpp +++ b/parts/fileview/filegroupspart.cpp @@ -36,8 +36,8 @@ typedef KDevGenericFactory<FileGroupsPart> FileGroupsFactory; static const KDevPluginInfo data("kdevfilegroups"); K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) ) -FileGroupsPart::FileGroupsPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "FileGroupsPart") +FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "FileGroupsPart") { deleteRequested = false; setInstance(FileGroupsFactory::instance()); diff --git a/parts/fileview/filegroupspart.h b/parts/fileview/filegroupspart.h index 85f83164..3a1207ec 100644 --- a/parts/fileview/filegroupspart.h +++ b/parts/fileview/filegroupspart.h @@ -26,7 +26,7 @@ class FileGroupsPart : public KDevPlugin TQ_OBJECT public: - FileGroupsPart( TQObject *tqparent, const char *name, const TQStringList & ); + FileGroupsPart( TQObject *parent, const char *name, const TQStringList & ); ~FileGroupsPart(); public slots: diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index 40c2b752..0c498e98 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -77,7 +77,7 @@ private: class FileViewFolderItem : public TQListViewItem { public: - FileViewFolderItem(TQListView *tqparent, const TQString &name, const TQString &pattern); + FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern); bool matches(const TQString &fileName); private: @@ -85,8 +85,8 @@ private: }; -FileViewFolderItem::FileViewFolderItem(TQListView *tqparent, const TQString &name, const TQString &pattern) - : TQListViewItem(tqparent, name) +FileViewFolderItem::FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern) + : TQListViewItem(parent, name) { setPixmap(0, SmallIcon("folder")); m_patterns.setAutoDelete(true); @@ -133,7 +133,7 @@ bool FileViewFolderItem::matches(const TQString &fileName) class FileGroupsFileItem : public TQListViewItem { public: - FileGroupsFileItem(TQListViewItem *tqparent, const TQString &fileName); + FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName); TQString fileName() const { return fullname; } @@ -142,8 +142,8 @@ private: }; -FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *tqparent, const TQString &fileName) - : TQListViewItem(tqparent), fullname(fileName) +FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName) + : TQListViewItem(parent), fullname(fileName) { setPixmap(0, SmallIcon("document")); TQFileInfo fi(fileName); @@ -214,7 +214,7 @@ void FileGroupsWidget::slotItemExecuted(TQListViewItem *item) setOpen(item, !isOpen(item)); // Is it a group item? - if (!item->tqparent()) + if (!item->parent()) return; FileGroupsFileItem *fgfitem = static_cast<FileGroupsFileItem*>(item); @@ -230,7 +230,7 @@ void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const int customizeId = popup.insertItem(i18n("Customize...")); popup.tqsetWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed.")); if (item) { - if (item->tqparent()) { + if (item->parent()) { // Not for group items FileGroupsFileItem *fvfitem = static_cast<FileGroupsFileItem*>(item); TQString pathName = m_part->project()->projectDirectory() + TQDir::separator() + fvfitem->fileName(); diff --git a/parts/fileview/fileitemfactory.h b/parts/fileview/fileitemfactory.h index fcb606fc..bd484edd 100644 --- a/parts/fileview/fileitemfactory.h +++ b/parts/fileview/fileitemfactory.h @@ -28,13 +28,13 @@ namespace filetreeview { friend class FileTreeBranchItem; protected: - FileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf ) - : KFileTreeViewItem( tqparent, item, branch ), m_isProjectFile( pf ), m_isActiveDir( false ) + FileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf ) + : KFileTreeViewItem( parent, item, branch ), m_isProjectFile( pf ), m_isActiveDir( false ) { hideOrShow(); } - FileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch ) - : KFileTreeViewItem( tqparent, item, branch ), m_isProjectFile( false ) + FileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) + : KFileTreeViewItem( parent, item, branch ), m_isProjectFile( false ) { hideOrShow(); } diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp index a35d1a6d..7ca52b17 100644 --- a/parts/fileview/filetreeviewwidgetimpl.cpp +++ b/parts/fileview/filetreeviewwidgetimpl.cpp @@ -30,9 +30,9 @@ using namespace filetreeview; // class FileTreeViewWidgetImpl /////////////////////////////////////////////////////////////////////////////// -FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *tqparent, const char *name ) - : TQObject( tqparent, name ), m_branchItemFactory( 0 ), - m_part( tqparent->part() ), m_isReloadingTree( false ) +FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name ) + : TQObject( parent, name ), m_branchItemFactory( 0 ), + m_part( parent->part() ), m_isReloadingTree( false ) { kdDebug(9017) << "FileTreeViewWidgetImpl::FileTreeViewWidgetImpl()" << endl; @@ -63,7 +63,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl() FileTreeWidget *FileTreeViewWidgetImpl::fileTree() const { - return static_cast<FileTreeWidget *>( TQT_TQWIDGET(tqparent()) ); + return static_cast<FileTreeWidget *>( TQT_TQWIDGET(parent()) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/fileview/filetreeviewwidgetimpl.h b/parts/fileview/filetreeviewwidgetimpl.h index 34f19ca3..7df81e0e 100644 --- a/parts/fileview/filetreeviewwidgetimpl.h +++ b/parts/fileview/filetreeviewwidgetimpl.h @@ -41,7 +41,7 @@ class FileTreeViewWidgetImpl : public TQObject Q_OBJECT TQ_OBJECT public: - FileTreeViewWidgetImpl( FileTreeWidget *tqparent, const char *name ); + FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name ); virtual ~FileTreeViewWidgetImpl(); //! return a list containing the filenames of the currently selected items. diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index 958e756e..f5aa0ff4 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -51,8 +51,8 @@ using namespace filetreeview; // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// -FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *tqparent, KDevVCSFileInfoProvider *infoProvider ) - : KFileTreeView( tqparent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 ) +FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ) + : KFileTreeView( parent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 ) { kdDebug(9017) << "Requested FileTree for: " << projectDirectory() << endl; if (versionControl() && infoProvider) @@ -265,7 +265,7 @@ void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constr if ( !m_projectFiles.contains( file ) ) { // We got a new file to add to this project. - // Ensure all the tqparent directories are part of the project set, too. + // Ensure all the parent directories are part of the project set, too. TQStringList paths = TQStringList::split( "/", *it); paths.pop_back(); while( !paths.isEmpty() ) @@ -273,7 +273,7 @@ void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constr // We are adding the directories from longest (the one containing our file), // to the shortest, measured from root directory of our project. // Whenever we find out that a directory is already recorded as part of our project, - // we may stop adding, because its tqparent directories were already added - + // we may stop adding, because its parent directories were already added - // in some previous addition. TQString joinedPaths = paths.join("/"); if( m_projectFiles.contains( joinedPaths ) ) diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h index f7a7ac51..84d45e6d 100644 --- a/parts/fileview/filetreewidget.h +++ b/parts/fileview/filetreewidget.h @@ -49,7 +49,7 @@ class FileTreeWidget : public KFileTreeView Q_OBJECT TQ_OBJECT public: - FileTreeWidget( FileViewPart *part, TQWidget *tqparent, KDevVCSFileInfoProvider *infoProvider ); + FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ); virtual ~FileTreeWidget(); void openDirectory(const TQString &dirName); diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp index c5d0655a..0e3758c9 100644 --- a/parts/fileview/fileviewpart.cpp +++ b/parts/fileview/fileviewpart.cpp @@ -57,8 +57,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) ) // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// -FileViewPart::FileViewPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "FileViewPart"), +FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "FileViewPart"), m_widget( 0 ) { setInstance( FileViewFactory::instance() ); diff --git a/parts/fileview/fileviewpart.h b/parts/fileview/fileviewpart.h index 985d15ed..0dfd4796 100644 --- a/parts/fileview/fileviewpart.h +++ b/parts/fileview/fileviewpart.h @@ -27,7 +27,7 @@ class FileViewPart : public KDevPlugin TQ_OBJECT public: - FileViewPart( TQObject *tqparent, const char *name, const TQStringList & ); + FileViewPart( TQObject *parent, const char *name, const TQStringList & ); virtual ~FileViewPart(); //! Colors to use for VCS visual feed-back diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp index 040f6312..6b06647c 100644 --- a/parts/fileview/partwidget.cpp +++ b/parts/fileview/partwidget.cpp @@ -34,11 +34,11 @@ // class PartWidget /////////////////////////////////////////////////////////////////////////////// -PartWidget::PartWidget( FileViewPart *part, TQWidget *tqparent ) - : TQVBox( tqparent, "fileviewpartwidget" ), m_filetree( 0 ), +PartWidget::PartWidget( FileViewPart *part, TQWidget *parent ) + : TQVBox( parent, "fileviewpartwidget" ), m_filetree( 0 ), m_filter( 0 ), m_btnFilter( 0 ), m_part( part ) { - Q_ASSERT( part && tqparent ); + Q_ASSERT( part && parent ); KDevVCSFileInfoProvider *infoProvider = 0; if (part && part->versionControl() && part->versionControl()->fileInfoProvider()) diff --git a/parts/fileview/partwidget.h b/parts/fileview/partwidget.h index 66c57228..3dfa18a6 100644 --- a/parts/fileview/partwidget.h +++ b/parts/fileview/partwidget.h @@ -21,7 +21,7 @@ class PartWidget : public TQVBox Q_OBJECT TQ_OBJECT public: - PartWidget( FileViewPart *part, TQWidget *tqparent = 0 ); + PartWidget( FileViewPart *part, TQWidget *parent = 0 ); virtual ~PartWidget(); class FileTreeWidget *m_filetree; diff --git a/parts/fileview/stdfiletreewidgetimpl.cpp b/parts/fileview/stdfiletreewidgetimpl.cpp index 943f8850..3766973d 100644 --- a/parts/fileview/stdfiletreewidgetimpl.cpp +++ b/parts/fileview/stdfiletreewidgetimpl.cpp @@ -23,10 +23,10 @@ class StdFileTreeViewItem : public filetreeview::FileTreeViewItem { public: - StdFileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf ) - : FileTreeViewItem( tqparent, item, branch, pf ) {} - StdFileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch ) - : FileTreeViewItem( tqparent, item, branch ) {} + StdFileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf ) + : FileTreeViewItem( parent, item, branch, pf ) {} + StdFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) + : FileTreeViewItem( parent, item, branch ) {} }; /////////////////////////////////////////////////////////////////////////////// @@ -39,22 +39,22 @@ public: StdFileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix ) : FileTreeBranchItem( view, url, name, pix ) {} virtual ~StdFileTreeBranchItem() {} - virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem ); + virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ); }; /////////////////////////////////////////////////////////////////////////////// -KFileTreeViewItem* StdFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem ) +KFileTreeViewItem* StdFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ) { - if (!tqparent || !fileItem) + if (!parent || !fileItem) return 0; - FileTreeWidget *lv = static_cast<StdFileTreeViewItem*>( tqparent )->listView(); + FileTreeWidget *lv = static_cast<StdFileTreeViewItem*>( parent )->listView(); const KURL fileURL = fileItem->url(); const bool isDirectory = lv->isInProject( fileURL.path() ); - return new StdFileTreeViewItem( tqparent, fileItem, this, isDirectory ); + return new StdFileTreeViewItem( parent, fileItem, this, isDirectory ); } /////////////////////////////////////////////////////////////////////////////// @@ -74,14 +74,14 @@ public: // class StdFileTreeWidgetImpl /////////////////////////////////////////////////////////////////////////////// -StdFileTreeWidgetImpl::StdFileTreeWidgetImpl( FileTreeWidget *tqparent ) - : FileTreeViewWidgetImpl( tqparent, "stdfiletreewidgetimpl" ) +StdFileTreeWidgetImpl::StdFileTreeWidgetImpl( FileTreeWidget *parent ) + : FileTreeViewWidgetImpl( parent, "stdfiletreewidgetimpl" ) { kdDebug(9017) << "StdFileTreeWidgetImpl::StdFileTreeWidgetImpl()" << endl; setBranchItemFactory( new StdBranchItemFactory ); - tqparent->addColumn( TQString() ); + parent->addColumn( TQString() ); header()->hide(); } diff --git a/parts/fileview/stdfiletreewidgetimpl.h b/parts/fileview/stdfiletreewidgetimpl.h index 260d2372..4d15beff 100644 --- a/parts/fileview/stdfiletreewidgetimpl.h +++ b/parts/fileview/stdfiletreewidgetimpl.h @@ -25,7 +25,7 @@ class StdFileTreeWidgetImpl : public FileTreeViewWidgetImpl Q_OBJECT TQ_OBJECT public: - StdFileTreeWidgetImpl( FileTreeWidget *tqparent ); + StdFileTreeWidgetImpl( FileTreeWidget *parent ); virtual ~StdFileTreeWidgetImpl(); /* diff --git a/parts/fileview/vcscolorsconfigwidget.cpp b/parts/fileview/vcscolorsconfigwidget.cpp index 117955d5..63067c04 100644 --- a/parts/fileview/vcscolorsconfigwidget.cpp +++ b/parts/fileview/vcscolorsconfigwidget.cpp @@ -51,8 +51,8 @@ VCSColors &VCSColors::operator=( const VCSColors &others ) /////////////////////////////////////////////////////////////////////////////// VCSColorsConfigWidget::VCSColorsConfigWidget(FileViewPart *part, const VCSColors &vcsColors, - TQWidget* tqparent, const char* name, WFlags fl) - : VCSColorsConfigWidgetBase( tqparent, name, fl ), m_part( part ) + TQWidget* parent, const char* name, WFlags fl) + : VCSColorsConfigWidgetBase( parent, name, fl ), m_part( part ) { setColors( vcsColors ); } diff --git a/parts/fileview/vcscolorsconfigwidget.h b/parts/fileview/vcscolorsconfigwidget.h index 61d1b0e7..6a9a606b 100644 --- a/parts/fileview/vcscolorsconfigwidget.h +++ b/parts/fileview/vcscolorsconfigwidget.h @@ -41,7 +41,7 @@ class VCSColorsConfigWidget : public VCSColorsConfigWidgetBase public: VCSColorsConfigWidget( FileViewPart *part, const VCSColors &vcsColors, - TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); virtual ~VCSColorsConfigWidget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp index 6aebce29..eb3d2c4a 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.cpp +++ b/parts/fileview/vcsfiletreewidgetimpl.cpp @@ -42,10 +42,10 @@ using namespace filetreeview; class VCSFileTreeViewItem : public filetreeview::FileTreeViewItem { public: - VCSFileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf ) - : FileTreeViewItem( tqparent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} - VCSFileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch ) - : FileTreeViewItem( tqparent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} + VCSFileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf ) + : FileTreeViewItem( parent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} + VCSFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) + : FileTreeViewItem( parent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) { // paint cell in a different color depending on VCS state @@ -130,7 +130,7 @@ public: KDevVCSFileInfoProvider *vcsInfoProvider ) : FileTreeBranchItem( view, url, name, pix ), m_vcsInfoProvider( vcsInfoProvider ) {} // virtual ~VCSFileTreeBranchItem() {} - virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem ); + virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ); private: KDevVCSFileInfoProvider *m_vcsInfoProvider; @@ -138,17 +138,17 @@ private: /////////////////////////////////////////////////////////////////////////////// -KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem ) +KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ) { // kdDebug(9017) << "MyFileTreeBranch::createTreeViewItem(): " + fileItem->url().path() << endl; - if (!tqparent || !fileItem) + if (!parent || !fileItem) return 0; - FileTreeWidget *lv = static_cast<filetreeview::FileTreeViewItem*>( tqparent )->listView(); + FileTreeWidget *lv = static_cast<filetreeview::FileTreeViewItem*>( parent )->listView(); const KURL fileURL = fileItem->url(); const bool isDirectory = lv->isInProject( fileURL.path() ); - VCSFileTreeViewItem *newItem = new VCSFileTreeViewItem( tqparent, fileItem, this, isDirectory ); + VCSFileTreeViewItem *newItem = new VCSFileTreeViewItem( parent, fileItem, this, isDirectory ); // TQString fileName = fileURL.fileName(); // TQString dirName = URLUtil::extractPathNameRelative( lv->projectDirectory(), fileURL.directory() ); @@ -182,8 +182,8 @@ private: // class VCSFileTreeWidgetImpl /////////////////////////////////////////////////////////////////////////////// -VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSFileInfoProvider *infoProvider ) - : FileTreeViewWidgetImpl( tqparent, "vcsfiletreewidgetimpl" ), +VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider ) + : FileTreeViewWidgetImpl( parent, "vcsfiletreewidgetimpl" ), m_actionToggleShowVCSFields( 0 ), m_actionSyncWithRepository( 0 ), m_vcsInfoProvider( infoProvider ), m_isSyncingWithRepository( false ), m_vcsStatusRequestedItem( 0 ) { @@ -193,10 +193,10 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSF setBranchItemFactory( new VCSBranchItemFactory( m_vcsInfoProvider ) ); // Update the #define order on top if you change this order! - tqparent->addColumn( "Filename" ); - tqparent->addColumn( "tqStatus" ); - tqparent->addColumn( "Work" ); - tqparent->addColumn( "Repo" ); + parent->addColumn( "Filename" ); + parent->addColumn( "tqStatus" ); + parent->addColumn( "Work" ); + parent->addColumn( "Repo" ); connect( m_vcsInfoProvider, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void *)), this, TQT_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) ); @@ -218,7 +218,7 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSF TQDomDocument &dom = projectDom(); m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") ); slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings - connect( tqparent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*))); + connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*))); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h index b88766a5..ad9ccfab 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.h +++ b/parts/fileview/vcsfiletreewidgetimpl.h @@ -27,7 +27,7 @@ class VCSFileTreeWidgetImpl : public FileTreeViewWidgetImpl Q_OBJECT TQ_OBJECT public: - VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSFileInfoProvider *infoProvider ); + VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider ); virtual ~VCSFileTreeWidgetImpl(); /* diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp index 9824cdc9..dbb0dfc6 100644 --- a/parts/filter/filterpart.cpp +++ b/parts/filter/filterpart.cpp @@ -29,8 +29,8 @@ static const KDevPluginInfo data("kdevfilter"); K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) ) -FilterPart::FilterPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "FilterPart") +FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "FilterPart") { setInstance(FilterFactory::instance()); setXMLFile("kdevfilter.rc"); diff --git a/parts/filter/filterpart.h b/parts/filter/filterpart.h index 939590ed..e845adcf 100644 --- a/parts/filter/filterpart.h +++ b/parts/filter/filterpart.h @@ -25,7 +25,7 @@ class FilterPart : public KDevPlugin TQ_OBJECT public: - FilterPart( TQObject *tqparent, const char *name, const TQStringList & ); + FilterPart( TQObject *parent, const char *name, const TQStringList & ); ~FilterPart(); public slots: diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp index 63e40e89..b3c2240f 100644 --- a/parts/fullscreen/fullscreen_part.cpp +++ b/parts/fullscreen/fullscreen_part.cpp @@ -27,8 +27,8 @@ static const KDevPluginInfo data("kdevfullscreen"); typedef KDevGenericFactory<FullScreenPart> FullScreenFactory; K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) ) -FullScreenPart::FullScreenPart(TQObject *tqparent, const char *name, const TQStringList& ) - : KDevPlugin(&data, tqparent, name ? name : "FullScreenPart" ) +FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& ) + : KDevPlugin(&data, parent, name ? name : "FullScreenPart" ) { setInstance(FullScreenFactory::instance()); // const KAboutData &abdata1 = *(info()); diff --git a/parts/fullscreen/fullscreen_part.h b/parts/fullscreen/fullscreen_part.h index d248f686..0b5edd6e 100644 --- a/parts/fullscreen/fullscreen_part.h +++ b/parts/fullscreen/fullscreen_part.h @@ -22,7 +22,7 @@ class FullScreenPart : public KDevPlugin Q_OBJECT TQ_OBJECT public: - FullScreenPart(TQObject *tqparent, const char *name, const TQStringList &); + FullScreenPart(TQObject *parent, const char *name, const TQStringList &); virtual ~FullScreenPart(); public slots: diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp index 80c06c8b..db81ff76 100644 --- a/parts/grepview/grepdlg.cpp +++ b/parts/grepview/grepdlg.cpp @@ -80,8 +80,8 @@ const char *filepatterns[] = { }; -GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *tqparent, const char *name ) - : TQDialog(tqparent, name, false), m_part( part ) +GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name ) + : TQDialog(parent, name, false), m_part( part ) { setCaption(i18n("Find in Files")); diff --git a/parts/grepview/grepdlg.h b/parts/grepview/grepdlg.h index 294dd326..08931890 100644 --- a/parts/grepview/grepdlg.h +++ b/parts/grepview/grepdlg.h @@ -31,7 +31,7 @@ class GrepDialog : public TQDialog TQ_OBJECT public: - GrepDialog( GrepViewPart * part, TQWidget *tqparent=0, const char *name=0 ); + GrepDialog( GrepViewPart * part, TQWidget *parent=0, const char *name=0 ); ~GrepDialog(); void setPattern(const TQString &pattern) diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp index e404ad2d..741f3c43 100644 --- a/parts/grepview/grepviewpart.cpp +++ b/parts/grepview/grepviewpart.cpp @@ -34,8 +34,8 @@ static const KDevPluginInfo data("kdevgrepview"); K_EXPORT_COMPONENT_FACTORY(libkdevgrepview, GrepViewFactory(data)) -GrepViewPart::GrepViewPart( TQObject *tqparent, const char *name, const TQStringList & ) - : KDevPlugin( &data, tqparent, name ? name : "GrepViewPart" ) +GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringList & ) + : KDevPlugin( &data, parent, name ? name : "GrepViewPart" ) { setInstance(GrepViewFactory::instance()); diff --git a/parts/grepview/grepviewpart.h b/parts/grepview/grepviewpart.h index f33dd240..f318de75 100644 --- a/parts/grepview/grepviewpart.h +++ b/parts/grepview/grepviewpart.h @@ -28,7 +28,7 @@ class GrepViewPart : public KDevPlugin TQ_OBJECT public: - GrepViewPart( TQObject *tqparent, const char *name, const TQStringList & ); + GrepViewPart( TQObject *parent, const char *name, const TQStringList & ); ~GrepViewPart(); private slots: diff --git a/parts/grepview/grepviewwidget.h b/parts/grepview/grepviewwidget.h index f0b57aff..cb517c81 100644 --- a/parts/grepview/grepviewwidget.h +++ b/parts/grepview/grepviewwidget.h @@ -27,7 +27,7 @@ class GrepViewProcessWidget : public ProcessWidget Q_OBJECT TQ_OBJECT public: - GrepViewProcessWidget(TQWidget* tqparent) : ProcessWidget(tqparent) {}; + GrepViewProcessWidget(TQWidget* parent) : ProcessWidget(parent) {}; ~GrepViewProcessWidget(){}; void setMatchCount(int newCount) { diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp index e752335a..c103a3a8 100644 --- a/parts/konsole/konsoleviewpart.cpp +++ b/parts/konsole/konsoleviewpart.cpp @@ -28,8 +28,8 @@ typedef KDevGenericFactory<KonsoleViewPart> KonsoleViewFactory; static const KDevPluginInfo data("kdevkonsoleview"); K_EXPORT_COMPONENT_FACTORY(libkdevkonsoleview, KonsoleViewFactory(data)) -KonsoleViewPart::KonsoleViewPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "KonsoleViewPart") +KonsoleViewPart::KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "KonsoleViewPart") { setInstance( KonsoleViewFactory::instance() ); diff --git a/parts/konsole/konsoleviewpart.h b/parts/konsole/konsoleviewpart.h index 4731069b..2906daa7 100644 --- a/parts/konsole/konsoleviewpart.h +++ b/parts/konsole/konsoleviewpart.h @@ -24,7 +24,7 @@ class KonsoleViewPart : public KDevPlugin Q_OBJECT TQ_OBJECT public: - KonsoleViewPart(TQObject *tqparent, const char *name, const TQStringList &); + KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &); virtual ~KonsoleViewPart(); private slots: diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp index bce4df7e..7fc1fcbe 100644 --- a/parts/openwith/openwithpart.cpp +++ b/parts/openwith/openwithpart.cpp @@ -21,8 +21,8 @@ typedef KDevGenericFactory<OpenWithPart> OpenWithFactory; static const KDevPluginInfo data("kdevopenwith"); K_EXPORT_COMPONENT_FACTORY(libkdevopenwith, OpenWithFactory(data)) -OpenWithPart::OpenWithPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "OpenWithPart") +OpenWithPart::OpenWithPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "OpenWithPart") { setInstance( OpenWithFactory::instance() ); diff --git a/parts/openwith/openwithpart.h b/parts/openwith/openwithpart.h index 0f72adf8..004faa79 100644 --- a/parts/openwith/openwithpart.h +++ b/parts/openwith/openwithpart.h @@ -16,7 +16,7 @@ class OpenWithPart : public KDevPlugin public: - OpenWithPart(TQObject *tqparent, const char *name, const TQStringList &); + OpenWithPart(TQObject *parent, const char *name, const TQStringList &); ~OpenWithPart(); diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 1b314464..4267a85e 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -33,8 +33,8 @@ static const KDevPluginInfo data("kdevappoutputview"); typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory; K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) ) -AppOutputViewPart::AppOutputViewPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevAppFrontend(&data, tqparent, name ? name : "AppOutputViewPart") +AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &) + : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart") { setInstance(AppViewFactory::instance()); diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h index bb26aad8..afcbeb77 100644 --- a/parts/outputviews/appoutputviewpart.h +++ b/parts/outputviews/appoutputviewpart.h @@ -26,7 +26,7 @@ class AppOutputViewPart : public KDevAppFrontend TQ_OBJECT public: - AppOutputViewPart( TQObject *tqparent, const char *name, const TQStringList & ); + AppOutputViewPart( TQObject *parent, const char *name, const TQStringList & ); ~AppOutputViewPart(); virtual void startAppCommand(const TQString &directory, const TQString &command, bool inTerminal); diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index cd98a3e2..3e75a4d7 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -30,8 +30,8 @@ static const KDevPluginInfo data("kdevmakeview"); typedef KDevGenericFactory< MakeViewPart > MakeViewFactory; K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) ) -MakeViewPart::MakeViewPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevMakeFrontend(&data, tqparent, name) +MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &) + : KDevMakeFrontend(&data, parent, name) { setInstance(MakeViewFactory::instance()); diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h index 0d70edaf..4694233f 100644 --- a/parts/outputviews/makeviewpart.h +++ b/parts/outputviews/makeviewpart.h @@ -26,7 +26,7 @@ class MakeViewPart : public KDevMakeFrontend TQ_OBJECT public: - MakeViewPart( TQObject *tqparent, const char *name, const TQStringList & ); + MakeViewPart( TQObject *parent, const char *name, const TQStringList & ); ~MakeViewPart(); virtual TQWidget* widget(); virtual void updateSettingsFromConfig(); diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp index 5f6ae0f0..dbf2b554 100644 --- a/parts/partexplorer/partexplorer_plugin.cpp +++ b/parts/partexplorer/partexplorer_plugin.cpp @@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevpartexplorer"); typedef KDevGenericFactory<PartExplorerPlugin> PartExplorerPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) ) -PartExplorerPlugin::PartExplorerPlugin( TQObject *tqparent, const char *name, const TQStringList & ) - : KDevPlugin( &data, tqparent, name ? name : "PartExplorerPlugin" ) +PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & ) + : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" ) { // we need an instance setInstance( PartExplorerPluginFactory::instance() ); diff --git a/parts/partexplorer/partexplorer_plugin.h b/parts/partexplorer/partexplorer_plugin.h index 826ae6ed..c4e8743d 100644 --- a/parts/partexplorer/partexplorer_plugin.h +++ b/parts/partexplorer/partexplorer_plugin.h @@ -29,7 +29,7 @@ public: /** * Default constructor */ - PartExplorerPlugin( TQObject *tqparent, const char *name, const TQStringList & ); + PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & ); /** * Destructor diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp index d8b0cccf..a32aabb5 100644 --- a/parts/partexplorer/partexplorerform.cpp +++ b/parts/partexplorer/partexplorerform.cpp @@ -35,9 +35,9 @@ namespace PartExplorer{ class PropertyItem : public KListViewItem { public: - PropertyItem( KListViewItem *tqparent, const TQString &propertyName, + PropertyItem( KListViewItem *parent, const TQString &propertyName, const TQString &propertyType, const TQString &propertyValue ) - : KListViewItem( tqparent ) + : KListViewItem( parent ) { setText( 0, propertyName ); setText( 1, propertyType ); @@ -61,7 +61,7 @@ class ResultList; class ResultsToolTip: public TQToolTip { public: - ResultsToolTip( ResultsList* tqparent ); + ResultsToolTip( ResultsList* parent ); virtual void maybeTip( const TQPoint& p ); private: @@ -71,8 +71,8 @@ private: class ResultsList : public KListView { public: - ResultsList( TQWidget *tqparent ) - : KListView( tqparent, "resultslist" ) + ResultsList( TQWidget *parent ) + : KListView( parent, "resultslist" ) { this->setShowToolTips( false ); new ResultsToolTip( this ); @@ -86,8 +86,8 @@ public: } }; -ResultsToolTip::ResultsToolTip( ResultsList* tqparent ) - : TQToolTip( tqparent->viewport() ), m_resultsList( tqparent ) +ResultsToolTip::ResultsToolTip( ResultsList* parent ) + : TQToolTip( parent->viewport() ), m_resultsList( parent ) { } @@ -107,8 +107,8 @@ void ResultsToolTip::maybeTip( const TQPoint& p ) // class PartExplorerForm /////////////////////////////////////////////////////////////////////////////// -PartExplorerForm::PartExplorerForm( TQWidget *tqparent ) - : KDialogBase( tqparent, "parteplorerform", false, +PartExplorerForm::PartExplorerForm( TQWidget *parent ) + : KDialogBase( parent, "parteplorerform", false, i18n("Part Explorer - A Services Lister"), User1 | Close, User1, true ) { m_base = new PartExplorerFormBase( this, "partexplorerformbase", 0 ); diff --git a/parts/partexplorer/partexplorerform.h b/parts/partexplorer/partexplorerform.h index c28c37c0..ea4e638e 100644 --- a/parts/partexplorer/partexplorerform.h +++ b/parts/partexplorer/partexplorerform.h @@ -28,7 +28,7 @@ class PartExplorerForm : public KDialogBase Q_OBJECT TQ_OBJECT public: - PartExplorerForm( TQWidget *tqparent = 0 ); + PartExplorerForm( TQWidget *parent = 0 ); virtual ~PartExplorerForm(); /** diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index f76701e7..2c1de0ce 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -49,8 +49,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) ) using namespace KTextEditor; -QuickOpenPart::QuickOpenPart(TQObject *tqparent, const char *name, const TQStringList& ) - : KDevQuickOpen(&data, tqparent, name ? name : "QuickOpenPart" ) +QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringList& ) + : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" ) { setInstance(QuickOpenFactory::instance()); setXMLFile("kdevpart_quickopen.rc"); diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h index 6dbfb770..a651f39c 100644 --- a/parts/quickopen/quickopen_part.h +++ b/parts/quickopen/quickopen_part.h @@ -32,7 +32,7 @@ class QuickOpenPart : public KDevQuickOpen Q_OBJECT TQ_OBJECT public: - QuickOpenPart(TQObject *tqparent, const char *name, const TQStringList &); + QuickOpenPart(TQObject *parent, const char *name, const TQStringList &); virtual ~QuickOpenPart(); void selectItem( ItemDom item ); diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp index 993ad9d6..df0f6023 100644 --- a/parts/quickopen/quickopenclassdialog.cpp +++ b/parts/quickopen/quickopenclassdialog.cpp @@ -35,8 +35,8 @@ #include "quickopen_part.h" #include "quickopenfunctionchooseform.h" -QuickOpenClassDialog::QuickOpenClassDialog(QuickOpenPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl) - : QuickOpenDialog( part, tqparent, name, modal, fl ) +QuickOpenClassDialog::QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl) + : QuickOpenDialog( part, parent, name, modal, fl ) { nameLabel->setText( i18n("Class &name:") ); itemListLabel->setText( i18n("Class &list:") ); diff --git a/parts/quickopen/quickopenclassdialog.h b/parts/quickopen/quickopenclassdialog.h index 41423285..c3bf7597 100644 --- a/parts/quickopen/quickopenclassdialog.h +++ b/parts/quickopen/quickopenclassdialog.h @@ -32,7 +32,7 @@ class QuickOpenClassDialog : public QuickOpenDialog Q_OBJECT TQ_OBJECT public: - QuickOpenClassDialog(QuickOpenPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); virtual ~QuickOpenClassDialog(); public slots: diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp index b94e01f3..ee7884a9 100644 --- a/parts/quickopen/quickopendialog.cpp +++ b/parts/quickopen/quickopendialog.cpp @@ -28,8 +28,8 @@ #include "quickopendialog.h" #include "quickopen_part.h" -QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl) - : QuickOpenDialogBase( tqparent, name, modal, fl ), m_part( part ) +QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl) + : QuickOpenDialogBase( parent, name, modal, fl ), m_part( part ) { nameEdit->installEventFilter(this); connect( &m_typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTextChangedDelayed()) ); diff --git a/parts/quickopen/quickopendialog.h b/parts/quickopen/quickopendialog.h index 3b6fe84e..5e3f7a1f 100644 --- a/parts/quickopen/quickopendialog.h +++ b/parts/quickopen/quickopendialog.h @@ -37,7 +37,7 @@ class QuickOpenDialog : public QuickOpenDialogBase TQ_OBJECT public: - QuickOpenDialog(QuickOpenPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); virtual ~QuickOpenDialog(); virtual bool eventFilter(TQObject *watched, TQEvent *e); diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp index 0ceeab21..04735816 100644 --- a/parts/quickopen/quickopenfiledialog.cpp +++ b/parts/quickopen/quickopenfiledialog.cpp @@ -35,8 +35,8 @@ #include "quickopenfiledialog.h" #include "quickopen_part.h" -QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl) - : QuickOpenDialog( part, tqparent, name, modal, fl ), m_hasFullPaths( false ) +QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl) + : QuickOpenDialog( part, parent, name, modal, fl ), m_hasFullPaths( false ) { nameLabel->setText( i18n("File &name:") ); itemListLabel->setText( i18n("File &list:") ); @@ -50,8 +50,8 @@ QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, TQWidget* tqparent setFirstItemSelected(); } -QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & urls, TQWidget* tqparent, const char* name, bool modal, WFlags fl) - : QuickOpenDialog( part, tqparent, name, modal, fl ), m_hasFullPaths( true ) +QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & urls, TQWidget* parent, const char* name, bool modal, WFlags fl) + : QuickOpenDialog( part, parent, name, modal, fl ), m_hasFullPaths( true ) { nameLabel->setText( i18n("File &name:") ); itemListLabel->setText( i18n("File &list:") ); diff --git a/parts/quickopen/quickopenfiledialog.h b/parts/quickopen/quickopenfiledialog.h index 69c51316..268139a6 100644 --- a/parts/quickopen/quickopenfiledialog.h +++ b/parts/quickopen/quickopenfiledialog.h @@ -34,8 +34,8 @@ class QuickOpenFileDialog : public QuickOpenDialog Q_OBJECT TQ_OBJECT public: - QuickOpenFileDialog(QuickOpenPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); - QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); virtual ~QuickOpenFileDialog(); public slots: diff --git a/parts/quickopen/quickopenfunctionchooseform.cpp b/parts/quickopen/quickopenfunctionchooseform.cpp index 63d487b8..8e7a959d 100644 --- a/parts/quickopen/quickopenfunctionchooseform.cpp +++ b/parts/quickopen/quickopenfunctionchooseform.cpp @@ -28,8 +28,8 @@ #include "quickopenfunctionchooseform.h" -QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* tqparent, const char* name, bool modal, WFlags fl) -: QuickOpenFunctionChooseFormBase(tqparent,name, modal,fl) +QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* parent, const char* name, bool modal, WFlags fl) +: QuickOpenFunctionChooseFormBase(parent,name, modal,fl) { setCaption( i18n("Select One Argument or File of Function %1").tqarg( name ) ); slotArgsChange( 0 ); diff --git a/parts/quickopen/quickopenfunctionchooseform.h b/parts/quickopen/quickopenfunctionchooseform.h index 1119b4fa..33ad5ef3 100644 --- a/parts/quickopen/quickopenfunctionchooseform.h +++ b/parts/quickopen/quickopenfunctionchooseform.h @@ -31,7 +31,7 @@ class QuickOpenFunctionChooseForm : public QuickOpenFunctionChooseFormBase TQ_OBJECT public: - QuickOpenFunctionChooseForm(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + QuickOpenFunctionChooseForm(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~QuickOpenFunctionChooseForm(); void setRelativePath(int id, const TQString &path) { m_relPaths[id] = path; } diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp index 3887ced4..859597f5 100644 --- a/parts/quickopen/quickopenfunctiondialog.cpp +++ b/parts/quickopen/quickopenfunctiondialog.cpp @@ -39,8 +39,8 @@ #include "quickopenfunctionchooseform.h" #include "quickopenfunctiondialog.h" -QuickOpenFunctionDialog::QuickOpenFunctionDialog( QuickOpenPart *part, TQWidget* tqparent, const char* name, bool modal, WFlags fl) -: QuickOpenDialog(part, tqparent, name, modal, fl) +QuickOpenFunctionDialog::QuickOpenFunctionDialog( QuickOpenPart *part, TQWidget* parent, const char* name, bool modal, WFlags fl) +: QuickOpenDialog(part, parent, name, modal, fl) { nameLabel->setText( i18n("Function &name:") ); itemListLabel->setText( i18n("Function &list:") ); diff --git a/parts/quickopen/quickopenfunctiondialog.h b/parts/quickopen/quickopenfunctiondialog.h index 24da168b..47c16bc8 100644 --- a/parts/quickopen/quickopenfunctiondialog.h +++ b/parts/quickopen/quickopenfunctiondialog.h @@ -35,7 +35,7 @@ class QuickOpenFunctionDialog : public QuickOpenDialog TQ_OBJECT public: - QuickOpenFunctionDialog( QuickOpenPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + QuickOpenFunctionDialog( QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~QuickOpenFunctionDialog(); void gotoFile( TQString name ); diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp index a991171a..8a3c8bd5 100644 --- a/parts/regexptest/regexptestpart.cpp +++ b/parts/regexptest/regexptestpart.cpp @@ -24,8 +24,8 @@ static const KDevPluginInfo data("kdevregexptest"); typedef KDevGenericFactory<RegexpTestPart> RegexpTestFactory; K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) ) -RegexpTestPart::RegexpTestPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "RegexpTestPart") +RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "RegexpTestPart") { setInstance(RegexpTestFactory::instance()); setXMLFile("kdevregexptest.rc"); diff --git a/parts/regexptest/regexptestpart.h b/parts/regexptest/regexptestpart.h index 5318b86e..61dbe9e3 100644 --- a/parts/regexptest/regexptestpart.h +++ b/parts/regexptest/regexptestpart.h @@ -25,7 +25,7 @@ class RegexpTestPart : public KDevPlugin TQ_OBJECT public: - RegexpTestPart( TQObject *tqparent, const char *name, const TQStringList & ); + RegexpTestPart( TQObject *parent, const char *name, const TQStringList & ); ~RegexpTestPart(); private slots: diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp index 3e8242e8..e808ab70 100644 --- a/parts/replace/replace_part.cpp +++ b/parts/replace/replace_part.cpp @@ -29,8 +29,8 @@ static const KDevPluginInfo data("kdevreplace"); typedef KDevGenericFactory<ReplacePart> ReplaceFactory; K_EXPORT_COMPONENT_FACTORY(libkdevreplace, ReplaceFactory(data)) -ReplacePart::ReplacePart(TQObject *tqparent, const char *name, const TQStringList& ) - : KDevPlugin( &data, tqparent, name ? name : "ReplacePart" ) +ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& ) + : KDevPlugin( &data, parent, name ? name : "ReplacePart" ) { setInstance(ReplaceFactory::instance()); setXMLFile("kdevpart_replace.rc"); diff --git a/parts/replace/replace_part.h b/parts/replace/replace_part.h index efad03bd..65c0fe54 100644 --- a/parts/replace/replace_part.h +++ b/parts/replace/replace_part.h @@ -28,7 +28,7 @@ class ReplacePart : public KDevPlugin TQ_OBJECT public: - ReplacePart(TQObject *tqparent, const char *name, const TQStringList &); + ReplacePart(TQObject *parent, const char *name, const TQStringList &); ~ReplacePart(); public slots: diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp index 87be28f9..b0c5bffd 100644 --- a/parts/replace/replacedlgimpl.cpp +++ b/parts/replace/replacedlgimpl.cpp @@ -37,8 +37,8 @@ TQString escape(const TQString &str) } -ReplaceDlgImpl::ReplaceDlgImpl(TQWidget* tqparent, const char* name, bool modal, WFlags fl) - : ReplaceDlg(tqparent,name, modal,fl), _regexp_dialog( 0 ) +ReplaceDlgImpl::ReplaceDlgImpl(TQWidget* parent, const char* name, bool modal, WFlags fl) + : ReplaceDlg(parent,name, modal,fl), _regexp_dialog( 0 ) { connect( find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( saveComboHistories() ) ); diff --git a/parts/replace/replacedlgimpl.h b/parts/replace/replacedlgimpl.h index 73d49cb5..4ae8e86c 100644 --- a/parts/replace/replacedlgimpl.h +++ b/parts/replace/replacedlgimpl.h @@ -12,7 +12,7 @@ class ReplaceDlgImpl : public ReplaceDlg TQ_OBJECT public: - ReplaceDlgImpl(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ReplaceDlgImpl(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ReplaceDlgImpl(); TQRegExp expressionPattern(); diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp index 087e2b1f..853c170d 100644 --- a/parts/replace/replaceitem.cpp +++ b/parts/replace/replaceitem.cpp @@ -45,18 +45,18 @@ void ReplaceItem::setChecked( bool checked ) { if ( !isFile() ) // this is a child item { - if ( checked || !(tqparent()->hasCheckedChildren())) + if ( checked || !(parent()->hasCheckedChildren())) { - if ( tqparent()->isOn() != checked ) + if ( parent()->isOn() != checked ) { - tqparent()->_clicked = false; - tqparent()->setOn( checked ); + parent()->_clicked = false; + parent()->setOn( checked ); } } return; } - // this is a tqparent item, set self and tqchildren + // this is a parent item, set self and tqchildren ReplaceItem * item = firstChild(); while ( item ) { diff --git a/parts/replace/replaceitem.h b/parts/replace/replaceitem.h index 8d4f3fd3..aa8f1700 100644 --- a/parts/replace/replaceitem.h +++ b/parts/replace/replaceitem.h @@ -22,8 +22,8 @@ class ReplaceItem : public TQCheckListItem { public: // the file item - ReplaceItem( ReplaceView * tqparent, ReplaceItem * after, TQString file ) : - TQCheckListItem( tqparent, + ReplaceItem( ReplaceView * parent, ReplaceItem * after, TQString file ) : + TQCheckListItem( parent, after, file, TQCheckListItem::CheckBox ), _file( file ), _string( file ), _line( 0 ), _isfile( true ), @@ -34,8 +34,8 @@ public: } // the line item - ReplaceItem( ReplaceItem * tqparent, ReplaceItem * after, TQString file, TQString string, int line ) : - TQCheckListItem( tqparent, + ReplaceItem( ReplaceItem * parent, ReplaceItem * after, TQString file, TQString string, int line ) : + TQCheckListItem( parent, after, TQString::number( line + 1 ) + ": " + string, TQCheckListItem::CheckBox ), _file( file ), _string( string ), _line( line ), _isfile( false ), @@ -76,9 +76,9 @@ public: return _lineclicked; } - ReplaceItem * tqparent() const + ReplaceItem * parent() const { - return static_cast<ReplaceItem*>( TQListViewItem::tqparent() ); + return static_cast<ReplaceItem*>( TQListViewItem::parent() ); } ReplaceItem * firstChild() const diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index b81b7dbb..4d5c4b41 100644 --- a/parts/replace/replaceview.cpp +++ b/parts/replace/replaceview.cpp @@ -27,7 +27,7 @@ ReplaceItem * ReplaceView::firstChild() const } -ReplaceView::ReplaceView( TQWidget * tqparent ) : KListView( tqparent ), _latestfile( 0 ) +ReplaceView::ReplaceView( TQWidget * parent ) : KListView( parent ), _latestfile( 0 ) { setSorting( -1 ); addColumn( "" ); diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp index 6314306e..78749465 100644 --- a/parts/scripting/scriptingglobalconfig.cpp +++ b/parts/scripting/scriptingglobalconfig.cpp @@ -24,8 +24,8 @@ #include <keditlistbox.h> #include <kapplication.h> #include <kconfig.h> -scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *tqparent, const char *name) - : scriptingGlobalConfigBase(tqparent, name), m_part(part) +scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *parent, const char *name) + : scriptingGlobalConfigBase(parent, name), m_part(part) { // read kconfig and post list to the m_dirs KConfig *cfg = kapp->config(); diff --git a/parts/scripting/scriptingglobalconfig.h b/parts/scripting/scriptingglobalconfig.h index 3d132d58..424a64c0 100644 --- a/parts/scripting/scriptingglobalconfig.h +++ b/parts/scripting/scriptingglobalconfig.h @@ -30,7 +30,7 @@ class scriptingGlobalConfig: public scriptingGlobalConfigBase Q_OBJECT TQ_OBJECT public: - scriptingGlobalConfig(scriptingPart *part, TQWidget *tqparent = 0, const char *name = 0); + scriptingGlobalConfig(scriptingPart *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index 7a332fd8..0501ecd9 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -47,8 +47,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -scriptingPart::scriptingPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, tqparent, name ? name : "scriptingPart"), m_scripts(0L) +scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L) { setInstance(scriptingFactory::instance()); setXMLFile("kdevscripting.rc"); diff --git a/parts/scripting/scriptingpart.h b/parts/scripting/scriptingpart.h index 8465764d..ea891dd2 100644 --- a/parts/scripting/scriptingpart.h +++ b/parts/scripting/scriptingpart.h @@ -39,7 +39,7 @@ class scriptingPart: public KDevPlugin Q_OBJECT TQ_OBJECT public: - scriptingPart(TQObject *tqparent, const char *name, const TQStringList &args); + scriptingPart(TQObject *parent, const char *name, const TQStringList &args); ~scriptingPart(); public slots: diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index e130d1e6..3224a891 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -37,8 +37,8 @@ static const KDevPluginInfo data("kdevsnippet"); typedef KDevGenericFactory<SnippetPart> snippetFactory; K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) ) -SnippetPart::SnippetPart(TQObject *tqparent, const char *name, const TQStringList& ) - : KDevPlugin(&data, tqparent, name ? name : "SnippetPart" ) +SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& ) + : KDevPlugin(&data, parent, name ? name : "SnippetPart" ) { setInstance(snippetFactory::instance()); setXMLFile("kdevpart_snippet.rc"); diff --git a/parts/snippet/snippet_part.h b/parts/snippet/snippet_part.h index f9f7bc93..78212a1a 100644 --- a/parts/snippet/snippet_part.h +++ b/parts/snippet/snippet_part.h @@ -31,7 +31,7 @@ class SnippetPart : public KDevPlugin public: - SnippetPart(TQObject *tqparent, const char *name, const TQStringList &); + SnippetPart(TQObject *parent, const char *name, const TQStringList &); ~SnippetPart(); KAboutData * aboutData(); TQStringList getAllLanguages(); diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index e460cb67..9bcfa55c 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -85,7 +85,7 @@ SnippetWidget::~SnippetWidget() writeConfig(); delete _cfg; - /* We need to delete the child items before the tqparent items + /* We need to delete the child items before the parent items otherwise KDevelop would crash on exiting */ SnippetItem * item; while (_list.count() > 0) { @@ -111,7 +111,7 @@ void SnippetWidget::slotAdd() which the selected item is a child of*/ SnippetGroup * group = dynamic_cast<SnippetGroup*>(selectedItem()); if (!group) - group = dynamic_cast<SnippetGroup*>(selectedItem()->tqparent()); + group = dynamic_cast<SnippetGroup*>(selectedItem()->parent()); /*fill the combobox with the names of all SnippetGroup entries*/ for (SnippetItem *it=_list.first(); it; it=_list.next()) { @@ -218,10 +218,10 @@ void SnippetWidget::slotEdit() pSnippet->setName( dlg.snippetName->text() ); pSnippet->setText( dlg.snippetText->text() ); - /* if the user changed the tqparent we need to move the snippet */ + /* if the user changed the parent we need to move the snippet */ if ( SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName() != dlg.cbGroup->currentText() ) { SnippetGroup * newGroup = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list)); - pSnippet->tqparent()->takeItem(pSnippet); + pSnippet->parent()->takeItem(pSnippet); newGroup->insertItem(pSnippet); pSnippet->resetParent(); } @@ -917,7 +917,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *) SnippetGroup *group = dynamic_cast<SnippetGroup *>(item2); if (!group) - group = dynamic_cast<SnippetGroup *>(item2->tqparent()); + group = dynamic_cast<SnippetGroup *>(item2->parent()); TQCString dropped; TQByteArray data = e->tqencodedData("text/plain"); diff --git a/parts/snippet/snippetitem.cpp b/parts/snippet/snippetitem.cpp index 69010a5d..e2f08a2b 100644 --- a/parts/snippet/snippetitem.cpp +++ b/parts/snippet/snippetitem.cpp @@ -11,20 +11,20 @@ #include "snippetitem.h" -SnippetItem::SnippetItem(TQListView * tqparent, TQString name, TQString text ) - : TQListViewItem( tqparent, name ) +SnippetItem::SnippetItem(TQListView * parent, TQString name, TQString text ) + : TQListViewItem( parent, name ) { strName = name; strText = text; iParent = -1; } -SnippetItem::SnippetItem(TQListViewItem * tqparent, TQString name, TQString text) - : TQListViewItem( tqparent, name ) +SnippetItem::SnippetItem(TQListViewItem * parent, TQString name, TQString text) + : TQListViewItem( parent, name ) { strName = name; strText = text; - iParent = ((SnippetGroup *)tqparent)->getId(); + iParent = ((SnippetGroup *)parent)->getId(); } SnippetItem::~SnippetItem() @@ -69,7 +69,7 @@ void SnippetItem::setName(TQString name) void SnippetItem::resetParent() { - SnippetGroup * group = dynamic_cast<SnippetGroup*>(tqparent()); + SnippetGroup * group = dynamic_cast<SnippetGroup*>(parent()); if (group) iParent = group->getId(); } @@ -100,8 +100,8 @@ Deklaration for class SnippetGroup int SnippetGroup::iMaxId = 1; -SnippetGroup::SnippetGroup(TQListView * tqparent, TQString name, int id, TQString lang) - : SnippetItem(tqparent, name, "GROUP") +SnippetGroup::SnippetGroup(TQListView * parent, TQString name, int id, TQString lang) + : SnippetItem(parent, name, "GROUP") { if (id > 0) { iId = id; diff --git a/parts/snippet/snippetitem.h b/parts/snippet/snippetitem.h index d96ecd5b..ee181725 100644 --- a/parts/snippet/snippetitem.h +++ b/parts/snippet/snippetitem.h @@ -24,7 +24,7 @@ It also holds the needed data for one snippet. class SnippetItem : public TQListViewItem { friend class SnippetGroup; public: - SnippetItem(TQListViewItem * tqparent, TQString name, TQString text); + SnippetItem(TQListViewItem * parent, TQString name, TQString text); ~SnippetItem(); TQString getName(); @@ -37,7 +37,7 @@ public: static SnippetGroup * findGroupById(int id, TQPtrList<SnippetItem> &list); private: - SnippetItem(TQListView * tqparent, TQString name, TQString text); + SnippetItem(TQListView * parent, TQString name, TQString text); TQString strName; TQString strText; int iParent; @@ -51,7 +51,7 @@ it in the main TQPtrList<SnippetItem>. */ class SnippetGroup : public SnippetItem { public: - SnippetGroup(TQListView * tqparent, TQString name, int id, TQString lang=i18n("All")); + SnippetGroup(TQListView * parent, TQString name, int id, TQString lang=i18n("All")); ~SnippetGroup(); int getId() { return iId; } diff --git a/parts/snippet/snippetsettings.cpp b/parts/snippet/snippetsettings.cpp index d66094e7..8e559ba5 100644 --- a/parts/snippet/snippetsettings.cpp +++ b/parts/snippet/snippetsettings.cpp @@ -15,14 +15,14 @@ #include "snippet_widget.h" -SnippetSettings::SnippetSettings(TQWidget *tqparent, const char *name) - : SnippetSettingsBase(tqparent, name) +SnippetSettings::SnippetSettings(TQWidget *parent, const char *name) + : SnippetSettingsBase(parent, name) { _widget = NULL; } -SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *tqparent, const char *name) - : SnippetSettingsBase(tqparent, name) +SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *parent, const char *name) + : SnippetSettingsBase(parent, name) { _cfg = w->getSnippetConfig(); _widget = w; diff --git a/parts/snippet/snippetsettings.h b/parts/snippet/snippetsettings.h index 44c84e33..62b228b1 100644 --- a/parts/snippet/snippetsettings.h +++ b/parts/snippet/snippetsettings.h @@ -26,8 +26,8 @@ class SnippetSettings : public SnippetSettingsBase Q_OBJECT TQ_OBJECT public: - SnippetSettings(TQWidget *tqparent = 0, const char *name = 0); - SnippetSettings(SnippetWidget * w, TQWidget *tqparent = 0, const char *name = 0); + SnippetSettings(TQWidget *parent = 0, const char *name = 0); + SnippetSettings(SnippetWidget * w, TQWidget *parent = 0, const char *name = 0); ~SnippetSettings(); diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp index 3697b89f..332d97e3 100644 --- a/parts/texttools/texttoolspart.cpp +++ b/parts/texttools/texttoolspart.cpp @@ -28,8 +28,8 @@ typedef KDevGenericFactory<TextToolsPart> TextToolsFactory; static const KDevPluginInfo data("kdevtexttools"); K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) ) -TextToolsPart::TextToolsPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "TextToolsPart") +TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "TextToolsPart") { setInstance(TextToolsFactory::instance()); // setXMLFile("kdevfileview.rc"); diff --git a/parts/texttools/texttoolspart.h b/parts/texttools/texttoolspart.h index 42443c48..2f2768ab 100644 --- a/parts/texttools/texttoolspart.h +++ b/parts/texttools/texttoolspart.h @@ -25,7 +25,7 @@ class TextToolsPart : public KDevPlugin TQ_OBJECT public: - TextToolsPart( TQObject *tqparent, const char *name, const TQStringList & ); + TextToolsPart( TQObject *parent, const char *name, const TQStringList & ); ~TextToolsPart(); private slots: diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index 269c8136..a6815959 100644 --- a/parts/texttools/texttoolswidget.cpp +++ b/parts/texttools/texttoolswidget.cpp @@ -30,11 +30,11 @@ class TextStructItem : public TQListViewItem { public: - TextStructItem(TQListView *tqparent) - : TQListViewItem(tqparent) + TextStructItem(TQListView *parent) + : TQListViewItem(parent) {} - TextStructItem(TQListViewItem *tqparent) - : TQListViewItem(tqparent) + TextStructItem(TQListViewItem *parent) + : TQListViewItem(parent) { TQListViewItem *item = this; while (item->nextSibling()) @@ -48,7 +48,7 @@ public: return extra.isNull()? tag : TQString("%1: %2").tqarg(tag).tqarg(extra); } TextStructItem *parentStructItem() - { return static_cast<TextStructItem*>(tqparent()); } + { return static_cast<TextStructItem*>(parent()); } TQString tag; TQString extra; @@ -57,8 +57,8 @@ public: }; -TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *parent, const char *name) + : KListView(parent, name) { setResizeMode(TQListView::LastColumn); setSorting(-1); @@ -297,9 +297,9 @@ void TextToolsWidget::parseXML() } TextStructItem *closingItem = currentItem; - while (closingItem->tqparent() && closingItem->tag != tag) + while (closingItem->parent() && closingItem->tag != tag) closingItem = closingItem->parentStructItem(); - if (closingItem->tqparent()) { + if (closingItem->parent()) { closingItem->endpos = endpos; currentItem = closingItem->parentStructItem(); } else { @@ -377,7 +377,7 @@ void TextToolsWidget::parseLaTeX() TQString title = re.cap(2); kdDebug(9030) << "Match with " << tag << " and title " << title << endl; int level = hierarchyLevels.find(tag); - while (currentItem->tqparent() && level <= hierarchyLevels.find(currentItem->tag)) + while (currentItem->parent() && level <= hierarchyLevels.find(currentItem->tag)) currentItem = currentItem->parentStructItem(); TextStructItem *item = new TextStructItem(currentItem); diff --git a/parts/texttools/texttoolswidget.h b/parts/texttools/texttoolswidget.h index edbd834b..0d5593a2 100644 --- a/parts/texttools/texttoolswidget.h +++ b/parts/texttools/texttoolswidget.h @@ -29,7 +29,7 @@ class TextToolsWidget : public KListView public: enum Mode { HTML, Docbook, LaTeX }; - TextToolsWidget( TextToolsPart *part, TQWidget *tqparent=0, const char *name=0 ); + TextToolsWidget( TextToolsPart *part, TQWidget *parent=0, const char *name=0 ); ~TextToolsWidget(); void setMode(Mode mode, KParts::Part *part); diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index 02195822..e1de784a 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -24,8 +24,8 @@ static const KDevPluginInfo data("kdevtipofday"); typedef KDevGenericFactory<TipOfDayPart> TipOfDayFactory; K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) ) -TipOfDayPart::TipOfDayPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin(&data, tqparent, name ? name : "TipOfDayPart") +TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin(&data, parent, name ? name : "TipOfDayPart") { setInstance(TipOfDayFactory::instance()); diff --git a/parts/tipofday/tipofday_part.h b/parts/tipofday/tipofday_part.h index faf3ca19..83bedf04 100644 --- a/parts/tipofday/tipofday_part.h +++ b/parts/tipofday/tipofday_part.h @@ -17,7 +17,7 @@ class TipOfDayPart : public KDevPlugin public: - TipOfDayPart(TQObject *tqparent, const char *name, const TQStringList &); + TipOfDayPart(TQObject *parent, const char *name, const TQStringList &); public slots: diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index 1844ba06..7db56d91 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -65,9 +65,9 @@ template class TQPtrList<TQString>; // ---------------------------------------------------------------------- -KDevAppTreeListItem::KDevAppTreeListItem( KListView* tqparent, const TQString & name, +KDevAppTreeListItem::KDevAppTreeListItem( KListView* parent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ) - : TQListViewItem( tqparent, name ) + : TQListViewItem( parent, name ) { init(pixmap, parse, dir, p, c, dE); } @@ -75,9 +75,9 @@ KDevAppTreeListItem::KDevAppTreeListItem( KListView* tqparent, const TQString & // ---------------------------------------------------------------------- -KDevAppTreeListItem::KDevAppTreeListItem( TQListViewItem* tqparent, const TQString & name, +KDevAppTreeListItem::KDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ) - : TQListViewItem( tqparent, name ) + : TQListViewItem( parent, name ) { init(pixmap, parse, dir, p, c, dE); } @@ -118,7 +118,7 @@ void KDevAppTreeListItem::activate() void KDevAppTreeListItem::setOpen( bool o ) { if( o && !parsed ) { // fill the tqchildren before opening - ((KDevApplicationTree *) tqparent())->addDesktopGroup( path, this ); + ((KDevApplicationTree *) parent())->addDesktopGroup( path, this ); parsed = true; } TQListViewItem::setOpen( o ); @@ -131,8 +131,8 @@ bool KDevAppTreeListItem::isDirectory() // ---------------------------------------------------------------------- -KDevApplicationTree::KDevApplicationTree( TQWidget *tqparent, const char* name ) - : KListView( tqparent, name ), currentitem(0) +KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name ) + : KListView( parent, name ), currentitem(0) { addColumn( i18n("Known Applications") ); setRootIsDecorated( true ); diff --git a/parts/tools/kapplicationtree.h b/parts/tools/kapplicationtree.h index 2e869889..4887d848 100644 --- a/parts/tools/kapplicationtree.h +++ b/parts/tools/kapplicationtree.h @@ -50,9 +50,9 @@ protected: void init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry); public: - KDevAppTreeListItem( KListView* tqparent, const TQString & name, const TQPixmap& pixmap, + KDevAppTreeListItem( KListView* parent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ); - KDevAppTreeListItem( TQListViewItem* tqparent, const TQString & name, const TQPixmap& pixmap, + KDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ); bool isDirectory(); @@ -76,7 +76,7 @@ class KDevApplicationTree : public KListView Q_OBJECT TQ_OBJECT public: - KDevApplicationTree( TQWidget *tqparent, const char* name = 0 ); + KDevApplicationTree( TQWidget *parent, const char* name = 0 ); /** * Add a group of .desktop/.kdelnk entries diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index b6420714..ef30ffa8 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -39,8 +39,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) ) TQMap<int, TQString> externalToolMenuEntries; -ToolsPart::ToolsPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin( &data, tqparent, name ? name : "ToolsPart") +ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin( &data, parent, name ? name : "ToolsPart") { setInstance(ToolsFactory::instance()); diff --git a/parts/tools/tools_part.h b/parts/tools/tools_part.h index 5654d1ef..6b24b7b9 100644 --- a/parts/tools/tools_part.h +++ b/parts/tools/tools_part.h @@ -27,7 +27,7 @@ class ToolsPart : public KDevPlugin public: - ToolsPart( TQObject *tqparent, const char *name, const TQStringList & ); + ToolsPart( TQObject *parent, const char *name, const TQStringList & ); ~ToolsPart(); diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp index 915490d1..1b4c90f3 100644 --- a/parts/tools/toolsconfig.cpp +++ b/parts/tools/toolsconfig.cpp @@ -17,8 +17,8 @@ #include "kapplicationtree.h" -ToolsConfig::ToolsConfig(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), _tree(0) +ToolsConfig::ToolsConfig(TQWidget *parent, const char *name) + : TQWidget(parent, name), _tree(0) { _entries.setAutoDelete(true); } diff --git a/parts/tools/toolsconfig.h b/parts/tools/toolsconfig.h index 81ae27ab..4b5cf26f 100644 --- a/parts/tools/toolsconfig.h +++ b/parts/tools/toolsconfig.h @@ -31,7 +31,7 @@ class ToolsConfig : public TQWidget public: - ToolsConfig(TQWidget *tqparent = 0, const char *name = 0); + ToolsConfig(TQWidget *parent = 0, const char *name = 0); public slots: diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp index da96adad..b4643b26 100644 --- a/parts/tools/toolsconfigwidget.cpp +++ b/parts/tools/toolsconfigwidget.cpp @@ -41,8 +41,8 @@ struct ToolsConfigEntry }; -ToolsConfigWidget::ToolsConfigWidget(TQWidget *tqparent, const char *name) - : ToolsConfigWidgetBase(tqparent, name) +ToolsConfigWidget::ToolsConfigWidget(TQWidget *parent, const char *name) + : ToolsConfigWidgetBase(parent, name) { m_toolsmenuEntries.setAutoDelete(true); m_filecontextEntries.setAutoDelete(true); diff --git a/parts/tools/toolsconfigwidget.h b/parts/tools/toolsconfigwidget.h index d0b468ac..37812bac 100644 --- a/parts/tools/toolsconfigwidget.h +++ b/parts/tools/toolsconfigwidget.h @@ -26,7 +26,7 @@ class ToolsConfigWidget : public ToolsConfigWidgetBase TQ_OBJECT public: - ToolsConfigWidget(TQWidget *tqparent=0, const char *name=0); + ToolsConfigWidget(TQWidget *parent=0, const char *name=0); ~ToolsConfigWidget(); public slots: diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp index 64a07b70..855f4daf 100644 --- a/parts/uimode/uichooser_part.cpp +++ b/parts/uimode/uichooser_part.cpp @@ -18,8 +18,8 @@ typedef KDevGenericFactory<UIChooserPart> UIChooserFactory; static const KDevPluginInfo data("kdevuichooser"); K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) ) -UIChooserPart::UIChooserPart(TQObject *tqparent, const char *name, const TQStringList &) - : KDevPlugin( &data, tqparent, name ? name : "UIChooserPart") +UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &) + : KDevPlugin( &data, parent, name ? name : "UIChooserPart") { setInstance(UIChooserFactory::instance()); diff --git a/parts/uimode/uichooser_part.h b/parts/uimode/uichooser_part.h index 1e48d35b..a6b79532 100644 --- a/parts/uimode/uichooser_part.h +++ b/parts/uimode/uichooser_part.h @@ -18,7 +18,7 @@ class UIChooserPart : public KDevPlugin TQ_OBJECT public: - UIChooserPart(TQObject *tqparent, const char *name, const TQStringList &); + UIChooserPart(TQObject *parent, const char *name, const TQStringList &); ~UIChooserPart(); private slots: diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp index 064380e0..2fe6b919 100644 --- a/parts/uimode/uichooser_widget.cpp +++ b/parts/uimode/uichooser_widget.cpp @@ -27,8 +27,8 @@ #include "kdevmainwindow.h" #include "uichooser_widget.h" -UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *tqparent, const char *name) - : UIChooser(tqparent, name) +UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const char *name) + : UIChooser(parent, name) ,m_part(part), _lastMode(0L) { load(); diff --git a/parts/uimode/uichooser_widget.h b/parts/uimode/uichooser_widget.h index 4901f1af..67b45142 100644 --- a/parts/uimode/uichooser_widget.h +++ b/parts/uimode/uichooser_widget.h @@ -21,7 +21,7 @@ public: _NeverShowTabs = 2 }; - UIChooserWidget( UIChooserPart * part, TQWidget *tqparent=0, const char *name=0 ); + UIChooserWidget( UIChooserPart * part, TQWidget *parent=0, const char *name=0 ); public slots: void accept(); diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp index 5caa2db6..cfca7074 100644 --- a/parts/valgrind/valgrind_dialog.cpp +++ b/parts/valgrind/valgrind_dialog.cpp @@ -16,8 +16,8 @@ #include "valgrind_dialog.moc" -ValgrindDialog::ValgrindDialog( Type type, TQWidget* tqparent ) - : KDialogBase( tqparent, "valgrind dialog", true, i18n("Valgrind Memory Check"), Ok|Cancel ), +ValgrindDialog::ValgrindDialog( Type type, TQWidget* parent ) + : KDialogBase( parent, "valgrind dialog", true, i18n("Valgrind Memory Check"), Ok|Cancel ), m_type(type) { w = new DialogWidget( this ); diff --git a/parts/valgrind/valgrind_dialog.h b/parts/valgrind/valgrind_dialog.h index d3422b80..0d5153ee 100644 --- a/parts/valgrind/valgrind_dialog.h +++ b/parts/valgrind/valgrind_dialog.h @@ -18,7 +18,7 @@ class ValgrindDialog : public KDialogBase public: enum Type { Memcheck = 0, Calltree = 1 }; - ValgrindDialog( Type type, TQWidget* tqparent = 0 ); + ValgrindDialog( Type type, TQWidget* parent = 0 ); ~ValgrindDialog(); // the app to check diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp index 064129cf..abf10a6d 100644 --- a/parts/valgrind/valgrind_part.cpp +++ b/parts/valgrind/valgrind_part.cpp @@ -26,8 +26,8 @@ typedef KDevGenericFactory<ValgrindPart> ValgrindFactory; static const KDevPluginInfo data("kdevvalgrind"); K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) ) -ValgrindPart::ValgrindPart( TQObject *tqparent, const char *name, const TQStringList& ) - : KDevPlugin( &data, tqparent, name ? name : "ValgrindPart" ) +ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& ) + : KDevPlugin( &data, parent, name ? name : "ValgrindPart" ) { setInstance( ValgrindFactory::instance() ); setXMLFile( "kdevpart_valgrind.rc" ); diff --git a/parts/valgrind/valgrind_part.h b/parts/valgrind/valgrind_part.h index f7e3a4cf..4c5ab785 100644 --- a/parts/valgrind/valgrind_part.h +++ b/parts/valgrind/valgrind_part.h @@ -19,7 +19,7 @@ class ValgrindPart : public KDevPlugin TQ_OBJECT public: - ValgrindPart( TQObject *tqparent, const char *name, const TQStringList & ); + ValgrindPart( TQObject *parent, const char *name, const TQStringList & ); ~ValgrindPart(); void runValgrind( const TQString& exec, const TQString& parameters, const TQString& valExec, const TQString& valParameters ); diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp index 00eca21e..074a2c38 100644 --- a/parts/valgrind/valgrind_widget.cpp +++ b/parts/valgrind/valgrind_widget.cpp @@ -24,15 +24,15 @@ class ValListViewItem: public TQListViewItem { public: - ValListViewItem( TQListView* tqparent, int key, int pid, const TQString& message ): - TQListViewItem( tqparent, TQString::number( key ), TQString::number( pid ), message ), + ValListViewItem( TQListView* parent, int key, int pid, const TQString& message ): + TQListViewItem( parent, TQString::number( key ), TQString::number( pid ), message ), _key( key ), _pid ( pid ), backtrace( false ), _line( -1 ), _active( false ) {} - ValListViewItem( ValListViewItem* tqparent, int key, int pid, const TQString& message, const TQString& filename, int line, bool active ): - TQListViewItem( tqparent, TQString::number( key ), TQString(), message ), + ValListViewItem( ValListViewItem* parent, int key, int pid, const TQString& message, const TQString& filename, int line, bool active ): + TQListViewItem( parent, TQString::number( key ), TQString(), message ), _key( key ), _pid( pid ), backtrace( true ), _filename( filename ), _line( line ), _active( active ) { - if ( tqparent->_pid != _pid && _pid > 0 ) + if ( parent->_pid != _pid && _pid > 0 ) setText( 1, TQString::number( _pid ) ); } diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp index 16cad089..43e8bdb7 100644 --- a/parts/vcsmanager/vcsmanagerpart.cpp +++ b/parts/vcsmanager/vcsmanagerpart.cpp @@ -48,8 +48,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -VCSManagerPart::VCSManagerPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, tqparent, name ? name : "VCSManagerPart") +VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, parent, name ? name : "VCSManagerPart") { kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl; diff --git a/parts/vcsmanager/vcsmanagerpart.h b/parts/vcsmanager/vcsmanagerpart.h index 2d135b73..5edd77ac 100644 --- a/parts/vcsmanager/vcsmanagerpart.h +++ b/parts/vcsmanager/vcsmanagerpart.h @@ -40,7 +40,7 @@ class VCSManagerPart: public KDevPlugin Q_OBJECT TQ_OBJECT public: - VCSManagerPart(TQObject *tqparent, const char *name, const TQStringList &args); + VCSManagerPart(TQObject *parent, const char *name, const TQStringList &args); ~VCSManagerPart(); TQString vcsPlugin(); void loadVCSPlugin(); diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp index 2202484b..ef2f9568 100644 --- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp +++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp @@ -28,8 +28,8 @@ #include "vcsmanagerprojectconfig.h" #include "vcsmanagerpart.h" -VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *tqparent, const char *name ) - : VCSManagerProjectConfigBase( tqparent, name ), m_part( part ) +VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent, const char *name ) + : VCSManagerProjectConfigBase( parent, name ), m_part( part ) { setup(); } diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.h b/parts/vcsmanager/vcsmanagerprojectconfig.h index 9dbe0b27..9d4774f9 100644 --- a/parts/vcsmanager/vcsmanagerprojectconfig.h +++ b/parts/vcsmanager/vcsmanagerprojectconfig.h @@ -31,7 +31,7 @@ class VCSManagerProjectConfig: public VCSManagerProjectConfigBase Q_OBJECT TQ_OBJECT public: - VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *tqparent = 0, const char *name = 0); + VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp index e1257537..d60619f0 100644 --- a/src/generalinfowidget.cpp +++ b/src/generalinfowidget.cpp @@ -29,8 +29,8 @@ TQString makeRelativePath(const TQString& fromPath, const TQString& toPath); -GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *tqparent, const char *name) - : GeneralInfoWidgetBase(tqparent, name), m_projectDom(projectDom) { +GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name) + : GeneralInfoWidgetBase(parent, name), m_projectDom(projectDom) { connect(project_directory_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProjectDirectoryChanged(const TQString&))); diff --git a/src/generalinfowidget.h b/src/generalinfowidget.h index 85f926e5..0a93f610 100644 --- a/src/generalinfowidget.h +++ b/src/generalinfowidget.h @@ -27,7 +27,7 @@ class GeneralInfoWidget : public GeneralInfoWidgetBase { public: - GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0); + GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0); ~GeneralInfoWidget(); public slots: diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index b21f4c3a..9fb09d0e 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -36,9 +36,9 @@ class LangPluginItem : public TQCheckListItem { public: // name - "Name", label - "GenericName", info - "Comment" - LangPluginItem( TQListView * tqparent, TQString const & name, TQString const & label, + LangPluginItem( TQListView * parent, TQString const & name, TQString const & label, TQString const & info ) - : TQCheckListItem( tqparent, label, TQCheckListItem::CheckBox), + : TQCheckListItem( parent, label, TQCheckListItem::CheckBox), _name( name ), _info( info ) {} @@ -52,8 +52,8 @@ private: LanguageSelectWidget::LanguageSelectWidget(TQDomDocument &projectDom, - TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), m_projectDom(projectDom) + TQWidget *parent, const char *name) + : TQWidget(parent, name), m_projectDom(projectDom) { init(); } diff --git a/src/languageselectwidget.h b/src/languageselectwidget.h index 9e7e31de..1fc247a3 100644 --- a/src/languageselectwidget.h +++ b/src/languageselectwidget.h @@ -25,7 +25,7 @@ class LanguageSelectWidget : public TQWidget public: /* for selection of project parts */ - LanguageSelectWidget( TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0 ); + LanguageSelectWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 ); ~LanguageSelectWidget(); public slots: diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 8e39a63d..844bc4a9 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -105,7 +105,7 @@ void MainWindowShare::createActions() { ProjectManager::getInstance()->createActions( m_pMainWnd->actionCollection() ); - KStdAction::quit(this->tqparent(), TQT_SLOT(close()), m_pMainWnd->actionCollection()); + KStdAction::quit(this->parent(), TQT_SLOT(close()), m_pMainWnd->actionCollection()); KAction* action; diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp index 404a0bae..70975de5 100644 --- a/src/multibuffer.cpp +++ b/src/multibuffer.cpp @@ -45,8 +45,8 @@ #include <ktexteditor/document.h> #include <ktexteditor/viewcursorinterface.h> -MultiBuffer::MultiBuffer( TQWidget *tqparent ) - : TQSplitter( tqparent, "MultiBuffer" ), +MultiBuffer::MultiBuffer( TQWidget *parent ) + : TQSplitter( parent, "MultiBuffer" ), m_editorFactory( 0 ), m_delayActivate( false ), m_activated( false ), @@ -219,7 +219,7 @@ void MultiBuffer::show() KTextEditor::View *view = document->createView( this ); document->setWidget( view ); - // We're managing the view deletion by being its tqparent, + // We're managing the view deletion by being its parent, // don't let the part self-destruct disconnect( view, TQT_SIGNAL( destroyed() ), document, TQT_SLOT( slotWidgetDestroyed() ) ); diff --git a/src/multibuffer.h b/src/multibuffer.h index e3cabcf0..51b79466 100644 --- a/src/multibuffer.h +++ b/src/multibuffer.h @@ -42,7 +42,7 @@ class MultiBuffer : public TQSplitter Q_OBJECT TQ_OBJECT public: - MultiBuffer( TQWidget * tqparent = 0 ); + MultiBuffer( TQWidget * parent = 0 ); virtual ~MultiBuffer(); KParts::Part *activeBuffer() const; diff --git a/src/newui/button.cpp b/src/newui/button.cpp index 1e28a827..610f545e 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -39,10 +39,10 @@ namespace Ideal { -Button::Button(ButtonBar *tqparent, const TQString text, const TQIconSet &icon, +Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, const TQString &description) - :TQPushButton(icon, text, tqparent), m_buttonBar(tqparent), m_description(description), - m_place(tqparent->place()), m_realText(text), m_realIconSet(icon) + :TQPushButton(icon, text, parent), m_buttonBar(parent), m_description(description), + m_place(parent->place()), m_realText(text), m_realIconSet(icon) { hide(); setFlat(true); diff --git a/src/newui/button.h b/src/newui/button.h index 3dbc63ca..ecb4d2ab 100644 --- a/src/newui/button.h +++ b/src/newui/button.h @@ -41,7 +41,7 @@ class Button : public TQPushButton { Q_OBJECT TQ_OBJECT public: - Button(ButtonBar *tqparent, const TQString text, const TQIconSet &icon = TQIconSet(), + Button(ButtonBar *parent, const TQString text, const TQIconSet &icon = TQIconSet(), const TQString &description = TQString()); /**Sets the description used as a tooltip.*/ diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp index 55f55fb4..efc504a7 100644 --- a/src/newui/buttonbar.cpp +++ b/src/newui/buttonbar.cpp @@ -32,8 +32,8 @@ namespace Ideal { //ButtonLayout class -ButtonLayout::ButtonLayout(ButtonBar *tqparent, Direction d, int margin, int spacing, const char *name) - :TQBoxLayout(tqparent, d, margin, spacing, name), m_buttonBar(tqparent) +ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spacing, const char *name) + :TQBoxLayout(parent, d, margin, spacing, name), m_buttonBar(parent) { } @@ -62,8 +62,8 @@ TQSize ButtonLayout::tqminimumSize() const //ButtonBar class -ButtonBar::ButtonBar(Place place, ButtonMode mode, TQWidget *tqparent, const char *name) - :TQWidget(tqparent, name), m_place(place), l(0), m_shrinked(false), m_autoResize(true) +ButtonBar::ButtonBar(Place place, ButtonMode mode, TQWidget *parent, const char *name) + :TQWidget(parent, name), m_place(place), l(0), m_shrinked(false), m_autoResize(true) { switch (m_place) { diff --git a/src/newui/buttonbar.h b/src/newui/buttonbar.h index f8f13868..156b2c6d 100644 --- a/src/newui/buttonbar.h +++ b/src/newui/buttonbar.h @@ -37,7 +37,7 @@ class ButtonBar; Overrides tqminimumSize method to allow shrinking button bar buttons.*/ class ButtonLayout: public TQBoxLayout{ public: - ButtonLayout(ButtonBar *tqparent, Direction d, int margin = 0, int spacing = -1, const char * name = 0); + ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0); virtual TQSize tqminimumSize() const; @@ -56,7 +56,7 @@ class ButtonBar : public TQWidget { TQ_OBJECT public: ButtonBar(Place place, ButtonMode mode = IconsAndText, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); virtual ~ButtonBar(); /**Adds a button to the bar.*/ diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index 8394b00f..bf7cc627 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -39,9 +39,9 @@ #include "button.h" #include "dmainwindow.h" -DDockWindow::DDockWindow(DMainWindow *tqparent, Position position) - :TQDockWindow(TQDockWindow::InDock, tqparent), m_position(position), m_visible(false), - m_mainWindow(tqparent), m_doNotCloseActiveWidget(false), m_toggledButton(0), m_lastContextMenuButton(0) +DDockWindow::DDockWindow(DMainWindow *parent, Position position) + :TQDockWindow(TQDockWindow::InDock, parent), m_position(position), m_visible(false), + m_mainWindow(parent), m_doNotCloseActiveWidget(false), m_toggledButton(0), m_lastContextMenuButton(0) { setMovingEnabled(false); setResizeEnabled(true); @@ -347,7 +347,7 @@ bool DDockWindow::isActive() else { do { - w = (TQWidget*)w->tqparent(); + w = (TQWidget*)w->parent(); if (w && (w == toolWidget)) return true; } while (w); } diff --git a/src/newui/ddockwindow.h b/src/newui/ddockwindow.h index e9850d2f..d98aa375 100644 --- a/src/newui/ddockwindow.h +++ b/src/newui/ddockwindow.h @@ -44,7 +44,7 @@ class DDockWindow : public TQDockWindow { public: enum Position { Bottom, Left, Right }; - DDockWindow(DMainWindow *tqparent, Position position); + DDockWindow(DMainWindow *parent, Position position); virtual ~DDockWindow(); virtual void setVisible(bool v); diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index 68e8883d..32d47244 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -29,8 +29,8 @@ #include "dtabwidget.h" #include "docksplitter.h" -DMainWindow::DMainWindow(TQWidget *tqparent, const char *name) - :KParts::MainWindow(tqparent, name), m_firstRemoved(false), m_currentWidget(0) +DMainWindow::DMainWindow(TQWidget *parent, const char *name) + :KParts::MainWindow(parent, name), m_firstRemoved(false), m_currentWidget(0) { loadSettings(); createToolWindows(); diff --git a/src/newui/dmainwindow.h b/src/newui/dmainwindow.h index f20cfec9..28e0340f 100644 --- a/src/newui/dmainwindow.h +++ b/src/newui/dmainwindow.h @@ -35,7 +35,7 @@ class DMainWindow: public KParts::MainWindow { Q_OBJECT TQ_OBJECT public: - DMainWindow(TQWidget *tqparent = 0, const char *name = 0); + DMainWindow(TQWidget *parent = 0, const char *name = 0); virtual ~DMainWindow(); /**@return The tool window in given @p position.*/ diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp index c22f2723..647c5f43 100644 --- a/src/newui/docksplitter.cpp +++ b/src/newui/docksplitter.cpp @@ -23,8 +23,8 @@ namespace Ideal { -DockSplitter::DockSplitter(Qt::Orientation orientation, TQWidget *tqparent, const char *name) - :TQSplitter(tqparent, name), m_orientation(orientation) +DockSplitter::DockSplitter(Qt::Orientation orientation, TQWidget *parent, const char *name) + :TQSplitter(parent, name), m_orientation(orientation) { switch (m_orientation) { diff --git a/src/newui/docksplitter.h b/src/newui/docksplitter.h index c5450b1a..fc66387c 100644 --- a/src/newui/docksplitter.h +++ b/src/newui/docksplitter.h @@ -34,7 +34,7 @@ class DockSplitter: public TQSplitter { Q_OBJECT TQ_OBJECT public: - DockSplitter(Qt::Orientation orientation, TQWidget *tqparent = 0, const char *name = 0); + DockSplitter(Qt::Orientation orientation, TQWidget *parent = 0, const char *name = 0); ~DockSplitter(); void addDock(uint row, uint col, TQWidget *dock); diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp index 7ee27915..54fbee41 100644 --- a/src/newui/dtabwidget.cpp +++ b/src/newui/dtabwidget.cpp @@ -26,8 +26,8 @@ #include <kiconloader.h> #include <kapplication.h> -DTabWidget::DTabWidget(TQWidget *tqparent, const char *name) - :KTabWidget(tqparent, name), m_closeButton(0) +DTabWidget::DTabWidget(TQWidget *parent, const char *name) + :KTabWidget(parent, name), m_closeButton(0) { setFocusPolicy(TQ_NoFocus); setMargin(0); diff --git a/src/newui/dtabwidget.h b/src/newui/dtabwidget.h index fd480c73..4c52a517 100644 --- a/src/newui/dtabwidget.h +++ b/src/newui/dtabwidget.h @@ -28,7 +28,7 @@ class DTabWidget: public KTabWidget { Q_OBJECT TQ_OBJECT public: - DTabWidget(TQWidget *tqparent=0, const char *name=0); + DTabWidget(TQWidget *parent=0, const char *name=0); /**@return The close button at the top right corner. May be 0 if the configuration do not allow close buttons or the tabbar.*/ diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 4c9c6c6f..ccfafd10 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -89,8 +89,8 @@ struct ModificationData }; -PartController::PartController(TQWidget *tqparent) - : KDevPartController(tqparent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false) +PartController::PartController(TQWidget *parent) + : KDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false) { connect(this, TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part* )) ); connect(this, TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part* )) ); @@ -109,10 +109,10 @@ PartController::~PartController() } -void PartController::createInstance(TQWidget *tqparent) +void PartController::createInstance(TQWidget *parent) { if (!s_instance) - s_instance = new PartController(tqparent); + s_instance = new PartController(parent); } diff --git a/src/partcontroller.h b/src/partcontroller.h index dbb6a632..9e563914 100644 --- a/src/partcontroller.h +++ b/src/partcontroller.h @@ -48,7 +48,7 @@ class PartController : public KDevPartController public: PartController(TQWidget *toplevel); - static void createInstance(TQWidget *tqparent); + static void createInstance(TQWidget *parent); static PartController *getInstance(); ///// KDevPartController interface diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp index e6973d79..0414fd8d 100644 --- a/src/pluginselectdialog.cpp +++ b/src/pluginselectdialog.cpp @@ -27,9 +27,9 @@ class PluginItem : public TQCheckListItem { public: // name - "Name", label - "GenericName", info - "Comment" - PluginItem( TQListView * tqparent, TQString const & name, TQString const & label, + PluginItem( TQListView * parent, TQString const & name, TQString const & label, TQString const & info, TQString const url = TQString() ) - : TQCheckListItem( tqparent, label, TQCheckListItem::CheckBox), + : TQCheckListItem( parent, label, TQCheckListItem::CheckBox), _name( name ), _info( info ), _url( url ) {} @@ -44,8 +44,8 @@ private: }; -PluginSelectDialog::PluginSelectDialog(TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : PluginSelectDialogBase( tqparent,name, modal,fl ) +PluginSelectDialog::PluginSelectDialog(TQWidget* parent, const char* name, bool modal, WFlags fl ) + : PluginSelectDialogBase( parent,name, modal,fl ) { plugin_list->setResizeMode( TQListView::LastColumn ); plugin_list->addColumn(""); diff --git a/src/pluginselectdialog.h b/src/pluginselectdialog.h index 47316ef5..3adfdac4 100644 --- a/src/pluginselectdialog.h +++ b/src/pluginselectdialog.h @@ -23,7 +23,7 @@ class PluginSelectDialog : public PluginSelectDialogBase TQ_OBJECT public: - PluginSelectDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + PluginSelectDialog( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~PluginSelectDialog(); TQStringList unselectedPluginNames(); diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index ca6b6633..a80be429 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -40,15 +40,15 @@ class ProfileItem: public KListViewItem { public: - ProfileItem(KListView *tqparent, Profile *profile) - :KListViewItem(tqparent), m_profile(profile) + ProfileItem(KListView *parent, Profile *profile) + :KListViewItem(parent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); } - ProfileItem(KListViewItem *tqparent, Profile *profile) - : KListViewItem(tqparent), m_profile(profile) + ProfileItem(KListViewItem *parent, Profile *profile) + : KListViewItem(parent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); @@ -62,8 +62,8 @@ private: class EDListItem: public KListViewItem{ public: - EDListItem(KListView *tqparent, const TQString &text, bool derived) - : KListViewItem(tqparent, text), m_derived(derived) + EDListItem(KListView *parent, const TQString &text, bool derived) + : KListViewItem(parent, text), m_derived(derived) { } @@ -84,16 +84,16 @@ private: class ProfileListBuilding { public: - ProfileItem * operator() (ProfileItem *tqparent, Profile *profile) + ProfileItem * operator() (ProfileItem *parent, Profile *profile) { - tqparent->setOpen(true); - return new ProfileItem(tqparent, profile); + parent->setOpen(true); + return new ProfileItem(parent, profile); } }; -ProfileEditor::ProfileEditor(TQWidget *tqparent, const char *name) - :ProfileEditorBase(tqparent, name) +ProfileEditor::ProfileEditor(TQWidget *parent, const char *name) + :ProfileEditorBase(parent, name) { refresh(); } @@ -258,7 +258,7 @@ void ProfileEditor::removeProfile() if (profile->remove()) { TQListViewItem *item = profilesList->currentItem(); - profilesList->setCurrentItem(item->tqparent()); + profilesList->setCurrentItem(item->parent()); profile->detachFromParent(); delete profile; delete item; diff --git a/src/profileengine/editor/profileeditor.h b/src/profileengine/editor/profileeditor.h index aae785b1..b3c97215 100644 --- a/src/profileengine/editor/profileeditor.h +++ b/src/profileengine/editor/profileeditor.h @@ -31,7 +31,7 @@ class ProfileEditor : public ProfileEditorBase { Q_OBJECT TQ_OBJECT public: - ProfileEditor(TQWidget *tqparent = 0, const char *name = 0); + ProfileEditor(TQWidget *parent = 0, const char *name = 0); public slots: virtual void removeProperty(); diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index a5ad5803..02fe1216 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -26,8 +26,8 @@ #include <kconfig.h> #include <kio/netaccess.h> -Profile::Profile(Profile *tqparent, const TQString &name) - :m_parent(tqparent), m_name(name) +Profile::Profile(Profile *parent, const TQString &name) + :m_parent(parent), m_name(name) { if (m_parent) m_parent->addChildProfile(this); @@ -49,8 +49,8 @@ Profile::Profile(Profile *tqparent, const TQString &name) m_explicitDisable = config.readListEntry("List"); } -Profile::Profile(Profile *tqparent, const TQString &name, const TQString &genericName, const TQString &description) - :m_parent(tqparent), m_name(name), m_genericName(genericName), m_description(description) +Profile::Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description) + :m_parent(parent), m_name(name), m_genericName(genericName), m_description(description) { if (m_parent) m_parent->addChildProfile(this); diff --git a/src/profileengine/lib/profile.h b/src/profileengine/lib/profile.h index 30e00517..c6829245 100644 --- a/src/profileengine/lib/profile.h +++ b/src/profileengine/lib/profile.h @@ -45,12 +45,12 @@ public: ExplicitDisable /**<A list of explicitly disabled plugins (names).*/ }; - Profile(Profile *tqparent, const TQString &name); - Profile(Profile *tqparent, const TQString &name, const TQString &genericName, const TQString &description); + Profile(Profile *parent, const TQString &name); + Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description); ~Profile(); TQValueList<Profile*> tqchildren() const { return m_tqchildren; } - Profile *tqparent() const { return m_parent; } + Profile *parent() const { return m_parent; } void save(); bool remove(); diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h index 9184df62..90908afe 100644 --- a/src/profileengine/lib/profileengine.h +++ b/src/profileengine/lib/profileengine.h @@ -189,7 +189,7 @@ public: but the operation in this case returns a result of type defined by "Result" template parameter. - When iterating the tree, the result of operation applied to the tqparent profile + When iterating the tree, the result of operation applied to the parent profile is passed as @p result parameter to the recursive call for child profiles. For example, this function can be used to build another hierarcy of profiles @@ -199,24 +199,24 @@ public: @code class ProfileListBuilding { public: - ProfileItem * operator() (ProfileItem *tqparent, Profile *profile) + ProfileItem * operator() (ProfileItem *parent, Profile *profile) { - tqparent->setOpen(true); - return new ProfileItem(tqparent, profile); + parent->setOpen(true); + return new ProfileItem(parent, profile); } }; class ProfileItem: public KListViewItem { public: - ProfileItem(KListView *tqparent, Profile *profile) - :KListViewItem(tqparent), m_profile(profile) + ProfileItem(KListView *parent, Profile *profile) + :KListViewItem(parent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); } - ProfileItem(KListViewItem *tqparent, Profile *profile) - : KListViewItem(tqparent), m_profile(profile) + ProfileItem(KListViewItem *parent, Profile *profile) + : KListViewItem(parent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); diff --git a/src/projectsession.cpp b/src/projectsession.cpp index c471366f..2676f56b 100644 --- a/src/projectsession.cpp +++ b/src/projectsession.cpp @@ -244,7 +244,7 @@ bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValue //// mainframeEl=domdoc.createElement("Mainframe"); //// session.appendChild( mainframeEl); //// } -//// bool bMaxMode = ((QextMdiMainFrm*)m_pDocViewMan->tqparent())->isInMaximizedChildFrmMode(); +//// bool bMaxMode = ((QextMdiMainFrm*)m_pDocViewMan->parent())->isInMaximizedChildFrmMode(); //// mainframeEl.setAttribute("MaximizeMode", bMaxMode); diff --git a/src/settingswidget.ui b/src/settingswidget.ui index 305f7e4e..92d4554e 100644 --- a/src/settingswidget.ui +++ b/src/settingswidget.ui @@ -163,7 +163,7 @@ <string>Set the directory where you want your projects in.</string> </property> <property name="whatsThis" stdset="0"> - <string>By default, KDevelop uses a common tqparent directory for all new projects. Enter the absolute path of this common directory in the box or select it from your directory structure. KDevelop will place the any new project here as a subdirectory.</string> + <string>By default, KDevelop uses a common parent directory for all new projects. Enter the absolute path of this common directory in the box or select it from your directory structure. KDevelop will place the any new project here as a subdirectory.</string> </property> </widget> </hbox> diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 1f2c4dd5..e98ce01c 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -57,8 +57,8 @@ #include "editorproxy.h" #include "multibuffer.h" -SimpleMainWindow::SimpleMainWindow(TQWidget* tqparent, const char *name) - :DMainWindow(tqparent, name) +SimpleMainWindow::SimpleMainWindow(TQWidget* parent, const char *name) + :DMainWindow(parent, name) { resize(800, 600); // starts kdevelop at 800x600 the first time m_mainWindowShare = new MainWindowShare(TQT_TQOBJECT(this)); @@ -322,15 +322,15 @@ void SimpleMainWindow::raiseView(TQWidget *view) { //adymo: a workaround to make editor wrappers work: //editor view is passed to this function but the ui library knows only - //of its tqparent which is an editor wrapper, simply replacing the view + //of its parent which is an editor wrapper, simply replacing the view //by its wrapper helps here - if (view->tqparent()) - kdDebug() << view->tqparent()->className() << endl; - if (view->tqparent() && (view->tqparent()->isA("EditorWrapper") || view->tqparent()->isA("MultiBuffer"))) + if (view->parent()) + kdDebug() << view->parent()->className() << endl; + if (view->parent() && (view->parent()->isA("EditorWrapper") || view->parent()->isA("MultiBuffer"))) { -// kdDebug() << "tqparent is editor wrapper: " << -// static_cast<EditorWrapper*>(view->tqparent()) << endl; - view = (TQWidget*)view->tqparent(); +// kdDebug() << "parent is editor wrapper: " << +// static_cast<EditorWrapper*>(view->parent()) << endl; + view = (TQWidget*)view->parent(); } if (hasDockWidget(view)) @@ -577,9 +577,9 @@ void SimpleMainWindow::documentChangedState(const KURL &url, DocumentState state void SimpleMainWindow::closeTab() { // actionCollection()->action("file_close")->activate(); - if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->isA(TQTOOLBUTTON_OBJECT_NAME_STRING) && TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent()->isA("DTabWidget")) + if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->isA(TQTOOLBUTTON_OBJECT_NAME_STRING) && TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent()->isA("DTabWidget")) { - DTabWidget *tab = (DTabWidget*)TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent(); + DTabWidget *tab = (DTabWidget*)TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent(); if (tab && tab->currentPage()) closeTab(tab->currentPage()); } @@ -847,13 +847,13 @@ TQWidget *SimpleMainWindow::widgetForURL(KURL url) TQWidget *SimpleMainWindow::widgetInTab(TQWidget *w) { TQWidget *inTab = 0; - if (w && w->tqparent() && w->tqparent()->isA("EditorProxy")) - inTab = (TQWidget*)w->tqparent(); - else if (w && w->tqparent() && w->tqparent()->isA("MultiBuffer") - && w->tqparent()->tqparent() && w->tqparent()->tqparent()->isA("EditorProxy")) - inTab = (TQWidget*)w->tqparent()->tqparent(); - else if (w && w->tqparent() && w->tqparent()->isA("MultiBuffer")) - inTab = (TQWidget*)w->tqparent(); + if (w && w->parent() && w->parent()->isA("EditorProxy")) + inTab = (TQWidget*)w->parent(); + else if (w && w->parent() && w->parent()->isA("MultiBuffer") + && w->parent()->parent() && w->parent()->parent()->isA("EditorProxy")) + inTab = (TQWidget*)w->parent()->parent(); + else if (w && w->parent() && w->parent()->isA("MultiBuffer")) + inTab = (TQWidget*)w->parent(); else inTab = w; return inTab; diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h index 19ef20b2..193c70eb 100644 --- a/src/simplemainwindow.h +++ b/src/simplemainwindow.h @@ -38,7 +38,7 @@ class SimpleMainWindow: public DMainWindow, public KDevMainWindow { Q_OBJECT TQ_OBJECT public: - SimpleMainWindow(TQWidget* tqparent = 0, const char *name = 0); + SimpleMainWindow(TQWidget* parent = 0, const char *name = 0); virtual ~SimpleMainWindow(); virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString()); diff --git a/src/statusbar.cpp b/src/statusbar.cpp index 581c2fd2..267e3e2c 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -27,8 +27,8 @@ #include "statusbar.h" #include "partcontroller.h" -KDevStatusBar::KDevStatusBar(TQWidget *tqparent, const char *name) - : KStatusBar(tqparent, name), _cursorIface(0), _activePart(0) +KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name) + : KStatusBar(parent, name), _cursorIface(0), _activePart(0) { TQWidget * w = new TQWidget( this ); addWidget( w, 1, true ); diff --git a/src/statusbar.h b/src/statusbar.h index 1c325fcf..e63a8ad0 100644 --- a/src/statusbar.h +++ b/src/statusbar.h @@ -30,7 +30,7 @@ class KDevStatusBar : public KStatusBar TQ_OBJECT public: - KDevStatusBar( TQWidget *tqparent=0, const char *name=0 ); + KDevStatusBar( TQWidget *parent=0, const char *name=0 ); ~KDevStatusBar(); void addWidget ( TQWidget *widget, int stretch = 0, bool permanent = FALSE ); diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp index 200f7448..d4733285 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.cpp +++ b/vcs/clearcase/clearcasefileinfoprovider.cpp @@ -16,14 +16,14 @@ #include <kprocess.h> #include <tqapplication.h> -ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *tqparent) - : KDevVCSFileInfoProvider( (KDevVersionControl*) tqparent, "clearcasefileinfoprovider") +ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent) + : KDevVCSFileInfoProvider( (KDevVersionControl*) parent, "clearcasefileinfoprovider") { vcsInfo_ = NULL; - connect(tqparent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); + connect(parent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); - kdevVCS_ = tqparent; + kdevVCS_ = parent; } diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h index f4ac08f2..dcb1d26f 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.h +++ b/vcs/clearcase/clearcasefileinfoprovider.h @@ -24,7 +24,7 @@ class ClearcaseFileinfoProvider : public KDevVCSFileInfoProvider Q_OBJECT TQ_OBJECT public: - ClearcaseFileinfoProvider(ClearcasePart *tqparent); + ClearcaseFileinfoProvider(ClearcasePart *parent); virtual ~ClearcaseFileinfoProvider(); diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp index 69e25513..9b1cd67b 100644 --- a/vcs/clearcase/clearcasepart.cpp +++ b/vcs/clearcase/clearcasepart.cpp @@ -42,8 +42,8 @@ static const KDevPluginInfo data("kdevclearcase"); typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory; K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) ) -ClearcasePart::ClearcasePart( TQObject *tqparent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, tqparent, name ? name : "ClearcasePart" ), +ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & ) + : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ), default_checkin(""), default_checkout(""), default_uncheckout("-rm"), diff --git a/vcs/clearcase/clearcasepart.h b/vcs/clearcase/clearcasepart.h index 956fc214..cf5dae5b 100644 --- a/vcs/clearcase/clearcasepart.h +++ b/vcs/clearcase/clearcasepart.h @@ -22,7 +22,7 @@ class ClearcasePart : public KDevVersionControl { TQ_OBJECT public: - ClearcasePart( TQObject *tqparent, const char *name, const TQStringList & ); + ClearcasePart( TQObject *parent, const char *name, const TQStringList & ); ~ClearcasePart(); const TQString default_checkin; diff --git a/vcs/clearcase/integrator/ccintegratordlg.cpp b/vcs/clearcase/integrator/ccintegratordlg.cpp index 3f6f8d0e..8e89cf94 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.cpp +++ b/vcs/clearcase/integrator/ccintegratordlg.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "ccintegratordlg.h" -CCIntegratorDlg::CCIntegratorDlg(TQWidget *tqparent, const char *name) - :CCIntegratorDlgBase(tqparent, name) +CCIntegratorDlg::CCIntegratorDlg(TQWidget *parent, const char *name) + :CCIntegratorDlgBase(parent, name) { } diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h index 37d73885..674e7815 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.h +++ b/vcs/clearcase/integrator/ccintegratordlg.h @@ -27,7 +27,7 @@ class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog { Q_OBJECT TQ_OBJECT public: - CCIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0); + CCIntegratorDlg(TQWidget *parent = 0, const char *name = 0); virtual void accept(); virtual void init(const TQString &projectName, const TQString &projectLocation); diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp index d076abc9..4e8c1a0b 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.cpp +++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp @@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevclearcaseintegrator"); typedef KDevGenericFactory<ClearcaseIntegrator> ClearcaseIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libclearcaseintegrator, ClearcaseIntegratorFactory(data) ) -ClearcaseIntegrator::ClearcaseIntegrator(TQObject* tqparent, const char* name, +ClearcaseIntegrator::ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :KDevVCSIntegrator(tqparent, name) + :KDevVCSIntegrator(parent, name) { } @@ -39,15 +39,15 @@ ClearcaseIntegrator::~ClearcaseIntegrator() { } -VCSDialog* ClearcaseIntegrator::fetcher(TQWidget* // tqparent +VCSDialog* ClearcaseIntegrator::fetcher(TQWidget* // parent ) { return 0; } -VCSDialog* ClearcaseIntegrator::integrator(TQWidget* tqparent) +VCSDialog* ClearcaseIntegrator::integrator(TQWidget* parent) { - CCIntegratorDlg *dlg = new CCIntegratorDlg(tqparent); + CCIntegratorDlg *dlg = new CCIntegratorDlg(parent); return dlg; } diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h index 197638bf..9dc67e47 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.h +++ b/vcs/clearcase/integrator/clearcaseintegrator.h @@ -29,11 +29,11 @@ class ClearcaseIntegrator : public KDevVCSIntegrator Q_OBJECT TQ_OBJECT public: - ClearcaseIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~ClearcaseIntegrator(); - virtual VCSDialog* fetcher(TQWidget* tqparent); - virtual VCSDialog* integrator(TQWidget* tqparent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/cvsservice/annotatedialog.cpp b/vcs/cvsservice/annotatedialog.cpp index d61aeb72..2937b2bb 100644 --- a/vcs/cvsservice/annotatedialog.cpp +++ b/vcs/cvsservice/annotatedialog.cpp @@ -23,9 +23,9 @@ #include "annotatedialog.h" #include "annotatepage.h" -AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *tqparent, const char *name, int ) +AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent, const char *name, int ) : KDialogBase( Tabbed, i18n("CVS Annotate Dialog"), Close, Close, - tqparent, name? name : "annotateformdialog", false /*modal*/, true /*separator*/ ), + parent, name? name : "annotateformdialog", false /*modal*/, true /*separator*/ ), m_cvsService( cvsService ) { setWFlags( getWFlags() | WDestructiveClose ); diff --git a/vcs/cvsservice/annotatedialog.h b/vcs/cvsservice/annotatedialog.h index c6866967..b0229b9c 100644 --- a/vcs/cvsservice/annotatedialog.h +++ b/vcs/cvsservice/annotatedialog.h @@ -32,7 +32,7 @@ class AnnotateDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - AnnotateDialog( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 ); + AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~AnnotateDialog(); /** diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp index 68e12f6d..4c838cf9 100644 --- a/vcs/cvsservice/annotatepage.cpp +++ b/vcs/cvsservice/annotatepage.cpp @@ -32,9 +32,9 @@ #include "annotatepage.h" #include "annotateview.h" -AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *tqparent, const char *name, int ) +AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *parent, const char *name, int ) : DCOPObject( "CvsAnnotatePageDCOPIface" ), - TQWidget( tqparent, name? name : "annotateformpage" ), + TQWidget( parent, name? name : "annotateformpage" ), m_cvsService( cvsService ), m_cvsAnnotateJob( 0 ) { kdDebug(9006) << "AnnotatePage::AnnotatePage()" << endl; diff --git a/vcs/cvsservice/annotatepage.h b/vcs/cvsservice/annotatepage.h index 27a75314..ef2c2faa 100644 --- a/vcs/cvsservice/annotatepage.h +++ b/vcs/cvsservice/annotatepage.h @@ -43,7 +43,7 @@ class AnnotatePage : public TQWidget, virtual public CVSServiceDCOPIface friend class AnnotateView; public: - AnnotatePage( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 ); + AnnotatePage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~AnnotatePage(); /** diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp index 30e80a21..597415f1 100644 --- a/vcs/cvsservice/annotateview.cpp +++ b/vcs/cvsservice/annotateview.cpp @@ -32,7 +32,7 @@ class AnnotateViewItem : public TQListViewItem public: enum { LineNumberColumn, AuthorColumn, DateColumn,ContentColumn }; - AnnotateViewItem(AnnotateView *tqparent, TQString rev, TQString author, + AnnotateViewItem(AnnotateView *parent, TQString rev, TQString author, TQDateTime date, TQString content, TQString comment, bool odd, int linenumber); @@ -57,10 +57,10 @@ private: const int AnnotateViewItem::BORDER = 4; -AnnotateViewItem::AnnotateViewItem(AnnotateView *tqparent, TQString rev, +AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, TQString rev, TQString author, TQDateTime date, TQString content, TQString comment, bool odd, int linenumber) - : TQListViewItem(tqparent) + : TQListViewItem(parent) , m_revision(rev) , m_author(author) , m_content(content) @@ -140,9 +140,9 @@ int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col /*****************Definition of class AnnotateView ****************************/ /******************************************************************************/ -AnnotateView::AnnotateView(AnnotatePage *tqparent, const char *name) - : KListView(tqparent, name), TQToolTip( viewport() ), - m_page(tqparent) +AnnotateView::AnnotateView(AnnotatePage *parent, const char *name) + : KListView(parent, name), TQToolTip( viewport() ), + m_page(parent) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); setAllColumnsShowFocus(true); diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h index 99d222a3..956c0251 100644 --- a/vcs/cvsservice/annotateview.h +++ b/vcs/cvsservice/annotateview.h @@ -37,7 +37,7 @@ class AnnotateView : public KListView, public TQToolTip public: - explicit AnnotateView(AnnotatePage *tqparent, const char *name=0 ); + explicit AnnotateView(AnnotatePage *parent, const char *name=0 ); void addLine(TQString rev, TQString author, TQDateTime date, TQString content, TQString comment, bool odd); diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index 098dd98e..be20d977 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -68,9 +68,9 @@ public: /////////////////////////////////////////////////////////////////////////////// CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService, - TQWidget *tqparent, const char *name, WFlags ) : + TQWidget *parent, const char *name, WFlags ) : DCOPObject( "CheckoutDialogDCOPIface" ), - KDialogBase( tqparent, name? name : "checkoutdialog", true, i18n("CVS Checkout"), + KDialogBase( parent, name? name : "checkoutdialog", true, i18n("CVS Checkout"), Ok | Cancel, Ok, true ), m_service( cvsService ), m_job( 0 ) { diff --git a/vcs/cvsservice/checkoutdialog.h b/vcs/cvsservice/checkoutdialog.h index 422290d0..5d15b09b 100644 --- a/vcs/cvsservice/checkoutdialog.h +++ b/vcs/cvsservice/checkoutdialog.h @@ -32,7 +32,7 @@ class CheckoutDialog : public KDialogBase, virtual public CVSServiceDCOPIface Q_OBJECT TQ_OBJECT public: - CheckoutDialog( CvsService_stub *cvsService, TQWidget *tqparent = 0, + CheckoutDialog( CvsService_stub *cvsService, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~CheckoutDialog(); diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp index 9bed1119..a3988c06 100644 --- a/vcs/cvsservice/commitdlg.cpp +++ b/vcs/cvsservice/commitdlg.cpp @@ -30,8 +30,8 @@ /////////////////////////////////////////////////////////////////////////////// -CommitDialog::CommitDialog( const TQString &changeLogfileNamePath, TQWidget *tqparent ) - : CommitDialogBase( tqparent, "commitdialog", true ) +CommitDialog::CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent ) + : CommitDialogBase( parent, "commitdialog", true ) { connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); diff --git a/vcs/cvsservice/commitdlg.h b/vcs/cvsservice/commitdlg.h index edc27a64..e3406340 100644 --- a/vcs/cvsservice/commitdlg.h +++ b/vcs/cvsservice/commitdlg.h @@ -26,7 +26,7 @@ class CommitDialog : public CommitDialogBase Q_OBJECT TQ_OBJECT public: - CommitDialog( const TQString &changeLogfileNamePath, TQWidget *tqparent = 0 ); + CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent = 0 ); //! Returns the text of the log TQStringList logMessage() const; diff --git a/vcs/cvsservice/cvsdiffpage.cpp b/vcs/cvsservice/cvsdiffpage.cpp index 2f174155..7777760a 100644 --- a/vcs/cvsservice/cvsdiffpage.cpp +++ b/vcs/cvsservice/cvsdiffpage.cpp @@ -33,10 +33,10 @@ /////////////////////////////////////////////////////////////////////////////// CVSDiffPage::CVSDiffPage( CvsService_stub *cvsService, - TQWidget *tqparent, const char *name, int ) + TQWidget *parent, const char *name, int ) // Leaving it anonymous let us to have multiple objects at the same time! : DCOPObject(), // "CVSDiffPageDCOPIface" - TQWidget( tqparent, name? name : "logformdialog" ), + TQWidget( parent, name? name : "logformdialog" ), m_diffText( 0 ), m_cvsService( cvsService ), m_cvsDiffJob( 0 ) { TQLayout *thisLayout = new TQVBoxLayout( this ); diff --git a/vcs/cvsservice/cvsdiffpage.h b/vcs/cvsservice/cvsdiffpage.h index 879b28b2..17444ad2 100644 --- a/vcs/cvsservice/cvsdiffpage.h +++ b/vcs/cvsservice/cvsdiffpage.h @@ -31,7 +31,7 @@ class CVSDiffPage : public TQWidget, virtual public CVSServiceDCOPIface Q_OBJECT TQ_OBJECT public: - CVSDiffPage( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 ); + CVSDiffPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~CVSDiffPage(); void startDiff( const TQString &fileName, const TQString &v1, const TQString &v2 ); diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 7830f643..3c20af0c 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -31,8 +31,8 @@ // class CVSFileInfoProvider /////////////////////////////////////////////////////////////////////////////// -CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *tqparent, CvsService_stub *cvsService ) - : KDevVCSFileInfoProvider( tqparent, "cvsfileinfoprovider" ), +CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService ) + : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ), m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 ) { connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&))); diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h index 72f3cff0..ead2d113 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.h +++ b/vcs/cvsservice/cvsfileinfoprovider.h @@ -33,7 +33,7 @@ class CVSFileInfoProvider : public KDevVCSFileInfoProvider, virtual public CVSSe Q_OBJECT TQ_OBJECT public: - CVSFileInfoProvider( CvsServicePart *tqparent, CvsService_stub *cvsService ); + CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService ); virtual ~CVSFileInfoProvider(); // -- Sync interface diff --git a/vcs/cvsservice/cvsform.cpp b/vcs/cvsservice/cvsform.cpp index e1423ef6..ef0521c8 100644 --- a/vcs/cvsservice/cvsform.cpp +++ b/vcs/cvsservice/cvsform.cpp @@ -19,8 +19,8 @@ // class CvsForm /////////////////////////////////////////////////////////////////////////////// -CvsForm::CvsForm( TQWidget *tqparent, const char *name, WFlags f ) - : CvsFormBase( tqparent, name, f ) +CvsForm::CvsForm( TQWidget *parent, const char *name, WFlags f ) + : CvsFormBase( parent, name, f ) { setWFlags( getWFlags() | WDestructiveClose ); } diff --git a/vcs/cvsservice/cvsform.h b/vcs/cvsservice/cvsform.h index 8a9a4ef7..7973eb0e 100644 --- a/vcs/cvsservice/cvsform.h +++ b/vcs/cvsservice/cvsform.h @@ -23,7 +23,7 @@ class CvsForm : public CvsFormBase Q_OBJECT TQ_OBJECT public: - CvsForm( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + CvsForm( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~CvsForm(); TQString module() const; diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp index 5bd230c3..86ad3cbe 100644 --- a/vcs/cvsservice/cvslogdialog.cpp +++ b/vcs/cvsservice/cvslogdialog.cpp @@ -32,9 +32,9 @@ // class CVSLogDialog /////////////////////////////////////////////////////////////////////////////// -CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *tqparent, const char *name, int ) +CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent, const char *name, int ) : KDialogBase( Tabbed, i18n("CVS Log & Diff Dialog"), Close, Close, - tqparent, name? name : "logformdialog", false /*modal*/, true /*separator*/ ), + parent, name? name : "logformdialog", false /*modal*/, true /*separator*/ ), m_cvsLogPage( 0 ), m_cvsService( cvsService ) { setWFlags( getWFlags() | WDestructiveClose ); diff --git a/vcs/cvsservice/cvslogdialog.h b/vcs/cvsservice/cvslogdialog.h index 9f3518aa..694e610c 100644 --- a/vcs/cvsservice/cvslogdialog.h +++ b/vcs/cvsservice/cvslogdialog.h @@ -28,7 +28,7 @@ class CVSLogDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - CVSLogDialog( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 ); + CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~CVSLogDialog(); void startLog( const TQString &workDir, const TQString &pathName ); diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp index 07e59ce7..f50afdc5 100644 --- a/vcs/cvsservice/cvslogpage.cpp +++ b/vcs/cvsservice/cvslogpage.cpp @@ -32,9 +32,9 @@ // class CVSLogPage /////////////////////////////////////////////////////////////////////////////// -CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *tqparent, const char *name, int ) +CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *parent, const char *name, int ) : DCOPObject( "CvsLogPageDCOPIface" ), - TQWidget( tqparent, name? name : "logformpage" ), + TQWidget( parent, name? name : "logformpage" ), m_cvsService( cvsService ), m_cvsLogJob( 0 ) { TQLayout *thisLayout = new TQVBoxLayout( this ); diff --git a/vcs/cvsservice/cvslogpage.h b/vcs/cvsservice/cvslogpage.h index 27fbd3d2..d7e7ede2 100644 --- a/vcs/cvsservice/cvslogpage.h +++ b/vcs/cvsservice/cvslogpage.h @@ -30,7 +30,7 @@ class CVSLogPage : public TQWidget, virtual public CVSServiceDCOPIface Q_OBJECT TQ_OBJECT public: - CVSLogPage( CvsService_stub *cvsService, TQWidget *tqparent=0, const char *name=0, int flags=0 ); + CVSLogPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~CVSLogPage(); void startLog( const TQString &workDir, const TQString &pathName ); diff --git a/vcs/cvsservice/cvsoptionswidget.cpp b/vcs/cvsservice/cvsoptionswidget.cpp index eb66b773..32044dd3 100644 --- a/vcs/cvsservice/cvsoptionswidget.cpp +++ b/vcs/cvsservice/cvsoptionswidget.cpp @@ -24,8 +24,8 @@ // class DiffDialog /////////////////////////////////////////////////////////////////////////////// -CvsOptionsWidget::CvsOptionsWidget( TQWidget *tqparent, const char *name ) - : CvsOptionsWidgetBase( tqparent, name ) +CvsOptionsWidget::CvsOptionsWidget( TQWidget *parent, const char *name ) + : CvsOptionsWidgetBase( parent, name ) { readConfig(); } diff --git a/vcs/cvsservice/cvsoptionswidget.h b/vcs/cvsservice/cvsoptionswidget.h index 0dcfbba0..0384597c 100644 --- a/vcs/cvsservice/cvsoptionswidget.h +++ b/vcs/cvsservice/cvsoptionswidget.h @@ -25,7 +25,7 @@ class CvsOptionsWidget : public CvsOptionsWidgetBase Q_OBJECT TQ_OBJECT public: - CvsOptionsWidget( TQWidget *tqparent, const char *name=0 ); + CvsOptionsWidget( TQWidget *parent, const char *name=0 ); virtual ~CvsOptionsWidget(); bool pruneEmptyDirWhenUpdating() const; diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index c95d5e2e..17eb8998 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -80,8 +80,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) ) // class CvsServicePart /////////////////////////////////////////////////////////////////////////////// -CvsServicePart::CvsServicePart( TQObject *tqparent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, tqparent, +CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & ) + : KDevVersionControl( &data, parent, name ? name : "CvsService" ), actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ), actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ), @@ -283,9 +283,9 @@ void CvsServicePart::projectConfigWidget( KDialogBase *dlg ) /////////////////////////////////////////////////////////////////////////////// -TQWidget* CvsServicePart::newProjectWidget( TQWidget *tqparent ) +TQWidget* CvsServicePart::newProjectWidget( TQWidget *parent ) { - m_cvsConfigurationForm = new CvsForm( tqparent, "cvsform" ); + m_cvsConfigurationForm = new CvsForm( parent, "cvsform" ); return m_cvsConfigurationForm; } @@ -361,7 +361,7 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context ) id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.")); - // Now insert in tqparent menu + // Now insert in parent menu popup->insertItem( i18n("CvsService"), subMenu ); // If the current project doesn't support CVS, we don't diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h index 886d13b2..c6c4e2dd 100644 --- a/vcs/cvsservice/cvspart.h +++ b/vcs/cvsservice/cvspart.h @@ -43,15 +43,15 @@ class CvsServicePart : public KDevVersionControl public: //! Standard constructor. - CvsServicePart( TQObject *tqparent, const char *name, const TQStringList & ); + CvsServicePart( TQObject *parent, const char *name, const TQStringList & ); //! Destructor. virtual ~CvsServicePart(); /** * Returns the configuration widget (for properly configuring the project to - * use CVS), child of @p tqparent. + * use CVS), child of @p parent. */ - virtual TQWidget *newProjectWidget( TQWidget *tqparent ); + virtual TQWidget *newProjectWidget( TQWidget *parent ); /** * Setup a directory tree for use with CVS. */ diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index 319fcfe6..0eeba29e 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -43,9 +43,9 @@ int g_dcopErrCounter = 0; #endif -CvsProcessWidget::CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, TQWidget *tqparent, const char *name ) +CvsProcessWidget::CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, TQWidget *parent, const char *name ) : DCOPObject( "CvsProcessWidgetDCOPIface" ), - TQTextEdit( tqparent, name ), + TQTextEdit( parent, name ), m_part( part ), m_service( service ), m_job( 0 ) { setReadOnly( true ); diff --git a/vcs/cvsservice/cvsprocesswidget.h b/vcs/cvsservice/cvsprocesswidget.h index 2377ee97..62f73668 100644 --- a/vcs/cvsservice/cvsprocesswidget.h +++ b/vcs/cvsservice/cvsprocesswidget.h @@ -30,7 +30,7 @@ class CvsProcessWidget : public TQTextEdit, virtual public CVSServiceDCOPIface TQ_OBJECT public: CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, - TQWidget *tqparent, const char *name ); + TQWidget *parent, const char *name ); virtual ~CvsProcessWidget(); bool startJob( const DCOPRef &aJob ); diff --git a/vcs/cvsservice/diffdialog.cpp b/vcs/cvsservice/diffdialog.cpp index fd4ca8ef..a141d2a8 100644 --- a/vcs/cvsservice/diffdialog.cpp +++ b/vcs/cvsservice/diffdialog.cpp @@ -20,8 +20,8 @@ // class DiffDialog /////////////////////////////////////////////////////////////////////////////// -DiffDialog::DiffDialog( const CVSEntry &entry, TQWidget *tqparent, const char *name, WFlags f ) - : DiffDialogBase( tqparent, name, true, f) +DiffDialog::DiffDialog( const CVSEntry &entry, TQWidget *parent, const char *name, WFlags f ) + : DiffDialogBase( parent, name, true, f) { m_entry = entry; TQString currentRevision = entry.revision(); diff --git a/vcs/cvsservice/diffdialog.h b/vcs/cvsservice/diffdialog.h index 8870ff1e..c729f6cb 100644 --- a/vcs/cvsservice/diffdialog.h +++ b/vcs/cvsservice/diffdialog.h @@ -25,7 +25,7 @@ class DiffDialog : public DiffDialogBase Q_OBJECT TQ_OBJECT public: - DiffDialog(const CVSEntry &entry, TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + DiffDialog(const CVSEntry &entry, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~DiffDialog(); TQString revA() const; diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 8c5c53c6..972d90d6 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -39,7 +39,7 @@ static const int POPUP_BASE = 130977; TQStringList KDiffTextEdit::extParts; TQStringList KDiffTextEdit::extPartsTranslated; -KDiffTextEdit::KDiffTextEdit( TQWidget* tqparent, const char* name ): TQTextEdit( tqparent, name ) +KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name ) { KConfig* config = kapp->config(); config->setGroup( "Diff" ); @@ -174,8 +174,8 @@ void KDiffTextEdit::popupActivated( int id ) emit externalPartRequested( extParts[ id ] ); } -DiffWidget::DiffWidget( TQWidget *tqparent, const char *name, WFlags f ): - TQWidget( tqparent, name, f ), tempFile( 0 ) +DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ): + TQWidget( parent, name, f ), tempFile( 0 ) { job = 0; extPart = 0; diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h index 48b6447d..fe8c49a0 100644 --- a/vcs/cvsservice/diffwidget.h +++ b/vcs/cvsservice/diffwidget.h @@ -34,7 +34,7 @@ class KDiffTextEdit: public TQTextEdit Q_OBJECT TQ_OBJECT public: - KDiffTextEdit( TQWidget* tqparent = 0, const char* name = 0 ); + KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 ); virtual ~KDiffTextEdit(); void applySyntaxHighlight(); void clearSyntaxHighlight(); @@ -64,7 +64,7 @@ class DiffWidget : public TQWidget TQ_OBJECT public: - DiffWidget( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + DiffWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~DiffWidget(); public slots: diff --git a/vcs/cvsservice/editorsdialog.cpp b/vcs/cvsservice/editorsdialog.cpp index 9b796254..79695840 100644 --- a/vcs/cvsservice/editorsdialog.cpp +++ b/vcs/cvsservice/editorsdialog.cpp @@ -24,8 +24,8 @@ #include <cvsjob_stub.h> #include <cvsservice_stub.h> -EditorsDialog::EditorsDialog(CvsService_stub *cvsService, TQWidget *tqparent, const char *name) - : DCOPObject( "CvsEditorsDCOPIface"), EditorsDialogBase(tqparent, name, TRUE, TQt::WDestructiveClose), +EditorsDialog::EditorsDialog(CvsService_stub *cvsService, TQWidget *parent, const char *name) + : DCOPObject( "CvsEditorsDCOPIface"), EditorsDialogBase(parent, name, TRUE, TQt::WDestructiveClose), m_cvsService(cvsService), m_cvsJob(0) { } diff --git a/vcs/cvsservice/editorsdialog.h b/vcs/cvsservice/editorsdialog.h index ffb8b555..f02f47b8 100644 --- a/vcs/cvsservice/editorsdialog.h +++ b/vcs/cvsservice/editorsdialog.h @@ -24,7 +24,7 @@ class EditorsDialog: public EditorsDialogBase, virtual public CVSServiceDCOPIfac Q_OBJECT TQ_OBJECT public: - EditorsDialog(CvsService_stub *cvsService, TQWidget *tqparent = 0, const char *name = 0); + EditorsDialog(CvsService_stub *cvsService, TQWidget *parent = 0, const char *name = 0); virtual ~EditorsDialog(); void startjob(TQString strDir); diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp index 13cc370e..1bbc3b11 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp @@ -28,9 +28,9 @@ static const KDevPluginInfo data("kdevcvsserviceintegrator"); typedef KDevGenericFactory<CVSServiceIntegrator> CVSIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libcvsserviceintegrator, CVSIntegratorFactory(data) ) -CVSServiceIntegrator::CVSServiceIntegrator(TQObject* tqparent, const char* name, +CVSServiceIntegrator::CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args) - :KDevVCSIntegrator(tqparent, name) + :KDevVCSIntegrator(parent, name) { } @@ -38,14 +38,14 @@ CVSServiceIntegrator::~CVSServiceIntegrator( ) { } -VCSDialog* CVSServiceIntegrator::fetcher(TQWidget* tqparent) +VCSDialog* CVSServiceIntegrator::fetcher(TQWidget* parent) { return 0; } -VCSDialog* CVSServiceIntegrator::integrator(TQWidget* tqparent) +VCSDialog* CVSServiceIntegrator::integrator(TQWidget* parent) { - IntegratorDlg *dlg = new IntegratorDlg(this, tqparent); + IntegratorDlg *dlg = new IntegratorDlg(this, parent); return dlg; } diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h index 02c94430..ea45a8a2 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.h +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h @@ -28,11 +28,11 @@ class CVSServiceIntegrator: public KDevVCSIntegrator { Q_OBJECT TQ_OBJECT public: - CVSServiceIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); virtual ~CVSServiceIntegrator(); - virtual VCSDialog* fetcher(TQWidget* tqparent); - virtual VCSDialog* integrator(TQWidget* tqparent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp index 3561f7ad..4f833220 100644 --- a/vcs/cvsservice/integrator/integratordlg.cpp +++ b/vcs/cvsservice/integrator/integratordlg.cpp @@ -40,8 +40,8 @@ #include "initdlg.h" -IntegratorDlg::IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *tqparent, const char *name) - :IntegratorDlgBase(tqparent, name), m_integrator(integrator) +IntegratorDlg::IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent, const char *name) + :IntegratorDlgBase(parent, name), m_integrator(integrator) { TQFile cvspass(TQDir::homeDirPath() + "/.cvspass"); if (cvspass.open(IO_ReadOnly)) diff --git a/vcs/cvsservice/integrator/integratordlg.h b/vcs/cvsservice/integrator/integratordlg.h index 72ae30fd..711c972f 100644 --- a/vcs/cvsservice/integrator/integratordlg.h +++ b/vcs/cvsservice/integrator/integratordlg.h @@ -29,7 +29,7 @@ class IntegratorDlg: public IntegratorDlgBase, public VCSDialog { Q_OBJECT TQ_OBJECT public: - IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *tqparent = 0, const char *name = 0); + IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent = 0, const char *name = 0); virtual TQWidget *self(); virtual void init(const TQString &projectName, const TQString &projectLocation); diff --git a/vcs/cvsservice/releaseinputdialog.cpp b/vcs/cvsservice/releaseinputdialog.cpp index 83df254c..151c921b 100644 --- a/vcs/cvsservice/releaseinputdialog.cpp +++ b/vcs/cvsservice/releaseinputdialog.cpp @@ -20,8 +20,8 @@ // class ReleaseInputDialog /////////////////////////////////////////////////////////////////////////////// -ReleaseInputDialog::ReleaseInputDialog( TQWidget* tqparent) - : ReleaseInputDialogBase( tqparent, "releaseinputdialog", true, 0 ) +ReleaseInputDialog::ReleaseInputDialog( TQWidget* parent) + : ReleaseInputDialogBase( parent, "releaseinputdialog", true, 0 ) { } diff --git a/vcs/cvsservice/releaseinputdialog.h b/vcs/cvsservice/releaseinputdialog.h index ef8757bb..0d3c05c6 100644 --- a/vcs/cvsservice/releaseinputdialog.h +++ b/vcs/cvsservice/releaseinputdialog.h @@ -26,9 +26,9 @@ class ReleaseInputDialog : public ReleaseInputDialogBase public: /** * C-tor - * @param tqparent + * @param parent */ - ReleaseInputDialog( TQWidget* tqparent = 0 ); + ReleaseInputDialog( TQWidget* parent = 0 ); /** * Destructor */ diff --git a/vcs/cvsservice/tagdialog.cpp b/vcs/cvsservice/tagdialog.cpp index b3d3a42e..33aca057 100644 --- a/vcs/cvsservice/tagdialog.cpp +++ b/vcs/cvsservice/tagdialog.cpp @@ -18,8 +18,8 @@ // class TagDialog /////////////////////////////////////////////////////////////////////////////// -TagDialog::TagDialog( const TQString &caption, TQWidget *tqparent, const char *name ) - : TagDialogBase( tqparent, name ? name : "tagdialog", true ) +TagDialog::TagDialog( const TQString &caption, TQWidget *parent, const char *name ) + : TagDialogBase( parent, name ? name : "tagdialog", true ) { if (!caption.isEmpty()) { diff --git a/vcs/cvsservice/tagdialog.h b/vcs/cvsservice/tagdialog.h index e58b912d..54db2bb1 100644 --- a/vcs/cvsservice/tagdialog.h +++ b/vcs/cvsservice/tagdialog.h @@ -25,7 +25,7 @@ class TagDialog : public TagDialogBase Q_OBJECT TQ_OBJECT public: - TagDialog( const TQString &caption, TQWidget *tqparent = 0, const char *name = 0 ); + TagDialog( const TQString &caption, TQWidget *parent = 0, const char *name = 0 ); virtual ~TagDialog(); /** diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index 6bb3c08d..c3b94071 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -28,8 +28,8 @@ #include "execcommand.h" -CommitDialog::CommitDialog( TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n("Perforce Submit"), Ok|Cancel|Details ) +CommitDialog::CommitDialog( TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n("Perforce Submit"), Ok|Cancel|Details ) { TQWidget *w = new TQWidget( this, "main widget" ); setMainWidget( w ); diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h index ddca48a2..a1642fd2 100644 --- a/vcs/perforce/commitdlg.h +++ b/vcs/perforce/commitdlg.h @@ -26,7 +26,7 @@ class CommitDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - CommitDialog( TQWidget *tqparent = 0, const char *name = 0 ); + CommitDialog( TQWidget *parent = 0, const char *name = 0 ); ~CommitDialog(); TQString logMessage() const { return edit->text(); } diff --git a/vcs/perforce/integrator/perforceintegrator.cpp b/vcs/perforce/integrator/perforceintegrator.cpp index ec9802c9..bc7c0988 100644 --- a/vcs/perforce/integrator/perforceintegrator.cpp +++ b/vcs/perforce/integrator/perforceintegrator.cpp @@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevperforceintegrator"); typedef KDevGenericFactory<PerforceIntegrator> PerforceIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libperforceintegrator, PerforceIntegratorFactory(data) ) -PerforceIntegrator::PerforceIntegrator(TQObject* tqparent, const char* name, +PerforceIntegrator::PerforceIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :KDevVCSIntegrator(tqparent, name) + :KDevVCSIntegrator(parent, name) { } @@ -39,15 +39,15 @@ PerforceIntegrator::~PerforceIntegrator() { } -VCSDialog* PerforceIntegrator::fetcher(TQWidget* // tqparent +VCSDialog* PerforceIntegrator::fetcher(TQWidget* // parent ) { return 0; } -VCSDialog* PerforceIntegrator::integrator(TQWidget* tqparent) +VCSDialog* PerforceIntegrator::integrator(TQWidget* parent) { - PFIntegratorDlg *dlg = new PFIntegratorDlg(tqparent); + PFIntegratorDlg *dlg = new PFIntegratorDlg(parent); return dlg; } diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h index b76f8de8..875d9a73 100644 --- a/vcs/perforce/integrator/perforceintegrator.h +++ b/vcs/perforce/integrator/perforceintegrator.h @@ -29,11 +29,11 @@ class PerforceIntegrator : public KDevVCSIntegrator Q_OBJECT TQ_OBJECT public: - PerforceIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + PerforceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~PerforceIntegrator(); - virtual VCSDialog* fetcher(TQWidget* tqparent); - virtual VCSDialog* integrator(TQWidget* tqparent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/perforce/integrator/pfintegratordlg.cpp b/vcs/perforce/integrator/pfintegratordlg.cpp index 90e66923..8685b2f4 100644 --- a/vcs/perforce/integrator/pfintegratordlg.cpp +++ b/vcs/perforce/integrator/pfintegratordlg.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "pfintegratordlg.h" -PFIntegratorDlg::PFIntegratorDlg(TQWidget *tqparent, const char *name) - :PFIntegratorDlgBase(tqparent, name) +PFIntegratorDlg::PFIntegratorDlg(TQWidget *parent, const char *name) + :PFIntegratorDlgBase(parent, name) { } diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h index a4f515bf..d20bd74c 100644 --- a/vcs/perforce/integrator/pfintegratordlg.h +++ b/vcs/perforce/integrator/pfintegratordlg.h @@ -27,7 +27,7 @@ class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog { Q_OBJECT TQ_OBJECT public: - PFIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0); + PFIntegratorDlg(TQWidget *parent = 0, const char *name = 0); virtual void accept(); virtual void init(const TQString &projectName, const TQString &projectLocation); diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index 2bd60c76..dd950121 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -38,8 +38,8 @@ static const KDevPluginInfo data("kdevperforce"); typedef KDevGenericFactory<PerforcePart> PerforceFactory; K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) ) -PerforcePart::PerforcePart( TQObject *tqparent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, tqparent, name ? name : "PerforcePart" ) +PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & ) + : KDevVersionControl( &data, parent, name ? name : "PerforcePart" ) { setInstance(PerforceFactory::instance()); setupActions(); diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h index 18994e0d..f7991438 100644 --- a/vcs/perforce/perforcepart.h +++ b/vcs/perforce/perforcepart.h @@ -26,7 +26,7 @@ class PerforcePart : public KDevVersionControl TQ_OBJECT public: - PerforcePart( TQObject *tqparent, const char *name, const TQStringList & ); + PerforcePart( TQObject *parent, const char *name, const TQStringList & ); ~PerforcePart(); virtual TQString shortDescription() const diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp index 54c6c4f2..be54cabb 100644 --- a/vcs/subversion/commitdlg.cpp +++ b/vcs/subversion/commitdlg.cpp @@ -22,8 +22,8 @@ #include <tqevent.h> #include <ktextedit.h> -CommitDlg::CommitDlg( TQWidget* tqparent ) - : CommitDlgBase( tqparent ) +CommitDlg::CommitDlg( TQWidget* parent ) + : CommitDlgBase( parent ) { textMessage->installEventFilter(this); } diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp index 8c0c4ef9..32d28d27 100644 --- a/vcs/subversion/integrator/subversionintegrator.cpp +++ b/vcs/subversion/integrator/subversionintegrator.cpp @@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevsubversionintegrator"); typedef KDevGenericFactory<SubversionIntegrator> SubversionIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libsubversionintegrator, SubversionIntegratorFactory(data) ) -SubversionIntegrator::SubversionIntegrator(TQObject* tqparent, const char* name, +SubversionIntegrator::SubversionIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :KDevVCSIntegrator(tqparent, name) + :KDevVCSIntegrator(parent, name) { } @@ -39,15 +39,15 @@ SubversionIntegrator::~SubversionIntegrator() { } -VCSDialog* SubversionIntegrator::fetcher(TQWidget* // tqparent +VCSDialog* SubversionIntegrator::fetcher(TQWidget* // parent ) { return 0; } -VCSDialog* SubversionIntegrator::integrator(TQWidget* tqparent) +VCSDialog* SubversionIntegrator::integrator(TQWidget* parent) { - SvnIntegratorDlg *dlg = new SvnIntegratorDlg(tqparent); + SvnIntegratorDlg *dlg = new SvnIntegratorDlg(parent); return dlg; } diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h index d5ae7fad..1113c18e 100644 --- a/vcs/subversion/integrator/subversionintegrator.h +++ b/vcs/subversion/integrator/subversionintegrator.h @@ -29,11 +29,11 @@ class SubversionIntegrator : public KDevVCSIntegrator Q_OBJECT TQ_OBJECT public: - SubversionIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + SubversionIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~SubversionIntegrator(); - virtual VCSDialog* fetcher(TQWidget* tqparent); - virtual VCSDialog* integrator(TQWidget* tqparent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index cc074f8b..05572278 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -38,8 +38,8 @@ using namespace KIO; -SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *tqparent, const char *name ) - : SvnIntegratorDlgBase( tqparent, name ) +SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name ) + : SvnIntegratorDlgBase( parent, name ) { repos1->setMode( KFile::Directory ); } diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h index 3e464f3e..404ac6de 100644 --- a/vcs/subversion/integrator/svnintegratordlg.h +++ b/vcs/subversion/integrator/svnintegratordlg.h @@ -27,7 +27,7 @@ class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog { Q_OBJECT TQ_OBJECT public: - SvnIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0); + SvnIntegratorDlg(TQWidget *parent = 0, const char *name = 0); virtual void accept(); virtual void init(const TQString &projectName, const TQString &projectLocation); diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp index 57238227..21b84400 100644 --- a/vcs/subversion/kdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -257,7 +257,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // external++; // } // } -// if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ? +// if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ? // parentshavesvn++; // } // if ( files > 0 ) diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/kdevsvnd.h index 4d292b02..fa56be30 100644 --- a/vcs/subversion/kdevsvnd.h +++ b/vcs/subversion/kdevsvnd.h @@ -33,7 +33,7 @@ Q_OBJECT K_DCOP - //note: InSVN means tqparent is added. InRepos means itself is added + //note: InSVN means parent is added. InRepos means itself is added enum { SomeAreFiles = 1, SomeAreFolders = 2, SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 }; public: KDevSvnd(const TQCString &); diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp index abbd46cf..8fd05950 100644 --- a/vcs/subversion/kdevsvnd_widgets.cpp +++ b/vcs/subversion/kdevsvnd_widgets.cpp @@ -18,8 +18,8 @@ #include <tqlabel.h> #include <klocale.h> -SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* tqparent, const char* name, bool modal, WFlags f ) - :SvnSSLTrustPromptBase( tqparent, name, modal, f ) +SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool modal, WFlags f ) + :SvnSSLTrustPromptBase( parent, name, modal, f ) , m_code(-1) { listView1->setColumnText( 0, "Items" ); diff --git a/vcs/subversion/kdevsvnd_widgets.h b/vcs/subversion/kdevsvnd_widgets.h index c23514c1..9ec98cd6 100644 --- a/vcs/subversion/kdevsvnd_widgets.h +++ b/vcs/subversion/kdevsvnd_widgets.h @@ -21,7 +21,7 @@ class SvnSSLTrustPrompt : public SvnSSLTrustPromptBase{ Q_OBJECT TQ_OBJECT public: - SvnSSLTrustPrompt( TQWidget* tqparent=0, const char* name=0, bool modal=true, WFlags f=0 ); + SvnSSLTrustPrompt( TQWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 ); ~SvnSSLTrustPrompt(); void setupCertInfo( TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ); void setupFailedReasonMsg( TQString msg ); diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index 021860bd..d8b1230a 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -32,11 +32,11 @@ #include <kio/netaccess.h> #include <klocale.h> -SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *tqparent, const char *name) - : KDevVCSFileInfoProvider( tqparent, "svnfileinfoprovider" ), +SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *parent, const char *name) + : KDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ), m_cachedDirEntries( 0 ), m_recursiveDirEntries(0) { Q_UNUSED(name); - m_part = tqparent; + m_part = parent; } SVNFileInfoProvider::~SVNFileInfoProvider() { diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h index 50e6a209..dc1bfe1e 100644 --- a/vcs/subversion/subversion_fileinfo.h +++ b/vcs/subversion/subversion_fileinfo.h @@ -41,7 +41,7 @@ class SVNFileInfoProvider : public KDevVCSFileInfoProvider, public DCOPObject/*, K_DCOP public: - SVNFileInfoProvider( subversionPart *tqparent, const char *name = 0); + SVNFileInfoProvider( subversionPart *parent, const char *name = 0); virtual ~SVNFileInfoProvider(); // -- Sync interface diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index d9869854..a98f2298 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -63,8 +63,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) ) //bool g_projectWasJustCreated = false; -subversionPart::subversionPart(TQObject *tqparent, const char *name, const TQStringList& ) - : KDevVersionControl(&data, tqparent, name ? name : "Subversion" ) { +subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& ) + : KDevVersionControl(&data, parent, name ? name : "Subversion" ) { setInstance(subversionFactory::instance()); m_projWidget = 0; @@ -159,9 +159,9 @@ void subversionPart::setupActions() { this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); } -TQWidget* subversionPart::newProjectWidget( TQWidget* tqparent ) { +TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) { if ( !m_projWidget ) - m_projWidget = new subversionProjectWidget(tqparent,"projectwidget"); + m_projWidget = new subversionProjectWidget(parent,"projectwidget"); return m_projWidget; } @@ -257,7 +257,7 @@ if(!project()) id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).")); */ - // Now insert in tqparent menu + // Now insert in parent menu popup->insertItem( i18n("Subversion"), subMenu ); } } diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h index decd355f..bc24a814 100644 --- a/vcs/subversion/subversion_part.h +++ b/vcs/subversion/subversion_part.h @@ -42,11 +42,11 @@ class subversionPart : public KDevVersionControl TQ_OBJECT public: - subversionPart(TQObject *tqparent, const char *name, const TQStringList &); + subversionPart(TQObject *parent, const char *name, const TQStringList &); virtual ~subversionPart(); void setupActions(); - TQWidget* newProjectWidget( TQWidget* tqparent ); + TQWidget* newProjectWidget( TQWidget* parent ); void createNewProject( const TQString& dirname ); bool fetchFromRepository(); KDevVCSFileInfoProvider * fileInfoProvider() const; diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index 96f7d7f4..c27f845e 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -29,8 +29,8 @@ #include <tqtoolbutton.h> #include <tqpushbutton.h> -subversionWidget::subversionWidget( subversionPart *part, TQWidget *tqparent, const char* name ) - : KTabWidget(tqparent) +subversionWidget::subversionWidget( subversionPart *part, TQWidget *parent, const char* name ) + : KTabWidget(parent) { m_part = part; m_edit = new KTextEdit( this ); @@ -87,8 +87,8 @@ void subversionWidget::closeCurrentTab() //////////////////////////////////////////////////////////////////////// -SvnIntSortListItem::SvnIntSortListItem( TQListView* tqparent ) - :TQListViewItem(tqparent) +SvnIntSortListItem::SvnIntSortListItem( TQListView* parent ) + :TQListViewItem(parent) {} SvnIntSortListItem::~SvnIntSortListItem() {} @@ -103,8 +103,8 @@ int SvnIntSortListItem::compare( TQListViewItem *item, int col, bool ascending ) return 0; } -SvnLogViewItem::SvnLogViewItem( TQListView * tqparent ) - :SvnIntSortListItem( tqparent ) +SvnLogViewItem::SvnLogViewItem( TQListView * parent ) + :SvnIntSortListItem( parent ) { m_pathList = ""; m_message = ""; diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h index 0108da81..6418ba40 100644 --- a/vcs/subversion/subversion_widget.h +++ b/vcs/subversion/subversion_widget.h @@ -43,7 +43,7 @@ class subversionWidget : public KTabWidget Q_OBJECT TQ_OBJECT public: - subversionWidget(subversionPart *part, TQWidget *tqparent, const char* name); + subversionWidget(subversionPart *part, TQWidget *parent, const char* name); ~subversionWidget(); // append what?. Append any text status outputs @@ -67,7 +67,7 @@ private: */ class SvnIntSortListItem : public TQListViewItem { public: - SvnIntSortListItem ( TQListView* tqparent=0 ); + SvnIntSortListItem ( TQListView* parent=0 ); ~SvnIntSortListItem (); /** Returns < 0 if this item is less than i, 0 if they are equal and > 0 if this item is greater than i. */ @@ -76,7 +76,7 @@ public: class SvnLogViewItem : public SvnIntSortListItem { public: - SvnLogViewItem( TQListView* tqparent ); + SvnLogViewItem( TQListView* parent ); ~SvnLogViewItem(); TQString m_pathList; diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp index 5d80f997..b4095389 100644 --- a/vcs/subversion/svn_blamewidget.cpp +++ b/vcs/subversion/svn_blamewidget.cpp @@ -24,8 +24,8 @@ #include <klocale.h> #include <kmessagebox.h> -SvnBlameWidget::SvnBlameWidget( TQWidget *tqparent, const char* name, bool modal, WFlags f ) - :TQWidget( tqparent ) +SvnBlameWidget::SvnBlameWidget( TQWidget *parent, const char* name, bool modal, WFlags f ) + :TQWidget( parent ) { m_layout = new TQVBoxLayout( this, 1, 1 ); m_layout->setMargin(1); @@ -84,8 +84,8 @@ TQListView* SvnBlameWidget::outView() ///////////////////////////////////////////////////////////// -SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *tqparent ) - : TQDialog( tqparent ) +SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *parent ) + : TQDialog( parent ) { m_selected = ""; setCaption( i18n("Select one file to view annotation") ); diff --git a/vcs/subversion/svn_blamewidget.h b/vcs/subversion/svn_blamewidget.h index 7cba3077..b20499f2 100644 --- a/vcs/subversion/svn_blamewidget.h +++ b/vcs/subversion/svn_blamewidget.h @@ -42,7 +42,7 @@ class SvnBlameWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - SvnBlameWidget( TQWidget * tqparent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); + SvnBlameWidget( TQWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); virtual ~SvnBlameWidget(); void copyBlameData( TQValueList<SvnBlameHolder> *blamelist ); void show(); @@ -58,7 +58,7 @@ class SvnBlameFileSelectDlg : public TQDialog { Q_OBJECT TQ_OBJECT public: - SvnBlameFileSelectDlg( TQWidget *tqparent = 0L ); + SvnBlameFileSelectDlg( TQWidget *parent = 0L ); virtual ~SvnBlameFileSelectDlg(); void setCandidate( TQStringList *modifies ); TQString selected(); diff --git a/vcs/subversion/svn_copywidget.cpp b/vcs/subversion/svn_copywidget.cpp index e781ca10..30b25fd7 100644 --- a/vcs/subversion/svn_copywidget.cpp +++ b/vcs/subversion/svn_copywidget.cpp @@ -7,8 +7,8 @@ #include <kcombobox.h> #include <tqradiobutton.h> -SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *tqparent ) - : SvnCopyDialogBase( tqparent ) +SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent ) + : SvnCopyDialogBase( parent ) , m_holder(holder) { reqEdit->setText( reqPath ); diff --git a/vcs/subversion/svn_copywidget.h b/vcs/subversion/svn_copywidget.h index eb29ca39..6e71b168 100644 --- a/vcs/subversion/svn_copywidget.h +++ b/vcs/subversion/svn_copywidget.h @@ -14,7 +14,7 @@ class SvnCopyDialog : public SvnCopyDialogBase Q_OBJECT TQ_OBJECT public: - SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *tqparent ); + SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent ); ~SvnCopyDialog(); KURL sourceUrl(); diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp index 1b4d9c83..25149483 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.cpp +++ b/vcs/subversion/svn_fileselectdlg_commit.cpp @@ -34,8 +34,8 @@ #include <kdevproject.h> -SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* tqparent) - :SvnCommitDlgBase( tqparent, "svnfileselectcommitdlg", true ) +SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* parent) + :SvnCommitDlgBase( parent, "svnfileselectcommitdlg", true ) ,m_part(part) { this->setCaption(i18n("Select Files to Commit")); diff --git a/vcs/subversion/svn_fileselectdlg_commit.h b/vcs/subversion/svn_fileselectdlg_commit.h index 1a3cf74a..629b5063 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.h +++ b/vcs/subversion/svn_fileselectdlg_commit.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, TQWidget* tqparent = 0 ); + SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, TQWidget* parent = 0 ); ~SVNFileSelectDlgCommit(); void insertItem( TQString status, KURL url ); KURL::List checkedUrls(); diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index c8f33e66..541d1674 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -38,8 +38,8 @@ #include <tqlayout.h> #include <tqstringlist.h> -SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *tqparent) - :TQWidget(tqparent), m_part(part) +SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) + :TQWidget(parent), m_part(part) { m_layout = new TQGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout"); @@ -188,8 +188,8 @@ void SvnLogViewWidget::diffToPrevious() true/*recurse*/, true/*peg_diff*/ ); } -SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *tqparent, const char* name, bool modal, WFlags f ) -: SvnLogViewOptionDlgBase( tqparent, name, modal,f ) +SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *parent, const char* name, bool modal, WFlags f ) +: SvnLogViewOptionDlgBase( parent, name, modal,f ) { // radio1->setChecked(true); //repository log radio4->setChecked(true); //start revistion by revision keyword diff --git a/vcs/subversion/svn_logviewwidget.h b/vcs/subversion/svn_logviewwidget.h index 04c18249..42a0822c 100644 --- a/vcs/subversion/svn_logviewwidget.h +++ b/vcs/subversion/svn_logviewwidget.h @@ -49,7 +49,7 @@ class SvnLogViewWidget : public /*SvnLogViewWidgetBase*/ TQWidget { Q_OBJECT TQ_OBJECT public: - SvnLogViewWidget(subversionPart *part, TQWidget *tqparent); + SvnLogViewWidget(subversionPart *part, TQWidget *parent); virtual ~SvnLogViewWidget(); void setLogResult( TQValueList<SvnLogHolder> *loglist ); void setRequestedUrl( TQString url ); @@ -76,7 +76,7 @@ class SvnLogViewOptionDlg : public SvnLogViewOptionDlgBase { Q_OBJECT TQ_OBJECT public: - SvnLogViewOptionDlg(TQWidget *tqparent=0, const char* name=0, bool modal=TRUE, WFlags f=0); + SvnLogViewOptionDlg(TQWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0); ~SvnLogViewOptionDlg(); int revstart(); TQString revKindStart(); diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp index 8d3e5158..50731690 100644 --- a/vcs/subversion/svn_mergewidget.cpp +++ b/vcs/subversion/svn_mergewidget.cpp @@ -28,8 +28,8 @@ using namespace SvnGlobal; -SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *tqparent ) - : SvnMergeOptionDialogBase( tqparent ) +SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent ) + : SvnMergeOptionDialogBase( parent ) { dest->setURL( wcTarget.prettyURL() ); diff --git a/vcs/subversion/svn_mergewidget.h b/vcs/subversion/svn_mergewidget.h index da2a46dc..7f4a25fe 100644 --- a/vcs/subversion/svn_mergewidget.h +++ b/vcs/subversion/svn_mergewidget.h @@ -34,7 +34,7 @@ class SvnMergeDialog : public SvnMergeOptionDialogBase Q_OBJECT TQ_OBJECT public: - SvnMergeDialog( const KURL &wcTarget, TQWidget *tqparent = NULL ); + SvnMergeDialog( const KURL &wcTarget, TQWidget *parent = NULL ); virtual ~SvnMergeDialog(); KURL source1(); diff --git a/vcs/subversion/svn_switchwidget.cpp b/vcs/subversion/svn_switchwidget.cpp index 97744b06..7149cce2 100644 --- a/vcs/subversion/svn_switchwidget.cpp +++ b/vcs/subversion/svn_switchwidget.cpp @@ -7,8 +7,8 @@ #include "subversion_global.h" SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, - const TQString &wcPath, TQWidget *tqparent ) - : SvnSwitchDlgBase( tqparent ) + const TQString &wcPath, TQWidget *parent ) + : SvnSwitchDlgBase( parent ) , m_info( holder ) { connect( switchOnlyRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); diff --git a/vcs/subversion/svn_switchwidget.h b/vcs/subversion/svn_switchwidget.h index 1d06f303..d78adcd6 100644 --- a/vcs/subversion/svn_switchwidget.h +++ b/vcs/subversion/svn_switchwidget.h @@ -14,7 +14,7 @@ class SvnSwitchDlg : public SvnSwitchDlgBase TQ_OBJECT public: SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, - const TQString &wcPath, TQWidget *tqparent = NULL ); + const TQString &wcPath, TQWidget *parent = NULL ); virtual ~SvnSwitchDlg(); const TQString currentUrl(); |