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.cpp | |
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.cpp')
-rw-r--r-- | kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp index dd695a033..32f36f9e9 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp @@ -45,8 +45,8 @@ extern "C" namespace KFI { -KInstance * CFontViewPartFactory::theirInstance=NULL; -KAboutData * CFontViewPartFactory::theirAbout=NULL; +TDEInstance * CFontViewPartFactory::theirInstance=NULL; +TDEAboutData * CFontViewPartFactory::theirAbout=NULL; CFontViewPartFactory::CFontViewPartFactory() { @@ -71,12 +71,12 @@ TQObject * CFontViewPartFactory::createObject(TQObject *parent, const char *name return new CFontViewPart((TQWidget*) parent, name); } -KInstance* CFontViewPartFactory::instance() +TDEInstance* CFontViewPartFactory::instance() { if(!theirInstance) { - theirAbout = new KAboutData("fontviewpart", I18N_NOOP("CFontViewPart"), "0.1"); - theirInstance = new KInstance(theirAbout); + theirAbout = new TDEAboutData("fontviewpart", I18N_NOOP("CFontViewPart"), "0.1"); + theirInstance = new TDEInstance(theirAbout); } return theirInstance; } |