Browse Source

Rename KShared

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
12f3d421cd
58 changed files with 178 additions and 178 deletions
  1. 2
    2
      TODO
  2. 1
    1
      dnssd/remoteservice.h
  3. 2
    2
      dnssd/servicebase.h
  4. 2
    2
      kabc/scripts/addressee.src.cpp
  5. 1
    1
      kabc/scripts/addressee.src.h
  6. 2
    2
      kate/part/katetextline.h
  7. 4
    4
      kded/kdedmodule.cpp
  8. 2
    2
      kded/kdedmodule.h
  9. 1
    1
      kded/test/test.cpp
  10. 1
    1
      tdecore/kdebug.areas
  11. 1
    1
      tdecore/kglobal.cpp
  12. 2
    2
      tdecore/kglobal.h
  13. 3
    3
      tdecore/kicontheme.cpp
  14. 5
    5
      tdecore/kinstance.cpp
  15. 2
    2
      tdecore/kinstance.h
  16. 2
    2
      tdecore/klockfile.h
  17. 2
    2
      tdecore/kmountpoint.h
  18. 34
    34
      tdecore/ksharedptr.h
  19. 2
    2
      tdecore/ktimezones.cpp
  20. 3
    3
      tdecore/ktimezones.h
  21. 2
    2
      tdecore/kuser.cpp
  22. 2
    2
      tdecore/kuser.h
  23. 8
    8
      tdecore/tdeconfig.cpp
  24. 8
    8
      tdecore/tdeconfig.h
  25. 2
    2
      tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
  26. 1
    1
      tdecore/tdeconfig_compiler/tests/test8a.cpp.ref
  27. 1
    1
      tdecore/tdeconfig_compiler/tests/test8a.h.ref
  28. 1
    1
      tdecore/tdeconfig_compiler/tests/test8main.cpp
  29. 1
    1
      tdecore/tdeconfigbackend.h
  30. 2
    2
      tdecore/tdeconfigbase.h
  31. 2
    2
      tdecore/tdeconfigskeleton.cpp
  32. 2
    2
      tdecore/tdeconfigskeleton.h
  33. 2
    2
      tdecore/tdesycocaentry.h
  34. 1
    1
      tdecore/tdesycocafactory.cpp
  35. 1
    1
      tdeio/tdeio/kimageiofactory.h
  36. 1
    1
      tdeio/tdeio/kmimetype.cpp
  37. 1
    1
      tdeio/tdeio/kmimetype.h
  38. 1
    1
      tdeio/tdeio/kprotocolinfo.h
  39. 1
    1
      tdeio/tdeio/kservice.h
  40. 3
    3
      tdeio/tdeio/kservicegroup.h
  41. 1
    1
      tdeio/tdeio/kservicetype.h
  42. 2
    2
      tdeio/tdeio/ktraderparsetree.h
  43. 1
    1
      tdeio/tdeio/tdefilemetainfo.h
  44. 4
    4
      tderesources/configpage.cpp
  45. 2
    2
      tderesources/configpage.h
  46. 1
    1
      tdespell2/README
  47. 5
    5
      tdespell2/broker.cpp
  48. 5
    5
      tdespell2/broker.h
  49. 3
    3
      tdespell2/settings.cpp
  50. 3
    3
      tdespell2/settings.h
  51. 1
    1
      tdespell2/ui/highlighter.cpp
  52. 3
    3
      tdeui/kpanelapplet.cpp
  53. 1
    1
      tdeui/kpanelapplet.h
  54. 3
    3
      tdeui/krootpixmap.cpp
  55. 5
    5
      tdeui/krootpixmap.h
  56. 9
    9
      tdeui/ksharedpixmap.cpp
  57. 11
    11
      tdeui/ksharedpixmap.h
  58. 1
    1
      tdeutils/tdecmoduleinfo.h

+ 2
- 2
TODO View File

@@ -18,11 +18,11 @@ that we would like to make for the next binary incompatible release.
18 18
 
19 19
 - Remove all KDE_NO_COMPAT from the KDE2 -> KDE3 port before adding new ones for KDE4.
20 20
 
21
-- Remove the smart-to-dumb-pointer conversion operator from KSharedPtr
21
+- Remove the smart-to-dumb-pointer conversion operator from TDESharedPtr
22 22
   and replace it with a T* Get() member function. An implict conversion is
23 23
   far too dangerous.
24 24
   See: http://groups.google.com/groups?selm=4ognb0%243cd%40linda.teleport.com&oe=UTF-8&output=gplain
25
-  Also free the client from the requirement to inherit from KShared.
25
+  Also free the client from the requirement to inherit from TDEShared.
26 26
 
27 27
 - Remove all TDESocket, TDEServerSocket, KSocks and KExtendedSocket references
28 28
   throughout KDE in favor of KNetwork's socket implementations.

+ 1
- 1
dnssd/remoteservice.h View File

