Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 5c0390ebaa
commit 3a044decb0

@ -317,7 +317,7 @@
* Added a ruby DCOP service project template * Added a ruby DCOP service project template
* Improved the kapp Korundum application framework. It configures, builds and installs * 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 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 * k_dcop and k_dcop_signals declarations are shown as slot and signal declarations in
the class parser. the class parser.
* =begin to =end comments are ignored * =begin to =end comments are ignored
@ -2709,7 +2709,7 @@
* Added kicker, kioslave and kcmodule templates * Added kicker, kioslave and kcmodule templates
* Each template can define an icon which is * Each template can define an icon which is
shown in the app wizard shown in the app wizard
* The Big KInstance Cleanup * The Big TDEInstance Cleanup
2001-05-19 Matthias Hoelzer-Kluepfel <mhk@caldera.de> 2001-05-19 Matthias Hoelzer-Kluepfel <mhk@caldera.de>
* Added a plugin to provide and configure a * Added a plugin to provide and configure a
Tools menu. Tools menu.

@ -856,8 +856,8 @@ by selecting the "Global Functions" folder.
<programlisting> <programlisting>
1 int main(int argc, char **argv) 1 int main(int argc, char **argv)
2 { 2 {
3 KAboutData about("kscribble", I18N_NOOP("KScribble"), version, description, 3 TDEAboutData about("kscribble", I18N_NOOP("KScribble"), version, description,
4 KAboutData::License_GPL, "(C) 2002 Your Name", 0, 0, "you@you.com"); 4 TDEAboutData::License_GPL, "(C) 2002 Your Name", 0, 0, "you@you.com");
5 about.addAuthor( "Your Name", 0, "you@you.com" ); 5 about.addAuthor( "Your Name", 0, "you@you.com" );
6 TDECmdLineArgs::init(argc, argv, &amp;about); 6 TDECmdLineArgs::init(argc, argv, &amp;about);
7 TDECmdLineArgs::addCmdLineOptions(options); 7 TDECmdLineArgs::addCmdLineOptions(options);

@ -122,7 +122,7 @@ Makes sure only one instance of an application can run simultaneously.
</para> </para>
</formalpara></listitem> </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> <para>
Holds information for the about box. Holds information for the about box.
</para> </para>
@ -3120,7 +3120,7 @@ extern "C" { int kdemain(int argc, char **argv); }
int kdemain(int argc, char **argv) int kdemain(int argc, char **argv)
{ {
KLocale::setMainCatalogue("tdelibs"); KLocale::setMainCatalogue("tdelibs");
KInstance instance("kio_ftp"); TDEInstance instance("kio_ftp");
(void) KGlobal::locale(); (void) KGlobal::locale();
if (argc != 4) { if (argc != 4) {

@ -1006,8 +1006,8 @@ below.</para>
<programlisting> <programlisting>
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("hello", I18N_NOOP("Hello"), version, description, TDEAboutData about("hello", I18N_NOOP("Hello"), version, description,
KAboutData::License_GPL, "(C) 2006 Joe User", 0, 0, TDEAboutData::License_GPL, "(C) 2006 Joe User", 0, 0,
"joe@user.com"); "joe@user.com");
about.addAuthor( "Joe User", 0, "joe@user.com" ); about.addAuthor( "Joe User", 0, "joe@user.com" );
</programlisting> </programlisting>

@ -236,12 +236,12 @@ void KDevDesignerPart::setupToolsAction( KRadioAction * toggle, TQAction * actio
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
KInstance* KDevDesignerPartFactory::s_instance = 0L; TDEInstance* KDevDesignerPartFactory::s_instance = 0L;
KAboutData* KDevDesignerPartFactory::s_about = 0L; TDEAboutData* KDevDesignerPartFactory::s_about = 0L;
KDevDesignerPartFactory::KDevDesignerPartFactory() KDevDesignerPartFactory::KDevDesignerPartFactory()
: KParts::Factory() : KParts::Factory()
@ -270,14 +270,14 @@ KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget,
return obj; return obj;
} }
KInstance* KDevDesignerPartFactory::instance() TDEInstance* KDevDesignerPartFactory::instance()
{ {
if( !s_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("Alexander Dymo", 0, "cloudtemple@mksat.net");
s_about->addAuthor("Trolltech AS", 0, "info@trolltech.com"); s_about->addAuthor("Trolltech AS", 0, "info@trolltech.com");
s_instance = new KInstance(s_about); s_instance = new TDEInstance(s_about);
} }
return s_instance; return s_instance;
} }

@ -125,8 +125,8 @@ private:
KRadioAction* pointerAction; KRadioAction* pointerAction;
}; };
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class KDevDesignerPartFactory : public KParts::Factory class KDevDesignerPartFactory : public KParts::Factory
{ {
@ -138,11 +138,11 @@ public:
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, TQObject *parent, const char *name,
const char *classname, const TQStringList &args ); const char *classname, const TQStringList &args );
static KInstance* instance(); static TDEInstance* instance();
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
static KAboutData* s_about; static TDEAboutData* s_about;
}; };
#endif // _KDEVDESIGNERPART_H_ #endif // _KDEVDESIGNERPART_H_

