diff options
58 files changed, 178 insertions, 178 deletions
@@ -18,11 +18,11 @@ that we would like to make for the next binary incompatible release. - Remove all KDE_NO_COMPAT from the KDE2 -> KDE3 port before adding new ones for KDE4. -- Remove the smart-to-dumb-pointer conversion operator from KSharedPtr +- Remove the smart-to-dumb-pointer conversion operator from TDESharedPtr and replace it with a T* Get() member function. An implict conversion is far too dangerous. See: http://groups.google.com/groups?selm=4ognb0%243cd%40linda.teleport.com&oe=UTF-8&output=gplain - Also free the client from the requirement to inherit from KShared. + Also free the client from the requirement to inherit from TDEShared. - Remove all TDESocket, TDEServerSocket, KSocks and KExtendedSocket references throughout KDE in favor of KNetwork's socket implementations. diff --git a/dnssd/remoteservice.h b/dnssd/remoteservice.h index 8f529f791..485fd64d2 100644 --- a/dnssd/remoteservice.h +++ b/dnssd/remoteservice.h @@ -43,7 +43,7 @@ class KDNSSD_EXPORT RemoteService : public TQObject, public ServiceBase { Q_OBJECT public: - typedef KSharedPtr<RemoteService> Ptr; + typedef TDESharedPtr<RemoteService> Ptr; /** Creates unresolved service from given DNS label diff --git a/dnssd/servicebase.h b/dnssd/servicebase.h index debb987cf..b3a6cab9d 100644 --- a/dnssd/servicebase.h +++ b/dnssd/servicebase.h @@ -37,10 +37,10 @@ services of given type are present in given domain. @short Describes any type of service. @author Jakub Stachowski */ -class KDNSSD_EXPORT ServiceBase : public KShared +class KDNSSD_EXPORT ServiceBase : public TDEShared { public: - typedef KSharedPtr<ServiceBase> Ptr; + typedef TDESharedPtr<ServiceBase> Ptr; /** @param name Service name - empty for metaservices diff --git a/kabc/scripts/addressee.src.cpp b/kabc/scripts/addressee.src.cpp index 64e8f382a..b235a70ae 100644 --- a/kabc/scripts/addressee.src.cpp +++ b/kabc/scripts/addressee.src.cpp @@ -44,7 +44,7 @@ static bool emailsEquals( const TQStringList&, const TQStringList& ); KABC::SortMode *Addressee::mSortMode = 0; -struct Addressee::AddresseeData : public KShared +struct Addressee::AddresseeData : public TDEShared { TQString uid; TQString uri; @@ -68,7 +68,7 @@ Addressee::AddresseeData* Addressee::shared_null = 0; Addressee::AddresseeData* Addressee::makeSharedNull() { Addressee::shared_null = new AddresseeData; - shared_null->_KShared_ref(); //just in case (we should add KSD) + shared_null->_TDEShared_ref(); //just in case (we should add KSD) shared_null->empty = true; shared_null->changed = false; shared_null->resource = 0; diff --git a/kabc/scripts/addressee.src.h b/kabc/scripts/addressee.src.h index f87edc5ec..9cadfd41e 100644 --- a/kabc/scripts/addressee.src.h +++ b/kabc/scripts/addressee.src.h @@ -391,7 +391,7 @@ class KABC_EXPORT Addressee void detach(); struct AddresseeData; - mutable KSharedPtr<AddresseeData> mData; + mutable TDESharedPtr<AddresseeData> mData; private: static AddresseeData* shared_null; diff --git a/kate/part/katetextline.h b/kate/part/katetextline.h index 3922d04d0..7f14be16c 100644 --- a/kate/part/katetextline.h +++ b/kate/part/katetextline.h @@ -38,13 +38,13 @@ class TQTextStream; * The attribute stores the index to a table that contains fonts and colors * and also if a character is selected. */ -class KateTextLine : public KShared +class KateTextLine : public TDEShared { public: /** * Define a Shared-Pointer type */ - typedef KSharedPtr<KateTextLine> Ptr; + typedef TDESharedPtr<KateTextLine> Ptr; public: /** diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp index 6371b2534..61da755b3 100644 --- a/kded/kdedmodule.cpp +++ b/kded/kdedmodule.cpp @@ -26,7 +26,7 @@ #include "kdedmodule.h" #include "tdeconfigdata.h" -typedef TQMap<KEntryKey, KSharedPtr<KShared> > KDEDObjectMap; +typedef TQMap<KEntryKey, TDESharedPtr<TDEShared> > KDEDObjectMap; class KDEDModulePrivate { @@ -62,7 +62,7 @@ void KDEDModule::resetIdle() d->timer.start(d->timeout, true); } -void KDEDModule::insert(const TQCString &app, const TQCString &key, KShared *obj) +void KDEDModule::insert(const TQCString &app, const TQCString &key, TDEShared *obj) { if (!d->objMap) d->objMap = new KDEDObjectMap; @@ -74,13 +74,13 @@ void KDEDModule::insert(const TQCString &app, const TQCString &key, KShared *obj KEntryKey indexKey(app, key); // Prevent deletion in case the same object is inserted again. - KSharedPtr<KShared> _obj = obj; + TDESharedPtr<TDEShared> _obj = obj; d->objMap->replace(indexKey, _obj); resetIdle(); } -KShared * KDEDModule::find(const TQCString &app, const TQCString &key) +TDEShared * KDEDModule::find(const TQCString &app, const TQCString &key) { if (!d->objMap) return 0; diff --git a/kded/kdedmodule.h b/kded/kdedmodule.h index 855a02824..f3954e842 100644 --- a/kded/kdedmodule.h +++ b/kded/kdedmodule.h @@ -91,12 +91,12 @@ public: * Any previous object inserted with the same values for @p app * and @p key will be removed. */ - void insert(const TQCString &app, const TQCString &key, KShared *obj); + void insert(const TQCString &app, const TQCString &key, TDEShared *obj); /** * Lookup object indexed with @p app and @p key */ - KShared *find(const TQCString &app, const TQCString &key); + TDEShared *find(const TQCString &app, const TQCString &key); /** * remove object indexed with @p app and @p key. diff --git a/kded/test/test.cpp b/kded/test/test.cpp index e99eb1421..8d2aa91b9 100644 --- a/kded/test/test.cpp +++ b/kded/test/test.cpp @@ -1,6 +1,6 @@ #include "test.h" -class TestObject : public KShared +class TestObject : public TDEShared { public: TestObject(const TQCString &_app) : app(_app) diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas index 8621f7897..4cdeadefe 100644 --- a/tdecore/kdebug.areas +++ b/tdecore/kdebug.areas @@ -33,7 +33,7 @@ 264 tdecore (KIconLoader) 265 tdecore (KIconEffect) 270 tdeui (KRootPixmap) -280 tdeui (KSharedPixmap) +280 tdeui (TDESharedPixmap) 281 tdeui (TDECModule) 282 tdeui (KDockWidget) 290 tdeui (KPixmapIO) diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp index d26bbb678..a2a83e436 100644 --- a/tdecore/kglobal.cpp +++ b/tdecore/kglobal.cpp @@ -67,7 +67,7 @@ TDEConfig *TDEGlobal::config() return _instance->config(); } -KSharedConfig *TDEGlobal::sharedConfig() +TDESharedConfig *TDEGlobal::sharedConfig() { MYASSERT(_instance); diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h index 22877c8ce..075f068b7 100644 --- a/tdecore/kglobal.h +++ b/tdecore/kglobal.h @@ -23,7 +23,7 @@ class KCharsets; class TDEConfig; -class KSharedConfig; +class TDESharedConfig; class KIconLoader; class TDEHardwareDevices; class TDEGlobalNetworkManager; @@ -71,7 +71,7 @@ public: * Returns the general config object. * @return the global configuration object. */ - static KSharedConfig *sharedConfig(); + static TDESharedConfig *sharedConfig(); /** * Returns an iconloader object. diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp index abced574e..d985cc8b0 100644 --- a/tdecore/kicontheme.cpp +++ b/tdecore/kicontheme.cpp @@ -43,7 +43,7 @@ public: TQString example, screenshot; TQString linkOverlay, lockOverlay, zipOverlay, shareOverlay; bool hidden; - KSharedConfig::Ptr sharedConfig; + TDESharedConfig::Ptr sharedConfig; }; /** @@ -136,9 +136,9 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName) fileName = mDir + "index.theme"; mainSection="Icon Theme"; } - // Use KSharedConfig to avoid parsing the file many times, from each kinstance. + // Use TDESharedConfig to avoid parsing the file many times, from each kinstance. // Need to keep a ref to it to make this useful - d->sharedConfig = KSharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ ); + d->sharedConfig = TDESharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ ); TDEConfig& cfg = *d->sharedConfig; //was: KSimpleConfig cfg(fileName); diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp index cef932fa1..953b8ffa1 100644 --- a/tdecore/kinstance.cpp +++ b/tdecore/kinstance.cpp @@ -65,7 +65,7 @@ public: KMimeSourceFactory* mimeSourceFactory; TQString configName; bool ownAboutdata; - KSharedConfig::Ptr sharedConfig; + TDESharedConfig::Ptr sharedConfig; }; TDEInstance::TDEInstance( const TQCString& name) @@ -201,7 +201,7 @@ TDEConfig *TDEInstance::config() const if( _config == 0 ) { if ( !d->configName.isEmpty() ) { - d->sharedConfig = KSharedConfig::openConfig( d->configName ); + d->sharedConfig = TDESharedConfig::openConfig( d->configName ); // Check whether custom config files are allowed. d->sharedConfig->setGroup( "KDE Action Restrictions" ); @@ -220,10 +220,10 @@ TDEConfig *TDEInstance::config() const if ( d->sharedConfig == 0 ) { if ( !_name.isEmpty() ) { - d->sharedConfig = KSharedConfig::openConfig( _name + "rc", m_configReadOnly ); + d->sharedConfig = TDESharedConfig::openConfig( _name + "rc", m_configReadOnly ); } else { - d->sharedConfig = KSharedConfig::openConfig( TQString::null ); + d->sharedConfig = TDESharedConfig::openConfig( TQString::null ); } } @@ -244,7 +244,7 @@ TDEConfig *TDEInstance::config() const return _config; } -KSharedConfig *TDEInstance::sharedConfig() const +TDESharedConfig *TDEInstance::sharedConfig() const { DEBUG_CHECK_ALIVE if (_config == 0) diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h index 8178fe9c5..24ec92d3f 100644 --- a/tdecore/kinstance.h +++ b/tdecore/kinstance.h @@ -26,7 +26,7 @@ class KCharsets; class TQFont; class TDEInstancePrivate; class KMimeSourceFactory; -class KSharedConfig; +class TDESharedConfig; class TDEHardwareDevices; class TDEGlobalNetworkManager; @@ -94,7 +94,7 @@ class TDECORE_EXPORT TDEInstance * Returns the general config object ("appnamerc"). * @return the TDEConfig object for the instance. */ - KSharedConfig *sharedConfig() const; + TDESharedConfig *sharedConfig() const; /** * Set a read-only flag on the configuration files diff --git a/tdecore/klockfile.h b/tdecore/klockfile.h index 698706554..f3bf0b0bc 100644 --- a/tdecore/klockfile.h +++ b/tdecore/klockfile.h @@ -30,10 +30,10 @@ * @author Waldo Bastian <bastian@kde.org> * @since 3.3 */ -class TDECORE_EXPORT KLockFile : public KShared +class TDECORE_EXPORT KLockFile : public TDEShared { public: - typedef KSharedPtr<KLockFile> Ptr; + typedef TDESharedPtr<KLockFile> Ptr; KLockFile(const TQString &file); diff --git a/tdecore/kmountpoint.h b/tdecore/kmountpoint.h index e68fb23ab..e35b042e6 100644 --- a/tdecore/kmountpoint.h +++ b/tdecore/kmountpoint.h @@ -32,11 +32,11 @@ * @author Waldo Bastian <bastian@kde.org> * @since 3.2 */ -class TDECORE_EXPORT KMountPoint : public KShared +class TDECORE_EXPORT KMountPoint : public TDEShared { typedef signed long long int filesize_t; public: - typedef KSharedPtr<KMountPoint> Ptr; + typedef TDESharedPtr<KMountPoint> Ptr; typedef TQValueList<Ptr> List; public: enum { NeedMountOptions = 1, NeedRealDeviceName = 2 }; diff --git a/tdecore/ksharedptr.h b/tdecore/ksharedptr.h index 16ece722c..60a06a55f 100644 --- a/tdecore/ksharedptr.h +++ b/tdecore/ksharedptr.h @@ -15,132 +15,132 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KSharedPTR_H -#define KSharedPTR_H +#ifndef TDESharedPTR_H +#define TDESharedPTR_H #include "tdelibs_export.h" /** * Reference counting for shared objects. If you derive your object * from this class, then you may use it in conjunction with - * KSharedPtr to control the lifetime of your object. + * TDESharedPtr to control the lifetime of your object. * - * Specifically, all classes that derive from KShared have an internal + * Specifically, all classes that derive from TDEShared have an internal * counter keeping track of how many other objects have a reference to - * their object. If used with KSharedPtr, then your object will + * their object. If used with TDESharedPtr, then your object will * not be deleted until all references to the object have been * released. * * You should probably not ever use any of the methods in this class - * directly -- let the KSharedPtr take care of that. Just derive - * your class from KShared and forget about it. + * directly -- let the TDESharedPtr take care of that. Just derive + * your class from TDEShared and forget about it. * * @author Waldo Bastian <bastian@kde.org> */ -class TDECORE_EXPORT KShared { +class TDECORE_EXPORT TDEShared { public: /** * Standard constructor. This will initialize the reference count * on this object to 0. */ - KShared() : count(0) { } + TDEShared() : count(0) { } /** * Copy constructor. This will @em not actually copy the objects * but it will initialize the reference count on this object to 0. */ - KShared( const KShared & ) : count(0) { } + TDEShared( const TDEShared & ) : count(0) { } /** * Overloaded assignment operator. */ - KShared &operator=(const KShared & ) { return *this; } + TDEShared &operator=(const TDEShared & ) { return *this; } /** * Increases the reference count by one. */ - void _KShared_ref() const { count++; } + void _TDEShared_ref() const { count++; } /** * Releases a reference (decreases the reference count by one). If * the count goes to 0, this object will delete itself. */ - void _KShared_unref() const { if (!--count) delete this; } + void _TDEShared_unref() const { if (!--count) delete this; } /** * Return the current number of references held. * * @return Number of references */ - int _KShared_count() const { return count; } + int _TDEShared_count() const { return count; } protected: - virtual ~KShared() { } + virtual ~TDEShared() { } private: mutable int count; }; /** * Can be used to control the lifetime of an object that has derived - * KShared. As long a someone holds a KSharedPtr on some KShared + * TDEShared. As long a someone holds a TDESharedPtr on some TDEShared * object it won't become deleted but is deleted once its reference * count is 0. This struct emulates C++ pointers virtually perfectly. * So just use it like a simple C++ pointer. * - * KShared and KSharedPtr are preferred over QShared / QSharedPtr + * TDEShared and TDESharedPtr are preferred over QShared / QSharedPtr * since they are more safe. * * WARNING: Please note that this class template provides an implicit * conversion to T*. Do *not* change this pointer or the pointee (don't - * call delete on it, for instance) behind KSharedPtr's back. + * call delete on it, for instance) behind TDESharedPtr's back. * * @author Waldo Bastian <bastian@kde.org> */ template< class T > -class KSharedPtr +class TDESharedPtr { public: /** * Creates a null pointer. */ - KSharedPtr() + TDESharedPtr() : ptr(0) { } /** * Creates a new pointer. * @param t the pointer */ - KSharedPtr( T* t ) - : ptr(t) { if ( ptr ) ptr->_KShared_ref(); } + TDESharedPtr( T* t ) + : ptr(t) { if ( ptr ) ptr->_TDEShared_ref(); } /** * Copies a pointer. * @param p the pointer to copy */ - KSharedPtr( const KSharedPtr& p ) - : ptr(p.ptr) { if ( ptr ) ptr->_KShared_ref(); } + TDESharedPtr( const TDESharedPtr& p ) + : ptr(p.ptr) { if ( ptr ) ptr->_TDEShared_ref(); } /** * Unreferences the object that this pointer points to. If it was * the last reference, the object will be deleted. */ - ~KSharedPtr() { if ( ptr ) ptr->_KShared_unref(); } + ~TDESharedPtr() { if ( ptr ) ptr->_TDEShared_unref(); } - KSharedPtr<T>& operator= ( const KSharedPtr<T>& p ) { + TDESharedPtr<T>& operator= ( const TDESharedPtr<T>& p ) { if ( ptr == p.ptr ) return *this; - if ( ptr ) ptr->_KShared_unref(); + if ( ptr ) ptr->_TDEShared_unref(); ptr = p.ptr; - if ( ptr ) ptr->_KShared_ref(); + if ( ptr ) ptr->_TDEShared_ref(); return *this; } - KSharedPtr<T>& operator= ( T* p ) { + TDESharedPtr<T>& operator= ( T* p ) { if ( ptr == p ) return *this; - if ( ptr ) ptr->_KShared_unref(); + if ( ptr ) ptr->_TDEShared_unref(); ptr = p; - if ( ptr ) ptr->_KShared_ref(); + if ( ptr ) ptr->_TDEShared_ref(); return *this; } - bool operator== ( const KSharedPtr<T>& p ) const { return ( ptr == p.ptr ); } - bool operator!= ( const KSharedPtr<T>& p ) const { return ( ptr != p.ptr ); } + bool operator== ( const TDESharedPtr<T>& p ) const { return ( ptr == p.ptr ); } + bool operator!= ( const TDESharedPtr<T>& p ) const { return ( ptr != p.ptr ); } bool operator== ( const T* p ) const { return ( ptr == p ); } bool operator!= ( const T* p ) const { return ( ptr != p ); } bool operator!() const { return ( ptr == 0 ); } @@ -167,7 +167,7 @@ public: * Returns the number of references. * @return the number of references */ - int count() const { return ptr->_KShared_count(); } // for debugging purposes + int count() const { return ptr->_TDEShared_count(); } // for debugging purposes private: T* ptr; }; diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp index b46e05dd5..6b21e0392 100644 --- a/tdecore/ktimezones.cpp +++ b/tdecore/ktimezones.cpp @@ -203,7 +203,7 @@ bool KTimezone::isValidLongitude(float longitude) } KTimezone::KTimezone( - KSharedPtr<KTimezoneSource> db, const TQString& name, + TDESharedPtr<KTimezoneSource> db, const TQString& name, const TQString &countryCode, float latitude, float longitude, const TQString &comment) : m_db(db), @@ -415,7 +415,7 @@ const KTimezones::ZoneMap KTimezones::allZones() TQTextStream str(&f); TQRegExp lineSeparator("[ \t]"); TQRegExp ordinateSeparator("[+-]"); - KSharedPtr<KTimezoneSource> db(new KTimezoneSource(m_zoneinfoDir)); + TDESharedPtr<KTimezoneSource> db(new KTimezoneSource(m_zoneinfoDir)); while (!str.atEnd()) { TQString line = str.readLine(); diff --git a/tdecore/ktimezones.h b/tdecore/ktimezones.h index d24e8ec10..339cbf5bf 100644 --- a/tdecore/ktimezones.h +++ b/tdecore/ktimezones.h @@ -49,7 +49,7 @@ class KTimezonesPrivate; * @author S.R.Haque <srhaque@iee.org>. */ class TDECORE_EXPORT KTimezoneSource : - public KShared + public TDEShared { public: KTimezoneSource(const TQString &db); @@ -114,7 +114,7 @@ public: * @param comment description of the timezone, if any. */ KTimezone( - KSharedPtr<KTimezoneSource> db, const TQString &name, + TDESharedPtr<KTimezoneSource> db, const TQString &name, const TQString &countryCode = TQString(), float latitude = UNKNOWN, float longitude = UNKNOWN, const TQString &comment = TQString()); ~KTimezone(); @@ -191,7 +191,7 @@ private: KTimezone(const KTimezone&); KTimezone& operator=(const KTimezone&); - KSharedPtr<KTimezoneSource> m_db; + TDESharedPtr<KTimezoneSource> m_db; TQString m_name; TQString m_countryCode; float m_latitude; diff --git a/tdecore/kuser.cpp b/tdecore/kuser.cpp index 3fffddf4f..6bad14bd0 100644 --- a/tdecore/kuser.cpp +++ b/tdecore/kuser.cpp @@ -32,7 +32,7 @@ #include <grp.h> -class KUserPrivate : public KShared +class KUserPrivate : public TDEShared { public: bool valid; @@ -271,7 +271,7 @@ TQStringList KUser::allUserNames() { KUser::~KUser() { } -class KUserGroupPrivate : public KShared +class KUserGroupPrivate : public TDEShared { public: bool valid; diff --git a/tdecore/kuser.h b/tdecore/kuser.h index 12b511f9f..a48cf124d 100644 --- a/tdecore/kuser.h +++ b/tdecore/kuser.h @@ -233,7 +233,7 @@ public: static TQStringList allUserNames(); private: - KSharedPtr<KUserPrivate> d; + TDESharedPtr<KUserPrivate> d; void fillPasswd(struct passwd* p); void fillName(const char* name); }; @@ -375,7 +375,7 @@ public: static TQStringList allGroupNames(); private: - KSharedPtr<KUserGroupPrivate> d; + TDESharedPtr<KUserGroupPrivate> d; void fillGroup(struct group* g); void fillName(const char* name); }; diff --git a/tdecore/tdeconfig.cpp b/tdecore/tdeconfig.cpp index 62464b81f..bef3d7944 100644 --- a/tdecore/tdeconfig.cpp +++ b/tdecore/tdeconfig.cpp @@ -328,14 +328,14 @@ TDEConfig* TDEConfig::copyTo(const TQString &file, TDEConfig *config) const void TDEConfig::virtual_hook( int id, void* data ) { TDEConfigBase::virtual_hook( id, data ); } -static KStaticDeleter< TQValueList<KSharedConfig*> > sd; -TQValueList<KSharedConfig*> *KSharedConfig::s_list = 0; +static KStaticDeleter< TQValueList<TDESharedConfig*> > sd; +TQValueList<TDESharedConfig*> *TDESharedConfig::s_list = 0; -KSharedConfig::Ptr KSharedConfig::openConfig(const TQString& fileName, bool readOnly, bool useKDEGlobals ) +TDESharedConfig::Ptr TDESharedConfig::openConfig(const TQString& fileName, bool readOnly, bool useKDEGlobals ) { if (s_list) { - for(TQValueList<KSharedConfig*>::ConstIterator it = s_list->begin(); + for(TQValueList<TDESharedConfig*>::ConstIterator it = s_list->begin(); it != s_list->end(); ++it) { if ((*it)->backEnd->fileName() == fileName && @@ -344,21 +344,21 @@ KSharedConfig::Ptr KSharedConfig::openConfig(const TQString& fileName, bool read return (*it); } } - return new KSharedConfig(fileName, readOnly, useKDEGlobals); + return new TDESharedConfig(fileName, readOnly, useKDEGlobals); } -KSharedConfig::KSharedConfig( const TQString& fileName, bool readonly, bool usekdeglobals) +TDESharedConfig::TDESharedConfig( const TQString& fileName, bool readonly, bool usekdeglobals) : TDEConfig(fileName, readonly, usekdeglobals) { if (!s_list) { - sd.setObject(s_list, new TQValueList<KSharedConfig*>); + sd.setObject(s_list, new TQValueList<TDESharedConfig*>); } s_list->append(this); } -KSharedConfig::~KSharedConfig() +TDESharedConfig::~TDESharedConfig() { if ( s_list ) s_list->remove(this); diff --git a/tdecore/tdeconfig.h b/tdecore/tdeconfig.h index 77a009efa..59f784107 100644 --- a/tdecore/tdeconfig.h +++ b/tdecore/tdeconfig.h @@ -267,14 +267,14 @@ private: /** * TDEConfig variant using shared memory * - * KSharedConfig provides a reference counted, shared memory variant + * TDESharedConfig provides a reference counted, shared memory variant * of TDEConfig. */ -class TDECORE_EXPORT KSharedConfig : public TDEConfig, public KShared +class TDECORE_EXPORT TDESharedConfig : public TDEConfig, public TDEShared { - friend class TQValueList<KSharedConfig*>; + friend class TQValueList<TDESharedConfig*>; public: - typedef KSharedPtr<KSharedConfig> Ptr; + typedef TDESharedPtr<TDESharedConfig> Ptr; public: /** @@ -283,14 +283,14 @@ public: * @param readOnly set the config object's read-only status * @param bUseKDEGlobals Toggle reading the global KDE configuration file. */ - static KSharedConfig::Ptr openConfig(const TQString& fileName, bool readOnly = false, + static TDESharedConfig::Ptr openConfig(const TQString& fileName, bool readOnly = false, bool bUseKDEGlobals = true); private: - KSharedConfig( const TQString& fileName, bool readOnly, bool useKDEGlobals ); - ~KSharedConfig(); + TDESharedConfig( const TQString& fileName, bool readOnly, bool useKDEGlobals ); + ~TDESharedConfig(); - static TQValueList<KSharedConfig*> *s_list; + static TQValueList<TDESharedConfig*> *s_list; }; #endif diff --git a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp index c7f2fd7bd..4069561bb 100644 --- a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp +++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp @@ -1220,7 +1220,7 @@ int main( int argc, char **argv ) if ( !singleton ) { h << " " << className << "("; if (cfgFileNameArg) - h << " KSharedConfig::Ptr config" << (parameters.isEmpty() ? " = TDEGlobal::sharedConfig()" : ", "); + h << " TDESharedConfig::Ptr config" << (parameters.isEmpty() ? " = TDEGlobal::sharedConfig()" : ", "); for (TQValueList<Param>::ConstIterator it = parameters.begin(); it != parameters.end(); ++it) { @@ -1502,7 +1502,7 @@ int main( int argc, char **argv ) cpp << className << "::" << className << "( "; if ( cfgFileNameArg ) { if ( !singleton ) - cpp << " KSharedConfig::Ptr config"; + cpp << " TDESharedConfig::Ptr config"; else cpp << " const char *config"; cpp << (parameters.isEmpty() ? " " : ", "); diff --git a/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref b/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref index c0a9ddda5..6181295eb 100644 --- a/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref +++ b/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref @@ -3,7 +3,7 @@ #include "test8a.h" -Test8a::Test8a( KSharedConfig::Ptr config ) +Test8a::Test8a( TDESharedConfig::Ptr config ) : TDEConfigSkeleton( config ) { setCurrentGroup( TQString::fromLatin1( "Group" ) ); diff --git a/tdecore/tdeconfig_compiler/tests/test8a.h.ref b/tdecore/tdeconfig_compiler/tests/test8a.h.ref index 9913cfc49..88686ca1b 100644 --- a/tdecore/tdeconfig_compiler/tests/test8a.h.ref +++ b/tdecore/tdeconfig_compiler/tests/test8a.h.ref @@ -11,7 +11,7 @@ class Test8a : public TDEConfigSkeleton { public: - Test8a( KSharedConfig::Ptr config = TDEGlobal::sharedConfig() ); + Test8a( TDESharedConfig::Ptr config = TDEGlobal::sharedConfig() ); ~Test8a(); /** diff --git a/tdecore/tdeconfig_compiler/tests/test8main.cpp b/tdecore/tdeconfig_compiler/tests/test8main.cpp index 04864a95c..2611a48af 100644 --- a/tdecore/tdeconfig_compiler/tests/test8main.cpp +++ b/tdecore/tdeconfig_compiler/tests/test8main.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. int main( int, char*[] ) { TDEInstance i("test"); - Test8a *config1 = new Test8a( KSharedConfig::openConfig( TQString::null ) ); + Test8a *config1 = new Test8a( TDESharedConfig::openConfig( TQString::null ) ); Test8a *config2 = new Test8a(); Test8b::self(); delete config1; diff --git a/tdecore/tdeconfigbackend.h b/tdecore/tdeconfigbackend.h index c1092364c..916479643 100644 --- a/tdecore/tdeconfigbackend.h +++ b/tdecore/tdeconfigbackend.h @@ -48,7 +48,7 @@ class TDEConfigBackEndPrivate; class TDECORE_EXPORT TDEConfigBackEnd { friend class TDEConfig; - friend class KSharedConfig; + friend class TDESharedConfig; public: /** * Constructs a configuration back end. diff --git a/tdecore/tdeconfigbase.h b/tdecore/tdeconfigbase.h index b9522dcb6..1166703ce 100644 --- a/tdecore/tdeconfigbase.h +++ b/tdecore/tdeconfigbase.h @@ -46,7 +46,7 @@ class TDEConfigGroup; * abstract base class, meaning that you cannot directly instantiate * objects of this class. Either use TDEConfig (for usual %KDE * configuration) or KSimpleConfig (for special needs as in ksamba), or - * even KSharedConfig (stores values in shared memory). + * even TDESharedConfig (stores values in shared memory). * * All configuration entries are key, value pairs. Each entry also * belongs to a specific group of related entries. All configuration @@ -65,7 +65,7 @@ class TDEConfigGroup; * @see TDEGlobal#config() * @see TDEConfig * @see KSimpleConfig - * @see KSharedConfig + * @see TDESharedConfig */ class TDECORE_EXPORT TDEConfigBase : public TQObject { diff --git a/tdecore/tdeconfigskeleton.cpp b/tdecore/tdeconfigskeleton.cpp index 0990949d0..1abaf388b 100644 --- a/tdecore/tdeconfigskeleton.cpp +++ b/tdecore/tdeconfigskeleton.cpp @@ -885,7 +885,7 @@ TDEConfigSkeleton::TDEConfigSkeleton( const TQString &configname ) if ( !configname.isEmpty() ) { - mConfig = KSharedConfig::openConfig( configname ); + mConfig = TDESharedConfig::openConfig( configname ); } else { @@ -893,7 +893,7 @@ TDEConfigSkeleton::TDEConfigSkeleton( const TQString &configname ) } } -TDEConfigSkeleton::TDEConfigSkeleton(KSharedConfig::Ptr config) +TDEConfigSkeleton::TDEConfigSkeleton(TDESharedConfig::Ptr config) : mCurrentGroup( "No Group" ), mUseDefaults(false) { kdDebug(177) << "Creating TDEConfigSkeleton (" << (void *)this << ")" << endl; diff --git a/tdecore/tdeconfigskeleton.h b/tdecore/tdeconfigskeleton.h index d9424e9df..ccbf4529b 100644 --- a/tdecore/tdeconfigskeleton.h +++ b/tdecore/tdeconfigskeleton.h @@ -800,7 +800,7 @@ public: * * @param config configuration object to use. */ - TDEConfigSkeleton(KSharedConfig::Ptr config); + TDEConfigSkeleton(TDESharedConfig::Ptr config); /** * Destructor @@ -1215,7 +1215,7 @@ protected: private: TQString mCurrentGroup; - KSharedConfig::Ptr mConfig; // pointer to TDEConfig object + TDESharedConfig::Ptr mConfig; // pointer to TDEConfig object TDEConfigSkeletonItem::List mItems; TDEConfigSkeletonItem::Dict mItemDict; diff --git a/tdecore/tdesycocaentry.h b/tdecore/tdesycocaentry.h index a4e2512e0..d7ddbaf20 100644 --- a/tdecore/tdesycocaentry.h +++ b/tdecore/tdesycocaentry.h @@ -34,7 +34,7 @@ class TQDataStream; * @internal * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/tdesycoca.html */ -class TDECORE_EXPORT KSycocaEntry : public KShared +class TDECORE_EXPORT KSycocaEntry : public TDEShared { public: @@ -42,7 +42,7 @@ public: virtual KSycocaType sycocaType() const { return KST_KSycocaEntry; } public: - typedef KSharedPtr<KSycocaEntry> Ptr; + typedef TDESharedPtr<KSycocaEntry> Ptr; typedef TQValueList<Ptr> List; public: // KDoc seems to barf on those typedefs and generates no docs after them /** diff --git a/tdecore/tdesycocafactory.cpp b/tdecore/tdesycocafactory.cpp index d7d350ddf..bffd12b6a 100644 --- a/tdecore/tdesycocafactory.cpp +++ b/tdecore/tdesycocafactory.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> template class TQDict<KSycocaEntry>; -template class TQDict<KSharedPtr<KSycocaEntry> >; +template class TQDict<TDESharedPtr<KSycocaEntry> >; KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id) : m_resourceList(0), m_entryDict(0), m_sycocaDict(0) 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<KImageIOFormat> Ptr; + typedef TDESharedPtr<KImageIOFormat> Ptr; typedef TQValueList<Ptr> 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 <tdesycoca.h> #include <kde_file.h> -template class KSharedPtr<KMimeType>; +template class TDESharedPtr<KMimeType>; template class TQValueList<KMimeType::Ptr>; 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<KMimeType> Ptr; + typedef TDESharedPtr<KMimeType> Ptr; typedef TQValueList<Ptr> 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<KProtocolInfo> Ptr; + typedef TDESharedPtr<KProtocolInfo> 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<KService> Ptr; + typedef TDESharedPtr<KService> Ptr; typedef TQValueList<Ptr> 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<KServiceGroup> Ptr; - typedef KSharedPtr<KSycocaEntry> SPtr; + typedef TDESharedPtr<KServiceGroup> Ptr; + typedef TDESharedPtr<KSycocaEntry> SPtr; typedef TQValueList<SPtr> List; public: /** @@ -332,7 +332,7 @@ class TDEIO_EXPORT KServiceSeparator : public KSycocaEntry K_SYCOCATYPE( KST_KServiceSeparator, KSycocaEntry ) public: - typedef KSharedPtr<KServiceSeparator> Ptr; + typedef TDESharedPtr<KServiceSeparator> 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<KServiceType> Ptr; + typedef TDESharedPtr<KServiceType> Ptr; typedef TQValueList<Ptr> 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<ParseTreeBase> Ptr; + typedef TDESharedPtr<ParseTreeBase> 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; }; diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp index 5b574c593..5844dd97c 100644 --- a/tderesources/configpage.cpp +++ b/tderesources/configpage.cpp @@ -45,7 +45,7 @@ namespace KRES { -ResourcePageInfo::ResourcePageInfo() : KShared() { +ResourcePageInfo::ResourcePageInfo() : TDEShared() { mManager = 0L; mConfig = 0L; } @@ -153,7 +153,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) ConfigPage::~ConfigPage() { - TQValueList<KSharedPtr<ResourcePageInfo> >::Iterator it; + TQValueList<TDESharedPtr<ResourcePageInfo> >::Iterator it; for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it ) { (*it)->mManager->removeObserver( this ); } @@ -226,7 +226,7 @@ void ConfigPage::loadManager( const TQString& family ) info->mConfig = new TDEConfig( KRES::ManagerImpl::defaultConfigFile( family ) ); info->mManager->readConfig( info->mConfig ); - mInfoMap.append( KSharedPtr<ResourcePageInfo>(info) ); + mInfoMap.append( TDESharedPtr<ResourcePageInfo>(info) ); } } @@ -234,7 +234,7 @@ void ConfigPage::save() { saveResourceSettings(); - TQValueList<KSharedPtr<ResourcePageInfo> >::Iterator it; + TQValueList<TDESharedPtr<ResourcePageInfo> >::Iterator it; for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it ) (*it)->mManager->writeConfig( (*it)->mConfig ); diff --git a/tderesources/configpage.h b/tderesources/configpage.h index 35776763c..5f3819c0f 100644 --- a/tderesources/configpage.h +++ b/tderesources/configpage.h @@ -37,7 +37,7 @@ class TQPushButton; namespace KRES { -class TDERESOURCES_EXPORT ResourcePageInfo : public KShared +class TDERESOURCES_EXPORT ResourcePageInfo : public TDEShared { public: ResourcePageInfo(); @@ -93,7 +93,7 @@ class TDERESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<R TDEConfig* mConfig; TQString mFamily; TQStringList mFamilyMap; - TQValueList<KSharedPtr<ResourcePageInfo> > mInfoMap; + TQValueList<TDESharedPtr<ResourcePageInfo> > mInfoMap; KComboBox* mFamilyCombo; KListView* mListView; diff --git a/tdespell2/README b/tdespell2/README index 4cba772b6..53d6f4e27 100644 --- a/tdespell2/README +++ b/tdespell2/README @@ -9,7 +9,7 @@ Dictionaries are abstracted in the KSpell::Dictionary object which encapsulates all spell-checking functionality. You'll notice that the Broker is being created via the -Broker::Ptr Broker::openBroker( KSharedConfig *config =0 ); +Broker::Ptr Broker::openBroker( TDESharedConfig *config =0 ); call. The Broker is a shared object and the reason for this construct is very simple: - most application would need to have a few Broker objects (one for diff --git a/tdespell2/broker.cpp b/tdespell2/broker.cpp index a5df8178c..5e03c377b 100644 --- a/tdespell2/broker.cpp +++ b/tdespell2/broker.cpp @@ -56,11 +56,11 @@ public: TQPtrDict<Broker> *Broker::s_brokers = 0; -Broker *Broker::openBroker( KSharedConfig *config ) +Broker *Broker::openBroker( TDESharedConfig *config ) { - KSharedConfig::Ptr preventDeletion; + TDESharedConfig::Ptr preventDeletion; if ( !config ) { - preventDeletion = KSharedConfig::openConfig( DEFAULT_CONFIG_FILE ); + preventDeletion = TDESharedConfig::openConfig( DEFAULT_CONFIG_FILE ); } else preventDeletion = config; @@ -74,9 +74,9 @@ Broker *Broker::openBroker( KSharedConfig *config ) return broker; } -Broker::Broker( KSharedConfig *config ) +Broker::Broker( TDESharedConfig *config ) { - KSharedConfig::Ptr preventDeletion( config ); + TDESharedConfig::Ptr preventDeletion( config ); Q_UNUSED( preventDeletion ); if ( !s_brokers ) diff --git a/tdespell2/broker.h b/tdespell2/broker.h index 26be0e11e..f96361a58 100644 --- a/tdespell2/broker.h +++ b/tdespell2/broker.h @@ -28,7 +28,7 @@ #include <tqstringlist.h> #include <tqstring.h> -class KSharedConfig; +class TDESharedConfig; template <typename T> class TQPtrDict; @@ -46,11 +46,11 @@ namespace KSpell2 * of the KSpell2 architecture. */ class KDE_EXPORT Broker : public TQObject, - public KShared + public TDEShared { Q_OBJECT public: - typedef KSharedPtr<Broker> Ptr; + typedef TDESharedPtr<Broker> Ptr; /** * Constructs the broker. * @@ -65,7 +65,7 @@ namespace KSpell2 * and default client values. If no value will * be passed Broker will use global tdespellrc file. */ - static Broker *openBroker( KSharedConfig *config = 0 ); + static Broker *openBroker( TDESharedConfig *config = 0 ); public: ~Broker(); @@ -122,7 +122,7 @@ namespace KSpell2 friend class Settings; void changed(); private: - Broker( KSharedConfig *config ); + Broker( TDESharedConfig *config ); void loadPlugins(); void loadPlugin( const TQString& ); private: diff --git a/tdespell2/settings.cpp b/tdespell2/settings.cpp index d1d050ce7..57535b85c 100644 --- a/tdespell2/settings.cpp +++ b/tdespell2/settings.cpp @@ -37,7 +37,7 @@ class Settings::Private { public: Broker* broker; //can't be a Ptr since we don't want to hold a ref on it - KSharedConfig::Ptr config; + TDESharedConfig::Ptr config; bool modified; TQString defaultLanguage; @@ -50,7 +50,7 @@ public: TQMap<TQString, bool> ignore; }; -Settings::Settings( Broker *broker, KSharedConfig *config ) +Settings::Settings( Broker *broker, TDESharedConfig *config ) { d = new Private; d->broker = broker; @@ -67,7 +67,7 @@ Settings::~Settings() delete d; d = 0; } -KSharedConfig *Settings::sharedConfig() const +TDESharedConfig *Settings::sharedConfig() const { return d->config; } diff --git a/tdespell2/settings.h b/tdespell2/settings.h index 2346f0772..ebf3ad46d 100644 --- a/tdespell2/settings.h +++ b/tdespell2/settings.h @@ -26,7 +26,7 @@ #include <tqstring.h> #include <tdelibs_export.h> -class KSharedConfig; +class TDESharedConfig; namespace KSpell2 { @@ -59,7 +59,7 @@ namespace KSpell2 void save(); - KSharedConfig *sharedConfig() const; + TDESharedConfig *sharedConfig() const; private: void loadConfig(); @@ -68,7 +68,7 @@ namespace KSpell2 private: friend class Broker; - Settings( Broker *broker, KSharedConfig *config ); + Settings( Broker *broker, TDESharedConfig *config ); private: class Private; Private *d; diff --git a/tdespell2/ui/highlighter.cpp b/tdespell2/ui/highlighter.cpp index 176d69232..32970f9e4 100644 --- a/tdespell2/ui/highlighter.cpp +++ b/tdespell2/ui/highlighter.cpp @@ -51,7 +51,7 @@ Highlighter::Highlighter( TQTextEdit *textEdit, d = new Private; d->filter = filter; if ( !configFile.isEmpty() ) - d->broker = Broker::openBroker( KSharedConfig::openConfig( configFile ) ); + d->broker = Broker::openBroker( TDESharedConfig::openConfig( configFile ) ); else d->broker = Broker::openBroker(); diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp index d38f36980..02a098283 100644 --- a/tdeui/kpanelapplet.cpp +++ b/tdeui/kpanelapplet.cpp @@ -37,7 +37,7 @@ public: {} const TQPopupMenu* customMenu; - KSharedConfig::Ptr sharedConfig; + TDESharedConfig::Ptr sharedConfig; TQPtrList<TQObject> watchedForFocus; bool hasFocus; }; @@ -60,7 +60,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type, } setBackgroundOrigin( AncestorOrigin ); - d->sharedConfig = KSharedConfig::openConfig(configFile, kapp && kapp->config()->isImmutable()); + d->sharedConfig = TDESharedConfig::openConfig(configFile, kapp && kapp->config()->isImmutable()); _config = d->sharedConfig; } @@ -188,7 +188,7 @@ bool KPanelApplet::eventFilter(TQObject *o, TQEvent * e) return TQFrame::eventFilter(o, e); } -KSharedConfig::Ptr KPanelApplet::sharedConfig() const +TDESharedConfig::Ptr KPanelApplet::sharedConfig() const { return d->sharedConfig; } diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h index 43c7221aa..a8729e331 100644 --- a/tdeui/kpanelapplet.h +++ b/tdeui/kpanelapplet.h @@ -185,7 +185,7 @@ public: * called \<appletname\>\<instanceid\>rc in the user's local %KDE directory. **/ TDEConfig* config() const { return _config; } - KSharedConfig::Ptr sharedConfig() const; + TDESharedConfig::Ptr sharedConfig() const; /** * @return Type indicating the applet's type. diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp index 3530b5d45..71b1d86ca 100644 --- a/tdeui/krootpixmap.cpp +++ b/tdeui/krootpixmap.cpp @@ -61,7 +61,7 @@ void KRootPixmap::init() m_Fade = 0; m_BlurRadius = 0; m_BlurSigma = 0; - m_pPixmap = new KSharedPixmap; //ordinary KPixmap on win32 + m_pPixmap = new TDESharedPixmap; //ordinary KPixmap on win32 m_pTimer = new TQTimer( this ); m_bInit = false; m_bActive = false; @@ -238,7 +238,7 @@ void KRootPixmap::repaint(bool force) m_Desk = currentDesktop(); } - // KSharedPixmap will correctly generate a tile for us. + // TDESharedPixmap will correctly generate a tile for us. m_pPixmap->loadFromShared(pixmapName(m_Desk), m_Rect); #else m_Desk = currentDesktop(); @@ -308,7 +308,7 @@ void KRootPixmap::slotDone(bool success) updateBackground( m_pPixmap ); } -void KRootPixmap::updateBackground( KSharedPixmap *spm ) +void KRootPixmap::updateBackground( TDESharedPixmap *spm ) { TQPixmap pm = *spm; diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h index 776863c46..bc5518221 100644 --- a/tdeui/krootpixmap.h +++ b/tdeui/krootpixmap.h @@ -20,7 +20,7 @@ class TQRect; class TQWidget; class TQTimer; -class KSharedPixmap; +class TDESharedPixmap; class KRootPixmapData; /** @@ -37,7 +37,7 @@ class KRootPixmapData; * Instead of using the default behavior, you can ask KRootPixmap * to emit a backgroundUpdated(const TQPixmap &) signal whenever * the background needs updating by using setCustomPainting(bool). - * Alternatively by reimplementing updateBackground(KSharedPixmap*) + * Alternatively by reimplementing updateBackground(TDESharedPixmap*) * you can take complete control of the behavior. * * @author Geert Jansen <jansen@kde.org> @@ -179,7 +179,7 @@ public slots: void setCustomPainting( bool enable ) { m_bCustomPaint = enable; } /** - * Asks KDesktop to export the desktop background as a KSharedPixmap. + * Asks KDesktop to export the desktop background as a TDESharedPixmap. * This method uses DCOP to call KBackgroundIface/setExport(int). */ void enableExports(); @@ -209,7 +209,7 @@ protected: * applies the fade effect, then sets the target's background, or emits * backgroundUpdated(const TQPixmap &) depending on the painting mode. */ - virtual void updateBackground( KSharedPixmap * ); + virtual void updateBackground( TDESharedPixmap * ); private slots: void slotBackgroundChanged(int); @@ -229,7 +229,7 @@ private: TQRect m_Rect; TQWidget *m_pWidget; TQTimer *m_pTimer; - KSharedPixmap *m_pPixmap; + TDESharedPixmap *m_pPixmap; KRootPixmapData *d; void init(); diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp index 6789e0a64..b9e0e69c4 100644 --- a/tdeui/ksharedpixmap.cpp +++ b/tdeui/ksharedpixmap.cpp @@ -49,10 +49,10 @@ #undef FocusOut /** - * KSharedPixmap + * TDESharedPixmap */ -class KSharedPixmapPrivate +class TDESharedPixmapPrivate { public: Atom pixmap; @@ -61,21 +61,21 @@ public: TQRect rect; }; -KSharedPixmap::KSharedPixmap() +TDESharedPixmap::TDESharedPixmap() : TQWidget(0L, "shpixmap comm window") { - d = new KSharedPixmapPrivate; + d = new TDESharedPixmapPrivate; init(); } -KSharedPixmap::~KSharedPixmap() +TDESharedPixmap::~TDESharedPixmap() { delete d; } -void KSharedPixmap::init() +void TDESharedPixmap::init() { d->pixmap = XInternAtom(tqt_xdisplay(), "PIXMAP", false); TQCString atom; @@ -85,7 +85,7 @@ void KSharedPixmap::init() } -bool KSharedPixmap::isAvailable(const TQString & name) const +bool TDESharedPixmap::isAvailable(const TQString & name) const { TQString str = TQString("KDESHPIXMAP:%1").arg(name); Atom sel = XInternAtom(tqt_xdisplay(), str.latin1(), true); @@ -95,7 +95,7 @@ bool KSharedPixmap::isAvailable(const TQString & name) const } -bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect) +bool TDESharedPixmap::loadFromShared(const TQString & name, const TQRect & rect) { d->rect = rect; if (d->selection != None) @@ -120,7 +120,7 @@ bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect) } -bool KSharedPixmap::x11Event(XEvent *event) +bool TDESharedPixmap::x11Event(XEvent *event) { if (event->type != SelectionNotify) return false; diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h index 3295b38d1..7873be6e5 100644 --- a/tdeui/ksharedpixmap.h +++ b/tdeui/ksharedpixmap.h @@ -11,8 +11,8 @@ * version 2 of the License, or (at your option) any later version. */ -#ifndef __KSharedPixmap_h_Included__ -#define __KSharedPixmap_h_Included__ +#ifndef __TDESharedPixmap_h_Included__ +#define __TDESharedPixmap_h_Included__ #include <kpixmap.h> @@ -26,7 +26,7 @@ #include <tqpixmap.h> #include <tqwidget.h> -class KSharedPixmapPrivate; +class TDESharedPixmapPrivate; /** * Shared pixmap client. @@ -35,7 +35,7 @@ class KSharedPixmapPrivate; * by a global id string, and can be accessed by all X clients. * * This class is a client class to shared pixmaps in KDE. You can use it - * to copy (a part of) a shared pixmap into. KSharedPixmap inherits KPixmap + * to copy (a part of) a shared pixmap into. TDESharedPixmap inherits KPixmap * for that purpose. * * The server part of shared pixmaps is not implemented here. @@ -44,7 +44,7 @@ class KSharedPixmapPrivate; * * An example: copy from a shared pixmap: * \code - * KSharedPixmap *pm = new KSharedPixmap; + * TDESharedPixmap *pm = new TDESharedPixmap; * connect(pm, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); * pm->loadFromShared("My Pixmap"); * \endcode @@ -53,7 +53,7 @@ class KSharedPixmapPrivate; * @version $Id$ * */ -class TDEUI_EXPORT KSharedPixmap: +class TDEUI_EXPORT TDESharedPixmap: public TQWidget, public KPixmap { @@ -65,12 +65,12 @@ public: /** * Construct an empty pixmap. */ - KSharedPixmap(); + TDESharedPixmap(); /** * Destroys the pixmap. */ - ~KSharedPixmap(); + ~TDESharedPixmap(); /** * Load from a shared pixmap reference. The signal done() is emitted @@ -80,7 +80,7 @@ public: * @param rect If you pass a nonzero rectangle, a tile is generated which * is able to fill up the specified rectangle completely. This is solely * for optimization: in some cases the tile will be much smaller than the - * original pixmap. It reflects KSharedPixmap's original use: sharing + * original pixmap. It reflects TDESharedPixmap's original use: sharing * of the desktop background to achieve pseudo transparency. * @return True if the shared pixmap exists and loading has started * successfully, false otherwise. @@ -110,11 +110,11 @@ private: bool copy(const TQString & id, const TQRect & rect); void init(); - KSharedPixmapPrivate *d; + TDESharedPixmapPrivate *d; }; #else // WIN32, Qt Embedded // Let's simply assume KPixmap will do for now. Yes, I know that's broken. -#define KSharedPixmap KPixmap +#define TDESharedPixmap KPixmap #endif #endif diff --git a/tdeutils/tdecmoduleinfo.h b/tdeutils/tdecmoduleinfo.h index 0bd7c44e3..2951e96d2 100644 --- a/tdeutils/tdecmoduleinfo.h +++ b/tdeutils/tdecmoduleinfo.h @@ -132,7 +132,7 @@ public: // changed from name() to avoid ambiguity with TQObject::name() on multiple inheritance /** - * @return a KSharedPtr to KService created from the modules .desktop file + * @return a TDESharedPtr to KService created from the modules .desktop file */ KService::Ptr service() const { return _service; } |