diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:08 -0600 |
| commit | 8856e75c203aa69be210b2fee1095ab9761aca7e (patch) | |
| tree | d59810016bc093e8dd7f2f886f07c45fa25447a5 /ark/arkfactory.cpp | |
| parent | ed70cd1b539ac2e02319b55183a5be7a28f2d116 (diff) | |
| download | tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.tar.gz tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'ark/arkfactory.cpp')
| -rw-r--r-- | ark/arkfactory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ark/arkfactory.cpp b/ark/arkfactory.cpp index 3e17e7a..b92b4aa 100644 --- a/ark/arkfactory.cpp +++ b/ark/arkfactory.cpp @@ -25,8 +25,8 @@ #include "ark_part.h" #include "arkfactory.h" -KInstance* ArkFactory::s_instance = 0L; -KAboutData* ArkFactory::s_about = 0L; +TDEInstance* ArkFactory::s_instance = 0L; +TDEAboutData* ArkFactory::s_about = 0L; int ArkFactory::instanceNumber = 0; K_EXPORT_COMPONENT_FACTORY( libarkpart, ArkFactory ) @@ -55,13 +55,13 @@ KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget, return obj; } -KInstance* ArkFactory::instance() +TDEInstance* ArkFactory::instance() { instanceNumber++; if( !s_instance ) { s_about = ArkPart::createAboutData(); - s_instance = new KInstance( s_about ); + s_instance = new TDEInstance( s_about ); } return s_instance; } |