@@ -43,7 +43,7 @@ class KDNSSD_EXPORT RemoteService : public TQObject, public ServiceBase
43 43
 {
44 44
 	Q_OBJECT
45 45
 public:
46
-	typedef KSharedPtr<RemoteService> Ptr;
46
+	typedef TDESharedPtr<RemoteService> Ptr;
47 47
 	
48 48
 	/**
49 49
 	Creates unresolved service from given DNS label

+ 2
- 2
dnssd/servicebase.h View File

@@ -37,10 +37,10 @@ services of given type are present in given domain.
37 37
 @short Describes any type of service.
38 38
 @author Jakub Stachowski
39 39
  */
40
-class KDNSSD_EXPORT ServiceBase : public KShared
40
+class KDNSSD_EXPORT ServiceBase : public TDEShared
41 41
 {
42 42
 public:
43
-	typedef KSharedPtr<ServiceBase> Ptr;
43
+	typedef TDESharedPtr<ServiceBase> Ptr;
44 44
 
45 45
 	/**
46 46
 	@param name Service name - empty for metaservices

+ 2
- 2
kabc/scripts/addressee.src.cpp View File

@@ -44,7 +44,7 @@ static bool emailsEquals( const TQStringList&, const TQStringList& );
44 44
 
45 45
 KABC::SortMode *Addressee::mSortMode = 0;
46 46
 
47
-struct Addressee::AddresseeData : public KShared
47
+struct Addressee::AddresseeData : public TDEShared
48 48
 {
49 49
   TQString uid;
50 50
   TQString uri;
@@ -68,7 +68,7 @@ Addressee::AddresseeData* Addressee::shared_null = 0;
68 68
 Addressee::AddresseeData* Addressee::makeSharedNull()
69 69
 {
70 70
   Addressee::shared_null = new AddresseeData;
71
-  shared_null->_KShared_ref(); //just in case (we should add KSD)
71
+  shared_null->_TDEShared_ref(); //just in case (we should add KSD)
72 72
   shared_null->empty = true;
73 73
   shared_null->changed = false;
74 74
   shared_null->resource = 0;

+ 1
- 1
kabc/scripts/addressee.src.h View File

@@ -391,7 +391,7 @@ class KABC_EXPORT Addressee
391 391
     void detach();
392 392
 
393 393
     struct AddresseeData;
394
-    mutable KSharedPtr<AddresseeData> mData;
394
+    mutable TDESharedPtr<AddresseeData> mData;
395 395
 
396 396
   private:
397 397
     static AddresseeData* shared_null;

+ 2
- 2
kate/part/katetextline.h View File

@@ -38,13 +38,13 @@ class TQTextStream;
38 38
  * The attribute stores the index to a table that contains fonts and colors
39 39
  * and also if a character is selected.
40 40
  */
41
-class KateTextLine : public KShared
41
+class KateTextLine : public TDEShared
42 42
 {
43 43
   public:
44 44
     /**
45 45
      * Define a Shared-Pointer type
46 46
      */
47
-    typedef KSharedPtr<KateTextLine> Ptr;
47
+    typedef TDESharedPtr<KateTextLine> Ptr;
48 48
 
49 49
   public:
50 50
     /**

+ 4
- 4
kded/kdedmodule.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include "kdedmodule.h"
27 27
 #include "tdeconfigdata.h"
28 28
 
29
-typedef TQMap<KEntryKey, KSharedPtr<KShared> > KDEDObjectMap;
29
+typedef TQMap<KEntryKey, TDESharedPtr<TDEShared> > KDEDObjectMap;
30 30
 
31 31
 class KDEDModulePrivate
32 32
 {
@@ -62,7 +62,7 @@ void KDEDModule::resetIdle()
62 62
       d->timer.start(d->timeout, true);
63 63
 }
64 64
 
65
-void KDEDModule::insert(const TQCString &app, const TQCString &key, KShared *obj)
65
+void KDEDModule::insert(const TQCString &app, const TQCString &key, TDEShared *obj)
66 66
 {
67 67
    if (!d->objMap)
68 68
       d->objMap = new KDEDObjectMap;
@@ -74,13 +74,13 @@ void KDEDModule::insert(const TQCString &app, const TQCString &key, KShared *obj
74 74
    KEntryKey indexKey(app, key);
75 75
 
76 76
    // Prevent deletion in case the same object is inserted again.
77
-   KSharedPtr<KShared> _obj = obj; 
77
+   TDESharedPtr<TDEShared> _obj = obj; 
78 78
 
79 79
    d->objMap->replace(indexKey, _obj);
80 80
    resetIdle();
81 81
 }
82 82
 
83
-KShared * KDEDModule::find(const TQCString &app, const TQCString &key)
83
+TDEShared * KDEDModule::find(const TQCString &app, const TQCString &key)
84 84
 {
85 85
    if (!d->objMap)
86 86
       return 0;

+ 2
- 2
kded/kdedmodule.h View File

@@ -91,12 +91,12 @@ public:
91 91
    * Any previous object inserted with the same values for @p app 
92 92
    * and @p key will be removed.
93 93
    */
94
-  void insert(const TQCString &app, const TQCString &key, KShared *obj);
94
+  void insert(const TQCString &app, const TQCString &key, TDEShared *obj);
95 95
 
96 96
   /**
97 97
    * Lookup object indexed with @p app and @p key
98 98
    */
99
-  KShared *find(const TQCString &app, const TQCString &key);
99
+  TDEShared *find(const TQCString &app, const TQCString &key);
100 100
   
101 101
   /**
102 102
    * remove object indexed with @p app and @p key.

+ 1
- 1
kded/test/test.cpp View File

@@ -1,6 +1,6 @@
1 1
 #include "test.h"
2 2
 
3
-class TestObject : public KShared
3
+class TestObject : public TDEShared
4 4
 {
5 5
 public:
6 6
    TestObject(const TQCString &_app) : app(_app)

+ 1
- 1
tdecore/kdebug.areas View File

@@ -33,7 +33,7 @@
33 33
 264        tdecore (KIconLoader)
34 34
 265        tdecore (KIconEffect)
35 35
 270        tdeui (KRootPixmap)
36
-280        tdeui (KSharedPixmap)
36
+280        tdeui (TDESharedPixmap)
37 37
 281        tdeui (TDECModule)
38 38
 282        tdeui (KDockWidget)
39 39
 290        tdeui (KPixmapIO)

+ 1
- 1
tdecore/kglobal.cpp View File

@@ -67,7 +67,7 @@ TDEConfig	*TDEGlobal::config()
67 67
     return _instance->config();
68 68
 }
69 69
 
70
-KSharedConfig *TDEGlobal::sharedConfig()
70
+TDESharedConfig *TDEGlobal::sharedConfig()
71 71
 {
72 72
     MYASSERT(_instance);
73 73
 

+ 2
- 2
tdecore/kglobal.h View File

@@ -23,7 +23,7 @@
23 23
 
24 24
 class KCharsets;
25 25
 class TDEConfig;
26
-class KSharedConfig;
26
+class TDESharedConfig;
27 27
 class KIconLoader;
28 28
 class TDEHardwareDevices;
29 29
 class TDEGlobalNetworkManager;
@@ -71,7 +71,7 @@ public:
71 71
      *  Returns the general config object.
72 72
      * @return the global configuration object.
73 73
      */
74
-    static KSharedConfig        *sharedConfig();
74
+    static TDESharedConfig        *sharedConfig();
75 75
 
76 76
     /**
77 77
      *  Returns an iconloader object.

+ 3
- 3
tdecore/kicontheme.cpp View File

@@ -43,7 +43,7 @@ public:
43 43
     TQString example, screenshot;
44 44
     TQString linkOverlay, lockOverlay, zipOverlay, shareOverlay;
45 45
     bool hidden;
46
-    KSharedConfig::Ptr sharedConfig;
46
+    TDESharedConfig::Ptr sharedConfig;
47 47
 };
48 48
 
49 49
 /**
@@ -136,9 +136,9 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
136 136
 	fileName = mDir + "index.theme";
137 137
 	mainSection="Icon Theme";
138 138
     }
139
-    // Use KSharedConfig to avoid parsing the file many times, from each kinstance.
139
+    // Use TDESharedConfig to avoid parsing the file many times, from each kinstance.
140 140
     // Need to keep a ref to it to make this useful
141
-    d->sharedConfig = KSharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ );
141
+    d->sharedConfig = TDESharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ );
142 142
     TDEConfig& cfg = *d->sharedConfig;
143 143
     //was: KSimpleConfig cfg(fileName);
144 144
 

+ 5
- 5
tdecore/kinstance.cpp View File

@@ -65,7 +65,7 @@ public:
65 65
     KMimeSourceFactory* mimeSourceFactory;
66 66
     TQString configName;
67 67
     bool ownAboutdata;
68
-    KSharedConfig::Ptr sharedConfig;
68
+    TDESharedConfig::Ptr sharedConfig;
69 69
 };
70 70
 
71 71
 TDEInstance::TDEInstance( const TQCString& name)
@@ -201,7 +201,7 @@ TDEConfig	*TDEInstance::config() const
201 201
     if( _config == 0 ) {
202 202
         if ( !d->configName.isEmpty() )
203 203
         {
204
-            d->sharedConfig = KSharedConfig::openConfig( d->configName );
204
+            d->sharedConfig = TDESharedConfig::openConfig( d->configName );
205 205
 
206 206
             // Check whether custom config files are allowed.
207 207
             d->sharedConfig->setGroup( "KDE Action Restrictions" );
@@ -220,10 +220,10 @@ TDEConfig	*TDEInstance::config() const
220 220
         if ( d->sharedConfig == 0 )
221 221
         {
222 222
 	    if ( !_name.isEmpty() ) {
223
-	        d->sharedConfig = KSharedConfig::openConfig( _name + "rc", m_configReadOnly );
223
+	        d->sharedConfig = TDESharedConfig::openConfig( _name + "rc", m_configReadOnly );
224 224
 	    }
225 225
 	    else {
226
-	        d->sharedConfig = KSharedConfig::openConfig( TQString::null );
226
+	        d->sharedConfig = TDESharedConfig::openConfig( TQString::null );
227 227
 	    }
228 228
 	}
229 229
 
@@ -244,7 +244,7 @@ TDEConfig	*TDEInstance::config() const
244 244
     return _config;
245 245
 }
246 246
 
247
-KSharedConfig *TDEInstance::sharedConfig() const
247
+TDESharedConfig *TDEInstance::sharedConfig() const
248 248
 {
249 249
     DEBUG_CHECK_ALIVE
250 250
     if (_config == 0)

+ 2
- 2
tdecore/kinstance.h View File

@@ -26,7 +26,7 @@ class KCharsets;
26 26
 class TQFont;
27 27
 class TDEInstancePrivate;
28 28
 class KMimeSourceFactory;
29
-class KSharedConfig;
29
+class TDESharedConfig;
30 30
 class TDEHardwareDevices;
31 31
 class TDEGlobalNetworkManager;
32 32
 
@@ -94,7 +94,7 @@ class TDECORE_EXPORT TDEInstance
94 94
      * Returns the general config object ("appnamerc").
95 95
      * @return the TDEConfig object for the instance.
96 96
      */
97
-    KSharedConfig      *sharedConfig() const;
97
+    TDESharedConfig      *sharedConfig() const;
98 98
 
99 99
     /**
100 100
      * Set a read-only flag on the configuration files

+ 2
- 2
tdecore/klockfile.h View File

@@ -30,10 +30,10 @@
30 30
  * @author Waldo Bastian <bastian@kde.org>
31 31
  * @since 3.3
32 32
  */
33
-class TDECORE_EXPORT KLockFile : public KShared
33
+class TDECORE_EXPORT KLockFile : public TDEShared
34 34
 {
35 35
 public:
36
-   typedef KSharedPtr<KLockFile> Ptr;
36
+   typedef TDESharedPtr<KLockFile> Ptr;
37 37
 
38 38
    KLockFile(const TQString &file);
39 39
 

+ 2
- 2
tdecore/kmountpoint.h View File

@@ -32,11 +32,11 @@
32 32
  * @author Waldo Bastian <bastian@kde.org>
33 33
  * @since 3.2
34 34
  */
35
-class TDECORE_EXPORT KMountPoint : public KShared
35
+class TDECORE_EXPORT KMountPoint : public TDEShared
36 36
 {
37 37
    typedef signed long long int filesize_t;
38 38
 public:
39
-  typedef KSharedPtr<KMountPoint> Ptr;
39
+  typedef TDESharedPtr<KMountPoint> Ptr;
40 40
   typedef TQValueList<Ptr> List;
41 41
 public:
42 42
    enum { NeedMountOptions = 1, NeedRealDeviceName = 2 };

+ 34
- 34
tdecore/ksharedptr.h View File

@@ -15,132 +15,132 @@
15 15
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
16 16
    Boston, MA 02110-1301, USA.
17 17
 */
18
-#ifndef KSharedPTR_H
19
-#define KSharedPTR_H
18
+#ifndef TDESharedPTR_H
19
+#define TDESharedPTR_H
20 20
 
21 21
 #include "tdelibs_export.h"
22 22
 
23 23
 /**
24 24
  * Reference counting for shared objects.  If you derive your object
25 25
  * from this class, then you may use it in conjunction with
26
- * KSharedPtr to control the lifetime of your object.
26
+ * TDESharedPtr to control the lifetime of your object.
27 27
  *
28
- * Specifically, all classes that derive from KShared have an internal
28
+ * Specifically, all classes that derive from TDEShared have an internal
29 29
  * counter keeping track of how many other objects have a reference to
30
- * their object.  If used with KSharedPtr, then your object will
30
+ * their object.  If used with TDESharedPtr, then your object will
31 31
  * not be deleted until all references to the object have been
32 32
  * released.
33 33
  *
34 34
  * You should probably not ever use any of the methods in this class
35
- * directly -- let the KSharedPtr take care of that.  Just derive
36
- * your class from KShared and forget about it.
35
+ * directly -- let the TDESharedPtr take care of that.  Just derive
36
+ * your class from TDEShared and forget about it.
37 37
  *
38 38
  * @author Waldo Bastian <bastian@kde.org>
39 39
  */
40
-class TDECORE_EXPORT KShared {
40
+class TDECORE_EXPORT TDEShared {
41 41
 public:
42 42
    /**
43 43
     * Standard constructor.  This will initialize the reference count
44 44
     * on this object to 0.
45 45
     */
46
-   KShared() : count(0) { }
46
+   TDEShared() : count(0) { }
47 47
 
48 48
    /**
49 49
     * Copy constructor.  This will @em not actually copy the objects
50 50
     * but it will initialize the reference count on this object to 0.
51 51
     */
52
-   KShared( const KShared & ) : count(0) { }
52
+   TDEShared( const TDEShared & ) : count(0) { }
53 53
 
54 54
    /**
55 55
     * Overloaded assignment operator.
56 56
     */
57
-   KShared &operator=(const KShared & ) { return *this; }
57
+   TDEShared &operator=(const TDEShared & ) { return *this; }
58 58
 
59 59
    /**
60 60
     * Increases the reference count by one.
61 61
     */
62
-   void _KShared_ref() const { count++; }
62
+   void _TDEShared_ref() const { count++; }
63 63
 
64 64
    /**
65 65
     * Releases a reference (decreases the reference count by one).  If
66 66
     * the count goes to 0, this object will delete itself.
67 67
     */
68
-   void _KShared_unref() const { if (!--count) delete this; }
68
+   void _TDEShared_unref() const { if (!--count) delete this; }
69 69
 
70 70
    /**
71 71
     * Return the current number of references held.
72 72
     *
73 73
     * @return Number of references
74 74
     */
75
-   int _KShared_count() const { return count; }
75
+   int _TDEShared_count() const { return count; }
76 76
 
77 77
 protected:
78
-   virtual ~KShared() { }
78
+   virtual ~TDEShared() { }
79 79
 private:
80 80
    mutable int count;
81 81
 };
82 82
 
83 83
 /**
84 84
  * Can be used to control the lifetime of an object that has derived
85
- * KShared. As long a someone holds a KSharedPtr on some KShared
85
+ * TDEShared. As long a someone holds a TDESharedPtr on some TDEShared
86 86
  * object it won't become deleted but is deleted once its reference
87 87
  * count is 0.  This struct emulates C++ pointers virtually perfectly.
88 88
  * So just use it like a simple C++ pointer.
89 89
  *
90
- * KShared and KSharedPtr are preferred over QShared / QSharedPtr
90
+ * TDEShared and TDESharedPtr are preferred over QShared / QSharedPtr
91 91
  * since they are more safe.
92 92
  *
93 93
  * WARNING: Please note that this class template provides an implicit
94 94
  * conversion to T*. Do *not* change this pointer or the pointee (don't
95
- * call delete on it, for instance) behind KSharedPtr's back.
95
+ * call delete on it, for instance) behind TDESharedPtr's back.
96 96
  *
97 97
  * @author Waldo Bastian <bastian@kde.org>
98 98
  */
99 99
 template< class T >
100
-class KSharedPtr
100
+class TDESharedPtr
101 101
 {
102 102
 public:
103 103
 /**
104 104
  * Creates a null pointer.
105 105
  */
106
-  KSharedPtr()
106
+  TDESharedPtr()
107 107
     : ptr(0) { }
108 108
   /**
109 109
    * Creates a new pointer.
110 110
    * @param t the pointer
111 111
    */
112
-  KSharedPtr( T* t )
113
-    : ptr(t) { if ( ptr ) ptr->_KShared_ref(); }
112
+  TDESharedPtr( T* t )
113
+    : ptr(t) { if ( ptr ) ptr->_TDEShared_ref(); }
114 114
 
115 115
   /**
116 116
    * Copies a pointer.
117 117
    * @param p the pointer to copy
118 118
    */
119
-  KSharedPtr( const KSharedPtr& p )
120
-    : ptr(p.ptr) { if ( ptr ) ptr->_KShared_ref(); }
119
+  TDESharedPtr( const TDESharedPtr& p )
120
+    : ptr(p.ptr) { if ( ptr ) ptr->_TDEShared_ref(); }
121 121
 
122 122
   /**
123 123
    * Unreferences the object that this pointer points to. If it was
124 124
    * the last reference, the object will be deleted.
125 125
    */
126
-  ~KSharedPtr() { if ( ptr ) ptr->_KShared_unref(); }
126
+  ~TDESharedPtr() { if ( ptr ) ptr->_TDEShared_unref(); }
127 127
 
128
-  KSharedPtr<T>& operator= ( const KSharedPtr<T>& p ) {
128
+  TDESharedPtr<T>& operator= ( const TDESharedPtr<T>& p ) {
129 129
     if ( ptr == p.ptr ) return *this;
130
-    if ( ptr ) ptr->_KShared_unref();
130
+    if ( ptr ) ptr->_TDEShared_unref();
131 131
     ptr = p.ptr;
132
-    if ( ptr ) ptr->_KShared_ref();
132
+    if ( ptr ) ptr->_TDEShared_ref();
133 133
     return *this;
134 134
   }
135
-  KSharedPtr<T>& operator= ( T* p ) {
135
+  TDESharedPtr<T>& operator= ( T* p ) {
136 136
     if ( ptr == p ) return *this;
137
-    if ( ptr ) ptr->_KShared_unref();
137
+    if ( ptr ) ptr->_TDEShared_unref();
138 138
     ptr = p;
139
-    if ( ptr ) ptr->_KShared_ref();
139
+    if ( ptr ) ptr->_TDEShared_ref();
140 140
     return *this;
141 141
   }
142
-  bool operator== ( const KSharedPtr<T>& p ) const { return ( ptr == p.ptr ); }
143
-  bool operator!= ( const KSharedPtr<T>& p ) const { return ( ptr != p.ptr ); }
142
+  bool operator== ( const TDESharedPtr<T>& p ) const { return ( ptr == p.ptr ); }
143
+  bool operator!= ( const TDESharedPtr<T>& p ) const { return ( ptr != p.ptr ); }
144 144
   bool operator== ( const T* p ) const { return ( ptr == p ); }
145 145
   bool operator!= ( const T* p ) const { return ( ptr != p ); }
146 146
   bool operator!() const { return ( ptr == 0 ); }
@@ -167,7 +167,7 @@ public:
167 167
    * Returns the number of references.
168 168
    * @return the number of references
169 169
    */
170
-  int count() const { return ptr->_KShared_count(); } // for debugging purposes
170
+  int count() const { return ptr->_TDEShared_count(); } // for debugging purposes
171 171
 private:
172 172
   T* ptr;
173 173
 };

+ 2
- 2
tdecore/ktimezones.cpp View File

@@ -203,7 +203,7 @@ bool KTimezone::isValidLongitude(float longitude)
203 203
 }
204 204
 
205 205
 KTimezone::KTimezone(
206
-    KSharedPtr<KTimezoneSource> db, const TQString& name,
206
+    TDESharedPtr<KTimezoneSource> db, const TQString& name,
207 207
     const TQString &countryCode, float latitude, float longitude,
208 208
     const TQString &comment) :
209 209
     m_db(db),
@@ -415,7 +415,7 @@ const KTimezones::ZoneMap KTimezones::allZones()
415 415
     TQTextStream str(&f);
416 416
     TQRegExp lineSeparator("[ \t]");
417 417
     TQRegExp ordinateSeparator("[+-]");
418
-    KSharedPtr<KTimezoneSource> db(new KTimezoneSource(m_zoneinfoDir));
418
+    TDESharedPtr<KTimezoneSource> db(new KTimezoneSource(m_zoneinfoDir));
419 419
     while (!str.atEnd())
420 420
     {
421 421
         TQString line = str.readLine();

+ 3
- 3
tdecore/ktimezones.h View File

@@ -49,7 +49,7 @@ class KTimezonesPrivate;
49 49
  * @author S.R.Haque <srhaque@iee.org>.
50 50
  */
51 51
 class TDECORE_EXPORT KTimezoneSource :
52
-    public KShared
52
+    public TDEShared
53 53
 {
54 54
 public:
55 55
     KTimezoneSource(const TQString &db);
@@ -114,7 +114,7 @@ public:
114 114
      * @param comment description of the timezone, if any.
115 115
      */
116 116
     KTimezone(
117
-        KSharedPtr<KTimezoneSource> db, const TQString &name,
117
+        TDESharedPtr<KTimezoneSource> db, const TQString &name,
118 118
         const TQString &countryCode = TQString(), float latitude = UNKNOWN, float longitude = UNKNOWN,
119 119
         const TQString &comment = TQString());
120 120
     ~KTimezone();
@@ -191,7 +191,7 @@ private:
191 191
     KTimezone(const KTimezone&);
192 192
     KTimezone& operator=(const KTimezone&);
193 193
 
194
-    KSharedPtr<KTimezoneSource> m_db;
194
+    TDESharedPtr<KTimezoneSource> m_db;
195 195
     TQString m_name;
196 196
     TQString m_countryCode;
197 197
     float m_latitude;

+ 2
- 2
tdecore/kuser.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <grp.h>
33 33
 
34 34
 
35
-class KUserPrivate : public KShared
35
+class KUserPrivate : public TDEShared
36 36
 {
37 37
 public:
38 38
 	bool valid;
@@ -271,7 +271,7 @@ TQStringList KUser::allUserNames() {
271 271
 KUser::~KUser() {
272 272
 }
273 273
 
274
-class KUserGroupPrivate : public KShared
274
+class KUserGroupPrivate : public TDEShared
275 275
 {
276 276
 public:
277 277
   bool valid;

+ 2
- 2
tdecore/kuser.h View File

@@ -233,7 +233,7 @@ public:
233 233
   static TQStringList allUserNames();
234 234
 
235 235
 private:
236
-  KSharedPtr<KUserPrivate> d;
236
+  TDESharedPtr<KUserPrivate> d;
237 237
   void fillPasswd(struct passwd* p);
238 238
   void fillName(const char* name);
239 239
 };
@@ -375,7 +375,7 @@ public:
375 375
   static TQStringList allGroupNames();
376 376
   
377 377
 private:
378
-  KSharedPtr<KUserGroupPrivate> d;
378
+  TDESharedPtr<KUserGroupPrivate> d;
379 379
   void fillGroup(struct group* g);
380 380
   void fillName(const char* name);
381 381
 };

+ 8
- 8
tdecore/tdeconfig.cpp View File

@@ -328,14 +328,14 @@ TDEConfig* TDEConfig::copyTo(const TQString &file, TDEConfig *config) const
328 328
 void TDEConfig::virtual_hook( int id, void* data )
329 329
 { TDEConfigBase::virtual_hook( id, data ); }
330 330
 
331
-static KStaticDeleter< TQValueList<KSharedConfig*> > sd;
332
-TQValueList<KSharedConfig*> *KSharedConfig::s_list = 0;
331
+static KStaticDeleter< TQValueList<TDESharedConfig*> > sd;
332
+TQValueList<TDESharedConfig*> *TDESharedConfig::s_list = 0;
333 333
 
334
-KSharedConfig::Ptr KSharedConfig::openConfig(const TQString& fileName, bool readOnly, bool useKDEGlobals )
334
+TDESharedConfig::Ptr TDESharedConfig::openConfig(const TQString& fileName, bool readOnly, bool useKDEGlobals )
335 335
 {
336 336
   if (s_list)
337 337
   {
338
-     for(TQValueList<KSharedConfig*>::ConstIterator it = s_list->begin();
338
+     for(TQValueList<TDESharedConfig*>::ConstIterator it = s_list->begin();
339 339
          it != s_list->end(); ++it)
340 340
      {
341 341
         if ((*it)->backEnd->fileName() == fileName &&
@@ -344,21 +344,21 @@ KSharedConfig::Ptr KSharedConfig::openConfig(const TQString& fileName, bool read
344 344
            return (*it);
345 345
      }
346 346
   }
347
-  return new KSharedConfig(fileName, readOnly, useKDEGlobals);
347
+  return new TDESharedConfig(fileName, readOnly, useKDEGlobals);
348 348
 }
349 349
 
350
-KSharedConfig::KSharedConfig( const TQString& fileName, bool readonly, bool usekdeglobals)
350
+TDESharedConfig::TDESharedConfig( const TQString& fileName, bool readonly, bool usekdeglobals)
351 351
  : TDEConfig(fileName, readonly, usekdeglobals)
352 352
 {
353 353
   if (!s_list)
354 354
   {
355
-    sd.setObject(s_list, new TQValueList<KSharedConfig*>);
355
+    sd.setObject(s_list, new TQValueList<TDESharedConfig*>);
356 356
   }
357 357
 
358 358
   s_list->append(this);
359 359
 }
360 360
 
361
-KSharedConfig::~KSharedConfig()
361
+TDESharedConfig::~TDESharedConfig()
362 362
 {
363 363
   if ( s_list )
364 364
     s_list->remove(this);

+ 8
- 8
tdecore/tdeconfig.h View File

@@ -267,14 +267,14 @@ private:
267 267
 /**
268 268
  * TDEConfig variant using shared memory
269 269
  *
270
- * KSharedConfig provides a reference counted, shared memory variant
270
+ * TDESharedConfig provides a reference counted, shared memory variant
271 271
  * of TDEConfig.
272 272
  */
273
-class TDECORE_EXPORT KSharedConfig : public TDEConfig, public KShared
273
+class TDECORE_EXPORT TDESharedConfig : public TDEConfig, public TDEShared
274 274
 {
275
-  friend class TQValueList<KSharedConfig*>;
275
+  friend class TQValueList<TDESharedConfig*>;
276 276
 public:
277
-  typedef KSharedPtr<KSharedConfig> Ptr;
277
+  typedef TDESharedPtr<TDESharedConfig> Ptr;
278 278
 
279 279
 public:  
280 280
   /**
@@ -283,14 +283,14 @@ public:
283 283
    * @param readOnly set the config object's read-only status
284 284
    * @param bUseKDEGlobals Toggle reading the global KDE configuration file.
285 285
    */
286
-  static KSharedConfig::Ptr openConfig(const TQString& fileName, bool readOnly = false,
286
+  static TDESharedConfig::Ptr openConfig(const TQString& fileName, bool readOnly = false,
287 287
     bool bUseKDEGlobals = true);
288 288
 
289 289
 private:
290
-  KSharedConfig( const TQString& fileName, bool readOnly, bool useKDEGlobals );
291
-  ~KSharedConfig();
290
+  TDESharedConfig( const TQString& fileName, bool readOnly, bool useKDEGlobals );
291
+  ~TDESharedConfig();
292 292
 
293
-  static TQValueList<KSharedConfig*> *s_list;
293
+  static TQValueList<TDESharedConfig*> *s_list;
294 294
 };
295 295
 
296 296
 #endif

+ 2
- 2
tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp View File

@@ -1220,7 +1220,7 @@ int main( int argc, char **argv )
1220 1220
   if ( !singleton ) {
1221 1221
     h << "    " << className << "(";
1222 1222
     if (cfgFileNameArg)
1223
-       h << " KSharedConfig::Ptr config" << (parameters.isEmpty() ? " = TDEGlobal::sharedConfig()" : ", ");
1223
+       h << " TDESharedConfig::Ptr config" << (parameters.isEmpty() ? " = TDEGlobal::sharedConfig()" : ", ");
1224 1224
     for (TQValueList<Param>::ConstIterator it = parameters.begin();
1225 1225
          it != parameters.end(); ++it)
1226 1226
     {
@@ -1502,7 +1502,7 @@ int main( int argc, char **argv )
1502 1502
   cpp << className << "::" << className << "( ";
1503 1503
   if ( cfgFileNameArg ) {
1504 1504
     if ( !singleton )
1505
-      cpp << " KSharedConfig::Ptr config";
1505
+      cpp << " TDESharedConfig::Ptr config";
1506 1506
     else
1507 1507
       cpp << " const char *config";
1508 1508
     cpp << (parameters.isEmpty() ? " " : ", ");

+ 1
- 1
tdecore/tdeconfig_compiler/tests/test8a.cpp.ref View File

@@ -3,7 +3,7 @@
3 3
 
4 4
 #include "test8a.h"
5 5
 
6
-Test8a::Test8a(  KSharedConfig::Ptr config  )
6
+Test8a::Test8a(  TDESharedConfig::Ptr config  )
7 7
   : TDEConfigSkeleton( config )
8 8
 {
9 9
   setCurrentGroup( TQString::fromLatin1( "Group" ) );

+ 1
- 1
tdecore/tdeconfig_compiler/tests/test8a.h.ref View File

@@ -11,7 +11,7 @@ class Test8a : public TDEConfigSkeleton
11 11
 {
12 12
   public:
13 13
 
14
-    Test8a( KSharedConfig::Ptr config = TDEGlobal::sharedConfig() );
14
+    Test8a( TDESharedConfig::Ptr config = TDEGlobal::sharedConfig() );
15 15
     ~Test8a();
16 16
 
17 17
     /**

+ 1
- 1
tdecore/tdeconfig_compiler/tests/test8main.cpp View File

@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26 26
 int main( int, char*[] )
27 27
 {
28 28
   TDEInstance i("test");
29
-  Test8a *config1 = new Test8a( KSharedConfig::openConfig( TQString::null ) );
29
+  Test8a *config1 = new Test8a( TDESharedConfig::openConfig( TQString::null ) );
30 30
   Test8a *config2 = new Test8a();
31 31
   Test8b::self();
32 32
   delete config1;

+ 1
- 1
tdecore/tdeconfigbackend.h View File

@@ -48,7 +48,7 @@ class TDEConfigBackEndPrivate;
48 48
 class TDECORE_EXPORT TDEConfigBackEnd
49 49
 {
50 50
   friend class TDEConfig;
51
-  friend class KSharedConfig;
51
+  friend class TDESharedConfig;
52 52
 public:
53 53
   /**
54 54
    * Constructs a configuration back end.

+ 2
- 2
tdecore/tdeconfigbase.h View File

@@ -46,7 +46,7 @@ class TDEConfigGroup;
46 46
  * abstract base class, meaning that you cannot directly instantiate
47 47
  * objects of this class. Either use TDEConfig (for usual %KDE
48 48
  * configuration) or KSimpleConfig (for special needs as in ksamba), or
49
- * even KSharedConfig (stores values in shared memory).
49
+ * even TDESharedConfig (stores values in shared memory).
50 50
  *
51 51
  * All configuration entries are key, value pairs.  Each entry also
52 52
  * belongs to a specific group of related entries.  All configuration
@@ -65,7 +65,7 @@ class TDEConfigGroup;
65 65
  * @see TDEGlobal#config()
66 66
  * @see TDEConfig
67 67
  * @see KSimpleConfig
68
- * @see KSharedConfig
68
+ * @see TDESharedConfig
69 69
  */
70 70
 class TDECORE_EXPORT TDEConfigBase : public TQObject
71 71
 {

+ 2
- 2
tdecore/tdeconfigskeleton.cpp View File

@@ -885,7 +885,7 @@ TDEConfigSkeleton::TDEConfigSkeleton( const TQString &configname )
885 885
 
886 886
   if ( !configname.isEmpty() )
887 887
   {
888
-    mConfig = KSharedConfig::openConfig( configname );
888
+    mConfig = TDESharedConfig::openConfig( configname );
889 889
   }
890 890
   else
891 891
   {
@@ -893,7 +893,7 @@ TDEConfigSkeleton::TDEConfigSkeleton( const TQString &configname )
893 893
   }
894 894
 }
895 895
 
896
-TDEConfigSkeleton::TDEConfigSkeleton(KSharedConfig::Ptr config)
896
+TDEConfigSkeleton::TDEConfigSkeleton(TDESharedConfig::Ptr config)
897 897
   : mCurrentGroup( "No Group" ), mUseDefaults(false)
898 898
 {
899 899
   kdDebug(177) << "Creating TDEConfigSkeleton (" << (void *)this << ")" << endl;

+ 2
- 2
tdecore/tdeconfigskeleton.h View File

@@ -800,7 +800,7 @@ public:
800 800
    * 
801 801
    * @param config configuration object to use.
802 802
    */
803
-  TDEConfigSkeleton(KSharedConfig::Ptr config);
803
+  TDEConfigSkeleton(TDESharedConfig::Ptr config);
804 804
 
805 805
   /**
806 806
    * Destructor
@@ -1215,7 +1215,7 @@ protected:
1215 1215
 private:
1216 1216
   TQString mCurrentGroup;
1217 1217
 
1218
-  KSharedConfig::Ptr mConfig; // pointer to TDEConfig object
1218
+  TDESharedConfig::Ptr mConfig; // pointer to TDEConfig object
1219 1219
 
1220 1220
   TDEConfigSkeletonItem::List mItems;
1221 1221
   TDEConfigSkeletonItem::Dict mItemDict;

+ 2
- 2
tdecore/tdesycocaentry.h View File

@@ -34,7 +34,7 @@ class TQDataStream;
34 34
  * @internal
35 35
  * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/tdesycoca.html 
36 36
  */
37
-class TDECORE_EXPORT KSycocaEntry : public KShared
37
+class TDECORE_EXPORT KSycocaEntry : public TDEShared
38 38
 {
39 39
  
40 40
 public:
@@ -42,7 +42,7 @@ public:
42 42
    virtual KSycocaType sycocaType() const { return KST_KSycocaEntry; }
43 43
 
44 44
 public:
45
-  typedef KSharedPtr<KSycocaEntry> Ptr;
45
+  typedef TDESharedPtr<KSycocaEntry> Ptr;
46 46
   typedef TQValueList<Ptr> List;
47 47
 public: // KDoc seems to barf on those typedefs and generates no docs after them
48 48
    /**

+ 1
- 1
tdecore/tdesycocafactory.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <kdebug.h>
27 27
 
28 28
 template class TQDict<KSycocaEntry>;
29
-template class TQDict<KSharedPtr<KSycocaEntry> >;
29
+template class TQDict<TDESharedPtr<KSycocaEntry> >;
30 30
 
31 31
 KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id)
32 32
  : m_resourceList(0), m_entryDict(0), m_sycocaDict(0)

+ 1
- 1
tdeio/tdeio/kimageiofactory.h View File

@@ -20,7 +20,7 @@ class TDEIO_EXPORT KImageIOFormat : public KSycocaEntry
20 20
   K_SYCOCATYPE( KST_KImageIOFormat, KSycocaEntry )
21 21
 
22 22
 public:
23
-  typedef KSharedPtr<KImageIOFormat> Ptr;
23
+  typedef TDESharedPtr<KImageIOFormat> Ptr;
24 24
   typedef TQValueList<Ptr> List;
25 25
 public: // KDoc seems to barf on those typedefs and generates no docs after them
26 26
   /**

+ 1
- 1
tdeio/tdeio/kmimetype.cpp View File

@@ -59,7 +59,7 @@
59 59
 #include <tdesycoca.h>
60 60
 #include <kde_file.h>
61 61
 
62
-template class KSharedPtr<KMimeType>;
62
+template class TDESharedPtr<KMimeType>;
63 63
 template class TQValueList<KMimeType::Ptr>;
64 64
 
65 65
 KMimeType::Ptr KMimeType::s_pDefaultType = 0L;

+ 1
- 1
tdeio/tdeio/kmimetype.h View File

@@ -49,7 +49,7 @@ class TDEIO_EXPORT KMimeType : public KServiceType
49 49
   K_SYCOCATYPE( KST_KMimeType, KServiceType )
50 50
 
51 51
 public:
52
-  typedef KSharedPtr<KMimeType> Ptr;
52
+  typedef TDESharedPtr<KMimeType> Ptr;
53 53
   typedef TQValueList<Ptr> List;
54 54
 public:
55 55
   /**

+ 1
- 1
tdeio/tdeio/kprotocolinfo.h View File

@@ -47,7 +47,7 @@ class TDEIO_EXPORT KProtocolInfo : public KSycocaEntry
47 47
   K_SYCOCATYPE( KST_KProtocolInfo, KSycocaEntry )
48 48
 
49 49
 public:
50
-  typedef KSharedPtr<KProtocolInfo> Ptr;
50
+  typedef TDESharedPtr<KProtocolInfo> Ptr;
51 51
 
52 52
 public:
53 53
   /**

+ 1
- 1
tdeio/tdeio/kservice.h View File

@@ -52,7 +52,7 @@ class TDEIO_EXPORT KService : public KSycocaEntry
52 52
   friend class KBuildSycoca;
53 53
 
54 54
 public:
55
-  typedef KSharedPtr<KService> Ptr;
55
+  typedef TDESharedPtr<KService> Ptr;
56 56
   typedef TQValueList<Ptr> List;
57 57
 public:
58 58
   /**

+ 3
- 3
tdeio/tdeio/kservicegroup.h View File

@@ -71,8 +71,8 @@ class TDEIO_EXPORT KServiceGroup : public KSycocaEntry
71 71
   K_SYCOCATYPE( KST_KServiceGroup, KSycocaEntry )
72 72
 
73 73
 public:
74
-  typedef KSharedPtr<KServiceGroup> Ptr;
75
-  typedef KSharedPtr<KSycocaEntry> SPtr;
74
+  typedef TDESharedPtr<KServiceGroup> Ptr;
75
+  typedef TDESharedPtr<KSycocaEntry> SPtr;
76 76
   typedef TQValueList<SPtr> List;
77 77
 public:
78 78
   /**
@@ -332,7 +332,7 @@ class TDEIO_EXPORT KServiceSeparator : public KSycocaEntry
332 332
   K_SYCOCATYPE( KST_KServiceSeparator, KSycocaEntry )
333 333
 
334 334
 public:
335
-  typedef KSharedPtr<KServiceSeparator> Ptr;
335
+  typedef TDESharedPtr<KServiceSeparator> Ptr;
336 336
 public:
337 337
   /**
338 338
    * Construct a service separator

+ 1
- 1
tdeio/tdeio/kservicetype.h View File

@@ -47,7 +47,7 @@ class TDEIO_EXPORT KServiceType : public KSycocaEntry
47 47
   K_SYCOCATYPE( KST_KServiceType, KSycocaEntry )
48 48
 
49 49
 public:
50
-  typedef KSharedPtr<KServiceType> Ptr;
50
+  typedef TDESharedPtr<KServiceType> Ptr;
51 51
   typedef TQValueList<Ptr> List;
52 52
 public:
53 53
 

+ 2
- 2
tdeio/tdeio/ktraderparsetree.h View File

@@ -120,10 +120,10 @@ public:
120 120
 /**
121 121
  * @internal
122 122
  */
123
-class TDEIO_EXPORT ParseTreeBase : public KShared
123
+class TDEIO_EXPORT ParseTreeBase : public TDEShared
124 124
 {
125 125
 public:
126
-  typedef KSharedPtr<ParseTreeBase> Ptr;
126
+  typedef TDESharedPtr<ParseTreeBase> Ptr;
127 127
   ParseTreeBase() { }
128 128
 
129 129
   virtual bool eval( ParseContext *_context ) const = 0;

+ 1
- 1
tdeio/tdeio/tdefilemetainfo.h View File

@@ -1698,7 +1698,7 @@ private:
1698 1698
         KFilePlugin* plugin;
1699 1699
         KFileMimeTypeInfo* mimeTypeInfo;
1700 1700
         // The problem here is that plugin can be shared in multiple instances,
1701
-        // so the memory management isn't easy. KDE4 solution: use KSharedPtr?
1701
+        // so the memory management isn't easy. KDE4 solution: use TDESharedPtr?
1702 1702
         // For now we flag one copy of the KFilePlugin pointer as being "owned".
1703 1703
         bool ownsPlugin;
1704 1704
     };

+ 4
- 4
tderesources/configpage.cpp View File

@@ -45,7 +45,7 @@
45 45
 
46 46
 namespace KRES {
47 47
 
48
-ResourcePageInfo::ResourcePageInfo() : KShared() {
48
+ResourcePageInfo::ResourcePageInfo() : TDEShared() {
49 49
   mManager = 0L;
50 50
   mConfig = 0L;
51 51
 }
@@ -153,7 +153,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
153 153
 
154 154
 ConfigPage::~ConfigPage()
155 155
 {
156
-  TQValueList<KSharedPtr<ResourcePageInfo> >::Iterator it;
156
+  TQValueList<TDESharedPtr<ResourcePageInfo> >::Iterator it;
157 157
   for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it ) {
158 158
     (*it)->mManager->removeObserver( this );
159 159
   }
@@ -226,7 +226,7 @@ void ConfigPage::loadManager( const TQString& family )
226 226
       info->mConfig = new TDEConfig( KRES::ManagerImpl::defaultConfigFile( family ) );
227 227
       info->mManager->readConfig( info->mConfig );
228 228
 
229
-      mInfoMap.append( KSharedPtr<ResourcePageInfo>(info) );
229
+      mInfoMap.append( TDESharedPtr<ResourcePageInfo>(info) );
230 230
   }
231 231
 }
232 232
 
@@ -234,7 +234,7 @@ void ConfigPage::save()
234 234
 {
235 235
   saveResourceSettings();
236 236
 
237
-  TQValueList<KSharedPtr<ResourcePageInfo> >::Iterator it;
237
+  TQValueList<TDESharedPtr<ResourcePageInfo> >::Iterator it;
238 238
   for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it )
239 239
     (*it)->mManager->writeConfig( (*it)->mConfig );
240 240
 

+ 2
- 2
tderesources/configpage.h View File

@@ -37,7 +37,7 @@ class TQPushButton;
37 37
 
38 38
 namespace KRES {
39 39
 
40
-class TDERESOURCES_EXPORT ResourcePageInfo : public KShared
40
+class TDERESOURCES_EXPORT ResourcePageInfo : public TDEShared
41 41
 {
42 42
   public:
43 43
     ResourcePageInfo();
@@ -93,7 +93,7 @@ class TDERESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<R
93 93
     TDEConfig* mConfig;
94 94
     TQString mFamily;
95 95
     TQStringList mFamilyMap;
96
-    TQValueList<KSharedPtr<ResourcePageInfo> > mInfoMap;
96
+    TQValueList<TDESharedPtr<ResourcePageInfo> > mInfoMap;
97 97
 
98 98
     KComboBox* mFamilyCombo;
99 99
     KListView* mListView;

+ 1
- 1
tdespell2/README View File

@@ -9,7 +9,7 @@ Dictionaries are abstracted in the KSpell::Dictionary object which
9 9
 encapsulates all spell-checking functionality.
10 10
 
11 11
 You'll notice that the Broker is being created via the 
12
-Broker::Ptr Broker::openBroker( KSharedConfig *config =0 );
12
+Broker::Ptr Broker::openBroker( TDESharedConfig *config =0 );
13 13
 call. The Broker is a shared object and the reason for this construct
14 14
 is very simple:
15 15
 - most application would need to have a few Broker objects (one for

+ 5
- 5
tdespell2/broker.cpp View File

@@ -56,11 +56,11 @@ public:
56 56
 
57 57
 TQPtrDict<Broker> *Broker::s_brokers = 0;
58 58
 
59
-Broker *Broker::openBroker( KSharedConfig *config )
59
+Broker *Broker::openBroker( TDESharedConfig *config )
60 60
 {
61
-    KSharedConfig::Ptr preventDeletion;
61
+    TDESharedConfig::Ptr preventDeletion;
62 62
     if ( !config ) {
63
-        preventDeletion = KSharedConfig::openConfig( DEFAULT_CONFIG_FILE );
63
+        preventDeletion = TDESharedConfig::openConfig( DEFAULT_CONFIG_FILE );
64 64
     } else
65 65
         preventDeletion = config;
66 66
 
@@ -74,9 +74,9 @@ Broker *Broker::openBroker( KSharedConfig *config )
74 74
     return broker;
75 75
 }
76 76
 
77
-Broker::Broker( KSharedConfig *config )
77
+Broker::Broker( TDESharedConfig *config )
78 78
 {
79
-    KSharedConfig::Ptr preventDeletion( config );
79
+    TDESharedConfig::Ptr preventDeletion( config );
80 80
     Q_UNUSED( preventDeletion );
81 81
 
82 82
     if ( !s_brokers )

+ 5
- 5
tdespell2/broker.h View File

@@ -28,7 +28,7 @@
28 28
 #include <tqstringlist.h>
29 29
 #include <tqstring.h>
30 30
 
31
-class KSharedConfig;
31
+class TDESharedConfig;
32 32
 template <typename T>
33 33
 class TQPtrDict;
34 34
 
@@ -46,11 +46,11 @@ namespace KSpell2
46 46
      * of the KSpell2 architecture.
47 47
      */
48 48
     class KDE_EXPORT Broker : public TQObject,
49
-                   public KShared
49
+                   public TDEShared
50 50
     {
51 51
         Q_OBJECT
52 52
     public:
53
-        typedef KSharedPtr<Broker> Ptr;
53
+        typedef TDESharedPtr<Broker> Ptr;
54 54
         /**
55 55
          * Constructs the broker.
56 56
          *
@@ -65,7 +65,7 @@ namespace KSpell2
65 65
          *        and default client values. If no value will
66 66
          *        be passed Broker will use global tdespellrc file.
67 67
          */
68
-        static Broker *openBroker( KSharedConfig *config = 0 );
68
+        static Broker *openBroker( TDESharedConfig *config = 0 );
69 69
 
70 70
     public:
71 71
         ~Broker();
@@ -122,7 +122,7 @@ namespace KSpell2
122 122
         friend class Settings;
123 123
         void changed();
124 124
     private:
125
-        Broker( KSharedConfig *config );
125
+        Broker( TDESharedConfig *config );
126 126
         void loadPlugins();
127 127
         void loadPlugin( const TQString& );
128 128
     private:

+ 3
- 3
tdespell2/settings.cpp View File

@@ -37,7 +37,7 @@ class Settings::Private
37 37
 {
38 38
 public:
39 39
     Broker*  broker; //can't be a Ptr since we don't want to hold a ref on it
40
-    KSharedConfig::Ptr config;
40
+    TDESharedConfig::Ptr config;
41 41
     bool     modified;
42 42
 
43 43
     TQString defaultLanguage;
@@ -50,7 +50,7 @@ public:
50 50
     TQMap<TQString, bool> ignore;
51 51
 };
52 52
 
53
-Settings::Settings( Broker *broker, KSharedConfig *config )
53
+Settings::Settings( Broker *broker, TDESharedConfig *config )
54 54
 {
55 55
     d = new Private;
56 56
     d->broker = broker;
@@ -67,7 +67,7 @@ Settings::~Settings()
67 67
     delete d; d = 0;
68 68
 }
69 69
 
70
-KSharedConfig *Settings::sharedConfig() const
70
+TDESharedConfig *Settings::sharedConfig() const
71 71
 {
72 72
     return d->config;
73 73
 }

+ 3
- 3
tdespell2/settings.h View File

@@ -26,7 +26,7 @@
26 26
 #include <tqstring.h>
27 27
 #include <tdelibs_export.h>
28 28
 
29
-class KSharedConfig;
29
+class TDESharedConfig;
30 30
 
31 31
 namespace KSpell2
32 32
 {
@@ -59,7 +59,7 @@ namespace KSpell2
59 59
 
60 60
         void save();
61 61
 
62
-        KSharedConfig *sharedConfig() const;
62
+        TDESharedConfig *sharedConfig() const;
63 63
 
64 64
     private:
65 65
         void loadConfig();
@@ -68,7 +68,7 @@ namespace KSpell2
68 68
 
69 69
     private:
70 70
         friend class Broker;
71
-        Settings( Broker *broker, KSharedConfig *config );
71
+        Settings( Broker *broker, TDESharedConfig *config );
72 72
     private:
73 73
         class Private;
74 74
         Private *d;

+ 1
- 1
tdespell2/ui/highlighter.cpp View File

@@ -51,7 +51,7 @@ Highlighter::Highlighter( TQTextEdit *textEdit,
51 51
     d = new Private;
52 52
     d->filter = filter;
53 53
     if ( !configFile.isEmpty() )
54
-        d->broker = Broker::openBroker( KSharedConfig::openConfig( configFile ) );
54
+        d->broker = Broker::openBroker( TDESharedConfig::openConfig( configFile ) );
55 55
     else
56 56
         d->broker = Broker::openBroker();
57 57
 

+ 3
- 3
tdeui/kpanelapplet.cpp View File

@@ -37,7 +37,7 @@ public:
37 37
       {}
38 38
 
39 39
   const TQPopupMenu* customMenu;
40
-  KSharedConfig::Ptr sharedConfig;
40
+  TDESharedConfig::Ptr sharedConfig;
41 41
   TQPtrList<TQObject> watchedForFocus;
42 42
   bool hasFocus;
43 43
 };
@@ -60,7 +60,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type,
60 60
   }
61 61
   setBackgroundOrigin( AncestorOrigin );
62 62
 
63
-  d->sharedConfig = KSharedConfig::openConfig(configFile, kapp && kapp->config()->isImmutable());
63
+  d->sharedConfig = TDESharedConfig::openConfig(configFile, kapp && kapp->config()->isImmutable());
64 64
   _config = d->sharedConfig;
65 65
 }
66 66
 
@@ -188,7 +188,7 @@ bool KPanelApplet::eventFilter(TQObject *o, TQEvent * e)
188 188
     return TQFrame::eventFilter(o, e);
189 189
 }
190 190
 
191
-KSharedConfig::Ptr KPanelApplet::sharedConfig() const
191
+TDESharedConfig::Ptr KPanelApplet::sharedConfig() const
192 192
 {
193 193
     return d->sharedConfig;
194 194
 }

+ 1
- 1
tdeui/kpanelapplet.h View File

@@ -185,7 +185,7 @@ public:
185 185
      * called \<appletname\>\<instanceid\>rc in the user's local %KDE directory.
186 186
      **/
187 187
     TDEConfig* config() const { return _config; }
188
-    KSharedConfig::Ptr sharedConfig() const;
188
+    TDESharedConfig::Ptr sharedConfig() const;
189 189
 
190 190
     /**
191 191
      * @return Type indicating the applet's type.

+ 3
- 3
tdeui/krootpixmap.cpp View File

@@ -61,7 +61,7 @@ void KRootPixmap::init()
61 61
     m_Fade = 0;
62 62
     m_BlurRadius = 0;
63 63
     m_BlurSigma = 0;
64
-    m_pPixmap = new KSharedPixmap; //ordinary KPixmap on win32
64
+    m_pPixmap = new TDESharedPixmap; //ordinary KPixmap on win32
65 65
     m_pTimer = new TQTimer( this );
66 66
     m_bInit = false;
67 67
     m_bActive = false;
@@ -238,7 +238,7 @@ void KRootPixmap::repaint(bool force)
238 238
 	m_Desk = currentDesktop();
239 239
     }
240 240
 
241
-    // KSharedPixmap will correctly generate a tile for us.
241
+    // TDESharedPixmap will correctly generate a tile for us.
242 242
     m_pPixmap->loadFromShared(pixmapName(m_Desk), m_Rect);
243 243
 #else
244 244
 	m_Desk = currentDesktop();
@@ -308,7 +308,7 @@ void KRootPixmap::slotDone(bool success)
308 308
 	updateBackground( m_pPixmap );
309 309
 }
310 310
 
311
-void KRootPixmap::updateBackground( KSharedPixmap *spm )
311
+void KRootPixmap::updateBackground( TDESharedPixmap *spm )
312 312
 {
313 313
     TQPixmap pm = *spm;
314 314
 

+ 5
- 5
tdeui/krootpixmap.h View File

@@ -20,7 +20,7 @@
20 20
 class TQRect;
21 21
 class TQWidget;
22 22
 class TQTimer;
23
-class KSharedPixmap;
23
+class TDESharedPixmap;
24 24
 class KRootPixmapData;
25 25
 
26 26
 /**
@@ -37,7 +37,7 @@ class KRootPixmapData;
37 37
  * Instead of using the default behavior, you can ask KRootPixmap
38 38
  * to emit a backgroundUpdated(const TQPixmap &) signal whenever
39 39
  * the background needs updating by using setCustomPainting(bool).
40
- * Alternatively by reimplementing updateBackground(KSharedPixmap*)
40
+ * Alternatively by reimplementing updateBackground(TDESharedPixmap*)
41 41
  * you can take complete control of the behavior.
42 42
  *
43 43
  * @author Geert Jansen <jansen@kde.org>
@@ -179,7 +179,7 @@ public slots:
179 179
     void setCustomPainting( bool enable ) { m_bCustomPaint = enable; }
180 180
 
181 181
     /**
182
-     * Asks KDesktop to export the desktop background as a KSharedPixmap.
182
+     * Asks KDesktop to export the desktop background as a TDESharedPixmap.
183 183
      * This method uses DCOP to call KBackgroundIface/setExport(int).
184 184
      */
185 185
     void enableExports();
@@ -209,7 +209,7 @@ protected:
209 209
      * applies the fade effect, then sets the target's background, or emits
210 210
      * backgroundUpdated(const TQPixmap &) depending on the painting mode.
211 211
      */
212
-    virtual void updateBackground( KSharedPixmap * );
212
+    virtual void updateBackground( TDESharedPixmap * );
213 213
 
214 214
 private slots:
215 215
     void slotBackgroundChanged(int);
@@ -229,7 +229,7 @@ private:
229 229
     TQRect m_Rect;
230 230
     TQWidget *m_pWidget;
231 231
     TQTimer *m_pTimer;
232
-    KSharedPixmap *m_pPixmap;
232
+    TDESharedPixmap *m_pPixmap;
233 233
     KRootPixmapData *d;
234 234
 
235 235
     void init();

+ 9
- 9
tdeui/ksharedpixmap.cpp View File

@@ -49,10 +49,10 @@
49 49
 #undef FocusOut
50 50
 
51 51
 /**
52
- * KSharedPixmap
52
+ * TDESharedPixmap
53 53
  */
54 54
 
55
-class KSharedPixmapPrivate
55
+class TDESharedPixmapPrivate
56 56
 {
57 57
 public:
58 58
   Atom pixmap;
@@ -61,21 +61,21 @@ public:
61 61
   TQRect rect;
62 62
 };
63 63
 
64
-KSharedPixmap::KSharedPixmap()
64
+TDESharedPixmap::TDESharedPixmap()
65 65
     : TQWidget(0L, "shpixmap comm window")
66 66
 {
67
-    d = new KSharedPixmapPrivate;
67
+    d = new TDESharedPixmapPrivate;
68 68
     init();
69 69
 }
70 70
 
71 71
 
72
-KSharedPixmap::~KSharedPixmap()
72
+TDESharedPixmap::~TDESharedPixmap()
73 73
 {
74 74
     delete d;
75 75
 }
76 76
 
77 77
 
78
-void KSharedPixmap::init()
78
+void TDESharedPixmap::init()
79 79
 {
80 80
     d->pixmap = XInternAtom(tqt_xdisplay(), "PIXMAP", false);
81 81
     TQCString atom;
@@ -85,7 +85,7 @@ void KSharedPixmap::init()
85 85
 }
86 86
 
87 87
 
88
-bool KSharedPixmap::isAvailable(const TQString & name) const
88
+bool TDESharedPixmap::isAvailable(const TQString & name) const
89 89
 {
90 90
     TQString str = TQString("KDESHPIXMAP:%1").arg(name);
91 91
     Atom sel = XInternAtom(tqt_xdisplay(), str.latin1(), true);
@@ -95,7 +95,7 @@ bool KSharedPixmap::isAvailable(const TQString & name) const
95 95
 }
96 96
 
97 97
 
98
-bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect)
98
+bool TDESharedPixmap::loadFromShared(const TQString & name, const TQRect & rect)
99 99
 {
100 100
     d->rect = rect;
101 101
     if (d->selection != None)
@@ -120,7 +120,7 @@ bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect)
120 120
 }
121 121
 
122 122
 
123
-bool KSharedPixmap::x11Event(XEvent *event)
123
+bool TDESharedPixmap::x11Event(XEvent *event)
124 124
 {
125 125
     if (event->type != SelectionNotify)
126 126
 	return false;

+ 11
- 11
tdeui/ksharedpixmap.h View File

@@ -11,8 +11,8 @@
11 11
  * version 2 of the License, or (at your option) any later version.
12 12
  */
13 13
 
14
-#ifndef __KSharedPixmap_h_Included__
15
-#define __KSharedPixmap_h_Included__
14
+#ifndef __TDESharedPixmap_h_Included__
15
+#define __TDESharedPixmap_h_Included__
16 16
 
17 17
 #include <kpixmap.h>
18 18
 
@@ -26,7 +26,7 @@
26 26
 #include <tqpixmap.h>
27 27
 #include <tqwidget.h>
28 28
 
29
-class KSharedPixmapPrivate;
29
+class TDESharedPixmapPrivate;
30 30
 
31 31
 /**
32 32
  * Shared pixmap client.
@@ -35,7 +35,7 @@ class KSharedPixmapPrivate;
35 35
  * by a global id string, and can be accessed by all X clients.
36 36
  *
37 37
  * This class is a client class to shared pixmaps in KDE. You can use it
38
- * to copy (a part of) a shared pixmap into. KSharedPixmap inherits KPixmap
38
+ * to copy (a part of) a shared pixmap into. TDESharedPixmap inherits KPixmap
39 39
  * for that purpose.
40 40
  *
41 41
  * The server part of shared pixmaps is not implemented here. 
@@ -44,7 +44,7 @@ class KSharedPixmapPrivate;
44 44
  *
45 45
  * An example: copy from a shared pixmap:
46 46
  * \code
47
- *   KSharedPixmap *pm = new KSharedPixmap;
47
+ *   TDESharedPixmap *pm = new TDESharedPixmap;
48 48
  *   connect(pm, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
49 49
  *   pm->loadFromShared("My Pixmap");
50 50
  * \endcode
@@ -53,7 +53,7 @@ class KSharedPixmapPrivate;
53 53
  * @version $Id$
54 54
  *
55 55
  */
56
-class TDEUI_EXPORT KSharedPixmap: 
56
+class TDEUI_EXPORT TDESharedPixmap: 
57 57
     public TQWidget,
58 58
     public KPixmap
59 59
 {
@@ -65,12 +65,12 @@ public:
65 65
     /**
66 66
      * Construct an empty pixmap.
67 67
      */
68
-    KSharedPixmap();
68
+    TDESharedPixmap();
69 69
 
70 70
     /**
71 71
      * Destroys the pixmap.
72 72
      */
73
-    ~KSharedPixmap();
73
+    ~TDESharedPixmap();
74 74
 
75 75
     /**
76 76
      * Load from a shared pixmap reference. The signal done() is emitted
@@ -80,7 +80,7 @@ public:
80 80
      * @param rect If you pass a nonzero rectangle, a tile is generated which 
81 81
      * is able to fill up the specified rectangle completely. This is solely 
82 82
      * for optimization: in some cases the tile will be much smaller than the 
83
-     * original pixmap. It reflects KSharedPixmap's original use: sharing
83
+     * original pixmap. It reflects TDESharedPixmap's original use: sharing
84 84
      * of the desktop background to achieve pseudo transparency.
85 85
      * @return True if the shared pixmap exists and loading has started
86 86
      * successfully, false otherwise.
@@ -110,11 +110,11 @@ private:
110 110
     bool copy(const TQString & id, const TQRect & rect);
111 111
     void init();
112 112
 
113
-    KSharedPixmapPrivate *d;
113
+    TDESharedPixmapPrivate *d;
114 114
 };
115 115
 #else // WIN32, Qt Embedded
116 116
 // Let's simply assume KPixmap will do for now. Yes, I know that's broken.
117
-#define KSharedPixmap KPixmap
117
+#define TDESharedPixmap KPixmap
118 118
 #endif
119 119
 
120 120
 #endif

+ 1
- 1
tdeutils/tdecmoduleinfo.h View File

@@ -132,7 +132,7 @@ public:
132 132
   // changed from name() to avoid ambiguity with TQObject::name() on multiple inheritance
133 133
 
134 134
   /**
135
-   * @return a KSharedPtr to KService created from the modules .desktop file
135
+   * @return a TDESharedPtr to KService created from the modules .desktop file
136 136
    */
137 137
   KService::Ptr service() const { return _service; }
138 138
 

Loading…
Cancel
Save