diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/cppparser/ast.h | 4 | ||||
-rw-r--r-- | lib/cppparser/driver.h | 2 | ||||
-rw-r--r-- | lib/cppparser/lexercache.h | 4 | ||||
-rw-r--r-- | lib/interfaces/codemodel.h | 76 | ||||
-rw-r--r-- | lib/interfaces/hashedstring.cpp | 8 | ||||
-rw-r--r-- | lib/interfaces/hashedstring.h | 2 |
6 files changed, 48 insertions, 48 deletions
diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h index e062d077..9051018a 100644 --- a/lib/cppparser/ast.h +++ b/lib/cppparser/ast.h @@ -1553,10 +1553,10 @@ private: }; -class TranslationUnitAST: public AST, public KShared +class TranslationUnitAST: public AST, public TDEShared { public: - typedef KSharedPtr<TranslationUnitAST> Node; + typedef TDESharedPtr<TranslationUnitAST> Node; enum { Type = NodeType_TranslationUnit }; DECLARE_ALLOC( TranslationUnitAST ) diff --git a/lib/cppparser/driver.h b/lib/cppparser/driver.h index 71e0f2d7..5e101839 100644 --- a/lib/cppparser/driver.h +++ b/lib/cppparser/driver.h @@ -52,7 +52,7 @@ enum typedef TQPair<TQString, int> Dependence; class ParsedFile; -typedef KSharedPtr< ParsedFile > ParsedFilePointer; +typedef TDESharedPtr< ParsedFile > ParsedFilePointer; class ParsedFile : public AbstractParseResult { public: diff --git a/lib/cppparser/lexercache.h b/lib/cppparser/lexercache.h index c1aac432..4d3783c7 100644 --- a/lib/cppparser/lexercache.h +++ b/lib/cppparser/lexercache.h @@ -28,7 +28,7 @@ class LexerCache; -class CachedLexedFile : public KShared, public CacheNode { +class CachedLexedFile : public TDEShared, public CacheNode { public: ///@todo add and manage the set of included files CachedLexedFile( const HashedString& fileName, LexerCache* manager ); @@ -107,7 +107,7 @@ class CachedLexedFile : public KShared, public CacheNode { */ }; -typedef KSharedPtr<CachedLexedFile> CachedLexedFilePointer; +typedef TDESharedPtr<CachedLexedFile> CachedLexedFilePointer; struct CachedLexedFilePointerCompare { bool operator() ( const CachedLexedFilePointer& lhs, const CachedLexedFilePointer& rhs ) const { diff --git a/lib/interfaces/codemodel.h b/lib/interfaces/codemodel.h index 86faa4f9..b6e03fdb 100644 --- a/lib/interfaces/codemodel.h +++ b/lib/interfaces/codemodel.h @@ -43,7 +43,7 @@ enum ParsedFileType { CppParsedFile }; -class AbstractParseResult : public KShared { +class AbstractParseResult : public TDEShared { public: virtual void read( TQDataStream& stream ) = 0; @@ -52,7 +52,7 @@ public: virtual ParsedFileType type() const = 0; }; -typedef KSharedPtr<AbstractParseResult> ParseResultPointer; +typedef TDESharedPtr<AbstractParseResult> ParseResultPointer; using namespace std; @@ -72,90 +72,90 @@ class TypeAliasModel; /** @class ItemDom Safe pointer to the @ref CodeModelItem. -This is a type definition: @code typedef KSharedPtr<CodeModelItem> ItemDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr<CodeModelItem> ItemDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr<CodeModelItem> ItemDom; +typedef TDESharedPtr<CodeModelItem> ItemDom; /** @class FileDom Safe pointer to the @ref FileModel. -This is a type definition: @code typedef KSharedPtr<FileModel> FileDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr<FileModel> FileDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr<FileModel> FileDom; +typedef TDESharedPtr<FileModel> FileDom; /** @class NamespaceDom Safe pointer to the @ref NamespaceModel. -This is a type definition: @code typedef KSharedPtr<NamespaceModel> NamespaceDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr<NamespaceModel> NamespaceDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr<NamespaceModel> NamespaceDom; +typedef TDESharedPtr<NamespaceModel> NamespaceDom; /** @class ClassDom Safe pointer to the @ref ClassModel. -This is a type definition: @code typedef KSharedPtr<ClassModel> ClassDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr<ClassModel> ClassDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr<ClassModel> ClassDom; +typedef TDESharedPtr<ClassModel> ClassDom; /** @class FunctionDom Safe pointer to the @ref FunctionModel. -This is a type definition: @code typedef KSharedPtr<FunctionModel> FunctionDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr<FunctionModel> FunctionDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr<FunctionModel> FunctionDom; +typedef TDESharedPtr<FunctionModel> FunctionDom; /** @class FunctionDefinitionDom Safe pointer to the @ref FunctionDefinitionModel. -This is a type definition: @code typedef KSharedPtr<FunctionDefinitionModel> FunctionDefinitionDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr<FunctionDefinitionModel> FunctionDefinitionDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr<FunctionDefinitionModel> FunctionDefinitionDom; +typedef TDESharedPtr<FunctionDefinitionModel> FunctionDefinitionDom; /** @class VariableDom Safe pointer to the @ref VariableModel. -This is a type definition: @code typedef KSharedPtr<VariableModel> VariableDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr<VariableModel> VariableDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr<VariableModel> VariableDom; +typedef TDESharedPtr<VariableModel> VariableDom; /** @class ArgumentDom Safe pointer to the @ref ArgumentModel. -This is a type definition: @code typedef KSharedPtr<ArgumentModel> ArgumentDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr<ArgumentModel> ArgumentDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr<ArgumentModel> ArgumentDom; +typedef TDESharedPtr<ArgumentModel> ArgumentDom; /** @class EnumDom Safe pointer to the @ref EnumModel. -This is a type definition: @code typedef KSharedPtr<EnumModel> EnumDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr<EnumModel> EnumDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr<EnumModel> EnumDom; +typedef TDESharedPtr<EnumModel> EnumDom; /** @class TypeAliasDom Safe pointer to the @ref TypeAliasModel. -This is a type definition: @code typedef KSharedPtr<TypeAliasModel> TypeAliasDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr<TypeAliasModel> TypeAliasDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr<TypeAliasModel> TypeAliasDom; +typedef TDESharedPtr<TypeAliasModel> TypeAliasDom; /** @class EnumeratorDom Safe pointer to the @ref EnumeratorModel. -This is a type definition: @code typedef KSharedPtr<EnumeratorModel> EnumeratorDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr<EnumeratorModel> EnumeratorDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr<EnumeratorModel> EnumeratorDom; +typedef TDESharedPtr<EnumeratorModel> EnumeratorDom; /** @class ItemList @@ -271,7 +271,7 @@ TQStringList sortedNameList( const ItemList& lst ) } /** -Casts safe code model pointers (@p KSharedPtr<T> objects like +Casts safe code model pointers (@p TDESharedPtr<T> objects like FileDom, NamespaceDom, etc.) to the @p Result type. Example: @@ -282,7 +282,7 @@ ClassDom cl = model_cast<ClassDom>(ns); @param x Object to cast. */ template <class Result, class T> -Result model_cast( KSharedPtr<T> x ) +Result model_cast( TDESharedPtr<T> x ) { Result r( static_cast<T*>(x) ); return r; @@ -458,7 +458,7 @@ variables, arguments, enums and enumerators, type aliases. Instances of this class should be created using @ref CodeModel::create method but usually it is better to create instances of derived classes like ClassModel, NamespaceModel, FileModel, etc. */ -class CodeModelItem: public KShared +class CodeModelItem: public TDEShared { public: /**A definition of safe pointer to the code model item.*/ diff --git a/lib/interfaces/hashedstring.cpp b/lib/interfaces/hashedstring.cpp index 8392e271..820dba04 100644 --- a/lib/interfaces/hashedstring.cpp +++ b/lib/interfaces/hashedstring.cpp @@ -60,7 +60,7 @@ void HashedString::initHash() { } -class HashedStringSetData : public KShared { +class HashedStringSetData : public TDEShared { public: #ifdef USE_HASHMAP typedef __gnu_cxx::hash_set<HashedString> StringSet; @@ -121,7 +121,7 @@ HashedStringSet& HashedStringSet::operator +=( const HashedStringSet& rhs ) { return * this; #ifndef USE_HASHMAP - KSharedPtr<HashedStringSetData> oldData = m_data; + TDESharedPtr<HashedStringSetData> oldData = m_data; if( !oldData ) oldData = new HashedStringSetData(); m_data = new HashedStringSetData(); std::set_union( oldData->m_files.begin(), oldData->m_files.end(), rhs.m_data->m_files.begin(), rhs.m_data->m_files.end(), std::insert_iterator<HashedStringSetData::StringSet>( m_data->m_files, m_data->m_files.end() ) ); @@ -142,7 +142,7 @@ HashedStringSet& HashedStringSet::operator -=( const HashedStringSet& rhs ) { if( !m_data ) return *this; if( !rhs.m_data ) return *this; #ifndef USE_HASHMAP - KSharedPtr<HashedStringSetData> oldData = m_data; + TDESharedPtr<HashedStringSetData> oldData = m_data; m_data = new HashedStringSetData(); std::set_difference( oldData->m_files.begin(), oldData->m_files.end(), rhs.m_data->m_files.begin(), rhs.m_data->m_files.end(), std::insert_iterator<HashedStringSetData::StringSet>( m_data->m_files, m_data->m_files.end() ) ); #else @@ -164,7 +164,7 @@ void HashedStringSet::makeDataPrivate() { m_data = new HashedStringSetData(); return ; } - if ( m_data->_KShared_count() != 1 ) + if ( m_data->_TDEShared_count() != 1 ) m_data = new HashedStringSetData( *m_data ); } diff --git a/lib/interfaces/hashedstring.h b/lib/interfaces/hashedstring.h index a039a771..c1bfd4ad 100644 --- a/lib/interfaces/hashedstring.h +++ b/lib/interfaces/hashedstring.h @@ -116,7 +116,7 @@ class HashedStringSet { private: friend class HashedStringSetGroup; void makeDataPrivate(); - KSharedPtr<HashedStringSetData> m_data; //this implies some additional cost because KShared's destructor is virtual. Maybe change that by copying KShared without the virtual destructor. + TDESharedPtr<HashedStringSetData> m_data; //this implies some additional cost because TDEShared's destructor is virtual. Maybe change that by copying TDEShared without the virtual destructor. friend HashedStringSet operator + ( const HashedStringSet& lhs, const HashedStringSet& rhs ); }; |