@ -23,7 +23,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqstring.h> #include <tqstring.h>
class KInstance; class TDEInstance;
TQPixmap BarIcon2 (const TQString &name); TQPixmap BarIcon2 (const TQString &name);
TQPixmap SmallIcon2 (const TQString &name); TQPixmap SmallIcon2 (const TQString &name);

@ -40,8 +40,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("kdevdesigner", I18N_NOOP("KDevDesigner"), version, description, TDEAboutData 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::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( "Trolltech AS", "TQt Designer code (Free Edition)" );
about.addAuthor( "Alexander Dymo", "Port to KDE, partification", "adymo@tdevelop.org" ); about.addAuthor( "Alexander Dymo", "Port to KDE, partification", "adymo@tdevelop.org" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);

@ -21,9 +21,9 @@ static KCmdLineOptions options[] =
int main (int argc, char *argv[]) int main (int argc, char *argv[])
{ {
KLocale::setMainCatalogue("tdelibs"); KLocale::setMainCatalogue("tdelibs");
KAboutData aboutdata("%{APPNAMELC}", I18N_NOOP("TDE"), TDEAboutData aboutdata("%{APPNAMELC}", I18N_NOOP("TDE"),
version, description, version, description,
KAboutData::License_GPL, "(C) %{YEAR}, %{AUTHOR}"); TDEAboutData::License_GPL, "(C) %{YEAR}, %{AUTHOR}");
aboutdata.addAuthor("%{AUTHOR}",I18N_NOOP("Developer"),"%{EMAIL}"); aboutdata.addAuthor("%{AUTHOR}",I18N_NOOP("Developer"),"%{EMAIL}");
TDECmdLineArgs::init( argc, argv, &aboutdata ); TDECmdLineArgs::init( argc, argv, &aboutdata );

@ -20,8 +20,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -25,7 +25,7 @@ extern "C"
KatePluginFactory::KatePluginFactory() KatePluginFactory::KatePluginFactory()
{ {
s_instance = new KInstance( "kate" ); s_instance = new TDEInstance( "kate" );
} }
KatePluginFactory::~KatePluginFactory() KatePluginFactory::~KatePluginFactory()
@ -38,7 +38,7 @@ TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, c
return new KatePlugin%{APPNAME}( parent, name ); 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 ) KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name )
: Kate::Plugin ( (Kate::Application*)parent, name ) : Kate::Plugin ( (Kate::Application*)parent, name )
@ -58,7 +58,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win)
TQT_SLOT( slotInsertHello() ), view->actionCollection(), TQT_SLOT( slotInsertHello() ), view->actionCollection(),
"edit_insert_%{APPNAMELC}" ); "edit_insert_%{APPNAMELC}" );
view->setInstance (new KInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile("plugins/%{APPNAMELC}/plugin_%{APPNAMELC}.rc"); view->setXMLFile("plugins/%{APPNAMELC}/plugin_%{APPNAMELC}.rc");
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
view->win = win; view->win = win;

@ -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() ); virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
}; };
class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface

@ -29,7 +29,7 @@ extern "C"
KatePluginFactory::KatePluginFactory() KatePluginFactory::KatePluginFactory()
{ {
s_instance = new KInstance( "kate" ); s_instance = new TDEInstance( "kate" );
} }
KatePluginFactory::~KatePluginFactory() KatePluginFactory::~KatePluginFactory()
@ -42,7 +42,7 @@ TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, c
return new KatePlugin%{APPNAME}( parent, name ); 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 ) KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name )
: Kate::Plugin ( (Kate::Application*)parent, name ) : Kate::Plugin ( (Kate::Application*)parent, name )
@ -62,7 +62,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win)
TQT_SLOT( slotInsertHello() ), view->actionCollection(), TQT_SLOT( slotInsertHello() ), view->actionCollection(),
"edit_insert_%{APPNAMELC}" ); "edit_insert_%{APPNAMELC}" );
view->setInstance (new KInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile("plugins/%{APPNAMELC}/plugin_%{APPNAMELC}.rc"); view->setXMLFile("plugins/%{APPNAMELC}/plugin_%{APPNAMELC}.rc");
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
view->win = win; view->win = win;

@ -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() ); virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
}; };
class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension

@ -20,14 +20,14 @@ public:
virtual void defaults(); virtual void defaults();
virtual int buttons(); virtual int buttons();
virtual TQString quickHelp() const; virtual TQString quickHelp() const;
virtual const KAboutData *aboutData()const virtual const TDEAboutData *aboutData()const
{ return myAboutData; }; { return myAboutData; };
public slots: public slots:
void configChanged(); void configChanged();
private: private:
KAboutData *myAboutData; TDEAboutData *myAboutData;
}; };
#endif #endif

