diff options
Diffstat (limited to 'buildtools/qmake')
21 files changed, 94 insertions, 94 deletions
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 ); } } |