diff options
73 files changed, 178 insertions, 178 deletions
@@ -317,7 +317,7 @@ * Added a ruby DCOP service project template * Improved the kapp Korundum application framework. It configures, builds and installs a C++ top level stub, that starts the ruby app. The ruby scripts are located via the - KStandardDirs/KInstance mechanism, in directory ..share/apps/<appname> + KStandardDirs/TDEInstance mechanism, in directory ..share/apps/<appname> * k_dcop and k_dcop_signals declarations are shown as slot and signal declarations in the class parser. * =begin to =end comments are ignored @@ -2709,7 +2709,7 @@ * Added kicker, kioslave and kcmodule templates * Each template can define an icon which is shown in the app wizard - * The Big KInstance Cleanup + * The Big TDEInstance Cleanup 2001-05-19 Matthias Hoelzer-Kluepfel <mhk@caldera.de> * Added a plugin to provide and configure a Tools menu. diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook index 92652bbc..bfade594 100644 --- a/doc/kde_app_devel/index.docbook +++ b/doc/kde_app_devel/index.docbook @@ -856,8 +856,8 @@ by selecting the "Global Functions" folder. <programlisting> 1 int main(int argc, char **argv) 2 { -3 KAboutData about("kscribble", I18N_NOOP("KScribble"), version, description, -4 KAboutData::License_GPL, "(C) 2002 Your Name", 0, 0, "you@you.com"); +3 TDEAboutData about("kscribble", I18N_NOOP("KScribble"), version, description, +4 TDEAboutData::License_GPL, "(C) 2002 Your Name", 0, 0, "you@you.com"); 5 about.addAuthor( "Your Name", 0, "you@you.com" ); 6 TDECmdLineArgs::init(argc, argv, &about); 7 TDECmdLineArgs::addCmdLineOptions(options); diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index 353bb436..f288f588 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -122,7 +122,7 @@ Makes sure only one instance of an application can run simultaneously. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdecore/KAboutData">KAboutData</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEAboutData">TDEAboutData</ulink></title> <para> Holds information for the about box. </para> @@ -3120,7 +3120,7 @@ extern "C" { int kdemain(int argc, char **argv); } int kdemain(int argc, char **argv) { KLocale::setMainCatalogue("tdelibs"); - KInstance instance("kio_ftp"); + TDEInstance instance("kio_ftp"); (void) KGlobal::locale(); if (argc != 4) { diff --git a/doc/tdevelop/getting-started.docbook b/doc/tdevelop/getting-started.docbook index 33bfee94..9a5937bd 100644 --- a/doc/tdevelop/getting-started.docbook +++ b/doc/tdevelop/getting-started.docbook @@ -1006,8 +1006,8 @@ below.</para> <programlisting> int main(int argc, char **argv) { - KAboutData about("hello", I18N_NOOP("Hello"), version, description, - KAboutData::License_GPL, "(C) 2006 Joe User", 0, 0, + TDEAboutData about("hello", I18N_NOOP("Hello"), version, description, + TDEAboutData::License_GPL, "(C) 2006 Joe User", 0, 0, "joe@user.com"); about.addAuthor( "Joe User", 0, "joe@user.com" ); </programlisting> diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp index 55e96244..798b8b6c 100644 --- a/kdevdesigner/designer/kdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -236,12 +236,12 @@ void KDevDesignerPart::setupToolsAction( KRadioAction * toggle, TQAction * actio // 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* KDevDesignerPartFactory::s_instance = 0L; -KAboutData* KDevDesignerPartFactory::s_about = 0L; +TDEInstance* KDevDesignerPartFactory::s_instance = 0L; +TDEAboutData* KDevDesignerPartFactory::s_about = 0L; KDevDesignerPartFactory::KDevDesignerPartFactory() : KParts::Factory() @@ -270,14 +270,14 @@ KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, return obj; } -KInstance* KDevDesignerPartFactory::instance() +TDEInstance* KDevDesignerPartFactory::instance() { if( !s_instance ) { - s_about = new KAboutData("kdevdesignerpart", I18N_NOOP("KDevDesignerPart"), "0.1"); + s_about = new TDEAboutData("kdevdesignerpart", I18N_NOOP("KDevDesignerPart"), "0.1"); s_about->addAuthor("Alexander Dymo", 0, "cloudtemple@mksat.net"); s_about->addAuthor("Trolltech AS", 0, "info@trolltech.com"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; } diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h index 3754dfd0..32537653 100644 --- a/kdevdesigner/designer/kdevdesigner_part.h +++ b/kdevdesigner/designer/kdevdesigner_part.h @@ -125,8 +125,8 @@ private: KRadioAction* pointerAction; }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KDevDesignerPartFactory : public KParts::Factory { @@ -138,11 +138,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 // _KDEVDESIGNERPART_H_ diff --git a/kdevdesigner/designer/myiconloader.h b/kdevdesigner/designer/myiconloader.h index 4fcc5ed5..63a47eee 100644 --- a/kdevdesigner/designer/myiconloader.h +++ b/kdevdesigner/designer/myiconloader.h @@ -23,7 +23,7 @@ #include <tqpixmap.h> #include <tqstring.h> -class KInstance; +class TDEInstance; TQPixmap BarIcon2 (const TQString &name); TQPixmap SmallIcon2 (const TQString &name); diff --git a/kdevdesigner/src/main.cpp b/kdevdesigner/src/main.cpp index cbdc4e76..58094d1b 100644 --- a/kdevdesigner/src/main.cpp +++ b/kdevdesigner/src/main.cpp @@ -40,8 +40,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kdevdesigner", I18N_NOOP("KDevDesigner"), version, description, - KAboutData::License_GPL, "KDevDesigner Copyright: (C) 2004-2005 Alexander Dymo\nTQt Designer Copyright: (C) 2000-2005 Trolltech AS All Rights Reserved", 0, 0); + TDEAboutData about("kdevdesigner", I18N_NOOP("KDevDesigner"), version, description, + TDEAboutData::License_GPL, "KDevDesigner Copyright: (C) 2004-2005 Alexander Dymo\nTQt Designer Copyright: (C) 2000-2005 Trolltech AS All Rights Reserved", 0, 0); about.addAuthor( "Trolltech AS", "TQt Designer code (Free Edition)" ); about.addAuthor( "Alexander Dymo", "Port to KDE, partification", "adymo@tdevelop.org" ); TDECmdLineArgs::init(argc, argv, &about); 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 <koFactory.h> -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 <kaboutdata.h> #include <klocale.h> -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); diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp index 1a87f1cd..5080a3a1 100644 --- a/languages/cpp/cppsupportfactory.cpp +++ b/languages/cpp/cppsupportfactory.cpp @@ -23,9 +23,9 @@ CppSupportFactory::CppSupportFactory() { } -KInstance *CppSupportFactory::createInstance() +TDEInstance *CppSupportFactory::createInstance() { - KInstance *instance = KDevGenericFactory<CppSupportPart>::createInstance(); + TDEInstance *instance = KDevGenericFactory<CppSupportPart>::createInstance(); KStandardDirs *dirs = instance->dirs(); dirs->addResourceType( "newclasstemplates", KStandardDirs::kde_default("data") + "kdevcppsupport/newclass/" ); dirs->addResourceType( "pcs", KStandardDirs::kde_default( "data" ) + "kdevcppsupport/pcs/" ); diff --git a/languages/cpp/cppsupportfactory.h b/languages/cpp/cppsupportfactory.h index 55878c84..6d312a5a 100644 --- a/languages/cpp/cppsupportfactory.h +++ b/languages/cpp/cppsupportfactory.h @@ -25,7 +25,7 @@ public: static const KDevPluginInfo *info(); protected: - virtual KInstance *createInstance(); + virtual TDEInstance *createInstance(); }; #endif diff --git a/languages/csharp/csharpdoc.cpp b/languages/csharp/csharpdoc.cpp index 154301a4..cd32d03e 100644 --- a/languages/csharp/csharpdoc.cpp +++ b/languages/csharp/csharpdoc.cpp @@ -116,7 +116,7 @@ extern "C" { int kdemain(int argc, char **argv) { - KInstance instance( "kio_csharpdoc" ); + TDEInstance instance( "kio_csharpdoc" ); KGlobal::locale()->setMainCatalogue("tdevelop"); if (argc != 4) { diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp index e6d58fb3..eb9aeb2e 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp @@ -57,11 +57,11 @@ TQObject *PgiOptionsFactory::createObject(TQObject *parent, const char *name, } -KInstance *PgiOptionsFactory::s_instance = 0; -KInstance *PgiOptionsFactory::instance() +TDEInstance *PgiOptionsFactory::s_instance = 0; +TDEInstance *PgiOptionsFactory::instance() { if (!s_instance) - s_instance = new KInstance("kdevpgioptions"); + s_instance = new TDEInstance("kdevpgioptions"); return s_instance; } diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h index 0f38025b..d8947476 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.h +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.h @@ -26,10 +26,10 @@ public: virtual TQObject* createObject( TQObject *parent, const char *name, const char *classname, const TQStringList &args); - static KInstance *instance(); + static TDEInstance *instance(); private: - static KInstance *s_instance; + static TDEInstance *s_instance; }; #endif diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java index 83ebfbf0..5822f563 100644 --- a/languages/java/app_templates/kappjava/app.java +++ b/languages/java/app_templates/kappjava/app.java @@ -237,8 +237,8 @@ static String[][] options = static void main(String[] cmdLineArgs) { - KAboutData about = new KAboutData("%{APPNAMELC}", "%{APPNAME}", version, description, - KAboutData.License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", null, null, "%{EMAIL}"); + TDEAboutData about = new TDEAboutData("%{APPNAMELC}", "%{APPNAME}", version, description, + TDEAboutData.License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", null, null, "%{EMAIL}"); about.addAuthor( "%{AUTHOR}", null, "%{EMAIL}" ); TDECmdLineArgs.init(cmdLineArgs, about); TDECmdLineArgs.addCmdLineOptions(options); diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp index 92bce808..11823c22 100644 --- a/languages/java/javasupportfactory.cpp +++ b/languages/java/javasupportfactory.cpp @@ -22,9 +22,9 @@ JavaSupportFactory::JavaSupportFactory() { } -KInstance *JavaSupportFactory::createInstance() +TDEInstance *JavaSupportFactory::createInstance() { - KInstance *instance = KDevGenericFactory<JavaSupportPart>::createInstance(); + TDEInstance *instance = KDevGenericFactory<JavaSupportPart>::createInstance(); KStandardDirs *dirs = instance->dirs(); dirs->addResourceType( "newclasstemplates", KStandardDirs::kde_default("data") + "kdevjavasupport/newclass/" ); dirs->addResourceType( "pcs", KStandardDirs::kde_default( "data" ) + "kdevjavasupport/pcs/" ); diff --git a/languages/java/javasupportfactory.h b/languages/java/javasupportfactory.h index 064b7dd4..785d7fea 100644 --- a/languages/java/javasupportfactory.h +++ b/languages/java/javasupportfactory.h @@ -25,7 +25,7 @@ public: static const KDevPluginInfo *info(); protected: - virtual KInstance *createInstance(); + virtual TDEInstance *createInstance(); }; #endif diff --git a/languages/perl/perldoc.cpp b/languages/perl/perldoc.cpp index 51a8f774..b699a0f5 100644 --- a/languages/perl/perldoc.cpp +++ b/languages/perl/perldoc.cpp @@ -116,7 +116,7 @@ extern "C" { int kdemain(int argc, char **argv) { - KInstance instance( "kio_perldoc" ); + TDEInstance instance( "kio_perldoc" ); KGlobal::locale()->setMainCatalogue("tdevelop"); if (argc != 4) { diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp index afe3ce74..ef4111bb 100644 --- a/languages/python/pydoc.cpp +++ b/languages/python/pydoc.cpp @@ -96,7 +96,7 @@ extern "C" { int kdemain(int argc, char **argv) { - KInstance instance( "kio_pydoc" ); + TDEInstance instance( "kio_pydoc" ); KGlobal::locale()->setMainCatalogue("tdevelop"); if (argc != 4) { diff --git a/languages/ruby/app_templates/dcopservice/app.cpp b/languages/ruby/app_templates/dcopservice/app.cpp index 4825c116..04770335 100644 --- a/languages/ruby/app_templates/dcopservice/app.cpp +++ b/languages/ruby/app_templates/dcopservice/app.cpp @@ -6,7 +6,7 @@ #include <kstandarddirs.h> int main(int argc, char **argv) { - KInstance * instance = new KInstance("%{APPNAMELC}"); + TDEInstance * instance = new TDEInstance("%{APPNAMELC}"); TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); delete instance; if (appdir.isNull()) { diff --git a/languages/ruby/app_templates/kapp/app.cpp b/languages/ruby/app_templates/kapp/app.cpp index 4825c116..04770335 100644 --- a/languages/ruby/app_templates/kapp/app.cpp +++ b/languages/ruby/app_templates/kapp/app.cpp @@ -6,7 +6,7 @@ #include <kstandarddirs.h> int main(int argc, char **argv) { - KInstance * instance = new KInstance("%{APPNAMELC}"); + TDEInstance * instance = new TDEInstance("%{APPNAMELC}"); TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); delete instance; if (appdir.isNull()) { diff --git a/languages/ruby/app_templates/kxt/app.cpp b/languages/ruby/app_templates/kxt/app.cpp index 4825c116..04770335 100644 --- a/languages/ruby/app_templates/kxt/app.cpp +++ b/languages/ruby/app_templates/kxt/app.cpp @@ -6,7 +6,7 @@ #include <kstandarddirs.h> int main(int argc, char **argv) { - KInstance * instance = new KInstance("%{APPNAMELC}"); + TDEInstance * instance = new TDEInstance("%{APPNAMELC}"); TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); delete instance; if (appdir.isNull()) { diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h index c705e9cd..24e3204a 100644 --- a/lib/interfaces/kdevgenericfactory.h +++ b/lib/interfaces/kdevgenericfactory.h @@ -39,7 +39,7 @@ Data should be a const static object. This way it complies with the requirements for data objecs of KDevGenericFactory constructor. <b>Important:</b><br> -There is no need to create @ref KAboutData objects. It is more useful to create +There is no need to create @ref TDEAboutData objects. It is more useful to create a static const @ref KDevPluginInfo object which can be used also in the constructor of a plugin. @@ -59,33 +59,33 @@ DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList In the example above the duplication of information is avoided as same @ref KDevPluginInfo objects are used for plugin and for plugin factory. This is possible because @ref KDevPluginInfo -class has an operator to cast @ref KDevPluginInfo to @ref KAboutData. +class has an operator to cast @ref KDevPluginInfo to @ref TDEAboutData. */ template <class T, class ParentType = TQObject> class KDevGenericFactory: public KGenericFactory<T, ParentType> { public: /**Constructor. - @param data A reference to KAboutData with an information about the plugin. + @param data A reference to TDEAboutData with an information about the plugin. Data should have: - plugin name as an application name; - untranslated plugin generic name as a product name; - license type number. . data object should live as long as factory lives.*/ - KDevGenericFactory(KAboutData *data) + KDevGenericFactory(TDEAboutData *data) :KGenericFactory<T, ParentType>(data->appName()), aboutData(data) { } /**Creates an instance.*/ - KInstance *createInstance() + TDEInstance *createInstance() { - return new KInstance(aboutData); + return new TDEInstance(aboutData); } private: - KAboutData *aboutData; + TDEAboutData *aboutData; }; diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h index fed92e69..b0cb3a8f 100644 --- a/lib/interfaces/kdevplugin.h +++ b/lib/interfaces/kdevplugin.h @@ -125,7 +125,7 @@ public: virtual ~KDevPlugin(); /**Provides an information about the plugin. - @return KAboutData object which was initialized in the constructor.*/ + @return TDEAboutData object which was initialized in the constructor.*/ const KDevPluginInfo* info(); /**@return A reference to the toplevel widget.*/ diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp index 81d58902..4af7fb8e 100644 --- a/lib/interfaces/kdevplugininfo.cpp +++ b/lib/interfaces/kdevplugininfo.cpp @@ -42,7 +42,7 @@ struct KDevPluginInfo::Private { TQValueList<KAboutPerson> m_authors; TQValueList<KAboutPerson> m_credits; - KAboutData *m_data; + TDEAboutData *m_data; }; @@ -67,21 +67,21 @@ KDevPluginInfo::KDevPluginInfo(const TQString &pluginName) TQString lic = offer->property("X-TDevelop-Plugin-License").toString(); if (lic == "GPL") - d->m_licenseType = KAboutData::License_GPL; + d->m_licenseType = TDEAboutData::License_GPL; else if (lic == "LGPL") - d->m_licenseType = KAboutData::License_LGPL; + d->m_licenseType = TDEAboutData::License_LGPL; else if (lic == "BSD") - d->m_licenseType = KAboutData::License_BSD; + d->m_licenseType = TDEAboutData::License_BSD; else if (lic == "QPL") - d->m_licenseType = KAboutData::License_QPL; + d->m_licenseType = TDEAboutData::License_QPL; else if (lic == "Artistic") - d->m_licenseType = KAboutData::License_Artistic; + d->m_licenseType = TDEAboutData::License_Artistic; else if (lic == "Custom") - d->m_licenseType = KAboutData::License_Custom; + d->m_licenseType = TDEAboutData::License_Custom; else - d->m_licenseType = KAboutData::License_Unknown; + d->m_licenseType = TDEAboutData::License_Unknown; - d->m_data = new KAboutData(d->m_pluginName.ascii(), d->m_rawGenericName.ascii(), "1", 0, d->m_licenseType); + d->m_data = new TDEAboutData(d->m_pluginName.ascii(), d->m_rawGenericName.ascii(), "1", 0, d->m_licenseType); } else kdDebug() << "Unable to load information for plugin: " << pluginName @@ -89,7 +89,7 @@ KDevPluginInfo::KDevPluginInfo(const TQString &pluginName) } -KDevPluginInfo::operator KAboutData *() const +KDevPluginInfo::operator TDEAboutData *() const { return d->m_data; } @@ -127,8 +127,8 @@ int KDevPluginInfo::licenseType() const TQString KDevPluginInfo::license() const { KDevPluginInfo &info = *const_cast<KDevPluginInfo*>(this); -// return KAboutData(info).license(); - KAboutData *data = info; +// return TDEAboutData(info).license(); + TDEAboutData *data = info; return data->license(); } diff --git a/lib/interfaces/kdevplugininfo.h b/lib/interfaces/kdevplugininfo.h index 3ade0e46..8a3e172f 100644 --- a/lib/interfaces/kdevplugininfo.h +++ b/lib/interfaces/kdevplugininfo.h @@ -44,9 +44,9 @@ public: and the same as the location of plugin resource files.*/ KDevPluginInfo(const TQString &pluginName); - /**Casts KDevPluginInfo to KAboutData. Uses KDevPluginInfo::pluginName as KAboutData::appName, - KDevPluginInfo::rawGenericName as KAboutData::programName KDevPluginInfo::licenseType as KAboutData::licenseType. Other parameters are ignored.*/ - operator KAboutData*() const; + /**Casts KDevPluginInfo to TDEAboutData. Uses KDevPluginInfo::pluginName as TDEAboutData::appName, + KDevPluginInfo::rawGenericName as TDEAboutData::programName KDevPluginInfo::licenseType as TDEAboutData::licenseType. Other parameters are ignored.*/ + operator TDEAboutData*() const; /**@return A name of a plugin (always untranslated).*/ TQString pluginName() const; diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index b1717f1e..11f3a4d3 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -50,9 +50,9 @@ public: : KDevGenericFactory<AbbrevPart>( data ) { } - virtual KInstance *createInstance() + virtual TDEInstance *createInstance() { - KInstance *instance = KDevGenericFactory<AbbrevPart>::createInstance(); + TDEInstance *instance = KDevGenericFactory<AbbrevPart>::createInstance(); KStandardDirs *dirs = instance->dirs(); dirs->addResourceType( "codetemplates", KStandardDirs::kde_default( "data" ) + "kdevabbrev/templates/" ); diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 38dba43f..92632de0 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -511,9 +511,9 @@ void AppWizardDialog::accept() m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" ); m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::currentDate().year() ) ); - // This isn't too pretty, but we have several templates that use KAboutData::License_${LICENSE} - // and unsurprisingly, KAboutData doesn't cover every imaginable case. - // These are the licenses known to KDE-3.2 KAboutData, KDevelop doesn't have all of these as prepared options today + // This isn't too pretty, but we have several templates that use TDEAboutData::License_${LICENSE} + // and unsurprisingly, TDEAboutData doesn't cover every imaginable case. + // These are the licenses known to KDE-3.2 TDEAboutData, KDevelop doesn't have all of these as prepared options today TQString license = license_combo->currentText(); if ( license == "GPL" || license == "GPL_V2" || license == "LGPL" || license == "LGPL_V2"|| license == "BSD" || license == "NCSA" || license == "MIT" || license == "Artistic" || diff --git a/parts/appwizard/appwizardfactory.cpp b/parts/appwizard/appwizardfactory.cpp index 76b25836..f60a23dc 100644 --- a/parts/appwizard/appwizardfactory.cpp +++ b/parts/appwizard/appwizardfactory.cpp @@ -23,9 +23,9 @@ AppWizardFactory::AppWizardFactory() { } -KInstance *AppWizardFactory::createInstance() +TDEInstance *AppWizardFactory::createInstance() { - KInstance *instance = KDevGenericFactory<AppWizardPart>::createInstance(); + TDEInstance *instance = KDevGenericFactory<AppWizardPart>::createInstance(); KStandardDirs *dirs = instance->dirs(); dirs->addResourceType("apptemplates", KStandardDirs::kde_default("data") + "kdevappwizard/templates/"); dirs->addResourceType("appimports", KStandardDirs::kde_default("data") + "kdevappwizard/imports/"); diff --git a/parts/appwizard/appwizardfactory.h b/parts/appwizard/appwizardfactory.h index 23fdfe29..57af5b3c 100644 --- a/parts/appwizard/appwizardfactory.h +++ b/parts/appwizard/appwizardfactory.h @@ -26,7 +26,7 @@ public: static const KDevPluginInfo *info(); protected: - virtual KInstance *createInstance(); + virtual TDEInstance *createInstance(); }; #endif diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp index c93812ad..fca1b3b8 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp +++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp @@ -27,7 +27,7 @@ #include <kdevgenericfactory.h> -static const KAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plugin"), "1.0"); +static const TDEAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plugin"), "1.0"); typedef KDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) ) diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp index cddc9106..f252c03e 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.cpp +++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp @@ -27,7 +27,7 @@ #include <kdevgenericfactory.h> -static const KAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation plugin"), "1.0"); +static const TDEAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation plugin"), "1.0"); typedef KDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) ) diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp index 898fcc0e..c6dcb8ee 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.cpp +++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp @@ -27,7 +27,7 @@ #include <kdevgenericfactory.h> -static const KAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin"), "1.0"); +static const TDEAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin"), "1.0"); typedef KDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) ) diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index 1d7543c3..3f0fbc54 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -41,7 +41,7 @@ extern "C" { int kdemain( int argc, char **argv ) { - KInstance instance( "kio_chm" ); + TDEInstance instance( "kio_chm" ); kdDebug() << "*** Starting kio_chm " << endl; diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index b1d9d166..c9c5f58e 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -32,8 +32,8 @@ extern "C" } } -KInstance* KChmPartFactory::s_instance = 0L; -KAboutData* KChmPartFactory::s_about = 0L; +TDEInstance* KChmPartFactory::s_instance = 0L; +TDEAboutData* KChmPartFactory::s_about = 0L; KChmPartFactory::KChmPartFactory( TQObject* parent, const char* name ) : KParts::Factory( parent, name ) @@ -54,13 +54,13 @@ KParts::Part* KChmPartFactory::createPartObject( TQWidget *parentWidget, const c return part; } -KInstance* KChmPartFactory::instance() +TDEInstance* KChmPartFactory::instance() { if( !s_instance ) { - s_about = new KAboutData( "kchmpart", + s_about = new TDEAboutData( "kchmpart", I18N_NOOP( "KChm" ), "1.0pre" ); - s_instance = new KInstance( s_about ); + s_instance = new TDEInstance( s_about ); } return s_instance; } @@ -69,7 +69,7 @@ KInstance* KChmPartFactory::instance() KChmPart::KChmPart( TQWidget * parent, const char * name ) : KDevHTMLPart( ), m_job(0) { - KInstance * instance = new KInstance( "kchmpart" ); + TDEInstance * instance = new TDEInstance( "kchmpart" ); setInstance( instance ); m_extension=new KParts::BrowserExtension(this); setOptions(-1); diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 5c4369c3..3ed054fe 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -27,8 +27,8 @@ #include <tqcstring.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KChmPartFactory: public KParts::Factory { @@ -43,11 +43,11 @@ class KChmPartFactory: public KParts::Factory 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; }; @@ -69,7 +69,7 @@ class KChmPart : public KDevHTMLPart */ protected: //virtual bool openFile(); - KInstance *m_instance; + TDEInstance *m_instance; KParts::BrowserExtension *m_extension; KIO::TransferJob *m_job; TQCString m_htmlData; diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index a728da7b..328a0387 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -450,7 +450,7 @@ int main(int argc, char *argv[]) KCmdLineLastOption }; - KAboutData aboutData("tdevelop-htdig", I18N_NOOP("TDevelop ht://Dig Indexer"), + TDEAboutData aboutData("tdevelop-htdig", I18N_NOOP("TDevelop ht://Dig Indexer"), "0.2", I18N_NOOP("TDE Index generator for documentation files.")); TDECmdLineArgs::init(argc, argv, &aboutData); diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp index 7311cb62..9b6f49e6 100644 --- a/parts/fullscreen/fullscreen_part.cpp +++ b/parts/fullscreen/fullscreen_part.cpp @@ -31,10 +31,10 @@ FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStrin : KDevPlugin(&data, parent, name ? name : "FullScreenPart" ) { setInstance(FullScreenFactory::instance()); -// const KAboutData &abdata1 = *(info()); +// const TDEAboutData &abdata1 = *(info()); // kdDebug() << abdata1.appName() << endl; const KDevPluginInfo &_info = *info(); - const KAboutData *abdata = _info; + const TDEAboutData *abdata = _info; kdDebug() << abdata->appName() << endl; setXMLFile("kdevpart_fullscreen.rc"); diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index 04993028..cd7da532 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -79,11 +79,11 @@ void SnippetPart::setupActions() /*! \fn SnippetPart::aboutData() */ -KAboutData* SnippetPart::aboutData() +TDEAboutData* SnippetPart::aboutData() { - KAboutData *data = new KAboutData ("snippetpart", I18N_NOOP("SnippetPart"), "1.1", + TDEAboutData *data = new TDEAboutData ("snippetpart", I18N_NOOP("SnippetPart"), "1.1", I18N_NOOP( "SnippetPart for TDevelop" ), - KAboutData::License_LGPL_V2, + TDEAboutData::License_LGPL_V2, I18N_NOOP( "(c) 2003" ), 0, "http://www.kdevelop.org"); data->addAuthor ("Robert Gruber", I18N_NOOP("Author"), "rgruber@users.sourceforge.net", "http://kmp3indexer.sf.net"); diff --git a/parts/snippet/snippet_part.h b/parts/snippet/snippet_part.h index f9266e75..8ffd8fce 100644 --- a/parts/snippet/snippet_part.h +++ b/parts/snippet/snippet_part.h @@ -16,7 +16,7 @@ class SnippetWidget; -class KAboutData; +class TDEAboutData; class KDialogBase; /* @@ -33,7 +33,7 @@ public: SnippetPart(TQObject *parent, const char *name, const TQStringList &); ~SnippetPart(); - KAboutData * aboutData(); + TDEAboutData * aboutData(); TQStringList getAllLanguages(); TQStringList getProjectLanguages(); diff --git a/src/Mainpage.dox b/src/Mainpage.dox index 78ee051b..12599626 100644 --- a/src/Mainpage.dox +++ b/src/Mainpage.dox @@ -42,8 +42,8 @@ Example: int main(int argc, char *argv[]) { static const char description[] = I18N_NOOP("My Application"); - KAboutData aboutData("myapp", I18N_NOOP("My Application"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData("myapp", I18N_NOOP("My Application"), + VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2004, MyApp developers"), "", "http://www.myapp.org"); aboutData.addAuthor("Me", I18N_NOOP("Creator"), "me@myapp.org"); diff --git a/src/main.cpp b/src/main.cpp index cba4e334..c25755a9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,8 +30,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment"); - KAboutData aboutData("tdevelop", I18N_NOOP("TDevelop"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData("tdevelop", I18N_NOOP("TDevelop"), + VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.kdevelop.org"); aboutData.addAuthor("Alexander Dymo", I18N_NOOP("Release coordinator, Overall improvements, Pascal support, C++ support, New File and Documentation parts"), "adymo@tdevelop.org"); aboutData.addAuthor("Amilcar do Carmo Lucas", I18N_NOOP("Release coordinator, API documentation, Doxygen and autoproject patches"), "amilcar@ida.ing.tu-bs.de"); diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp index 8f8214b2..1f3ecf9b 100644 --- a/src/main_assistant.cpp +++ b/src/main_assistant.cpp @@ -30,8 +30,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment:\nassistant and documentation viewer"); - KAboutData aboutData("kdevassistant", I18N_NOOP("TDevelop Assistant"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData("kdevassistant", I18N_NOOP("TDevelop Assistant"), + VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.kdevelop.org"); aboutData.addAuthor("Alexander Dymo", I18N_NOOP("Release coordinator, Overall improvements, Pascal support, C++ support, New File and Documentation parts"), "adymo@tdevelop.org"); aboutData.addAuthor("Amilcar do Carmo Lucas", I18N_NOOP("Release coordinator, API documentation, Doxygen and autoproject patches"), "amilcar@ida.ing.tu-bs.de"); diff --git a/src/profileengine/editor/main.cpp b/src/profileengine/editor/main.cpp index c88caea0..4ffe6f92 100644 --- a/src/profileengine/editor/main.cpp +++ b/src/profileengine/editor/main.cpp @@ -30,8 +30,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "", - KAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, ""); + TDEAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "", + TDEAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, ""); about.addAuthor("Alexander Dymo", 0, "adymo@tdevelop.org"); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp index 7646e727..7018456f 100644 --- a/vcs/subversion/svn_kio.cpp +++ b/vcs/subversion/svn_kio.cpp @@ -2136,7 +2136,7 @@ void kio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) { extern "C" { KDE_EXPORT int kdemain(int argc, char **argv) { - KInstance instance( "kio_kdevsvn" ); + TDEInstance instance( "kio_kdevsvn" ); kdDebug(9036) << "*** Starting kio_kdevsvn " << endl; |