@ -19,8 +19,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -13,8 +13,8 @@ static const char version[] = "%{VERSION}";
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("%{APPNAMELC}", 0, ki18n("%{APPNAME}"), version, ki18n(description), TDEAboutData about("%{APPNAMELC}", 0, ki18n("%{APPNAME}"), version, ki18n(description),
KAboutData::License_%{LICENSE}, ki18n("(C) %{YEAR} %{AUTHOR}"), KLocalizedString(), 0, "%{EMAIL}"); TDEAboutData::License_%{LICENSE}, ki18n("(C) %{YEAR} %{AUTHOR}"), KLocalizedString(), 0, "%{EMAIL}");
about.addAuthor( ki18n("%{AUTHOR}"), KLocalizedString(), "%{EMAIL}" ); about.addAuthor( ki18n("%{AUTHOR}"), KLocalizedString(), "%{EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);

@ -19,8 +19,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -19,8 +19,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -19,8 +19,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -70,7 +70,7 @@ extern "C"
{ {
int kdemain(int argc, char **argv) int kdemain(int argc, char **argv)
{ {
KInstance instance( "kio_%{APPNAMELC}" ); TDEInstance instance( "kio_%{APPNAMELC}" );
kdDebug(7101) << "*** Starting kio_%{APPNAMELC} " << endl; kdDebug(7101) << "*** Starting kio_%{APPNAMELC} " << endl;

@ -18,8 +18,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("%{APPNAME}", I18N_NOOP("%{APPNAME}"), version, description, TDEAboutData about("%{APPNAME}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) 2004 %{AUTHOR}", 0, 0, "%{EMAIL}"); TDEAboutData::License_%{LICENSE}, "(C) 2004 %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -12,10 +12,10 @@
static const char description[] = I18N_NOOP("%{APPNAME} KOffice Program"); static const char description[] = I18N_NOOP("%{APPNAME} KOffice Program");
static const char version[] = "%{VERSION}"; static const char version[] = "%{VERSION}";
KAboutData * new%{APPNAME}AboutData() TDEAboutData * new%{APPNAME}AboutData()
{ {
KAboutData * aboutData=new KAboutData( "%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), TDEAboutData * aboutData=new TDEAboutData( "%{APPNAMELC}", I18N_NOOP("%{APPNAME}"),
version, description, KAboutData::License_%{LICENSE}, version, description, TDEAboutData::License_%{LICENSE},
"(c) %{YEAR}, %{AUTHOR}"); "(c) %{YEAR}, %{AUTHOR}");
aboutData->addAuthor("%{AUTHOR}",0, "%{EMAIL}"); aboutData->addAuthor("%{AUTHOR}",0, "%{EMAIL}");
return aboutData; return aboutData;

@ -20,8 +20,8 @@ extern "C"
} }
}; };
KInstance* %{APPNAME}Factory::s_global = 0L; TDEInstance* %{APPNAME}Factory::s_global = 0L;
KAboutData* %{APPNAME}Factory::s_aboutData = 0L; TDEAboutData* %{APPNAME}Factory::s_aboutData = 0L;
%{APPNAME}Factory::%{APPNAME}Factory( TQObject* parent, const char* name ) %{APPNAME}Factory::%{APPNAME}Factory( TQObject* parent, const char* name )
: KoFactory( parent, name ) : KoFactory( parent, name )
@ -52,7 +52,7 @@ KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const
return part; return part;
} }
KAboutData* %{APPNAME}Factory::aboutData() TDEAboutData* %{APPNAME}Factory::aboutData()
{ {
if ( !s_aboutData ) if ( !s_aboutData )
// Change this, of course // Change this, of course
@ -60,11 +60,11 @@ KAboutData* %{APPNAME}Factory::aboutData()
return s_aboutData; return s_aboutData;
} }
KInstance* %{APPNAME}Factory::global() TDEInstance* %{APPNAME}Factory::global()
{ {
if ( !s_global ) if ( !s_global )
{ {
s_global = new KInstance( aboutData() ); s_global = new TDEInstance( aboutData() );
// Add any application-specific resource directories here // Add any application-specific resource directories here
// Tell the iconloader about share/apps/koffice/icons // Tell the iconloader about share/apps/koffice/icons

@ -8,8 +8,8 @@
#include <koFactory.h> #include <koFactory.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class %{APPNAME}Factory : public KoFactory 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() ); 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 // _Creates_ a TDEAboutData but doesn't keep ownership
static KAboutData* aboutData(); static TDEAboutData* aboutData();
private: private:
static KInstance* s_global; static TDEInstance* s_global;
static KAboutData* s_aboutData; static TDEAboutData* s_aboutData;
}; };
#endif #endif

@ -7,7 +7,7 @@
#include "%{APPNAMELC}.h" #include "%{APPNAMELC}.h"
#include "%{APPNAMELC}.moc" #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) KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name)
{ {
widget=new TQLabel("Init Value",widgetParent); widget=new TQLabel("Init Value",widgetParent);
@ -27,7 +27,7 @@ void %{APPNAME}::handleURL(const KURL &url)
extern "C" 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); return new %{APPNAME}(instance,par,widp,desktopname,name);
} }

@ -26,7 +26,7 @@ public:
* @param desktopName The filename of the configuration file. * @param desktopName The filename of the configuration file.
* @param name A TQt object name for your plugin. * @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 */ /** destructor */
~%{APPNAME}(); ~%{APPNAME}();

@ -144,12 +144,12 @@ void %{APPNAME}Part::fileSaveAs()
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
KInstance* %{APPNAME}PartFactory::s_instance = 0L; TDEInstance* %{APPNAME}PartFactory::s_instance = 0L;
KAboutData* %{APPNAME}PartFactory::s_about = 0L; TDEAboutData* %{APPNAME}PartFactory::s_about = 0L;
%{APPNAME}PartFactory::%{APPNAME}PartFactory() %{APPNAME}PartFactory::%{APPNAME}PartFactory()
: KParts::Factory() : KParts::Factory()
@ -178,13 +178,13 @@ KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, c
return obj; return obj;
} }
KInstance* %{APPNAME}PartFactory::instance() TDEInstance* %{APPNAME}PartFactory::instance()
{ {
if( !s_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_about->addAuthor("%{AUTHOR}", 0, "%{EMAIL}");
s_instance = new KInstance(s_about); s_instance = new TDEInstance(s_about);
} }
return s_instance; return s_instance;
} }

