diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /kcontrol/kfontinst/viewpart/FontViewPartFactory.h | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kfontinst/viewpart/FontViewPartFactory.h')
| -rw-r--r-- | kcontrol/kfontinst/viewpart/FontViewPartFactory.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h index 44b213632..7ac96e9c8 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h +++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h @@ -31,8 +31,8 @@ #include <klibloader.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; namespace KFI { @@ -47,12 +47,12 @@ class CFontViewPartFactory : public KLibFactory virtual ~CFontViewPartFactory(); virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); - static KInstance * instance(); + static TDEInstance * instance(); private: - static KInstance *theirInstance; - static KAboutData *theirAbout; + static TDEInstance *theirInstance; + static TDEAboutData *theirAbout; }; } |