From fcd5041fd6bf0cea48980d8a035468b2cdb5fff2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:31 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kmid/kmid_part.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kmid/kmid_part.cpp') diff --git a/kmid/kmid_part.cpp b/kmid/kmid_part.cpp index 5eafbe62..11e2d405 100644 --- a/kmid/kmid_part.cpp +++ b/kmid/kmid_part.cpp @@ -19,7 +19,7 @@ K_EXPORT_COMPONENT_FACTORY( libkmidpart, KMidFactory ) * We need one static instance of the factory for our C 'main' * function */ -KInstance *KMidFactory::s_instance = 0L; +TDEInstance *KMidFactory::s_instance = 0L; KMidFactory::KMidFactory() { @@ -45,10 +45,10 @@ KParts::Part *KMidFactory::createPartObject(TQWidget *parentWidget, const char * return obj; } -KAboutData *KMidFactory::aboutData() +TDEAboutData *KMidFactory::aboutData() { - KAboutData *aboutdata = new KAboutData("kmid", "KMid", "2.0", - I18N_NOOP("MIDI/Karaoke file player"), KAboutData::License_GPL, + TDEAboutData *aboutdata = new TDEAboutData("kmid", "KMid", "2.0", + I18N_NOOP("MIDI/Karaoke file player"), TDEAboutData::License_GPL, I18N_NOOP("(c) 1997,98,99,2000, Antonio Larrosa Jimenez"),"", "http://perso.wanadoo.es/antlarr/kmid.html"); aboutdata->addAuthor("Antonio Larrosa Jimenez", @@ -57,10 +57,10 @@ KAboutData *KMidFactory::aboutData() return aboutdata; } -KInstance *KMidFactory::instance() +TDEInstance *KMidFactory::instance() { if ( !s_instance ) - s_instance = new KInstance( aboutData() ); + s_instance = new TDEInstance( aboutData() ); return s_instance; } -- cgit v1.2.1