@ -65,8 +65,8 @@ private:
TQMultiLineEdit *m_widget; TQMultiLineEdit *m_widget;
}; };
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class %{APPNAME}PartFactory : public KParts::Factory class %{APPNAME}PartFactory : public KParts::Factory
{ {
@ -78,11 +78,11 @@ public:
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, TQObject *parent, const char *name,
const char *classname, const TQStringList &args ); const char *classname, const TQStringList &args );
static KInstance* instance(); static TDEInstance* instance();
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
static KAboutData* s_about; static TDEAboutData* s_about;
}; };
#endif // _%{APPNAMEUC}PART_H_ #endif // _%{APPNAMEUC}PART_H_

@ -18,8 +18,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -88,10 +88,10 @@ TQObject* %{APPNAME}Factory::createObject( TQObject* parent, const char* name, c
return new Plugin%{APPNAME}( parent, name ); return new Plugin%{APPNAME}( parent, name );
} }
KInstance *%{APPNAME}Factory::instance() TDEInstance *%{APPNAME}Factory::instance()
{ {
if ( !s_instance ) if ( !s_instance )
s_instance = new KInstance( "%{APPNAMELC}" ); s_instance = new TDEInstance( "%{APPNAMELC}" );
return s_instance; 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" #include "plugin_%{APPNAMELC}.moc"

@ -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() ); 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: private:
static KInstance* s_instance; static TDEInstance* s_instance;
}; };
#endif // _PLUGIN_%{APPNAMEUC}_H_ #endif // _PLUGIN_%{APPNAMEUC}_H_

@ -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 // The non-i18n name here must be the same as the directory in
// which the part's rc file is installed // 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}"); aboutData->addAuthor("%{AUTHOR}", 0, "%{EMAIL}");
return aboutData; return aboutData;
} }

