summaryrefslogtreecommitdiffstats
path: root/languages
diff options
context:
space:
mode:
Diffstat (limited to 'languages')
-rw-r--r--languages/cpp/cppcodecompletion.cpp2
-rw-r--r--languages/cpp/cppcodecompletion.h2
-rw-r--r--languages/cpp/simpletype.h20
-rw-r--r--languages/cpp/typedesc.cpp6
-rw-r--r--languages/cpp/typedesc.h16
5 files changed, 23 insertions, 23 deletions
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 = "<destructor>";
}
TypePointer CppCodeCompletion::createGlobalNamespace() {
- KSharedPtr<SimpleTypeCachedNamespace> n = new SimpleTypeCachedNamespace( TQStringList(), TQStringList() );
+ TDESharedPtr<SimpleTypeCachedNamespace> 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<SimpleTypeImpl> TypePointer;
+typedef TDESharedPtr<SimpleTypeImpl> 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<SimpleTypeImpl> TypePointer;
+typedef TDESharedPtr<SimpleTypeImpl> 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<SimpleTypeImpl> TypePointer;
+ typedef TDESharedPtr<SimpleTypeImpl> 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<TypeBuildInfo> m_build;
+ TDESharedPtr<TypeBuildInfo> m_build;
public:
enum MemberType {
@@ -575,9 +575,9 @@ class SimpleTypeImpl : public KShared {
};
}
- typedef KSharedPtr<SimpleTypeImpl> TypePointer;
+ typedef TDESharedPtr<SimpleTypeImpl> TypePointer;
- void setBuildInfo( KSharedPtr<TypeBuildInfo> build ) {
+ void setBuildInfo( TDESharedPtr<TypeBuildInfo> build ) {
m_build = build;
}
@@ -712,7 +712,7 @@ class SimpleTypeImpl : public KShared {
return TQValueList<TypePointer>();
}
- /**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<const TypeDescShared> TypeDesc::next() const {
+TDESharedPtr<const TypeDescShared> 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<TypeDescShared> TypeDescPointer;
-typedef KSharedPtr<SimpleTypeImpl> TypePointer;
+typedef TDESharedPtr<TypeDescShared> TypeDescPointer;
+typedef TDESharedPtr<SimpleTypeImpl> TypePointer;
enum ResolutionFlags {
NoFlag = 0,
@@ -144,7 +144,7 @@ enum TypeDescFlags {
};
-struct TypeDescData : public KShared {
+struct TypeDescData : public TDEShared {
typedef TQValueList<LocateResult> TemplateParams;
TQString m_cleanName;
int m_pointerDepth;
@@ -323,7 +323,7 @@ class TypeDesc {
TypeDescPointer next();
- KSharedPtr<const TypeDescShared> next() const;
+ TDESharedPtr<const TypeDescShared> next() const;
bool hasTemplateParams() const ;
@@ -372,20 +372,20 @@ class TypeDesc {
private:
void takeData( const TQString& string );
void makeDataPrivate();
- KSharedPtr<TypeDescData> m_data;
+ TDESharedPtr<TypeDescData> 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;