diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
| commit | 5fc6f26e12b596addd235f87320c31761bd5a84d (patch) | |
| tree | 0a1ff964c23fce07fc088017df4ad537d57e62e5 /karm | |
| parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
| download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'karm')
| -rw-r--r-- | karm/karm_part.cpp | 12 | ||||
| -rw-r--r-- | karm/karm_part.h | 10 | ||||
| -rw-r--r-- | karm/main.cpp | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index 4cf841902..a81873731 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -367,12 +367,12 @@ void karmPart::fileSaveAs() // 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* karmPartFactory::s_instance = 0L; -KAboutData* karmPartFactory::s_about = 0L; +TDEInstance* karmPartFactory::s_instance = 0L; +TDEAboutData* karmPartFactory::s_about = 0L; karmPartFactory::karmPartFactory() : KParts::Factory() @@ -401,13 +401,13 @@ KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const c return obj; } -KInstance* karmPartFactory::instance() +TDEInstance* karmPartFactory::instance() { if( !s_instance ) { - s_about = new KAboutData("karmpart", I18N_NOOP("karmPart"), "0.1"); + s_about = new TDEAboutData("karmpart", I18N_NOOP("karmPart"), "0.1"); s_about->addAuthor("Thorsten Staerk", 0, "thorsten@staerk.de"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; } diff --git a/karm/karm_part.h b/karm/karm_part.h index 797ae47fb..f04d48ff5 100644 --- a/karm/karm_part.h +++ b/karm/karm_part.h @@ -116,8 +116,8 @@ protected slots: void startNewSession(); }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class karmPartFactory : public KParts::Factory { @@ -129,11 +129,11 @@ public: virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - static KInstance* instance(); + static TDEInstance* instance(); private: - static KInstance* s_instance; - static KAboutData* s_about; + static TDEInstance* s_instance; + static TDEAboutData* s_about; }; #endif // _KARMPART_H_ diff --git a/karm/main.cpp b/karm/main.cpp index f2fab8fcf..a40b7e396 100644 --- a/karm/main.cpp +++ b/karm/main.cpp @@ -27,8 +27,8 @@ static const KCmdLineOptions options[] = int main( int argc, char *argv[] ) { - KAboutData aboutData( "karm", I18N_NOOP("KArm"), - KARM_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "karm", I18N_NOOP("KArm"), + KARM_VERSION, description, TDEAboutData::License_GPL, "(c) 1997-2004, KDE PIM Developers" ); aboutData.addAuthor( "Mark Bucciarelli", I18N_NOOP( "Current Maintainer" ), |