@ -10,7 +10,7 @@ class TQMultiLineEdit;
class TQWidget; class TQWidget;
class TQPainter; class TQPainter;
class KURL; class KURL;
class KAboutData; class TDEAboutData;
/** /**
* This is a "Part". It that does all the real work in a KPart * This is a "Part". It that does all the real work in a KPart
@ -51,7 +51,7 @@ public:
/** /**
* About data for the part * About data for the part
*/ */
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
protected: protected:
/** /**

@ -21,8 +21,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}" ); TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}" );
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
// warning, utf-8 char // warning, utf-8 char

@ -19,8 +19,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -19,8 +19,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -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(); KStandardDirs *dirs = instance->dirs();
dirs->addResourceType( "newclasstemplates", KStandardDirs::kde_default("data") + "kdevcppsupport/newclass/" ); dirs->addResourceType( "newclasstemplates", KStandardDirs::kde_default("data") + "kdevcppsupport/newclass/" );
dirs->addResourceType( "pcs", KStandardDirs::kde_default( "data" ) + "kdevcppsupport/pcs/" ); dirs->addResourceType( "pcs", KStandardDirs::kde_default( "data" ) + "kdevcppsupport/pcs/" );

@ -25,7 +25,7 @@ public:
static const KDevPluginInfo *info(); static const KDevPluginInfo *info();
protected: protected:
virtual KInstance *createInstance(); virtual TDEInstance *createInstance();
}; };
#endif #endif

@ -116,7 +116,7 @@ extern "C" {
int kdemain(int argc, char **argv) int kdemain(int argc, char **argv)
{ {
KInstance instance( "kio_csharpdoc" ); TDEInstance instance( "kio_csharpdoc" );
KGlobal::locale()->setMainCatalogue("tdevelop"); KGlobal::locale()->setMainCatalogue("tdevelop");
if (argc != 4) { if (argc != 4) {

@ -57,11 +57,11 @@ TQObject *PgiOptionsFactory::createObject(TQObject *parent, const char *name,
} }
KInstance *PgiOptionsFactory::s_instance = 0; TDEInstance *PgiOptionsFactory::s_instance = 0;
KInstance *PgiOptionsFactory::instance() TDEInstance *PgiOptionsFactory::instance()
{ {
if (!s_instance) if (!s_instance)
s_instance = new KInstance("kdevpgioptions"); s_instance = new TDEInstance("kdevpgioptions");
return s_instance; return s_instance;
} }

@ -26,10 +26,10 @@ public:
virtual TQObject* createObject( TQObject *parent, const char *name, virtual TQObject* createObject( TQObject *parent, const char *name,
const char *classname, const TQStringList &args); const char *classname, const TQStringList &args);
static KInstance *instance(); static TDEInstance *instance();
private: private:
static KInstance *s_instance; static TDEInstance *s_instance;
}; };
#endif #endif

@ -237,8 +237,8 @@ static String[][] options =
static void main(String[] cmdLineArgs) static void main(String[] cmdLineArgs)
{ {
KAboutData about = new KAboutData("%{APPNAMELC}", "%{APPNAME}", version, description, TDEAboutData about = new TDEAboutData("%{APPNAMELC}", "%{APPNAME}", version, description,
KAboutData.License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", null, null, "%{EMAIL}"); TDEAboutData.License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", null, null, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", null, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", null, "%{EMAIL}" );
TDECmdLineArgs.init(cmdLineArgs, about); TDECmdLineArgs.init(cmdLineArgs, about);
TDECmdLineArgs.addCmdLineOptions(options); TDECmdLineArgs.addCmdLineOptions(options);

@ -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(); KStandardDirs *dirs = instance->dirs();
dirs->addResourceType( "newclasstemplates", KStandardDirs::kde_default("data") + "kdevjavasupport/newclass/" ); dirs->addResourceType( "newclasstemplates", KStandardDirs::kde_default("data") + "kdevjavasupport/newclass/" );
dirs->addResourceType( "pcs", KStandardDirs::kde_default( "data" ) + "kdevjavasupport/pcs/" ); dirs->addResourceType( "pcs", KStandardDirs::kde_default( "data" ) + "kdevjavasupport/pcs/" );

@ -25,7 +25,7 @@ public:
static const KDevPluginInfo *info(); static const KDevPluginInfo *info();
protected: protected:
virtual KInstance *createInstance(); virtual TDEInstance *createInstance();
}; };
#endif #endif

@ -116,7 +116,7 @@ extern "C" {
int kdemain(int argc, char **argv) int kdemain(int argc, char **argv)
{ {
KInstance instance( "kio_perldoc" ); TDEInstance instance( "kio_perldoc" );
KGlobal::locale()->setMainCatalogue("tdevelop"); KGlobal::locale()->setMainCatalogue("tdevelop");
if (argc != 4) { if (argc != 4) {

@ -96,7 +96,7 @@ extern "C" {
int kdemain(int argc, char **argv) int kdemain(int argc, char **argv)
{ {
KInstance instance( "kio_pydoc" ); TDEInstance instance( "kio_pydoc" );
KGlobal::locale()->setMainCatalogue("tdevelop"); KGlobal::locale()->setMainCatalogue("tdevelop");
if (argc != 4) { if (argc != 4) {

@ -6,7 +6,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
int main(int argc, char **argv) { int main(int argc, char **argv) {
KInstance * instance = new KInstance("%{APPNAMELC}"); TDEInstance * instance = new TDEInstance("%{APPNAMELC}");
TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance);
delete instance; delete instance;
if (appdir.isNull()) { if (appdir.isNull()) {

@ -6,7 +6,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
int main(int argc, char **argv) { int main(int argc, char **argv) {
KInstance * instance = new KInstance("%{APPNAMELC}"); TDEInstance * instance = new TDEInstance("%{APPNAMELC}");
TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance);
delete instance; delete instance;
if (appdir.isNull()) { if (appdir.isNull()) {

@ -6,7 +6,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
int main(int argc, char **argv) { int main(int argc, char **argv) {
KInstance * instance = new KInstance("%{APPNAMELC}"); TDEInstance * instance = new TDEInstance("%{APPNAMELC}");
TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance);
delete instance; delete instance;
if (appdir.isNull()) { if (appdir.isNull()) {

@ -39,7 +39,7 @@ Data should be a const static object. This way it complies with the requirements
for data objecs of KDevGenericFactory constructor. for data objecs of KDevGenericFactory constructor.
<b>Important:</b><br> <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 a static const @ref KDevPluginInfo object which can be used also in the constructor
of a plugin. 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 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 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> template <class T, class ParentType = TQObject>
class KDevGenericFactory: public KGenericFactory<T, ParentType> class KDevGenericFactory: public KGenericFactory<T, ParentType>
{ {
public: public:
/**Constructor. /**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: Data should have:
- plugin name as an application name; - plugin name as an application name;
- untranslated plugin generic name as a product name; - untranslated plugin generic name as a product name;
- license type number. - license type number.
. .
data object should live as long as factory lives.*/ data object should live as long as factory lives.*/
KDevGenericFactory(KAboutData *data) KDevGenericFactory(TDEAboutData *data)
:KGenericFactory<T, ParentType>(data->appName()), aboutData(data) :KGenericFactory<T, ParentType>(data->appName()), aboutData(data)
{ {
} }
/**Creates an instance.*/ /**Creates an instance.*/
KInstance *createInstance() TDEInstance *createInstance()
{ {
return new KInstance(aboutData); return new TDEInstance(aboutData);
} }
private: private:
KAboutData *aboutData; TDEAboutData *aboutData;
}; };

