diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kparts/part.h | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kparts/part.h')
| -rw-r--r-- | kparts/part.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kparts/part.h b/kparts/part.h index 0c4023f6c..8a58063af 100644 --- a/kparts/part.h +++ b/kparts/part.h @@ -27,7 +27,7 @@ #include <kxmlguiclient.h> -class KInstance; +class TDEInstance; class TQWidget; class KAction; class KActionCollection; @@ -79,24 +79,24 @@ public: protected: /** - * Set the instance ( KInstance) for this part. + * Set the instance ( TDEInstance) for this part. * * Call this *first* in the inherited class constructor, * because it loads the i18n catalogues. */ - virtual void setInstance( KInstance *instance ); + virtual void setInstance( TDEInstance *instance ); /** - * Set the instance ( KInstance) for this part. + * Set the instance ( TDEInstance) for this part. * * Call this *first* in the inherited class constructor, * because it loads the i18n catalogues. */ - virtual void setInstance( KInstance *instance, bool loadPlugins ); + virtual void setInstance( TDEInstance *instance, bool loadPlugins ); /** * We have three different policies, whether to load new plugins or not. The - * value in the KConfig object of the KInstance object always overrides + * value in the KConfig object of the TDEInstance object always overrides * LoadPlugins and LoadPluginsIfEnabled. */ enum PluginLoadingMode { @@ -140,7 +140,7 @@ protected: * } * \endcode */ - void loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, KInstance *instance ); + void loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, TDEInstance *instance ); /** * For a KParts::Part: call this before setInstance(). |