From 12f3d421cd2991c0e3f96994efb836ce244172ff Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 00:36:34 -0600 Subject: Rename KShared --- tdeio/tdeio/kimageiofactory.h | 2 +- tdeio/tdeio/kmimetype.cpp | 2 +- tdeio/tdeio/kmimetype.h | 2 +- tdeio/tdeio/kprotocolinfo.h | 2 +- tdeio/tdeio/kservice.h | 2 +- tdeio/tdeio/kservicegroup.h | 6 +++--- tdeio/tdeio/kservicetype.h | 2 +- tdeio/tdeio/ktraderparsetree.h | 4 ++-- tdeio/tdeio/tdefilemetainfo.h | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tdeio') diff --git a/tdeio/tdeio/kimageiofactory.h b/tdeio/tdeio/kimageiofactory.h index 6d2d15940..13312a2a2 100644 --- a/tdeio/tdeio/kimageiofactory.h +++ b/tdeio/tdeio/kimageiofactory.h @@ -20,7 +20,7 @@ class TDEIO_EXPORT KImageIOFormat : public KSycocaEntry K_SYCOCATYPE( KST_KImageIOFormat, KSycocaEntry ) public: - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; typedef TQValueList List; public: // KDoc seems to barf on those typedefs and generates no docs after them /** diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp index e50d6c427..c3643c2d9 100644 --- a/tdeio/tdeio/kmimetype.cpp +++ b/tdeio/tdeio/kmimetype.cpp @@ -59,7 +59,7 @@ #include #include -template class KSharedPtr; +template class TDESharedPtr; template class TQValueList; KMimeType::Ptr KMimeType::s_pDefaultType = 0L; diff --git a/tdeio/tdeio/kmimetype.h b/tdeio/tdeio/kmimetype.h index 19a846b46..42f1cad8d 100644 --- a/tdeio/tdeio/kmimetype.h +++ b/tdeio/tdeio/kmimetype.h @@ -49,7 +49,7 @@ class TDEIO_EXPORT KMimeType : public KServiceType K_SYCOCATYPE( KST_KMimeType, KServiceType ) public: - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; typedef TQValueList List; public: /** diff --git a/tdeio/tdeio/kprotocolinfo.h b/tdeio/tdeio/kprotocolinfo.h index ae0eb56a2..6de45c1a7 100644 --- a/tdeio/tdeio/kprotocolinfo.h +++ b/tdeio/tdeio/kprotocolinfo.h @@ -47,7 +47,7 @@ class TDEIO_EXPORT KProtocolInfo : public KSycocaEntry K_SYCOCATYPE( KST_KProtocolInfo, KSycocaEntry ) public: - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; public: /** diff --git a/tdeio/tdeio/kservice.h b/tdeio/tdeio/kservice.h index 4db478ba6..a2e00d740 100644 --- a/tdeio/tdeio/kservice.h +++ b/tdeio/tdeio/kservice.h @@ -52,7 +52,7 @@ class TDEIO_EXPORT KService : public KSycocaEntry friend class KBuildSycoca; public: - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; typedef TQValueList List; public: /** diff --git a/tdeio/tdeio/kservicegroup.h b/tdeio/tdeio/kservicegroup.h index f2cd5a09f..ac4646599 100644 --- a/tdeio/tdeio/kservicegroup.h +++ b/tdeio/tdeio/kservicegroup.h @@ -71,8 +71,8 @@ class TDEIO_EXPORT KServiceGroup : public KSycocaEntry K_SYCOCATYPE( KST_KServiceGroup, KSycocaEntry ) public: - typedef KSharedPtr Ptr; - typedef KSharedPtr SPtr; + typedef TDESharedPtr Ptr; + typedef TDESharedPtr SPtr; typedef TQValueList List; public: /** @@ -332,7 +332,7 @@ class TDEIO_EXPORT KServiceSeparator : public KSycocaEntry K_SYCOCATYPE( KST_KServiceSeparator, KSycocaEntry ) public: - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; public: /** * Construct a service separator diff --git a/tdeio/tdeio/kservicetype.h b/tdeio/tdeio/kservicetype.h index b1cad7284..1e4bcaace 100644 --- a/tdeio/tdeio/kservicetype.h +++ b/tdeio/tdeio/kservicetype.h @@ -47,7 +47,7 @@ class TDEIO_EXPORT KServiceType : public KSycocaEntry K_SYCOCATYPE( KST_KServiceType, KSycocaEntry ) public: - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; typedef TQValueList List; public: diff --git a/tdeio/tdeio/ktraderparsetree.h b/tdeio/tdeio/ktraderparsetree.h index a08b61a5a..b0ec95f76 100644 --- a/tdeio/tdeio/ktraderparsetree.h +++ b/tdeio/tdeio/ktraderparsetree.h @@ -120,10 +120,10 @@ public: /** * @internal */ -class TDEIO_EXPORT ParseTreeBase : public KShared +class TDEIO_EXPORT ParseTreeBase : public TDEShared { public: - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; ParseTreeBase() { } virtual bool eval( ParseContext *_context ) const = 0; diff --git a/tdeio/tdeio/tdefilemetainfo.h b/tdeio/tdeio/tdefilemetainfo.h index 8cc3fdbdf..dde596d19 100644 --- a/tdeio/tdeio/tdefilemetainfo.h +++ b/tdeio/tdeio/tdefilemetainfo.h @@ -1698,7 +1698,7 @@ private: KFilePlugin* plugin; KFileMimeTypeInfo* mimeTypeInfo; // The problem here is that plugin can be shared in multiple instances, - // so the memory management isn't easy. KDE4 solution: use KSharedPtr? + // so the memory management isn't easy. KDE4 solution: use TDESharedPtr? // For now we flag one copy of the KFilePlugin pointer as being "owned". bool ownsPlugin; }; -- cgit v1.2.1