@ -125,7 +125,7 @@ public:
virtual ~KDevPlugin(); virtual ~KDevPlugin();
/**Provides an information about the plugin. /**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(); const KDevPluginInfo* info();
/**@return A reference to the toplevel widget.*/ /**@return A reference to the toplevel widget.*/

@ -42,7 +42,7 @@ struct KDevPluginInfo::Private {
TQValueList<KAboutPerson> m_authors; TQValueList<KAboutPerson> m_authors;
TQValueList<KAboutPerson> m_credits; 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(); TQString lic = offer->property("X-TDevelop-Plugin-License").toString();
if (lic == "GPL") if (lic == "GPL")
d->m_licenseType = KAboutData::License_GPL; d->m_licenseType = TDEAboutData::License_GPL;
else if (lic == "LGPL") else if (lic == "LGPL")
d->m_licenseType = KAboutData::License_LGPL; d->m_licenseType = TDEAboutData::License_LGPL;
else if (lic == "BSD") else if (lic == "BSD")
d->m_licenseType = KAboutData::License_BSD; d->m_licenseType = TDEAboutData::License_BSD;
else if (lic == "QPL") else if (lic == "QPL")
d->m_licenseType = KAboutData::License_QPL; d->m_licenseType = TDEAboutData::License_QPL;
else if (lic == "Artistic") else if (lic == "Artistic")
d->m_licenseType = KAboutData::License_Artistic; d->m_licenseType = TDEAboutData::License_Artistic;
else if (lic == "Custom") else if (lic == "Custom")
d->m_licenseType = KAboutData::License_Custom; d->m_licenseType = TDEAboutData::License_Custom;
else 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 else
kdDebug() << "Unable to load information for plugin: " << pluginName 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; return d->m_data;
} }
@ -127,8 +127,8 @@ int KDevPluginInfo::licenseType() const
TQString KDevPluginInfo::license() const TQString KDevPluginInfo::license() const
{ {
KDevPluginInfo &info = *const_cast<KDevPluginInfo*>(this); KDevPluginInfo &info = *const_cast<KDevPluginInfo*>(this);
// return KAboutData(info).license(); // return TDEAboutData(info).license();
KAboutData *data = info; TDEAboutData *data = info;
return data->license(); return data->license();
} }

@ -44,9 +44,9 @@ public:
and the same as the location of plugin resource files.*/ and the same as the location of plugin resource files.*/
KDevPluginInfo(const TQString &pluginName); KDevPluginInfo(const TQString &pluginName);
/**Casts KDevPluginInfo to KAboutData. Uses KDevPluginInfo::pluginName as KAboutData::appName, /**Casts KDevPluginInfo to TDEAboutData. Uses KDevPluginInfo::pluginName as TDEAboutData::appName,
KDevPluginInfo::rawGenericName as KAboutData::programName KDevPluginInfo::licenseType as KAboutData::licenseType. Other parameters are ignored.*/ KDevPluginInfo::rawGenericName as TDEAboutData::programName KDevPluginInfo::licenseType as TDEAboutData::licenseType. Other parameters are ignored.*/
operator KAboutData*() const; operator TDEAboutData*() const;
/**@return A name of a plugin (always untranslated).*/ /**@return A name of a plugin (always untranslated).*/
TQString pluginName() const; TQString pluginName() const;

