diff options
51 files changed, 130 insertions, 130 deletions
diff --git a/kamera/kioslave/kamera.cpp b/kamera/kioslave/kamera.cpp index 66c007f1..fe786228 100644 --- a/kamera/kioslave/kamera.cpp +++ b/kamera/kioslave/kamera.cpp @@ -67,7 +67,7 @@ extern "C" int kdemain(int argc, char **argv) { - KInstance instance("kio_kamera"); + TDEInstance instance("kio_kamera"); if(argc != 4) { kdDebug(7123) << "Usage: kio_kamera protocol " diff --git a/kcoloredit/kcolorchooser.cpp b/kcoloredit/kcolorchooser.cpp index cf4289d7..2d260c14 100644 --- a/kcoloredit/kcolorchooser.cpp +++ b/kcoloredit/kcolorchooser.cpp @@ -44,8 +44,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { KLocale::setMainCatalogue("tdelibs"); - KAboutData aboutData( "kcolorchooser", I18N_NOOP("KColorChooser"), - version, description, KAboutData::License_BSD, + TDEAboutData aboutData( "kcolorchooser", I18N_NOOP("KColorChooser"), + version, description, TDEAboutData::License_BSD, "(c) 2000, Waldo Bastian"); aboutData.addAuthor("Waldo Bastian",0, "[email protected]"); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kcoloredit/main.cpp b/kcoloredit/main.cpp index e92bbdca..b9a091f4 100644 --- a/kcoloredit/main.cpp +++ b/kcoloredit/main.cpp @@ -37,8 +37,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "kcoloredit", I18N_NOOP("KColorEdit"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kcoloredit", I18N_NOOP("KColorEdit"), + VERSION, description, TDEAboutData::License_GPL, "(c) 2000, Artur Rataj"); aboutData.addAuthor("Artur Rataj",0, "[email protected]"); aboutData.addCredit( "Nadeem Hasan", I18N_NOOP( "Rewrote UI code " diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp index 18a3df78..b1c29b63 100644 --- a/kdvi/kdvi_multipage.cpp +++ b/kdvi/kdvi_multipage.cpp @@ -96,11 +96,11 @@ KDVIMultiPage::~KDVIMultiPage() } -KAboutData* KDVIMultiPage::createAboutData() +TDEAboutData* KDVIMultiPage::createAboutData() { - KAboutData* about = new KAboutData("kdvi", I18N_NOOP("KDVI"), "1.3", + TDEAboutData* about = new TDEAboutData("kdvi", I18N_NOOP("KDVI"), "1.3", I18N_NOOP("A previewer for Device Independent files (DVI files) produced by the TeX typesetting system."), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "Markku Hinhala, Stephan Kebekus", I18N_NOOP("This program displays Device Independent (DVI) files which are produced by the TeX typesetting system.\n" "KDVI 1.3 is based on original code from KDVI version 0.43 and xdvik.")); diff --git a/kdvi/kdvi_multipage.h b/kdvi/kdvi_multipage.h index 1d42faa3..a6c033b9 100644 --- a/kdvi/kdvi_multipage.h +++ b/kdvi/kdvi_multipage.h @@ -34,7 +34,7 @@ public: virtual void addConfigDialogs(KConfigDialog* configDialog); - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); private: virtual DocumentWidget* createDocumentWidget(); diff --git a/kdvi/main.cpp b/kdvi/main.cpp index 2f3defbd..6b85af9d 100644 --- a/kdvi/main.cpp +++ b/kdvi/main.cpp @@ -31,8 +31,8 @@ static const char description[] = I18N_NOOP("A previewer for Device Independent int main(int argc, char** argv) { - KAboutData about ("kdvi", I18N_NOOP("KDVI"), "1.4", - description, KAboutData::License_GPL, + TDEAboutData about ("kdvi", I18N_NOOP("KDVI"), "1.4", + description, TDEAboutData::License_GPL, "Markku Hinhala, Stephan Kebekus", I18N_NOOP("This program displays Device Independent (DVI) files which are produced by the TeX typesetting system.\n" "This KDVI version is based on original code from KDVI version 0.43 and xdvik.")); diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp index 2cc4e0f5..7e420a11 100644 --- a/kfax/kfax.cpp +++ b/kfax/kfax.cpp @@ -1649,8 +1649,8 @@ static KCmdLineOptions options[] = int main (int argc, char **argv) { - KAboutData aboutData( "kfax", I18N_NOOP("KFax"), - KFAXVERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kfax", I18N_NOOP("KFax"), + KFAXVERSION, description, TDEAboutData::License_GPL, "(c) 1997-98 Bernd Johannes Wuebben"); aboutData.addAuthor( "Bernd Johannes Wuebben", 0, "[email protected]" ); aboutData.addCredit( "Nadeem Hasan", I18N_NOOP( "UI Rewrite, lots of code " diff --git a/kfaxview/faxmultipage.cpp b/kfaxview/faxmultipage.cpp index 44c1e273..d052b51b 100644 --- a/kfaxview/faxmultipage.cpp +++ b/kfaxview/faxmultipage.cpp @@ -55,12 +55,12 @@ FaxMultiPage::~FaxMultiPage() } -KAboutData* FaxMultiPage::createAboutData() +TDEAboutData* FaxMultiPage::createAboutData() { /* You obviously want to change this to match your setup */ - KAboutData* about = new KAboutData("kfaxview", I18N_NOOP("KFaxView"), "0.1", + TDEAboutData* about = new TDEAboutData("kfaxview", I18N_NOOP("KFaxView"), "0.1", I18N_NOOP("KViewshell Fax Plugin."), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "Stefan Kebekus", I18N_NOOP("This program previews fax (g3) files.")); diff --git a/kfaxview/faxmultipage.h b/kfaxview/faxmultipage.h index 6d506cff..a6e471e8 100644 --- a/kfaxview/faxmultipage.h +++ b/kfaxview/faxmultipage.h @@ -111,7 +111,7 @@ public: This member returns a structure that contains information about the authors of the implementation */ - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); private: /** This member holds the renderer which is used by the demo implementation */ diff --git a/kfaxview/main.cpp b/kfaxview/main.cpp index 93fd1807..7f4fbeee 100644 --- a/kfaxview/main.cpp +++ b/kfaxview/main.cpp @@ -50,8 +50,8 @@ static const char description[] = I18N_NOOP("A previewer for Fax files."); int main(int argc, char** argv) { - KAboutData about ("kfaxview", I18N_NOOP("KFaxView"), "3.5", - description, KAboutData::License_GPL, + TDEAboutData about ("kfaxview", I18N_NOOP("KFaxView"), "3.5", + description, TDEAboutData::License_GPL, "Stephan Kebekus, Helge Deller", I18N_NOOP("Fax-G3 plugin for the KViewShell document viewer framework.")); diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp index 68d1c425..08619841 100644 --- a/kghostview/kgv_view.cpp +++ b/kghostview/kgv_view.cpp @@ -364,12 +364,12 @@ KGVPart::~KGVPart() writeSettings(); } -KAboutData* KGVPart::createAboutData() +TDEAboutData* KGVPart::createAboutData() { - KAboutData* about = new KAboutData( "kghostview", I18N_NOOP( "KGhostView"), + TDEAboutData* about = new TDEAboutData( "kghostview", I18N_NOOP( "KGhostView"), KGHOSTVIEW_VERSION, I18N_NOOP( "Viewer for PostScript (.ps, .eps) and Portable Document Format (.pdf) files"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(C) 1998 Mark Donohoe, (C) 1999-2000 David Sweet, " "(C) 2000-2003 Wilco Greven", I18N_NOOP( "KGhostView displays, prints, and saves " diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h index 61c9d77c..d758ce5c 100644 --- a/kghostview/kgv_view.h +++ b/kghostview/kgv_view.h @@ -31,11 +31,11 @@ class TQFrame; class TQWidget; -class KAboutData; +class TDEAboutData; class KAction; class KActionCollection; class KDirWatch; -class KInstance; +class TDEInstance; class KPopupMenu; class KSelectAction; class KToggleAction; @@ -77,7 +77,7 @@ public: */ virtual bool closeURL(); - KDE_EXPORT static KAboutData* createAboutData(); + KDE_EXPORT static TDEAboutData* createAboutData(); public slots: /** diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp index c7024c59..dfeea82a 100644 --- a/kghostview/kgvfactory.cpp +++ b/kghostview/kgvfactory.cpp @@ -42,15 +42,15 @@ KGVFactory::~KGVFactory() s_self = 0; } -KInstance *KGVFactory::createInstance() +TDEInstance *KGVFactory::createInstance() { - KInstance* res = new KInstance( aboutData() ); + TDEInstance* res = new TDEInstance( aboutData() ); return res; } KGVFactory *KGVFactory::s_self; -KInstance *KGVFactory::s_instance; -KAboutData *KGVFactory::s_aboutData; +TDEInstance *KGVFactory::s_instance; +TDEAboutData *KGVFactory::s_aboutData; KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, @@ -84,19 +84,19 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char * return part; } -KInstance *KGVFactory::instance() +TDEInstance *KGVFactory::instance() { if ( !s_instance ) { if ( s_self ) s_instance = s_self->createInstance(); else - s_instance = new KInstance( aboutData() ); + s_instance = new TDEInstance( aboutData() ); } return s_instance; } -KAboutData *KGVFactory::aboutData() +TDEAboutData *KGVFactory::aboutData() { if ( !s_aboutData ) s_aboutData = KGVPart::createAboutData(); diff --git a/kghostview/kgvfactory.h b/kghostview/kgvfactory.h index 1c49926f..1b2e0801 100644 --- a/kghostview/kgvfactory.h +++ b/kghostview/kgvfactory.h @@ -22,16 +22,16 @@ #include <kparts/factory.h> #include <kparts/part.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KDE_EXPORT KGVFactory : public KParts::Factory { public: KGVFactory(); virtual ~KGVFactory(); - static KInstance *instance(); - static KAboutData *aboutData(); + static TDEInstance *instance(); + static TDEAboutData *aboutData(); virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, @@ -39,11 +39,11 @@ class KDE_EXPORT KGVFactory : public KParts::Factory const TQStringList &args ); protected: - virtual KInstance *createInstance(); + virtual TDEInstance *createInstance(); private: static KGVFactory*s_self; - static KInstance *s_instance; - static KAboutData *s_aboutData; + static TDEInstance *s_instance; + static TDEAboutData *s_aboutData; }; #endif diff --git a/kiconedit/main.cpp b/kiconedit/main.cpp index 65b8d3e4..1d6ca16d 100644 --- a/kiconedit/main.cpp +++ b/kiconedit/main.cpp @@ -42,8 +42,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData aboutData( "kiconedit", I18N_NOOP("KIconEdit"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kiconedit", I18N_NOOP("KIconEdit"), + VERSION, description, TDEAboutData::License_GPL, "(c) 1998, Thomas Tanghus"); aboutData.addAuthor("Thomas Tanghus",0, "[email protected]"); diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp index a07018c4..294d7581 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp +++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp @@ -46,12 +46,12 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kmrml, MrmlFactory("kmrml") ) KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ): KCModule(MrmlFactory::instance(), parent, name) { - KAboutData* ab = new KAboutData( + TDEAboutData* ab = new TDEAboutData( "kcmkmrml", I18N_NOOP("KCMKMrml"), KMRML_VERSION, I18N_NOOP("Advanced Search Control Module"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP( "Copyright 2002, Carsten Pfeiffer" ), 0, "http://devel-home.kde.org/~pfeiffer/kmrml/" ); diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.h b/kmrml/kmrml/kcontrol/kcmkmrml.h index 9be6db8a..8ff7d971 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.h +++ b/kmrml/kmrml/kcontrol/kcmkmrml.h @@ -21,7 +21,7 @@ #include <kcmodule.h> -class KAboutData; +class TDEAboutData; class KURLRequester; namespace KMrmlConfig diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp index 3a6f6721..ab4cfcfc 100644 --- a/kmrml/kmrml/mrml.cpp +++ b/kmrml/kmrml/mrml.cpp @@ -39,7 +39,7 @@ extern "C" { KDE_EXPORT int kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("tdelibs"); - KInstance instance( "kio_mrml" ); + TDEInstance instance( "kio_mrml" ); KGlobal::locale()->insertCatalogue( "kmrml" ); kdDebug() << "Starting MRML " << getpid() << endl; diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp index 56074222..80ac57c0 100644 --- a/kmrml/kmrml/mrml_part.cpp +++ b/kmrml/kmrml/mrml_part.cpp @@ -66,7 +66,7 @@ extern "C" } } -KInstance * PartFactory::s_instance = 0L; +TDEInstance * PartFactory::s_instance = 0L; PartFactory::PartFactory() : KParts::Factory() @@ -81,10 +81,10 @@ PartFactory::~PartFactory() s_instance = 0L; } -KInstance * PartFactory::instance() +TDEInstance * PartFactory::instance() { if ( !s_instance ) { - s_instance = new KInstance( "kmrml" ); + s_instance = new TDEInstance( "kmrml" ); KGlobal::locale()->insertCatalogue( "kmrml" ); } return s_instance; @@ -830,14 +830,14 @@ void MrmlPart::restoreState( TQDataStream& stream ) m_url = url; } -KAboutData * MrmlPart::createAboutData() +TDEAboutData * MrmlPart::createAboutData() { - KAboutData *data = new KAboutData( + TDEAboutData *data = new TDEAboutData( "kmrml", I18N_NOOP("MRML Client for TDE"), KMRML_VERSION, I18N_NOOP("A tool to search for images by their content"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2001-2002, Carsten Pfeiffer"), 0, I18N_NOOP("http://devel-home.kde.org/~pfeiffer/kmrml/") ); diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h index a382d22a..7efa4e95 100644 --- a/kmrml/kmrml/mrml_part.h +++ b/kmrml/kmrml/mrml_part.h @@ -34,7 +34,7 @@ class TQCheckBox; class TQHGroupBox; class TQPushButton; -class KAboutData; +class TDEAboutData; class KComboBox; class KIntNumInput; @@ -69,7 +69,7 @@ public: void saveState( TQDataStream& stream ); void restoreState( TQDataStream& stream ); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); public slots: virtual bool openURL( const KURL& ); @@ -157,7 +157,7 @@ public: PartFactory(); ~PartFactory(); - static KInstance * instance(); + static TDEInstance * instance(); protected: virtual KParts::Part * createPartObject( TQWidget *parentWidget = 0, @@ -168,7 +168,7 @@ protected: const TQStringList& args = TQStringList() ); private: - static KInstance * s_instance; + static TDEInstance * s_instance; }; diff --git a/kmrml/kmrml/mrmlsearch.cpp b/kmrml/kmrml/mrmlsearch.cpp index 49b9353a..fbd1468d 100644 --- a/kmrml/kmrml/mrmlsearch.cpp +++ b/kmrml/kmrml/mrmlsearch.cpp @@ -55,7 +55,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) query.append( path ); } - KInstance instance( "kio_mrml" ); + TDEInstance instance( "kio_mrml" ); KMrml::Config config( instance.config() ); KMrml::ServerSettings settings = config.defaultSettings(); diff --git a/kolourpaint/kolourpaint.cpp b/kolourpaint/kolourpaint.cpp index 763fe668..6f2cbf8a 100644 --- a/kolourpaint/kolourpaint.cpp +++ b/kolourpaint/kolourpaint.cpp @@ -57,20 +57,20 @@ static const KCmdLineOptions cmdLineOptions [] = int main (int argc, char *argv []) { - KAboutData aboutData + TDEAboutData aboutData ( "kolourpaint", I18N_NOOP ("KolourPaint"), kpVersionText, I18N_NOOP ("Paint Program for TDE"), - KAboutData::License_Custom, + TDEAboutData::License_Custom, 0/*copyright statement - see licence instead*/, 0/*no free text*/, "http://www.kolourpaint.org/" ); - // this is _not_ the same as KAboutData::License_BSD + // this is _not_ the same as TDEAboutData::License_BSD aboutData.setLicenseText (kpLicenseText); diff --git a/kooka/main.cpp b/kooka/main.cpp index 538e17cb..3b8d6ec0 100644 --- a/kooka/main.cpp +++ b/kooka/main.cpp @@ -73,8 +73,8 @@ static KCmdLineOptions options[] = int main( int argc, char *argv[] ) { - KAboutData about("kooka", I18N_NOOP("Kooka"), KOOKA_VERSION, I18N_NOOP(description), - KAboutData::License_GPL_V2, "(C) 2000 Klaas Freitag", 0, + TDEAboutData about("kooka", I18N_NOOP("Kooka"), KOOKA_VERSION, I18N_NOOP(description), + TDEAboutData::License_GPL_V2, "(C) 2000 Klaas Freitag", 0, I18N_NOOP("http://kooka.kde.org")); about.addAuthor( "Klaas Freitag", I18N_NOOP("developer"), "[email protected]" ); diff --git a/kpdf/part.cpp b/kpdf/part.cpp index 1ceb042d..9b798526 100644 --- a/kpdf/part.cpp +++ b/kpdf/part.cpp @@ -383,12 +383,12 @@ KURL Part::currentDocument() } //this don't go anywhere but is required by genericfactory.h -KAboutData* Part::createAboutData() +TDEAboutData* Part::createAboutData() { // the non-i18n name here must be the same as the directory in // which the part's rc file is installed ('partrcdir' in the // Makefile) - KAboutData* aboutData = new KAboutData("kpdfpart", I18N_NOOP("KPDF::Part"), "0.1"); + TDEAboutData* aboutData = new TDEAboutData("kpdfpart", I18N_NOOP("KPDF::Part"), "0.1"); aboutData->addAuthor("Wilco Greven", 0, "[email protected]"); return aboutData; } diff --git a/kpdf/part.h b/kpdf/part.h index a561326a..eec74710 100644 --- a/kpdf/part.h +++ b/kpdf/part.h @@ -33,7 +33,7 @@ class KConfig; class KDirWatch; class KToggleAction; class KSelectAction; -class KAboutData; +class TDEAboutData; class KPrinter; class ThumbnailList; @@ -73,7 +73,7 @@ public: uint observerId() const { return PART_ID; } void notifyViewportChanged( bool smoothMove ); - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); ASYNC goToPage(uint page); ASYNC openDocument(KURL doc); diff --git a/kpdf/shell/main.cpp b/kpdf/shell/main.cpp index 5009ba12..5d8f0be0 100644 --- a/kpdf/shell/main.cpp +++ b/kpdf/shell/main.cpp @@ -31,12 +31,12 @@ static KCmdLineOptions options[] = int main(int argc, char** argv) { - KAboutData about( + TDEAboutData about( "kpdf", I18N_NOOP("KPDF"), version, description, - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(C) 2002 Wilco Greven, Christophe Devriese\n(C) 2004-2005 Albert Astals Cid, Enrico Ros"); about.addAuthor("Wilco Greven", 0, "[email protected]"); diff --git a/kpovmodeler/pmfactory.cpp b/kpovmodeler/pmfactory.cpp index 488db1ce..971fcdde 100644 --- a/kpovmodeler/pmfactory.cpp +++ b/kpovmodeler/pmfactory.cpp @@ -35,8 +35,8 @@ extern "C" static const char description[] = I18N_NOOP( "Modeler for POV-Ray Scenes" ); -KInstance* PMFactory::s_instance = 0L; -KAboutData* PMFactory::s_aboutData = 0L; +TDEInstance* PMFactory::s_instance = 0L; +TDEAboutData* PMFactory::s_aboutData = 0L; PMFactory::PMFactory( ) { @@ -71,21 +71,21 @@ KParts::Part* PMFactory::createPartObject( TQWidget* parentWidget, return part; } -KInstance* PMFactory::instance( ) +TDEInstance* PMFactory::instance( ) { if( !s_instance ) - s_instance = new KInstance( aboutData( ) ); + s_instance = new TDEInstance( aboutData( ) ); return s_instance; } -const KAboutData* PMFactory::aboutData( ) +const TDEAboutData* PMFactory::aboutData( ) { if( !s_aboutData ) { s_aboutData = - new KAboutData( "kpovmodeler", I18N_NOOP( "KPovModeler" ), + new TDEAboutData( "kpovmodeler", I18N_NOOP( "KPovModeler" ), KPOVMODELER_VERSION, description, - KAboutData::License_GPL, "(c) 2001-2006, Andreas Zehender" ); + TDEAboutData::License_GPL, "(c) 2001-2006, Andreas Zehender" ); s_aboutData->addAuthor( "Andreas Zehender", 0, "[email protected]", "http://www.azweb.de" ); s_aboutData->addAuthor( "Luis Passos Carvalho", I18N_NOOP( "Textures" ), diff --git a/kpovmodeler/pmfactory.h b/kpovmodeler/pmfactory.h index 6af1b2ed..fd147aaa 100644 --- a/kpovmodeler/pmfactory.h +++ b/kpovmodeler/pmfactory.h @@ -22,8 +22,8 @@ #include <kparts/factory.h> -class KAboutData; -class KInstance; +class TDEAboutData; +class TDEInstance; class PMFactory : public KParts::Factory { @@ -39,11 +39,11 @@ public: const char* classname, const TQStringList& args ); - static KInstance* instance( ); - static const KAboutData* aboutData( ); + static TDEInstance* instance( ); + static const TDEAboutData* aboutData( ); private: - static KInstance* s_instance; - static KAboutData* s_aboutData; + static TDEInstance* s_instance; + static TDEAboutData* s_aboutData; }; #endif diff --git a/kpovmodeler/pmpluginmanager.cpp b/kpovmodeler/pmpluginmanager.cpp index 7af50d5c..c06f3342 100644 --- a/kpovmodeler/pmpluginmanager.cpp +++ b/kpovmodeler/pmpluginmanager.cpp @@ -38,7 +38,7 @@ class PMPluginWorkaround : public Plugin { public: PMPluginWorkaround( ) : Plugin( 0, 0 ) { }; - static TQValueList<Plugin::PluginInfo> installedPlugins( const KInstance* instance ) + static TQValueList<Plugin::PluginInfo> installedPlugins( const TDEInstance* instance ) { return pluginInfos( instance ); } diff --git a/kruler/main.cpp b/kruler/main.cpp index 13b860b7..b11b2b56 100644 --- a/kruler/main.cpp +++ b/kruler/main.cpp @@ -37,10 +37,10 @@ int main(int argc, char *argv[]) { - KAboutData aboutData( "kruler", I18N_NOOP("TDE Screen Ruler"), + TDEAboutData aboutData( "kruler", I18N_NOOP("TDE Screen Ruler"), VERSION, I18N_NOOP("A screen ruler for the Trinity Desktop Environment"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2000, Till Krech", freeFormText, homePageURL); diff --git a/ksnapshot/main.cpp b/ksnapshot/main.cpp index 0bf32633..8f03f2bf 100644 --- a/ksnapshot/main.cpp +++ b/ksnapshot/main.cpp @@ -42,8 +42,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData aboutData( "ksnapshot", I18N_NOOP("KSnapshot"), - KSNAPVERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "ksnapshot", I18N_NOOP("KSnapshot"), + KSNAPVERSION, description, TDEAboutData::License_GPL, "(c) 1997-2004, Richard J. Moore,\n(c) 2000, Matthias Ettrich,\n(c) 2002-2003 Aaron J. Seigo"); aboutData.addAuthor("Richard J. Moore",0, "[email protected]"); aboutData.addAuthor("Matthias Ettrich",0, "[email protected]"); diff --git a/ksvg/plugin/ksvg_factory.cpp b/ksvg/plugin/ksvg_factory.cpp index d5e5e1dc..a273e5bf 100644 --- a/ksvg/plugin/ksvg_factory.cpp +++ b/ksvg/plugin/ksvg_factory.cpp @@ -40,8 +40,8 @@ extern "C" } } -KInstance *KSVGPluginFactory::s_instance = 0; -KAboutData *KSVGPluginFactory::s_about = 0; +TDEInstance *KSVGPluginFactory::s_instance = 0; +TDEAboutData *KSVGPluginFactory::s_about = 0; KSVGPluginFactory::KSVGPluginFactory(TQObject *parent, const char *name) : KParts::Factory(parent, name) { @@ -75,16 +75,16 @@ KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *parentWidget, const return new KSVGPlugin(parentWidget, wname, parent, name, width, height); } -KInstance *KSVGPluginFactory::instance() +TDEInstance *KSVGPluginFactory::instance() { if(!s_instance) { - s_about = new KAboutData("ksvg", I18N_NOOP("KSVG"), "0.1", "KSVG\nFreedom for veKtors",KAboutData::License_GPL_V2,"(c) 2001-2003, The KSVG Team",0,"http://svg.kde.org"); + s_about = new TDEAboutData("ksvg", I18N_NOOP("KSVG"), "0.1", "KSVG\nFreedom for veKtors",TDEAboutData::License_GPL_V2,"(c) 2001-2003, The KSVG Team",0,"http://svg.kde.org"); s_about->addAuthor("Rob Buis", 0, "[email protected]"); s_about->addAuthor("Nikolas Zimmermann", 0, "[email protected]"); s_about->addCredit("Adrian Page", 0); s_about->addCredit("Andreas Streichardt", 0, "[email protected]"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; diff --git a/ksvg/plugin/ksvg_factory.h b/ksvg/plugin/ksvg_factory.h index b163efee..677bab38 100644 --- a/ksvg/plugin/ksvg_factory.h +++ b/ksvg/plugin/ksvg_factory.h @@ -24,8 +24,8 @@ #include <kparts/factory.h> #include <kparts/browserextension.h> -class KAboutData; -class KInstance; +class TDEAboutData; +class TDEInstance; class KSVGPluginFactory : public KParts::Factory { @@ -37,11 +37,11 @@ public: virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList()); - static KInstance *instance(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_about; + static TDEInstance *s_instance; + static TDEAboutData *s_about; }; class KSVGPluginBrowserExtension : public KParts::BrowserExtension diff --git a/ksvg/test/external/printnodetest.cpp b/ksvg/test/external/printnodetest.cpp index 9229461d..83ffafde 100644 --- a/ksvg/test/external/printnodetest.cpp +++ b/ksvg/test/external/printnodetest.cpp @@ -46,7 +46,7 @@ void Worker::slotParsingFinished(bool, const TQString &) int main(int argc, char **argv) { - KAboutData *about = new KAboutData("KSVG printNode test app", I18N_NOOP("KSVG test"), "0.1", I18N_NOOP("KSVG printNode test app")); + TDEAboutData *about = new TDEAboutData("KSVG printNode test app", I18N_NOOP("KSVG test"), "0.1", I18N_NOOP("KSVG printNode test app")); TDECmdLineArgs::init(argc, argv, about); TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/ksvg/test/external/svgdisplay.cc b/ksvg/test/external/svgdisplay.cc index b89a1f42..cf176bd1 100644 --- a/ksvg/test/external/svgdisplay.cc +++ b/ksvg/test/external/svgdisplay.cc @@ -13,7 +13,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData *about = new KAboutData( "KSVG test app", I18N_NOOP("KSVG test"), "0.1", I18N_NOOP("KSVG standalone test app") ); + TDEAboutData *about = new TDEAboutData( "KSVG test app", I18N_NOOP("KSVG test"), "0.1", I18N_NOOP("KSVG standalone test app") ); TDECmdLineArgs::init(argc, argv, about); TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kuickshow/src/main.cpp b/kuickshow/src/main.cpp index 36286463..ed0ad319 100644 --- a/kuickshow/src/main.cpp +++ b/kuickshow/src/main.cpp @@ -38,10 +38,10 @@ static KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { - KAboutData about( + TDEAboutData about( "kuickshow", I18N_NOOP( "KuickShow" ), KUICKSHOWVERSION, I18N_NOOP("A fast and versatile image viewer" ), - KAboutData::License_GPL, "(c) 1998-2006, Carsten Pfeiffer", + TDEAboutData::License_GPL, "(c) 1998-2006, Carsten Pfeiffer", 0 /*text*/, "http://devel-home.kde.org/~pfeiffer/" ); about.addAuthor( "Carsten Pfeiffer", 0, "[email protected]", diff --git a/kview/kviewcanvas/ChangeLog b/kview/kviewcanvas/ChangeLog index 1edb3529..9ec3ee84 100644 --- a/kview/kviewcanvas/ChangeLog +++ b/kview/kviewcanvas/ChangeLog @@ -10,7 +10,7 @@ * kimagecanvas.cpp: Fix checkBounds() to always keep the aspect ratio. - Create the factory with it's own KInstance. + Create the factory with it's own TDEInstance. * kimagecanvas.{h,cpp}: New method boundImageTo( QSize ). Fits the image into the requested width and height. diff --git a/kview/kviewcanvas/test/main.cpp b/kview/kviewcanvas/test/main.cpp index bd78c8fb..4c6fa3f7 100644 --- a/kview/kviewcanvas/test/main.cpp +++ b/kview/kviewcanvas/test/main.cpp @@ -17,7 +17,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kimageviewertest", I18N_NOOP("KImageViewerTest"), version, description, KAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "[email protected]"); + TDEAboutData about("kimageviewertest", I18N_NOOP("KImageViewerTest"), version, description, TDEAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "[email protected]"); about.addAuthor( "Matthias Kretz", 0, "[email protected]" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index b9e8af7d..dbfa1c92 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -167,11 +167,11 @@ KViewViewer::~KViewViewer() delete m_pBuffer; } -KAboutData * KViewViewer::createAboutData() +TDEAboutData * KViewViewer::createAboutData() { - KAboutData * aboutData = new KAboutData( "kviewviewer", I18N_NOOP( "KView" ), + TDEAboutData * aboutData = new TDEAboutData( "kviewviewer", I18N_NOOP( "KView" ), KVIEW_VERSION, I18N_NOOP( "TDE Image Viewer Part" ), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1997-2002, The KView Developers") ); aboutData->addAuthor( "Matthias Kretz", I18N_NOOP( "Maintainer" ), "[email protected]" ); aboutData->addAuthor( "Sirtaj Singh Kang", I18N_NOOP( "started it all" ), "[email protected]" ); @@ -743,7 +743,7 @@ void KViewViewer::slotDel() class PopupGUIClient : public KXMLGUIClient { public: - PopupGUIClient( KInstance *inst, const TQString &doc ) + PopupGUIClient( TDEInstance *inst, const TQString &doc ) { setInstance( inst ); setXML( doc ); diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h index 1cc26f32..06fb17bc 100644 --- a/kview/kviewviewer/kviewviewer.h +++ b/kview/kviewviewer/kviewviewer.h @@ -35,7 +35,7 @@ class KAction; class KActionMenu; class KToggleAction; class KSelectAction; -class KAboutData; +class TDEAboutData; class TQBuffer; class TQSize; class KDirWatch; @@ -54,7 +54,7 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf virtual ~KViewViewer(); KImageViewer::Canvas * canvas() const { return m_pCanvas; } - static KAboutData * createAboutData(); + static TDEAboutData * createAboutData(); virtual void setReadWrite( bool readwrite = true ); KParts::BrowserExtension * browserExtension() const { return m_pExtension; } diff --git a/kview/kviewviewer/test/main.cpp b/kview/kviewviewer/test/main.cpp index 499e75e5..5a562b08 100644 --- a/kview/kviewviewer/test/main.cpp +++ b/kview/kviewviewer/test/main.cpp @@ -17,7 +17,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kviewviewertest", I18N_NOOP("KView Viewer Test"), version, description, KAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "[email protected]"); + TDEAboutData about("kviewviewertest", I18N_NOOP("KView Viewer Test"), version, description, TDEAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "[email protected]"); about.addAuthor( "Matthias Kretz", 0, "[email protected]" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/kview/main.cpp b/kview/main.cpp index 4f8266d2..43b6d907 100644 --- a/kview/main.cpp +++ b/kview/main.cpp @@ -33,9 +33,9 @@ static KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) { - KAboutData about( "kview", I18N_NOOP( "KView" ), + TDEAboutData about( "kview", I18N_NOOP( "KView" ), KVIEW_VERSION, description, - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP( "(c) 1997-2002, The KView Developers" ) ); about.addAuthor( "Matthias Kretz", I18N_NOOP( "Maintainer" ), "[email protected]" ); about.addAuthor( "Sirtaj Singh Kang", I18N_NOOP( "started it all" ), "[email protected]" ); diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp index 9fcb1603..a08f871a 100644 --- a/kview/photobook/photobook.cpp +++ b/kview/photobook/photobook.cpp @@ -262,12 +262,12 @@ bool PhotoBookPart::openURL(const KURL &url) } -KAboutData* PhotoBookPart::createAboutData() +TDEAboutData* PhotoBookPart::createAboutData() { - return new KAboutData( + return new TDEAboutData( "photobook", I18N_NOOP("Photo Book"), "1.0", I18N_NOOP("Easily browse a folder of photographs"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("Copyright (c) 2004,2005 Charles Samuels <[email protected]>") ); } diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h index 1f9bd136..b7c8ee63 100644 --- a/kview/photobook/photobook.h +++ b/kview/photobook/photobook.h @@ -122,7 +122,7 @@ public: ~PhotoBookPart(); virtual bool openURL(const KURL &url); - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); virtual bool openFile(); public slots: diff --git a/kviewshell/empty_multipage.cpp b/kviewshell/empty_multipage.cpp index 8fc1a0f8..83ba49d9 100644 --- a/kviewshell/empty_multipage.cpp +++ b/kviewshell/empty_multipage.cpp @@ -37,11 +37,11 @@ EmptyMultiPage::EmptyMultiPage(TQWidget* parentWidget, const char* widgetName, T setRenderer(&emptyRenderer); } -KAboutData* EmptyMultiPage::createAboutData() +TDEAboutData* EmptyMultiPage::createAboutData() { - return new KAboutData("emptymultipage", I18N_NOOP("Empty Multipage"), + return new TDEAboutData("emptymultipage", I18N_NOOP("Empty Multipage"), "1.0", I18N_NOOP(""), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("Copyright (c) 2005 Wilfried Huss")); } diff --git a/kviewshell/empty_multipage.h b/kviewshell/empty_multipage.h index a423c2ed..b27fb1b6 100644 --- a/kviewshell/empty_multipage.h +++ b/kviewshell/empty_multipage.h @@ -41,7 +41,7 @@ public: /// opens a file virtual bool openFile() { return false; } - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); private: EmptyRenderer emptyRenderer; diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index 6afcee50..e4dbf633 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -1404,11 +1404,11 @@ void KViewPart::setStatusBarTextFromMultiPage( const TQString &msg ) emit setStatusBarText(msg); } -KAboutData* KViewPart::createAboutData() +TDEAboutData* KViewPart::createAboutData() { - return new KAboutData("kviewerpart", I18N_NOOP("Document Viewer Part"), + return new TDEAboutData("kviewerpart", I18N_NOOP("Document Viewer Part"), "0.6", I18N_NOOP(""), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("Copyright (c) 2005 Wilfried Huss")); } diff --git a/kviewshell/kviewpart.h b/kviewshell/kviewpart.h index 9fd0ed92..80c427c5 100644 --- a/kviewshell/kviewpart.h +++ b/kviewshell/kviewpart.h @@ -9,13 +9,13 @@ #include <kparts/browserextension.h> #include <tqtimer.h> -class KAboutData; +class TDEAboutData; class KAboutDialog; class KAccel; class KAction; class KConfig; class KDirWatch; -class KInstance; +class TDEInstance; class KMultiPage; class KRadioAction; class KSelectAction; @@ -38,7 +38,7 @@ public: const char *name, const TQStringList& args); virtual ~KViewPart(); - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); bool isValid() { return multiPage; } diff --git a/kviewshell/main.cpp b/kviewshell/main.cpp index 95b5e9d8..132cbfda 100644 --- a/kviewshell/main.cpp +++ b/kviewshell/main.cpp @@ -34,8 +34,8 @@ static const char description[] = I18N_NOOP("Generic framework for viewer applic int main(int argc, char **argv) { - KAboutData about ("kviewshell", I18N_NOOP("KViewShell"), "0.6", - description, KAboutData::License_GPL, + TDEAboutData about ("kviewshell", I18N_NOOP("KViewShell"), "0.6", + description, TDEAboutData::License_GPL, "(C) 2000, Matthias Hoelzer-Kluepfel\n" "(C) 2004-2005, Wilfried Huss", I18N_NOOP("Displays various document formats. " diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp index edc7e256..591447db 100644 --- a/kviewshell/plugins/djvu/djvumultipage.cpp +++ b/kviewshell/plugins/djvu/djvumultipage.cpp @@ -89,12 +89,12 @@ DjVuMultiPage::~DjVuMultiPage() } -KAboutData* DjVuMultiPage::createAboutData() +TDEAboutData* DjVuMultiPage::createAboutData() { /* You obviously want to change this to match your setup */ - KAboutData* about = new KAboutData("djvumultipage", I18N_NOOP("KDjView"), "0.1", + TDEAboutData* about = new TDEAboutData("djvumultipage", I18N_NOOP("KDjView"), "0.1", I18N_NOOP("KViewshell DjVu Plugin."), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "Wilfried Huss", I18N_NOOP("This program displays DjVu files.")); diff --git a/kviewshell/plugins/djvu/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h index d7c59b70..163bf474 100644 --- a/kviewshell/plugins/djvu/djvumultipage.h +++ b/kviewshell/plugins/djvu/djvumultipage.h @@ -119,7 +119,7 @@ public: This member returns a structure that contains information about the authors of the implementation */ - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); /** Re-implementation of the print method */ virtual void print(); |