diff options
Diffstat (limited to 'buildtools')
135 files changed, 346 insertions, 346 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; |