From 3a044decb0a5d7be822c888b2d5374573d7df96e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:23:50 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- languages/cpp/app_templates/dcopservice/main.cpp | 4 ++-- languages/cpp/app_templates/kapp/main.cpp | 4 ++-- languages/cpp/app_templates/kateplugin/plugin_app.cpp | 6 +++--- languages/cpp/app_templates/kateplugin/plugin_app.h | 2 +- languages/cpp/app_templates/kateplugin2/plugin_app.cpp | 6 +++--- languages/cpp/app_templates/kateplugin2/plugin_app.h | 2 +- languages/cpp/app_templates/kcmodule/module.h | 4 ++-- languages/cpp/app_templates/kconfig35/main.cpp | 4 ++-- languages/cpp/app_templates/kde4app/main.cpp | 4 ++-- languages/cpp/app_templates/kdedcop/main.cpp | 4 ++-- languages/cpp/app_templates/khello/main.cpp | 4 ++-- languages/cpp/app_templates/khello2/main.cpp | 4 ++-- languages/cpp/app_templates/kioslave/slave.cpp | 2 +- languages/cpp/app_templates/kmake/app.cpp | 4 ++-- languages/cpp/app_templates/kofficepart/kopart_aboutdata.h | 6 +++--- languages/cpp/app_templates/kofficepart/kopart_factory.cpp | 10 +++++----- languages/cpp/app_templates/kofficepart/kopart_factory.h | 14 +++++++------- languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp | 4 ++-- languages/cpp/app_templates/konqnavpanel/konqnavpanel.h | 2 +- languages/cpp/app_templates/kpartapp/app_part.cpp | 12 ++++++------ languages/cpp/app_templates/kpartapp/app_part.h | 10 +++++----- languages/cpp/app_templates/kpartapp/main.cpp | 4 ++-- languages/cpp/app_templates/kpartplugin/plugin_app.cpp | 6 +++--- languages/cpp/app_templates/kpartplugin/plugin_app.h | 4 ++-- languages/cpp/app_templates/kscons_kmdi/app_part.cpp | 4 ++-- languages/cpp/app_templates/kscons_kmdi/app_part.h | 4 ++-- languages/cpp/app_templates/kscons_kmdi/main.cpp | 4 ++-- languages/cpp/app_templates/kscons_kxt/main.cpp | 4 ++-- languages/cpp/app_templates/kxt/main.cpp | 4 ++-- 29 files changed, 73 insertions(+), 73 deletions(-) (limited to 'languages/cpp/app_templates') diff --git a/languages/cpp/app_templates/dcopservice/main.cpp b/languages/cpp/app_templates/dcopservice/main.cpp index 43f72701..90ce4623 100644 --- a/languages/cpp/app_templates/dcopservice/main.cpp +++ b/languages/cpp/app_templates/dcopservice/main.cpp @@ -21,9 +21,9 @@ static KCmdLineOptions options[] = int main (int argc, char *argv[]) { KLocale::setMainCatalogue("tdelibs"); - KAboutData aboutdata("%{APPNAMELC}", I18N_NOOP("TDE"), + TDEAboutData aboutdata("%{APPNAMELC}", I18N_NOOP("TDE"), version, description, - KAboutData::License_GPL, "(C) %{YEAR}, %{AUTHOR}"); + TDEAboutData::License_GPL, "(C) %{YEAR}, %{AUTHOR}"); aboutdata.addAuthor("%{AUTHOR}",I18N_NOOP("Developer"),"%{EMAIL}"); TDECmdLineArgs::init( argc, argv, &aboutdata ); diff --git a/languages/cpp/app_templates/kapp/main.cpp b/languages/cpp/app_templates/kapp/main.cpp index 2649e228..7ebd68a8 100644 --- a/languages/cpp/app_templates/kapp/main.cpp +++ b/languages/cpp/app_templates/kapp/main.cpp @@ -20,8 +20,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, - KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); + TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, + TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 1a40df32..d7d8080c 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -25,7 +25,7 @@ extern "C" KatePluginFactory::KatePluginFactory() { - s_instance = new KInstance( "kate" ); + s_instance = new TDEInstance( "kate" ); } KatePluginFactory::~KatePluginFactory() @@ -38,7 +38,7 @@ TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, c return new KatePlugin%{APPNAME}( parent, name ); } -KInstance* KatePluginFactory::s_instance = 0L; +TDEInstance* KatePluginFactory::s_instance = 0L; KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ) @@ -58,7 +58,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); - view->setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile("plugins/%{APPNAMELC}/plugin_%{APPNAMELC}.rc"); win->guiFactory()->addClient (view); view->win = win; diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h index 4e5a259a..2e715e4e 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin/plugin_app.h @@ -26,7 +26,7 @@ class KatePluginFactory : public KLibFactory virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: - static KInstance* s_instance; + static TDEInstance* s_instance; }; class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 18595d10..43084511 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -29,7 +29,7 @@ extern "C" KatePluginFactory::KatePluginFactory() { - s_instance = new KInstance( "kate" ); + s_instance = new TDEInstance( "kate" ); } KatePluginFactory::~KatePluginFactory() @@ -42,7 +42,7 @@ TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, c return new KatePlugin%{APPNAME}( parent, name ); } -KInstance* KatePluginFactory::s_instance = 0L; +TDEInstance* KatePluginFactory::s_instance = 0L; KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ) @@ -62,7 +62,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); - view->setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile("plugins/%{APPNAMELC}/plugin_%{APPNAMELC}.rc"); win->guiFactory()->addClient (view); view->win = win; diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h index 0033bd76..86776a53 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h @@ -30,7 +30,7 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: - static KInstance* s_instance; + static TDEInstance* s_instance; }; class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension diff --git a/languages/cpp/app_templates/kcmodule/module.h b/languages/cpp/app_templates/kcmodule/module.h index a80d8712..e9b97c38 100644 --- a/languages/cpp/app_templates/kcmodule/module.h +++ b/languages/cpp/app_templates/kcmodule/module.h @@ -20,14 +20,14 @@ public: virtual void defaults(); virtual int buttons(); virtual TQString quickHelp() const; - virtual const KAboutData *aboutData()const + virtual const TDEAboutData *aboutData()const { return myAboutData; }; public slots: void configChanged(); private: - KAboutData *myAboutData; + TDEAboutData *myAboutData; }; #endif diff --git a/languages/cpp/app_templates/kconfig35/main.cpp b/languages/cpp/app_templates/kconfig35/main.cpp index 7927da59..3c912936 100644 --- a/languages/cpp/app_templates/kconfig35/main.cpp +++ b/languages/cpp/app_templates/kconfig35/main.cpp @@ -19,8 +19,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, - KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); + TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, + TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/languages/cpp/app_templates/kde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp index 8719e21a..a77d5e14 100644 --- a/languages/cpp/app_templates/kde4app/main.cpp +++ b/languages/cpp/app_templates/kde4app/main.cpp @@ -13,8 +13,8 @@ static const char version[] = "%{VERSION}"; int main(int argc, char **argv) { - KAboutData about("%{APPNAMELC}", 0, ki18n("%{APPNAME}"), version, ki18n(description), - KAboutData::License_%{LICENSE}, ki18n("(C) %{YEAR} %{AUTHOR}"), KLocalizedString(), 0, "%{EMAIL}"); + TDEAboutData about("%{APPNAMELC}", 0, ki18n("%{APPNAME}"), version, ki18n(description), + TDEAboutData::License_%{LICENSE}, ki18n("(C) %{YEAR} %{AUTHOR}"), KLocalizedString(), 0, "%{EMAIL}"); about.addAuthor( ki18n("%{AUTHOR}"), KLocalizedString(), "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); diff --git a/languages/cpp/app_templates/kdedcop/main.cpp b/languages/cpp/app_templates/kdedcop/main.cpp index 2462c3fe..15b3c3f0 100644 --- a/languages/cpp/app_templates/kdedcop/main.cpp +++ b/languages/cpp/app_templates/kdedcop/main.cpp @@ -19,8 +19,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, - KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); + TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, + TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/languages/cpp/app_templates/khello/main.cpp b/languages/cpp/app_templates/khello/main.cpp index 2ad5ebcc..5e1dfd1d 100644 --- a/languages/cpp/app_templates/khello/main.cpp +++ b/languages/cpp/app_templates/khello/main.cpp @@ -19,8 +19,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, - KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); + TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, + TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/languages/cpp/app_templates/khello2/main.cpp b/languages/cpp/app_templates/khello2/main.cpp index 71d897a4..31799020 100644 --- a/languages/cpp/app_templates/khello2/main.cpp +++ b/languages/cpp/app_templates/khello2/main.cpp @@ -19,8 +19,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, - KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); + TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, + TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/kioslave/slave.cpp index c8dc5d81..3dbd8cac 100644 --- a/languages/cpp/app_templates/kioslave/slave.cpp +++ b/languages/cpp/app_templates/kioslave/slave.cpp @@ -70,7 +70,7 @@ extern "C" { int kdemain(int argc, char **argv) { - KInstance instance( "kio_%{APPNAMELC}" ); + TDEInstance instance( "kio_%{APPNAMELC}" ); kdDebug(7101) << "*** Starting kio_%{APPNAMELC} " << endl; diff --git a/languages/cpp/app_templates/kmake/app.cpp b/languages/cpp/app_templates/kmake/app.cpp index ba44bf40..d0d1eecb 100644 --- a/languages/cpp/app_templates/kmake/app.cpp +++ b/languages/cpp/app_templates/kmake/app.cpp @@ -18,8 +18,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("%{APPNAME}", I18N_NOOP("%{APPNAME}"), version, description, - KAboutData::License_%{LICENSE}, "(C) 2004 %{AUTHOR}", 0, 0, "%{EMAIL}"); + TDEAboutData about("%{APPNAME}", I18N_NOOP("%{APPNAME}"), version, description, + TDEAboutData::License_%{LICENSE}, "(C) 2004 %{AUTHOR}", 0, 0, "%{EMAIL}"); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h b/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h index ab66d088..20893271 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h +++ b/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h @@ -12,10 +12,10 @@ static const char description[] = I18N_NOOP("%{APPNAME} KOffice Program"); static const char version[] = "%{VERSION}"; -KAboutData * new%{APPNAME}AboutData() +TDEAboutData * new%{APPNAME}AboutData() { - KAboutData * aboutData=new KAboutData( "%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), - version, description, KAboutData::License_%{LICENSE}, + TDEAboutData * aboutData=new TDEAboutData( "%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), + version, description, TDEAboutData::License_%{LICENSE}, "(c) %{YEAR}, %{AUTHOR}"); aboutData->addAuthor("%{AUTHOR}",0, "%{EMAIL}"); return aboutData; diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp index 86287a3f..7d2d20d1 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -20,8 +20,8 @@ extern "C" } }; -KInstance* %{APPNAME}Factory::s_global = 0L; -KAboutData* %{APPNAME}Factory::s_aboutData = 0L; +TDEInstance* %{APPNAME}Factory::s_global = 0L; +TDEAboutData* %{APPNAME}Factory::s_aboutData = 0L; %{APPNAME}Factory::%{APPNAME}Factory( TQObject* parent, const char* name ) : KoFactory( parent, name ) @@ -52,7 +52,7 @@ KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const return part; } -KAboutData* %{APPNAME}Factory::aboutData() +TDEAboutData* %{APPNAME}Factory::aboutData() { if ( !s_aboutData ) // Change this, of course @@ -60,11 +60,11 @@ KAboutData* %{APPNAME}Factory::aboutData() return s_aboutData; } -KInstance* %{APPNAME}Factory::global() +TDEInstance* %{APPNAME}Factory::global() { if ( !s_global ) { - s_global = new KInstance( aboutData() ); + s_global = new TDEInstance( aboutData() ); // Add any application-specific resource directories here // Tell the iconloader about share/apps/koffice/icons diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h index 2bb18133..2d5a56e2 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.h +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h @@ -8,8 +8,8 @@ #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class %{APPNAME}Factory : public KoFactory { @@ -21,14 +21,14 @@ public: virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); - static KInstance* global(); + static TDEInstance* global(); - // _Creates_ a KAboutData but doesn't keep ownership - static KAboutData* aboutData(); + // _Creates_ a TDEAboutData but doesn't keep ownership + static TDEAboutData* aboutData(); private: - static KInstance* s_global; - static KAboutData* s_aboutData; + static TDEInstance* s_global; + static TDEAboutData* s_aboutData; }; #endif diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp index ae9a85a6..48876c9a 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp @@ -7,7 +7,7 @@ #include "%{APPNAMELC}.h" #include "%{APPNAMELC}.moc" -%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): +%{APPNAME}::%{APPNAME}(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { widget=new TQLabel("Init Value",widgetParent); @@ -27,7 +27,7 @@ void %{APPNAME}::handleURL(const KURL &url) extern "C" { - void* create_konqsidebar_%{APPNAME}(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + void* create_konqsidebar_%{APPNAME}(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new %{APPNAME}(instance,par,widp,desktopname,name); } diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index a2a8082d..c54c096a 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -26,7 +26,7 @@ public: * @param desktopName The filename of the configuration file. * @param name A TQt object name for your plugin. **/ - %{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + %{APPNAME}(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); /** destructor */ ~%{APPNAME}(); diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 1f3992af..80c9f967 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -144,12 +144,12 @@ void %{APPNAME}Part::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 #include -KInstance* %{APPNAME}PartFactory::s_instance = 0L; -KAboutData* %{APPNAME}PartFactory::s_about = 0L; +TDEInstance* %{APPNAME}PartFactory::s_instance = 0L; +TDEAboutData* %{APPNAME}PartFactory::s_about = 0L; %{APPNAME}PartFactory::%{APPNAME}PartFactory() : KParts::Factory() @@ -178,13 +178,13 @@ KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, c return obj; } -KInstance* %{APPNAME}PartFactory::instance() +TDEInstance* %{APPNAME}PartFactory::instance() { if( !s_instance ) { - s_about = new KAboutData("%{APPNAMELC}part", I18N_NOOP("%{APPNAME}Part"), "%{VERSION}"); + s_about = new TDEAboutData("%{APPNAMELC}part", I18N_NOOP("%{APPNAME}Part"), "%{VERSION}"); s_about->addAuthor("%{AUTHOR}", 0, "%{EMAIL}"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; } diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h index 113d8726..418d7327 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.h +++ b/languages/cpp/app_templates/kpartapp/app_part.h @@ -65,8 +65,8 @@ private: TQMultiLineEdit *m_widget; }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class %{APPNAME}PartFactory : public KParts::Factory { @@ -78,11 +78,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 // _%{APPNAMEUC}PART_H_ diff --git a/languages/cpp/app_templates/kpartapp/main.cpp b/languages/cpp/app_templates/kpartapp/main.cpp index 81b3e40d..416d18ca 100644 --- a/languages/cpp/app_templates/kpartapp/main.cpp +++ b/languages/cpp/app_templates/kpartapp/main.cpp @@ -18,8 +18,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, - KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); + TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, + TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index 61e3ca0e..1812b5e2 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -88,10 +88,10 @@ TQObject* %{APPNAME}Factory::createObject( TQObject* parent, const char* name, c return new Plugin%{APPNAME}( parent, name ); } -KInstance *%{APPNAME}Factory::instance() +TDEInstance *%{APPNAME}Factory::instance() { if ( !s_instance ) - s_instance = new KInstance( "%{APPNAMELC}" ); + s_instance = new TDEInstance( "%{APPNAMELC}" ); return s_instance; } @@ -104,6 +104,6 @@ extern "C" } } -KInstance* %{APPNAME}Factory::s_instance = 0L; +TDEInstance* %{APPNAME}Factory::s_instance = 0L; #include "plugin_%{APPNAMELC}.moc" diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h index 8423f56e..132ce724 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.h +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h @@ -27,10 +27,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - static KInstance* instance(); + static TDEInstance* instance(); private: - static KInstance* s_instance; + static TDEInstance* s_instance; }; #endif // _PLUGIN_%{APPNAMEUC}_H_ diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp index 06a6409c..70f13d98 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp @@ -49,11 +49,11 @@ K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); { } -KAboutData *%{APPNAMELC}Part::createAboutData() +TDEAboutData *%{APPNAMELC}Part::createAboutData() { // The non-i18n name here must be the same as the directory in // which the part's rc file is installed - KAboutData *aboutData = new KAboutData("%{APPNAMELC}part", I18N_NOOP("%{APPNAMELC}Part"), "0.0.1"); + TDEAboutData *aboutData = new TDEAboutData("%{APPNAMELC}part", I18N_NOOP("%{APPNAMELC}Part"), "0.0.1"); aboutData->addAuthor("%{AUTHOR}", 0, "%{EMAIL}"); return aboutData; } diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h index 1c9e4d14..42d1b22c 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.h +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h @@ -10,7 +10,7 @@ class TQMultiLineEdit; class TQWidget; class TQPainter; class KURL; -class KAboutData; +class TDEAboutData; /** * This is a "Part". It that does all the real work in a KPart @@ -51,7 +51,7 @@ public: /** * About data for the part */ - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); protected: /** diff --git a/languages/cpp/app_templates/kscons_kmdi/main.cpp b/languages/cpp/app_templates/kscons_kmdi/main.cpp index 5795feb9..dca1e7a6 100644 --- a/languages/cpp/app_templates/kscons_kmdi/main.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/main.cpp @@ -21,8 +21,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, - KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}" ); + TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, + TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); // warning, utf-8 char diff --git a/languages/cpp/app_templates/kscons_kxt/main.cpp b/languages/cpp/app_templates/kscons_kxt/main.cpp index 9da16af6..45d9cf8f 100644 --- a/languages/cpp/app_templates/kscons_kxt/main.cpp +++ b/languages/cpp/app_templates/kscons_kxt/main.cpp @@ -19,8 +19,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, - KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); + TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, + TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/languages/cpp/app_templates/kxt/main.cpp b/languages/cpp/app_templates/kxt/main.cpp index 7927da59..3c912936 100644 --- a/languages/cpp/app_templates/kxt/main.cpp +++ b/languages/cpp/app_templates/kxt/main.cpp @@ -19,8 +19,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, - KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); + TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, + TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); -- cgit v1.2.1