From 8d6fecdf83984625b9bc6d010a6a00ee670af344 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 00:39:49 -0600 Subject: Rename KShared --- languages/cpp/cppcodecompletion.cpp | 2 +- languages/cpp/cppcodecompletion.h | 2 +- languages/cpp/simpletype.h | 20 ++++++++++---------- languages/cpp/typedesc.cpp | 6 +++--- languages/cpp/typedesc.h | 16 ++++++++-------- 5 files changed, 23 insertions(+), 23 deletions(-) (limited to 'languages') diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index 7ef40424..aaad17c1 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -106,7 +106,7 @@ const char* destructorPrefix = ""; } TypePointer CppCodeCompletion::createGlobalNamespace() { - KSharedPtr n = new SimpleTypeCachedNamespace( TQStringList(), TQStringList() ); + TDESharedPtr n = new SimpleTypeCachedNamespace( TQStringList(), TQStringList() ); n->addAliases(m_pSupport->codeCompletionConfig()->namespaceAliases() ); return n.data(); } diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h index 24877215..815c8df4 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -90,7 +90,7 @@ namespace CppEvaluation } struct ExpressionInfo; -typedef KSharedPtr TypePointer; +typedef TDESharedPtr TypePointer; class CppCodeCompletion : public TQObject { diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h index bf90a4e7..c6652be1 100644 --- a/languages/cpp/simpletype.h +++ b/languages/cpp/simpletype.h @@ -40,7 +40,7 @@ class SimpleTypeImpl; class SimpleTypeNamespace; class SimpleTypeFunctionInterface; -typedef KSharedPtr TypePointer; +typedef TDESharedPtr TypePointer; ///if this is set, imported items will get their parent set to the node they were acquired through(which may increase the overall count of items, decrease the caching-performance, and may create other problems in locating stuff) //#define PHYSICAL_IMPORT @@ -220,7 +220,7 @@ class SimpleTypeConfiguration { }; -class SimpleTypeImpl : public KShared { +class SimpleTypeImpl : public TDEShared { /*enum ResolutionFlags { NoFlag = 0, HadTypedef = 1, @@ -229,7 +229,7 @@ class SimpleTypeImpl : public KShared { };*/ public: - typedef KSharedPtr TypePointer; + typedef TDESharedPtr TypePointer; SimpleTypeImpl( const TQStringList& scope ) : m_resolutionCount( 0 ), m_resolutionFlags( NoFlag ), m_scope( scope ) { setScope( m_scope ); @@ -363,7 +363,7 @@ class SimpleTypeImpl : public KShared { int m_resolutionCount; ResolutionFlags m_resolutionFlags; - SimpleTypeImpl( const SimpleTypeImpl& /*rhs*/ ) : KShared() {} + SimpleTypeImpl( const SimpleTypeImpl& /*rhs*/ ) : TDEShared() {} SimpleTypeImpl& operator = ( const SimpleTypeImpl& /*rhs*/ ) { return * this; @@ -502,7 +502,7 @@ class SimpleTypeImpl : public KShared { } ///An abstract class for building types lazily - struct TypeBuildInfo : public KShared { + struct TypeBuildInfo : public TDEShared { TypePointer buildCached() { if ( m_cache ) return m_cache; @@ -529,14 +529,14 @@ class SimpleTypeImpl : public KShared { Q_UNUSED( rhs ); return *this; } - TypeBuildInfo( const TypeBuildInfo& rhs ) : KShared() { + TypeBuildInfo( const TypeBuildInfo& rhs ) : TDEShared() { Q_UNUSED( rhs ); } }; ///A class that stores information about a member of some SimpleType class MemberInfo { - KSharedPtr m_build; + TDESharedPtr m_build; public: enum MemberType { @@ -575,9 +575,9 @@ class SimpleTypeImpl : public KShared { }; } - typedef KSharedPtr TypePointer; + typedef TDESharedPtr TypePointer; - void setBuildInfo( KSharedPtr build ) { + void setBuildInfo( TDESharedPtr build ) { m_build = build; } @@ -712,7 +712,7 @@ class SimpleTypeImpl : public KShared { return TQValueList(); } - /**TypeDescs and SimpleTypeImpls usually have a cross-reference, which creates a circular dependency so that they are never freed using KShared. This function breaks the loop, and also breaks all other possible dependency-loops. After this function was called, the type still contains its private information, but can not not be used to resolve anything anymore. This function is called automatically while the destruction of SimpleTypeConfiguration */ + /**TypeDescs and SimpleTypeImpls usually have a cross-reference, which creates a circular dependency so that they are never freed using TDEShared. This function breaks the loop, and also breaks all other possible dependency-loops. After this function was called, the type still contains its private information, but can not not be used to resolve anything anymore. This function is called automatically while the destruction of SimpleTypeConfiguration */ virtual void breakReferences(); ///Returns either itself, or the (namespace-)proxy this type is a slave of. diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp index 5f2c292c..146beb08 100644 --- a/languages/cpp/typedesc.cpp +++ b/languages/cpp/typedesc.cpp @@ -209,7 +209,7 @@ void TypeDesc::setIncludeFiles( const HashedStringSet& files ) { (*it)->setIncludeFiles( files ); } if( m_data->m_nextType ) { - if( m_data->m_nextType->_KShared_count() != 1 ) + if( m_data->m_nextType->_TDEShared_count() != 1 ) m_data->m_nextType = new TypeDescShared( *(m_data->m_nextType) ); m_data->m_nextType->setIncludeFiles( files ); } @@ -222,7 +222,7 @@ void TypeDesc::addIncludeFiles( const HashedStringSet& files ) { (*it)->addIncludeFiles( files ); } if( m_data->m_nextType ) { - if( m_data->m_nextType->_KShared_count() != 1 ) + if( m_data->m_nextType->_TDEShared_count() != 1 ) m_data->m_nextType = new TypeDescShared( *(m_data->m_nextType) ); m_data->m_nextType->addIncludeFiles( files ); } @@ -485,7 +485,7 @@ TypeDescPointer TypeDesc::next() { return m_data->m_nextType; } -KSharedPtr TypeDesc::next() const { +TDESharedPtr TypeDesc::next() const { if ( !m_data ) return 0; return m_data->m_nextType.data(); diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h index 0229c781..f2746a03 100644 --- a/languages/cpp/typedesc.h +++ b/languages/cpp/typedesc.h @@ -27,8 +27,8 @@ class SimpleTypeImpl; class TypeTrace; -typedef KSharedPtr TypeDescPointer; -typedef KSharedPtr TypePointer; +typedef TDESharedPtr TypeDescPointer; +typedef TDESharedPtr TypePointer; enum ResolutionFlags { NoFlag = 0, @@ -144,7 +144,7 @@ enum TypeDescFlags { }; -struct TypeDescData : public KShared { +struct TypeDescData : public TDEShared { typedef TQValueList TemplateParams; TQString m_cleanName; int m_pointerDepth; @@ -323,7 +323,7 @@ class TypeDesc { TypeDescPointer next(); - KSharedPtr next() const; + TDESharedPtr next() const; bool hasTemplateParams() const ; @@ -372,20 +372,20 @@ class TypeDesc { private: void takeData( const TQString& string ); void makeDataPrivate(); - KSharedPtr m_data; + TDESharedPtr m_data; void maybeInit(); void init( TQString stri ); }; -class TypeDescShared : public TypeDesc, public KShared { +class TypeDescShared : public TypeDesc, public TDEShared { public: - TypeDescShared( const TypeDescShared& rhs ) : TypeDesc( rhs ), KShared() {} + TypeDescShared( const TypeDescShared& rhs ) : TypeDesc( rhs ), TDEShared() {} - TypeDescShared( const TypeDesc& rhs ) : TypeDesc( rhs ), KShared() {} + TypeDescShared( const TypeDesc& rhs ) : TypeDesc( rhs ), TDEShared() {} TypeDescShared& operator = ( const TypeDesc& rhs ) { ( *( TypeDesc* ) this ) = rhs; -- cgit v1.2.3