@ -50,9 +50,9 @@ public:
: KDevGenericFactory<AbbrevPart>( data ) : KDevGenericFactory<AbbrevPart>( data )
{ } { }
virtual KInstance *createInstance() virtual TDEInstance *createInstance()
{ {
KInstance *instance = KDevGenericFactory<AbbrevPart>::createInstance(); TDEInstance *instance = KDevGenericFactory<AbbrevPart>::createInstance();
KStandardDirs *dirs = instance->dirs(); KStandardDirs *dirs = instance->dirs();
dirs->addResourceType( "codetemplates", dirs->addResourceType( "codetemplates",
KStandardDirs::kde_default( "data" ) + "kdevabbrev/templates/" ); KStandardDirs::kde_default( "data" ) + "kdevabbrev/templates/" );

@ -511,9 +511,9 @@ void AppWizardDialog::accept()
m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" ); m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" );
m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::currentDate().year() ) ); 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} // This isn't too pretty, but we have several templates that use TDEAboutData::License_${LICENSE}
// and unsurprisingly, KAboutData doesn't cover every imaginable case. // and unsurprisingly, TDEAboutData 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 // 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(); TQString license = license_combo->currentText();
if ( license == "GPL" || license == "GPL_V2" || license == "LGPL" || license == "LGPL_V2"|| if ( license == "GPL" || license == "GPL_V2" || license == "LGPL" || license == "LGPL_V2"||
license == "BSD" || license == "NCSA" || license == "MIT" || license == "Artistic" || license == "BSD" || license == "NCSA" || license == "MIT" || license == "Artistic" ||

@ -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(); KStandardDirs *dirs = instance->dirs();
dirs->addResourceType("apptemplates", KStandardDirs::kde_default("data") + "kdevappwizard/templates/"); dirs->addResourceType("apptemplates", KStandardDirs::kde_default("data") + "kdevappwizard/templates/");
dirs->addResourceType("appimports", KStandardDirs::kde_default("data") + "kdevappwizard/imports/"); dirs->addResourceType("appimports", KStandardDirs::kde_default("data") + "kdevappwizard/imports/");

@ -26,7 +26,7 @@ public:
static const KDevPluginInfo *info(); static const KDevPluginInfo *info();
protected: protected:
virtual KInstance *createInstance(); virtual TDEInstance *createInstance();
}; };
#endif #endif

@ -27,7 +27,7 @@
#include <kdevgenericfactory.h> #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; typedef KDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory;
K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) ) K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) )

@ -27,7 +27,7 @@
#include <kdevgenericfactory.h> #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; typedef KDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory;
K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) ) K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) )

@ -27,7 +27,7 @@
#include <kdevgenericfactory.h> #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; typedef KDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory;
K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) ) K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) )

@ -41,7 +41,7 @@ extern "C"
{ {
int kdemain( int argc, char **argv ) int kdemain( int argc, char **argv )
{ {
KInstance instance( "kio_chm" ); TDEInstance instance( "kio_chm" );
kdDebug() << "*** Starting kio_chm " << endl; kdDebug() << "*** Starting kio_chm " << endl;

@ -32,8 +32,8 @@ extern "C"
} }
} }
KInstance* KChmPartFactory::s_instance = 0L; TDEInstance* KChmPartFactory::s_instance = 0L;
KAboutData* KChmPartFactory::s_about = 0L; TDEAboutData* KChmPartFactory::s_about = 0L;
KChmPartFactory::KChmPartFactory( TQObject* parent, const char* name ) KChmPartFactory::KChmPartFactory( TQObject* parent, const char* name )
: KParts::Factory( parent, name ) : KParts::Factory( parent, name )
@ -54,13 +54,13 @@ KParts::Part* KChmPartFactory::createPartObject( TQWidget *parentWidget, const c
return part; return part;
} }
KInstance* KChmPartFactory::instance() TDEInstance* KChmPartFactory::instance()
{ {
if( !s_instance ) if( !s_instance )
{ {
s_about = new KAboutData( "kchmpart", s_about = new TDEAboutData( "kchmpart",
I18N_NOOP( "KChm" ), "1.0pre" ); I18N_NOOP( "KChm" ), "1.0pre" );
s_instance = new KInstance( s_about ); s_instance = new TDEInstance( s_about );
} }
return s_instance; return s_instance;
} }
@ -69,7 +69,7 @@ KInstance* KChmPartFactory::instance()
KChmPart::KChmPart( TQWidget * parent, const char * name ) KChmPart::KChmPart( TQWidget * parent, const char * name )
: KDevHTMLPart( ), m_job(0) : KDevHTMLPart( ), m_job(0)
{ {
KInstance * instance = new KInstance( "kchmpart" ); TDEInstance * instance = new TDEInstance( "kchmpart" );
setInstance( instance ); setInstance( instance );
m_extension=new KParts::BrowserExtension(this); m_extension=new KParts::BrowserExtension(this);
setOptions(-1); setOptions(-1);

@ -27,8 +27,8 @@
#include <tqcstring.h> #include <tqcstring.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class KChmPartFactory: public KParts::Factory class KChmPartFactory: public KParts::Factory
{ {
@ -43,11 +43,11 @@ class KChmPartFactory: public KParts::Factory
TQObject *parent, const char *name, TQObject *parent, const char *name,
const char *classname, const TQStringList &args ); const char *classname, const TQStringList &args );
static KInstance *instance(); static TDEInstance *instance();
private: private:
static KInstance *s_instance; static TDEInstance *s_instance;
static KAboutData *s_about; static TDEAboutData *s_about;
}; };
@ -69,7 +69,7 @@ class KChmPart : public KDevHTMLPart
*/ */
protected: protected:
//virtual bool openFile(); //virtual bool openFile();
KInstance *m_instance; TDEInstance *m_instance;
KParts::BrowserExtension *m_extension; KParts::BrowserExtension *m_extension;
KIO::TransferJob *m_job; KIO::TransferJob *m_job;
TQCString m_htmlData; TQCString m_htmlData;

@ -450,7 +450,7 @@ int main(int argc, char *argv[])
KCmdLineLastOption 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.")); "0.2", I18N_NOOP("TDE Index generator for documentation files."));
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);

