diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:52:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:52:27 -0600 |
| commit | fd7791939e48e06e7f0b9cc9d32738757783e180 (patch) | |
| tree | 64efdead645c6d058b560dbf9952e2dd73a99f83 /src/kdiff3_part.cpp | |
| parent | 046d6d18d5e6e3ca95711968793d8c46f56de6e8 (diff) | |
| download | kdiff3-fd7791939e48e06e7f0b9cc9d32738757783e180.tar.gz kdiff3-fd7791939e48e06e7f0b9cc9d32738757783e180.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/kdiff3_part.cpp')
| -rw-r--r-- | src/kdiff3_part.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp index 406c3df..78bd226 100644 --- a/src/kdiff3_part.cpp +++ b/src/kdiff3_part.cpp @@ -250,12 +250,12 @@ bool KDiff3Part::saveFile() // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include <kaboutdata.h> #include <klocale.h> -KInstance* KDiff3PartFactory::s_instance = 0L; -KAboutData* KDiff3PartFactory::s_about = 0L; +TDEInstance* KDiff3PartFactory::s_instance = 0L; +TDEAboutData* KDiff3PartFactory::s_about = 0L; KDiff3PartFactory::KDiff3PartFactory() : KParts::Factory() @@ -284,13 +284,13 @@ KParts::Part* KDiff3PartFactory::createPartObject( TQWidget *parentWidget, const return obj; } -KInstance* KDiff3PartFactory::instance() +TDEInstance* KDiff3PartFactory::instance() { if( !s_instance ) { - s_about = new KAboutData("kdiff3part", I18N_NOOP("KDiff3Part"), VERSION); + s_about = new TDEAboutData("kdiff3part", I18N_NOOP("KDiff3Part"), VERSION); s_about->addAuthor("Joachim Eibl", 0, "joachim.eibl at gmx.de"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; } |