From 973b82a5b271e07036dedbed227ff0592f0e18ad Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:13:21 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- ksayit/Freeverb_plugin/ksayitfreeverblib.cpp | 4 ++-- ksayit/Freeverb_plugin/ksayitfreeverblib.h | 2 +- ksayit/src/main.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ksayit') diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp index dc0e132..02560b6 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp +++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp @@ -37,13 +37,13 @@ extern "C" }; */ -KInstance *FreeverbPluginFactory::p_instance = 0L; +TDEInstance *FreeverbPluginFactory::p_instance = 0L; // Factory Constructor FreeverbPluginFactory::FreeverbPluginFactory(TQObject *parent, const char* name) { - p_instance = new KInstance("FreeverbPluginFactory"); + p_instance = new TDEInstance("FreeverbPluginFactory"); } diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.h b/ksayit/Freeverb_plugin/ksayitfreeverblib.h index 8c224fc..44c9bf8 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.h +++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.h @@ -40,7 +40,7 @@ public: const TQStringList &args=TQStringList()); private: - static KInstance* p_instance; + static TDEInstance* p_instance; }; diff --git a/ksayit/src/main.cpp b/ksayit/src/main.cpp index c7c9b26..6b23aba 100644 --- a/ksayit/src/main.cpp +++ b/ksayit/src/main.cpp @@ -40,8 +40,8 @@ static const char *description = int main(int argc, char *argv[]) { - KAboutData aboutData( "ksayit", I18N_NOOP("KSayIt"), - KSAYIT_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "ksayit", I18N_NOOP("KSayIt"), + KSAYIT_VERSION, description, TDEAboutData::License_GPL, "(c) 1996 - 2005, Robert Vogl", 0, 0, "voglrobe@web.de"); aboutData.addAuthor("Robert Vogl",0, "voglrobe@web.de"); TDECmdLineArgs::init( argc, argv, &aboutData ); -- cgit v1.2.1