diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdecore/klibloader.h | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/klibloader.h')
| -rw-r--r-- | tdecore/klibloader.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h index aa88db925..d9e632184 100644 --- a/tdecore/klibloader.h +++ b/tdecore/klibloader.h @@ -23,11 +23,11 @@ #include <tqstringlist.h> #include <tqasciidict.h> #include <tqptrlist.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <stdlib.h> // For backwards compatibility -class KInstance; +class TDEInstance; class TQTimer; class KLibrary; class KLibFactory; @@ -255,7 +255,7 @@ public: /** * @internal - * Internal Method, called by the KApplication destructor. + * Internal Method, called by the TDEApplication destructor. * Do not call it. * This is what makes it possible to rely on ~KLibFactory * being called in all cases, whether the library is unloaded @@ -271,9 +271,9 @@ public: * @param name of the library. If it is not a path, the function searches in * the "module" and "lib" resources. If there is no extension, * ".la" will be appended. - * @param instance a KInstance used to get the standard paths + * @param instance a TDEInstance used to get the standard paths */ - static TQString findLibrary( const char * name, const KInstance * instance = KGlobal::instance() ); + static TQString findLibrary( const char * name, const TDEInstance * instance = TDEGlobal::instance() ); protected: KLibLoader( TQObject* parent = 0, const char* name = 0 ); @@ -306,12 +306,12 @@ private: * NOTE: you probably want to use KGenericFactory<PluginClassName> * instead of writing your own factory. * - * In the constructor of your factory you should create an instance of KInstance + * In the constructor of your factory you should create an instance of TDEInstance * like this: * \code - * s_global = new KInstance( "kspread" ); + * s_global = new TDEInstance( "kspread" ); * \endcode - * This KInstance is comparable to KGlobal used by normal applications. + * This TDEInstance is comparable to TDEGlobal used by normal applications. * It allows you to find resource files (images, XML, sound etc.) belonging * to the library. * |