diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 32b67ac0690de411b26b1d5e715b188c27442248 (patch) | |
tree | 43167816a3df6b3a877d71c9a7963ed270dcc8c9 /buildtools/autotools | |
parent | 330c33ab6f97b279737bf9527c9add7bb1475450 (diff) | |
download | tdevelop-32b67ac0690de411b26b1d5e715b188c27442248.tar.gz tdevelop-32b67ac0690de411b26b1d5e715b188c27442248.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'buildtools/autotools')
56 files changed, 159 insertions, 159 deletions
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: |