@ -31,10 +31,10 @@ FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStrin
: KDevPlugin(&data, parent, name ? name : "FullScreenPart" ) : KDevPlugin(&data, parent, name ? name : "FullScreenPart" )
{ {
setInstance(FullScreenFactory::instance()); setInstance(FullScreenFactory::instance());
// const KAboutData &abdata1 = *(info()); // const TDEAboutData &abdata1 = *(info());
// kdDebug() << abdata1.appName() << endl; // kdDebug() << abdata1.appName() << endl;
const KDevPluginInfo &_info = *info(); const KDevPluginInfo &_info = *info();
const KAboutData *abdata = _info; const TDEAboutData *abdata = _info;
kdDebug() << abdata->appName() << endl; kdDebug() << abdata->appName() << endl;
setXMLFile("kdevpart_fullscreen.rc"); setXMLFile("kdevpart_fullscreen.rc");

@ -79,11 +79,11 @@ void SnippetPart::setupActions()
/*! /*!
\fn SnippetPart::aboutData() \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" ), I18N_NOOP( "SnippetPart for TDevelop" ),
KAboutData::License_LGPL_V2, TDEAboutData::License_LGPL_V2,
I18N_NOOP( "(c) 2003" ), 0, "http://www.kdevelop.org"); I18N_NOOP( "(c) 2003" ), 0, "http://www.kdevelop.org");
data->addAuthor ("Robert Gruber", I18N_NOOP("Author"), "rgruber@users.sourceforge.net", "http://kmp3indexer.sf.net"); data->addAuthor ("Robert Gruber", I18N_NOOP("Author"), "rgruber@users.sourceforge.net", "http://kmp3indexer.sf.net");

@ -16,7 +16,7 @@
class SnippetWidget; class SnippetWidget;
class KAboutData; class TDEAboutData;
class KDialogBase; class KDialogBase;
/* /*
@ -33,7 +33,7 @@ public:
SnippetPart(TQObject *parent, const char *name, const TQStringList &); SnippetPart(TQObject *parent, const char *name, const TQStringList &);
~SnippetPart(); ~SnippetPart();
KAboutData * aboutData(); TDEAboutData * aboutData();
TQStringList getAllLanguages(); TQStringList getAllLanguages();
TQStringList getProjectLanguages(); TQStringList getProjectLanguages();

@ -42,8 +42,8 @@ Example:
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
static const char description[] = I18N_NOOP("My Application"); static const char description[] = I18N_NOOP("My Application");
KAboutData aboutData("myapp", I18N_NOOP("My Application"), TDEAboutData aboutData("myapp", I18N_NOOP("My Application"),
VERSION, description, KAboutData::License_GPL, VERSION, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999-2004, MyApp developers"), I18N_NOOP("(c) 1999-2004, MyApp developers"),
"", "http://www.myapp.org"); "", "http://www.myapp.org");
aboutData.addAuthor("Me", I18N_NOOP("Creator"), "me@myapp.org"); aboutData.addAuthor("Me", I18N_NOOP("Creator"), "me@myapp.org");

@ -30,8 +30,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment"); static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment");
KAboutData aboutData("tdevelop", I18N_NOOP("TDevelop"), TDEAboutData aboutData("tdevelop", I18N_NOOP("TDevelop"),
VERSION, description, KAboutData::License_GPL, VERSION, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.kdevelop.org"); 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("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"); aboutData.addAuthor("Amilcar do Carmo Lucas", I18N_NOOP("Release coordinator, API documentation, Doxygen and autoproject patches"), "amilcar@ida.ing.tu-bs.de");

@ -30,8 +30,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment:\nassistant and documentation viewer"); static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment:\nassistant and documentation viewer");
KAboutData aboutData("kdevassistant", I18N_NOOP("TDevelop Assistant"), TDEAboutData aboutData("kdevassistant", I18N_NOOP("TDevelop Assistant"),
VERSION, description, KAboutData::License_GPL, VERSION, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.kdevelop.org"); 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("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"); aboutData.addAuthor("Amilcar do Carmo Lucas", I18N_NOOP("Release coordinator, API documentation, Doxygen and autoproject patches"), "amilcar@ida.ing.tu-bs.de");

@ -30,8 +30,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "", TDEAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "",
KAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, ""); TDEAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, "");
about.addAuthor("Alexander Dymo", 0, "adymo@tdevelop.org"); about.addAuthor("Alexander Dymo", 0, "adymo@tdevelop.org");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -2136,7 +2136,7 @@ void kio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) {
extern "C" extern "C"
{ {
KDE_EXPORT int kdemain(int argc, char **argv) { KDE_EXPORT int kdemain(int argc, char **argv) {
KInstance instance( "kio_kdevsvn" ); TDEInstance instance( "kio_kdevsvn" );
kdDebug(9036) << "*** Starting kio_kdevsvn " << endl; kdDebug(9036) << "*** Starting kio_kdevsvn " << endl;

Loading…
Cancel
Save