diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
commit | 539a1fd1ae6290cc3eec745226c0ce45b02c1545 (patch) | |
tree | e1cf785f3b349d568bade07dccdb5b39eb862331 /languages/cpp/cppcodecompletion.cpp | |
parent | 82324bf130254bac6932131a55607c866773ca84 (diff) | |
download | tdevelop-539a1fd1ae6290cc3eec745226c0ce45b02c1545.tar.gz tdevelop-539a1fd1ae6290cc3eec745226c0ce45b02c1545.zip |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'languages/cpp/cppcodecompletion.cpp')
-rw-r--r-- | languages/cpp/cppcodecompletion.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index 08f6aa1e..3d9fcb73 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -828,7 +828,7 @@ struct CompTypeProcessor : public TypeProcessor { CompTypeProcessor( SimpleType scope, bool processArguments ) : m_scope( scope ), m_processArguments( processArguments ) {} - virtual TQString tqparentType() { + virtual TQString parentType() { return m_scope->fullType(); } @@ -1904,18 +1904,18 @@ SimpleContext* CppCodeCompletion::computeFunctionContext( FunctionDom f, int lin if ( !scope.isEmpty() ) { - SimpleType tqparentType; + SimpleType parentType; /* if( !m_cachedFromContext ) { TypePointer t = SimpleType(TQStringList())->locateDecType( scope.join("") ).desc().resolved();; if( t ) - tqparentType = SimpleType( t.data() ); + parentType = SimpleType( t.data() ); else - tqparentType = SimpleType( scope ); + parentType = SimpleType( scope ); } else {*/ - tqparentType = SimpleType( scope, getIncludeFiles() ); + parentType = SimpleType( scope, getIncludeFiles() ); //} - tqparentType->descForEdit().setTotalPointerDepth( 1 ); - ctx->setContainer( tqparentType ); + parentType->descForEdit().setTotalPointerDepth( 1 ); + ctx->setContainer( parentType ); } SimpleType global = ctx->global(); @@ -2564,7 +2564,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } if ( !scope.isEmpty() ) { - SimpleType tqparentType; + SimpleType parentType; /*if( !m_cachedFromContext ) { TypePointer t = createGlobalNamespace(); @@ -2584,14 +2584,14 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { d.setIncludeFiles( getIncludeFiles() ); SimpleTypeImpl * i = SimpleType( TQStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data(); if ( i ) { - tqparentType = i; + parentType = i; } else { - tqparentType = SimpleType( scope, getIncludeFiles() ); + parentType = SimpleType( scope, getIncludeFiles() ); } } else { - tqparentType = SimpleType( scope, getIncludeFiles() ); + parentType = SimpleType( scope, getIncludeFiles() ); } - this_type = tqparentType; + this_type = parentType; this_type->descForEdit().setTotalPointerDepth( 1 ); ctx->setContainer( this_type ); } @@ -3687,8 +3687,8 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, TQValueLis args << Catalog::QueryArgument( "name", fullname ); - TQValueList<LocateResult> tqparents = typeR->getBases( ); - for ( TQValueList<LocateResult>::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) { + TQValueList<LocateResult> parents = typeR->getBases( ); + for ( TQValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; SimpleType tp = SimpleType( ( *it ) ->resolved() ); @@ -3812,9 +3812,9 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList if ( m_completionMode != SignalCompletion ) { if ( !type->isNamespace() ) { if ( num == 1 ) - e.postfix += "; (protected)"; // in " + proc.tqparentType() + ")"; + e.postfix += "; (protected)"; // in " + proc.parentType() + ")"; if ( num == 2 ) - e.postfix += "; (private)"; // in " + proc.tqparentType() + ")"; + e.postfix += "; (private)"; // in " + proc.parentType() + ")"; } } @@ -3930,9 +3930,9 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList computeCompletionEntryList( klass->name(), type, entryList, klass->typeAliasList(), isInstance, depth ); } - TQValueList<LocateResult> tqparents = type->getBases( ); + TQValueList<LocateResult> parents = type->getBases( ); - for ( TQValueList<LocateResult>::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) { + for ( TQValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; |