diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
| commit | ef71f46965855308db367f74956513eccc71bc46 (patch) | |
| tree | 71f1aca189b7beda22f9e95b19608dccfa4f3050 /kopete/libkopete/kcautoconfigmodule.h | |
| parent | bdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff) | |
| download | tdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kopete/libkopete/kcautoconfigmodule.h')
| -rw-r--r-- | kopete/libkopete/kcautoconfigmodule.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kopete/libkopete/kcautoconfigmodule.h b/kopete/libkopete/kcautoconfigmodule.h index 1fe15acf..91ce9886 100644 --- a/kopete/libkopete/kcautoconfigmodule.h +++ b/kopete/libkopete/kcautoconfigmodule.h @@ -63,18 +63,18 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule /** * Standard KCModule constructor. Use KGlobal::config() */ - KCAutoConfigModule( KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); /** * Constructor. * @param config the KConfig to use - * @param instance KInstance object for this KCM + * @param instance TDEInstance object for this KCM * @param parent parent widget * @param args special arguments for this KCM * * @todo document what the args mean (inherited from KCModule?) */ - KCAutoConfigModule(KConfig* config, KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule(KConfig* config, TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); /** * Constructor, much like the one above, except with |