diff options
Diffstat (limited to 'buildtools/qmake/qmakescopeitem.cpp')
| -rw-r--r-- | buildtools/qmake/qmakescopeitem.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
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(); } |