From 8d6fecdf83984625b9bc6d010a6a00ee670af344 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 00:39:49 -0600 Subject: Rename KShared --- lib/interfaces/codemodel.h | 76 ++++++++++++++++++++--------------------- lib/interfaces/hashedstring.cpp | 8 ++--- lib/interfaces/hashedstring.h | 2 +- 3 files changed, 43 insertions(+), 43 deletions(-) (limited to 'lib/interfaces') 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 ParseResultPointer; +typedef TDESharedPtr 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 ItemDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr ItemDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr ItemDom; +typedef TDESharedPtr ItemDom; /** @class FileDom Safe pointer to the @ref FileModel. -This is a type definition: @code typedef KSharedPtr FileDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr FileDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr FileDom; +typedef TDESharedPtr FileDom; /** @class NamespaceDom Safe pointer to the @ref NamespaceModel. -This is a type definition: @code typedef KSharedPtr NamespaceDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr NamespaceDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr NamespaceDom; +typedef TDESharedPtr NamespaceDom; /** @class ClassDom Safe pointer to the @ref ClassModel. -This is a type definition: @code typedef KSharedPtr ClassDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr ClassDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr ClassDom; +typedef TDESharedPtr ClassDom; /** @class FunctionDom Safe pointer to the @ref FunctionModel. -This is a type definition: @code typedef KSharedPtr FunctionDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr FunctionDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr FunctionDom; +typedef TDESharedPtr FunctionDom; /** @class FunctionDefinitionDom Safe pointer to the @ref FunctionDefinitionModel. -This is a type definition: @code typedef KSharedPtr FunctionDefinitionDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr FunctionDefinitionDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr FunctionDefinitionDom; +typedef TDESharedPtr FunctionDefinitionDom; /** @class VariableDom Safe pointer to the @ref VariableModel. -This is a type definition: @code typedef KSharedPtr VariableDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr VariableDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr VariableDom; +typedef TDESharedPtr VariableDom; /** @class ArgumentDom Safe pointer to the @ref ArgumentModel. -This is a type definition: @code typedef KSharedPtr ArgumentDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr ArgumentDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr ArgumentDom; +typedef TDESharedPtr ArgumentDom; /** @class EnumDom Safe pointer to the @ref EnumModel. -This is a type definition: @code typedef KSharedPtr EnumDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr EnumDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr EnumDom; +typedef TDESharedPtr EnumDom; /** @class TypeAliasDom Safe pointer to the @ref TypeAliasModel. -This is a type definition: @code typedef KSharedPtr TypeAliasDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr TypeAliasDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr TypeAliasDom; +typedef TDESharedPtr TypeAliasDom; /** @class EnumeratorDom Safe pointer to the @ref EnumeratorModel. -This is a type definition: @code typedef KSharedPtr EnumeratorDom; @endcode -@sa KSharedPtr +This is a type definition: @code typedef TDESharedPtr EnumeratorDom; @endcode +@sa TDESharedPtr */ -typedef KSharedPtr EnumeratorDom; +typedef TDESharedPtr EnumeratorDom; /** @class ItemList @@ -271,7 +271,7 @@ TQStringList sortedNameList( const ItemList& lst ) } /** -Casts safe code model pointers (@p KSharedPtr objects like +Casts safe code model pointers (@p TDESharedPtr objects like FileDom, NamespaceDom, etc.) to the @p Result type. Example: @@ -282,7 +282,7 @@ ClassDom cl = model_cast(ns); @param x Object to cast. */ template -Result model_cast( KSharedPtr x ) +Result model_cast( TDESharedPtr x ) { Result r( static_cast(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 StringSet; @@ -121,7 +121,7 @@ HashedStringSet& HashedStringSet::operator +=( const HashedStringSet& rhs ) { return * this; #ifndef USE_HASHMAP - KSharedPtr oldData = m_data; + TDESharedPtr 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( 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 oldData = m_data; + TDESharedPtr 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( 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 m_data; //this implies some additional cost because KShared's destructor is virtual. Maybe change that by copying KShared without the virtual destructor. + TDESharedPtr 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 ); }; -- cgit v1.2.1