diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
198 files changed, 424 insertions, 424 deletions
diff --git a/drkonqi/crashtest.cpp b/drkonqi/crashtest.cpp index a0aae0347..57f055420 100644 --- a/drkonqi/crashtest.cpp +++ b/drkonqi/crashtest.cpp @@ -68,10 +68,10 @@ void level1(int t) int main(int argc, char *argv[]) { - KAboutData aboutData("crashtext", "Crash Test for DrKonqi", + TDEAboutData aboutData("crashtext", "Crash Test for DrKonqi", "1.1", "Crash Test for DrKonqi", - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2000-2002 David Faure, Waldo Bastian"); TDECmdLineArgs::init(argc, argv, &aboutData); diff --git a/drkonqi/drbugreport.cpp b/drkonqi/drbugreport.cpp index 3ec731b01..924f83e28 100644 --- a/drkonqi/drbugreport.cpp +++ b/drkonqi/drbugreport.cpp @@ -35,7 +35,7 @@ #include "drbugreport.h" DrKBugReport::DrKBugReport(TQWidget *parent, bool modal, - const KAboutData *aboutData) + const TDEAboutData *aboutData) : KBugReport(parent, modal, aboutData) { } diff --git a/drkonqi/drbugreport.h b/drkonqi/drbugreport.h index d1e98e028..a76740416 100644 --- a/drkonqi/drbugreport.h +++ b/drkonqi/drbugreport.h @@ -28,7 +28,7 @@ #ifndef DRBUGREPORT_H #define DRBUGREPORT_H -class KAboutData; +class TDEAboutData; #include <kbugreport.h> @@ -41,7 +41,7 @@ public: * Constructor. */ DrKBugReport(TQWidget *parent = 0, bool modal = true, - const KAboutData *aboutData = 0); + const TDEAboutData *aboutData = 0); public: /** diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index 1e22bbbd9..38e8c84cc 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -74,7 +74,7 @@ void KrashConfig :: readConfig() programname.setStr(I18N_NOOP("unknown")); // leak some memory... Well. It's only done once anyway :-) const char * progname = tqstrdup(programname); - m_aboutData = new KAboutData(args->getOption("appname"), + m_aboutData = new TDEAboutData(args->getOption("appname"), progname, args->getOption("appversion"), 0, 0, 0, 0, 0, diff --git a/drkonqi/krashconf.h b/drkonqi/krashconf.h index 236083f76..f20c395f0 100644 --- a/drkonqi/krashconf.h +++ b/drkonqi/krashconf.h @@ -70,7 +70,7 @@ public: bool showDebugger() const { return m_showdebugger && !m_debugger.isNull(); }; bool showBugReport() const { return m_showbugreport; }; bool disableChecks() const { return m_disablechecks; }; - const KAboutData *aboutData() const { return m_aboutData; } + const TDEAboutData *aboutData() const { return m_aboutData; } TQString execName() const { return m_execname; } void expandString(TQString &str, bool shell, const TQString &tempFile = TQString::null) const; @@ -84,7 +84,7 @@ private: void readConfig(); private: - KAboutData *m_aboutData; + TDEAboutData *m_aboutData; int m_pid; int m_signalnum; bool m_showdebugger; diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp index 8e40ea8bb..e65c63632 100644 --- a/drkonqi/main.cpp +++ b/drkonqi/main.cpp @@ -68,11 +68,11 @@ int main( int argc, char* argv[] ) setenv("TDE_DEBUG", "true", 1); unsetenv("SESSION_MANAGER"); - KAboutData aboutData( "drkonqi", + TDEAboutData aboutData( "drkonqi", I18N_NOOP("The TDE Crash Handler"), version, description, - KAboutData::License_BSD, + TDEAboutData::License_BSD, "(C) 2012, The Trinity Desktop Project"); aboutData.addAuthor("Timothy Pearson", 0, "[email protected]"); aboutData.addAuthor("Hans Petter Bieker", 0, "[email protected]"); diff --git a/drkonqi/toplevel.h b/drkonqi/toplevel.h index e6854bab5..e6d1b84cb 100644 --- a/drkonqi/toplevel.h +++ b/drkonqi/toplevel.h @@ -30,7 +30,7 @@ #ifndef TOPLEVEL_H #define TOPLEVEL_H -class KAboutData; +class TDEAboutData; class KrashConfig; class DrKBugReport; diff --git a/kappfinder/main.cpp b/kappfinder/main.cpp index b28cf01cc..35338bc9c 100644 --- a/kappfinder/main.cpp +++ b/kappfinder/main.cpp @@ -33,8 +33,8 @@ static KCmdLineOptions options[] = { int main( int argc, char *argv[] ) { - KAboutData aboutData( "kappfinder", I18N_NOOP( "KAppfinder" ), - "1.0", description, KAboutData::License_GPL, + TDEAboutData aboutData( "kappfinder", I18N_NOOP( "KAppfinder" ), + "1.0", description, TDEAboutData::License_GPL, "(c) 1998-2000, Matthias Hoelzer-Kluepfel" ); aboutData.addAuthor( "Matthias Hoelzer-Kluepfel", 0, "[email protected]" ); aboutData.addAuthor( "Tobias Koenig", 0, "[email protected]" ); diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp index 298ff06bb..d120a024c 100644 --- a/kappfinder/main_install.cpp +++ b/kappfinder/main_install.cpp @@ -34,7 +34,7 @@ int main( int argc, char *argv[] ) { - KInstance instance( "kappfinder_install" ); + TDEInstance instance( "kappfinder_install" ); int added = 0; if ( argc != 2 ) { diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp index 28f293509..f5dd1ea5c 100644 --- a/kate/app/katemain.cpp +++ b/kate/app/katemain.cpp @@ -60,8 +60,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) // here we go, construct the Kate version TQString kateVersion = KateApp::kateVersion(); - KAboutData aboutData ("kate", I18N_NOOP("Kate"), kateVersion.latin1(), - I18N_NOOP( "Kate - Advanced Text Editor" ), KAboutData::License_LGPL_V2, + TDEAboutData aboutData ("kate", I18N_NOOP("Kate"), kateVersion.latin1(), + I18N_NOOP( "Kate - Advanced Text Editor" ), TDEAboutData::License_LGPL_V2, I18N_NOOP( "(c) 2000-2005 The Kate Authors" ), 0, "http://kate.kde.org"); aboutData.addAuthor ("Christoph Cullmann", I18N_NOOP("Maintainer"), "[email protected]", "http://www.babylon2k.de"); diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 02b00017f..2f32d2c24 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -549,10 +549,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) We now hard-code the first two numbers to match the 3.5.x days and only update the last number. */ TQString kWriteVersion = TQString ("4.5.%1").arg(KDE::versionMajor()); - KAboutData aboutData ( "kwrite", + TDEAboutData aboutData ( "kwrite", I18N_NOOP("KWrite"), kWriteVersion.latin1(), - I18N_NOOP( "KWrite - Text Editor" ), KAboutData::License_LGPL_V2, + I18N_NOOP( "KWrite - Text Editor" ), TDEAboutData::License_LGPL_V2, I18N_NOOP( "(c) 2000-2005 The Kate Authors" ), 0, "http://kate.kde.org" ); aboutData.addAuthor ("Christoph Cullmann", I18N_NOOP("Maintainer"), "[email protected]", "http://www.babylon2k.de"); diff --git a/kcminit/main.cpp b/kcminit/main.cpp index eb40e77c0..52fe79d98 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -234,7 +234,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) startup = ( strcmp( argv[ 0 ], "kcminit_startup" ) == 0 ); // started from starttde? KLocale::setMainCatalogue("kcontrol"); - KAboutData aboutData( "kcminit", I18N_NOOP("KCMInit"), + TDEAboutData aboutData( "kcminit", I18N_NOOP("KCMInit"), "", I18N_NOOP("KCMInit - runs startups initialization for Control Modules.")); diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index 2279c9a78..1e28238a6 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -225,9 +225,9 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) : KCModule(parent, "kcmaccess") { - KAboutData *about = - new KAboutData(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2000, Matthias Hoelzer-Kluepfel")); about->addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "[email protected]"); @@ -563,7 +563,7 @@ KAccessConfig::~KAccessConfig() void KAccessConfig::configureKNotify() { - KAboutData about(I18N_NOOP("kaccess"), + TDEAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"), 0); KNotifyDialog::configure (this, 0, &about); diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h index 287514343..fac04aef4 100644 --- a/kcontrol/access/kcmaccess.h +++ b/kcontrol/access/kcmaccess.h @@ -22,7 +22,7 @@ class TQRadioButton; class KColorButton; class TQSlider; class KNumInput; -class KAboutData; +class TDEAboutData; class ExtendedIntNumInput : public KIntNumInput { diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp index d57b8228b..9b29f9e6c 100644 --- a/kcontrol/access/main.cpp +++ b/kcontrol/access/main.cpp @@ -6,8 +6,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] ) { - KAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"), - 0, 0, KAboutData::License_GPL, + TDEAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2000, Matthias Hoelzer-Kluepfel")); about.addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "[email protected]"); diff --git a/kcontrol/accessibility/accessibility.cpp b/kcontrol/accessibility/accessibility.cpp index eca3880ed..b22df15ff 100644 --- a/kcontrol/accessibility/accessibility.cpp +++ b/kcontrol/accessibility/accessibility.cpp @@ -56,9 +56,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_accessibility, AccessibilityFactory("kcmaccessib AccessibilityConfig::AccessibilityConfig(TQWidget *parent, const char *name, const TQStringList &) : AccessibilityConfigWidget( parent, name){ - KAboutData *about = - new KAboutData(I18N_NOOP("kcmaccessiblity"), I18N_NOOP("TDE Accessibility Tool"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmaccessiblity"), I18N_NOOP("TDE Accessibility Tool"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2000, Matthias Hoelzer-Kluepfel")); about->addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "[email protected]"); diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index bbc361cd1..6f6a39cd1 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -242,9 +242,9 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name) connect(hardware->midiMapper, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotChanged() ) ); - KAboutData *about = new KAboutData(I18N_NOOP("kcmarts"), + TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmarts"), I18N_NOOP("The Sound Server Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999 - 2001, Stefan Westerfeld")); about->addAuthor("Stefan Westerfeld",I18N_NOOP("aRts Author") , "[email protected]"); setAboutData(about); diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index d54cb5e60..aab1f7bba 100644 --- a/kcontrol/background/main.cpp +++ b/kcontrol/background/main.cpp @@ -67,9 +67,9 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList connect(m_base, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("TDE Background Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("TDE Background Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2009,2010 Timothy Pearson")); about->addAuthor("Timothy Pearson", 0, "[email protected]"); diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index bfdfad35b..eff4eb2aa 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -132,9 +132,9 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name): connect(m_pitch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); connect(m_duration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("TDE Bell Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("TDE Bell Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2001 Christian Czezatke, Matthias Elter")); about->addAuthor("Christian Czezatke", I18N_NOOP("Original author"), "[email protected]"); diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp index 0d6c398a1..69fece8e3 100644 --- a/kcontrol/clock/main.cpp +++ b/kcontrol/clock/main.cpp @@ -42,9 +42,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_clock, KlockModuleFactory("kcmkclock")) KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KlockModuleFactory::instance(), parent, name) { - KAboutData *about = - new KAboutData(I18N_NOOP("kcmclock"), I18N_NOOP("TDE Clock Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmclock"), I18N_NOOP("TDE Clock Control Module"), + 0, 0, TDEAboutData::License_GPL, "(c) 1996 - 2001 Luca Montecchiani"); about->addAuthor("Luca Montecchiani", I18N_NOOP("Original author"), "[email protected]"); diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 4212112cc..041be096d 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -279,8 +279,8 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis load(); - KAboutData* about = new KAboutData("kcmcolors", I18N_NOOP("Colors"), 0, 0, - KAboutData::License_GPL, + TDEAboutData* about = new TDEAboutData("kcmcolors", I18N_NOOP("Colors"), 0, 0, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1997-2005 Colors Developers"), 0, 0); about->addAuthor("Mark Donohoe", 0, 0); about->addAuthor("Matthias Hoelzer", 0, 0); diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp index 8bf1a026f..fd9401d59 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.cpp +++ b/kcontrol/componentchooser/kcm_componentchooser.cpp @@ -30,9 +30,9 @@ KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ): connect(m_chooser,TQT_SIGNAL(changed(bool)),this,TQT_SIGNAL(changed(bool))); setButtons( Help | Apply ); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmcomponentchooser"), I18N_NOOP("Component Chooser"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmcomponentchooser"), I18N_NOOP("Component Chooser"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c), 2002 Joseph Wenninger")); about->addAuthor("Joseph Wenninger", 0 , "[email protected]"); diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h index 72dab21ba..f2c68b3bd 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.h +++ b/kcontrol/componentchooser/kcm_componentchooser.h @@ -20,7 +20,7 @@ #include "componentchooser.h" -class KAboutData; +class TDEAboutData; class KCMComponentChooser : public KCModule { diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index b4872d1c0..4c9b9967b 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -235,9 +235,9 @@ TQString whatstr; _signers = new KSSLSigners; - KAboutData *about = - new KAboutData(I18N_NOOP("kcmcrypto"), I18N_NOOP("TDE Crypto Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmcrypto"), I18N_NOOP("TDE Crypto Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2000 - 2001 George Staikos")); about->addAuthor("George Staikos", 0, "[email protected]"); about->addAuthor("Carsten Pfeiffer", 0, "[email protected]"); diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 9d38de323..3ca9e8ccc 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -757,9 +757,9 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin systemconfig->setFileWriteMode(0644); } - KAboutData *about = - new KAboutData(I18N_NOOP("kcmdisplayconfig"), I18N_NOOP("TDE Display Profile Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmdisplayconfig"), I18N_NOOP("TDE Display Profile Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2011 Timothy Pearson")); about->addAuthor("Timothy Pearson", 0, "[email protected]"); diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 9210a9295..c8bc0a8ed 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -56,8 +56,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kdnssd, KCMDnssdFactory("kcmkdnssd")) KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&) : ConfigDialog(parent, name), m_wdchanged(false) { - setAboutData(new KAboutData(I18N_NOOP("kcm_kdnssd"), - I18N_NOOP("ZeroConf configuration"),0,0,KAboutData::License_GPL, + setAboutData(new TDEAboutData(I18N_NOOP("kcm_kdnssd"), + I18N_NOOP("ZeroConf configuration"),0,0,TDEAboutData::License_GPL, I18N_NOOP("(C) 2004,2005 Jakub Stachowski"))); setQuickHelp(i18n("Setup services browsing with ZeroConf")); if (geteuid()!=0) tabs->removePage(tab_2); // normal user cannot change wide-area settings diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index dacc1ed7e..2c04835c9 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -75,7 +75,7 @@ private: SearchProvider *m_provider; }; -FilterOptions::FilterOptions(KInstance *instance, TQWidget *parent, const char *name) +FilterOptions::FilterOptions(TDEInstance *instance, TQWidget *parent, const char *name) :KCModule(instance, parent, name) { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, KDialog::marginHint(), diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h index e39997995..6352dfea5 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h @@ -35,7 +35,7 @@ class FilterOptions : public KCModule Q_OBJECT public: - FilterOptions(KInstance *instance, TQWidget *parent = 0, const char *name = 0); + FilterOptions(TDEInstance *instance, TQWidget *parent = 0, const char *name = 0); void load(); void load( bool useDefaults ); diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h index 77e8c8b0f..abf3fe255 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h @@ -27,7 +27,7 @@ #include <kurifilter.h> -class KInstance; +class TDEInstance; class KAutoWebSearch : public KURIFilterPlugin, public DCOPObject { diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h index eff650902..7ad52849b 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h @@ -27,7 +27,7 @@ #include <kurifilter.h> -class KInstance; +class TDEInstance; class KURISearchFilter : public KURIFilterPlugin, public DCOPObject { diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h index 0c8035d89..b5154cbc6 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h @@ -28,7 +28,7 @@ #include <kurifilter.h> #include <tqregexp.h> -class KInstance; +class TDEInstance; class KProcess; /* diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h index f2bf4654c..db5f9027d 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h @@ -27,7 +27,7 @@ #include <kgenericfactory.h> #include <kurifilter.h> -class KInstance; +class TDEInstance; /** * This is short URL filter class. diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp index 4e9f50121..2750e8aab 100644 --- a/kcontrol/filetypes/keditfiletype.cpp +++ b/kcontrol/filetypes/keditfiletype.cpp @@ -111,9 +111,9 @@ static KCmdLineOptions options[] = int main(int argc, char ** argv) { KLocale::setMainCatalogue("filetypes"); - KAboutData aboutData( "keditfiletype", I18N_NOOP("KEditFileType"), "1.0", + TDEAboutData aboutData( "keditfiletype", I18N_NOOP("KEditFileType"), "1.0", I18N_NOOP("TDE file type editor - simplified version for editing a single file type"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2000, KDE developers") ); aboutData.addAuthor("Preston Brown",0, "[email protected]"); aboutData.addAuthor("David Faure",0, "[email protected]"); diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index 936a8ab38..040433665 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -67,9 +67,9 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis config = new KSimpleConfig( TQString::fromLatin1( "hwmanagerrc" )); systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" )); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Hardware Device Manager"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Hardware Device Manager"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2012 Timothy Pearson")); about->addAuthor("Timothy Pearson", 0, "[email protected]"); diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index a4c3999d2..56af11adc 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -73,9 +73,9 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &) } systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" )); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("TDE ICC Profile Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("TDE ICC Profile Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2009,2010 Timothy Pearson")); about->addAuthor("Timothy Pearson", 0, "[email protected]"); diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp index 396a6ee4f..2ced51361 100644 --- a/kcontrol/icons/main.cpp +++ b/kcontrol/icons/main.cpp @@ -51,9 +51,9 @@ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &) tab->addTab(tab2, i18n("Ad&vanced")); connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); - KAboutData* about = new KAboutData("kcmicons", I18N_NOOP("Icons"), "3.0", + TDEAboutData* about = new TDEAboutData("kcmicons", I18N_NOOP("Icons"), "3.0", I18N_NOOP("Icons Control Panel Module"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2000-2003 Geert Jansen"), 0, 0); about->addAuthor("Geert Jansen", 0, "[email protected]"); about->addAuthor("Antonio Larrosa Jimenez", 0, "[email protected]"); diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index d29ae64f9..017f9477b 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -402,10 +402,10 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const : KCModule(parent, name), title(_title) { - KAboutData *about = - new KAboutData(I18N_NOOP("kcminfo"), + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcminfo"), I18N_NOOP("TDE Panel System Information Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1998 - 2002 Helge Deller")); about->addAuthor("Helge Deller", 0, "[email protected]"); diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index e7acd2856..483f7dd1d 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -91,10 +91,10 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) : KCModule(parent, name) { - KAboutData *about = - new KAboutData(I18N_NOOP("kcminfo"), + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcminfo"), I18N_NOOP("TDE Panel Memory Information Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1998 - 2002 Helge Deller")); about->addAuthor("Helge Deller", 0, "[email protected]"); diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 6f29c2c8b..686772709 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -404,8 +404,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) load(); - KAboutData* about = new KAboutData("kcmmouse", I18N_NOOP("Mouse"), 0, 0, - KAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2005 Mouse developers")); + TDEAboutData* about = new TDEAboutData("kcmmouse", I18N_NOOP("Mouse"), 0, 0, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2005 Mouse developers")); about->addAuthor("Patrick Dowler", 0, 0); about->addAuthor("Dirk A. Mueller", 0, 0); about->addAuthor("David Faure", 0, 0); diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp index 935b5903b..a4cd605be 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp @@ -82,10 +82,10 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin setButtons(KCModule::Help); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmioslaveinfo"), + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmioslaveinfo"), I18N_NOOP("TDE Panel System Information Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2001 - 2002 Alexander Neundorf")); about->addAuthor("Alexander Neundorf", 0, "[email protected]"); diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index 190e33c7b..9a622c667 100644 --- a/kcontrol/joystick/joystick.cpp +++ b/kcontrol/joystick/joystick.cpp @@ -69,9 +69,9 @@ extern "C" joystick::joystick(TQWidget *parent, const char *name, const TQStringList &) : KCModule(JoystickFactory::instance(), parent, name) { - setAboutData( new KAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0", + setAboutData( new TDEAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0", I18N_NOOP("TDE Control Center Module to test Joysticks"), - KAboutData::License_GPL, "(c) 2004, Martin Koller", + TDEAboutData::License_GPL, "(c) 2004, Martin Koller", 0, "[email protected]")); setQuickHelp( i18n("<h1>Joystick</h1>" diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index e80f0603f..411a95748 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -101,16 +101,16 @@ KControlApp::~KControlApp() extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { KLocale::setMainCatalogue("kcontrol"); - KAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"), - KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), KAboutData::License_GPL, + TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"), + KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL, I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers")); - KAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"), - KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), KAboutData::License_GPL, + TDEAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"), + KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), TDEAboutData::License_GPL, I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers")); TQCString argv_0 = argv[0]; - KAboutData *aboutData; + TDEAboutData *aboutData; if (argv_0.right(11) == "kinfocenter") { aboutData = &aboutKInfoCenter; diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index 5be813dc0..584480837 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -253,7 +253,7 @@ void ConfigModule::embedded() _embedStack->raiseWidget(_embedWidget); // put it above the busy label } -const KAboutData *ConfigModule::aboutData() const +const TDEAboutData *ConfigModule::aboutData() const { if (!_module) return 0; return _module->aboutData(); diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h index bcdc7d7e4..fc5406fa6 100644 --- a/kcontrol/kcontrol/modules.h +++ b/kcontrol/kcontrol/modules.h @@ -27,7 +27,7 @@ template<class ConfigModule> class TQPtrList; class TQStringList; -class KAboutData; +class TDEAboutData; class KCModule; class ProxyWidget; class KProcess; @@ -50,7 +50,7 @@ public: bool isActive() { return _module != 0; }; ProxyWidget *module(); - const KAboutData *aboutData() const; + const TDEAboutData *aboutData() const; public slots: diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index a385d859e..7e3f30de4 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -320,7 +320,7 @@ void ProxyWidget::clientChanged(bool state) emit changed(state); } -const KAboutData *ProxyWidget::aboutData() const +const TDEAboutData *ProxyWidget::aboutData() const { return _client->aboutData(); } diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h index f8a7e9ee3..e1cff0351 100644 --- a/kcontrol/kcontrol/proxywidget.h +++ b/kcontrol/kcontrol/proxywidget.h @@ -29,7 +29,7 @@ class TQPushButton; class TQFrame; class KCModule; -class KAboutData; +class TDEAboutData; #include "dockcontainer.h" #include <tqscrollview.h> @@ -46,7 +46,7 @@ public: ~ProxyWidget(); TQString quickHelp() const; - const KAboutData *aboutData() const; + const TDEAboutData *aboutData() const; public slots: diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 0c2c9a68e..bd3c70222 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -486,15 +486,15 @@ void TopLevel::reportBug() bool deleteit = false; if (!_active) // report against kcontrol - dummyAbout = const_cast<KAboutData*>(KGlobal::instance()->aboutData()); + dummyAbout = const_cast<TDEAboutData*>(KGlobal::instance()->aboutData()); else { if (_active->aboutData()) - dummyAbout = const_cast<KAboutData*>(_active->aboutData()); + dummyAbout = const_cast<TDEAboutData*>(_active->aboutData()); else { snprintf(buffer, sizeof(buffer), "kcm%s", _active->library().latin1()); - dummyAbout = new KAboutData(buffer, _active->moduleName().utf8(), "2.0"); + dummyAbout = new TDEAboutData(buffer, _active->moduleName().utf8(), "2.0"); deleteit = true; } } diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h index 8cc4a7a67..1a7e1735f 100644 --- a/kcontrol/kcontrol/toplevel.h +++ b/kcontrol/kcontrol/toplevel.h @@ -100,7 +100,7 @@ private: * against a module with no about data * we construct one for him **/ - KAboutData *dummyAbout; + TDEAboutData *dummyAbout; }; #endif diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index c74b46e08..226e84310 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -49,9 +49,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kded, KDEDFactory( "kcmkded" ) ) KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) : KCModule( KDEDFactory::instance(), parent, name ) { - KAboutData *about = - new KAboutData( I18N_NOOP( "kcmkded" ), I18N_NOOP( "TDE Service Manager" ), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData( I18N_NOOP( "kcmkded" ), I18N_NOOP( "TDE Service Manager" ), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2002 Daniel Molkentin" ) ); about->addAuthor("Daniel Molkentin",0,"[email protected]"); setAboutData( about ); diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index c225187fd..5b2ac8a1a 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -84,10 +84,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) { KGlobal::locale()->insertCatalogue(KFI_CATALOGUE); - KAboutData* about = new KAboutData("kcmfontinst", + TDEAboutData* about = new TDEAboutData("kcmfontinst", I18N_NOOP("TDE Font Installer"), 0, 0, - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("GUI front end to the fonts:/ ioslave.\n" "(c) Craig Drummond, 2000 - 2004")); about->addAuthor("Craig Drummond", I18N_NOOP("Developer and maintainer"), "[email protected]"); diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp index a27bebf70..7421d1681 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/kio/KioFonts.cpp @@ -110,7 +110,7 @@ int kdemain(int argc, char **argv) KLocale::setMainCatalogue(KFI_CATALOGUE); - KInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL); + TDEInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL); KFI::CKioFonts slave(argv[2], argv[3]); slave.dispatchLoop(); diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index 3c8a47086..7d9d9d3f4 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -85,7 +85,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) itsToolsFrame->setFrameShape(TQFrame::NoFrame); previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised); previewFrame->setFrameShape(TQFrame::Panel); - setInstance(new KInstance("kfontview")); + setInstance(new TDEInstance("kfontview")); itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview"); itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp index dd695a033..32f36f9e9 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp @@ -45,8 +45,8 @@ extern "C" namespace KFI { -KInstance * CFontViewPartFactory::theirInstance=NULL; -KAboutData * CFontViewPartFactory::theirAbout=NULL; +TDEInstance * CFontViewPartFactory::theirInstance=NULL; +TDEAboutData * CFontViewPartFactory::theirAbout=NULL; CFontViewPartFactory::CFontViewPartFactory() { @@ -71,12 +71,12 @@ TQObject * CFontViewPartFactory::createObject(TQObject *parent, const char *name return new CFontViewPart((TQWidget*) parent, name); } -KInstance* CFontViewPartFactory::instance() +TDEInstance* CFontViewPartFactory::instance() { if(!theirInstance) { - theirAbout = new KAboutData("fontviewpart", I18N_NOOP("CFontViewPart"), "0.1"); - theirInstance = new KInstance(theirAbout); + theirAbout = new TDEAboutData("fontviewpart", I18N_NOOP("CFontViewPart"), "0.1"); + theirInstance = new TDEInstance(theirAbout); } return theirInstance; } diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h index 44b213632..7ac96e9c8 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h +++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h @@ -31,8 +31,8 @@ #include <klibloader.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; namespace KFI { @@ -47,12 +47,12 @@ class CFontViewPartFactory : public KLibFactory virtual ~CFontViewPartFactory(); virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); - static KInstance * instance(); + static TDEInstance * instance(); private: - static KInstance *theirInstance; - static KAboutData *theirAbout; + static TDEInstance *theirInstance; + static TDEAboutData *theirAbout; }; } diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index acfd96178..bbac01bc8 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -112,8 +112,8 @@ static KCmdLineOptions options[] = KCmdLineLastOption }; -static KAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"), - KAboutData::License_GPL, +static TDEAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"), + TDEAboutData::License_GPL, I18N_NOOP("(c) Craig Drummond, 2004")); int main(int argc, char **argv) diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp index 39972bc73..16e52c8ec 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.cpp +++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp @@ -32,9 +32,9 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - KAboutData *about = - new KAboutData(I18N_NOOP("kcmkicker"), I18N_NOOP("TDE Panel Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmkicker"), I18N_NOOP("TDE Panel Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999 - 2001 Matthias Elter\n(c) 2002 Aaron J. Seigo")); about->addAuthor("Matthias Elter", 0, "[email protected]"); diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index daf9f283f..8bf4646df 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -351,13 +351,13 @@ TQString KickerConfig::quickHelp() const " manipulation of the panel's buttons and applets."); } -KAboutData *KickerConfig::aboutData() +TDEAboutData *KickerConfig::aboutData() { - // the KAboutDatas are deleted by the KCModules - KAboutData *about - = new KAboutData(I18N_NOOP("kcmkicker"), + // the TDEAboutDatas are deleted by the KCModules + TDEAboutData *about + = new TDEAboutData(I18N_NOOP("kcmkicker"), I18N_NOOP("TDE Panel Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2009 - 2010 Timothy Pearson\n" "(c) 1999 - 2001 Matthias Elter\n" "(c) 2002 - 2003 Aaron J. Seigo")); diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h index 97de653b5..bbc567273 100644 --- a/kcontrol/kicker/main.h +++ b/kcontrol/kicker/main.h @@ -24,7 +24,7 @@ #include "extensionInfo.h" class TQComboBox; -class KAboutData; +class TDEAboutData; class KDirWatch; class KickerConfig : public TQObject, public DCOPObject @@ -46,7 +46,7 @@ public: void restartKicker(); TQString quickHelp() const; - KAboutData *aboutData(); + TDEAboutData *aboutData(); int currentPanelIndex() const { return m_currentPanelIndex; } diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp index 742033c7b..80453b75b 100644 --- a/kcontrol/kio/socks.cpp +++ b/kcontrol/kio/socks.cpp @@ -38,9 +38,9 @@ KSocksConfig::KSocksConfig(TQWidget *parent) : KCModule(parent, "kcmkio") { - KAboutData *about = - new KAboutData(I18N_NOOP("kcmsocks"), I18N_NOOP("TDE SOCKS Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmsocks"), I18N_NOOP("TDE SOCKS Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2001 George Staikos")); about->addAuthor("George Staikos", 0, "[email protected]"); diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index ea2479264..30914e96a 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -84,10 +84,10 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & connect( m_notifyWidget->m_playerButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPlayerSettings())); - KAboutData* ab = new KAboutData( + TDEAboutData* ab = new TDEAboutData( "kcmknotify", I18N_NOOP("KNotify"), "3.0", I18N_NOOP("System Notification Control Panel Module"), - KAboutData::License_GPL, "(c) 2002 Carsten Pfeiffer", 0, 0 ); + TDEAboutData::License_GPL, "(c) 2002 Carsten Pfeiffer", 0, 0 ); ab->addAuthor( "Carsten Pfeiffer", 0, "[email protected]" ); ab->addCredit( "Charles Samuels", I18N_NOOP("Original implementation"), "[email protected]" ); diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h index 7f5cf8507..5af670bbe 100644 --- a/kcontrol/knotify/knotify.h +++ b/kcontrol/knotify/knotify.h @@ -32,7 +32,7 @@ class TQCheckBox; class TQLabel; class TQSlider; -class KAboutData; +class TDEAboutData; class KComboBox; class KURLRequester; class PlayerSettingsDialog; diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index 28654869e..f1f28efca 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -78,9 +78,9 @@ extern "C" KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name) : KCModule(parent, name), mConfig(config) { - KAboutData *about = - new KAboutData(I18N_NOOP("kcmkonqhtml"), I18N_NOOP("Konqueror Browsing Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmkonqhtml"), I18N_NOOP("Konqueror Browsing Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999 - 2001 The Konqueror Developers")); about->addAuthor("Waldo Bastian",0,"[email protected]"); diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 64ecc45d9..8eb8747ce 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -53,8 +53,8 @@ KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&) topLayout->add(dialog); load(); - KAboutData *ab=new KAboutData( "kcmkonsole", I18N_NOOP("KCM Konsole"), - "0.2",I18N_NOOP("KControl module for Konsole configuration"), KAboutData::License_GPL, + TDEAboutData *ab=new TDEAboutData( "kcmkonsole", I18N_NOOP("KCM Konsole"), + "0.2",I18N_NOOP("KControl module for Konsole configuration"), TDEAboutData::License_GPL, "(c) 2001, Andrea Rizzi", 0, 0, "[email protected]"); ab->addAuthor("Andrea Rizzi",0, "[email protected]"); diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 47070ab02..4a3f21644 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -46,10 +46,10 @@ kthememanager::kthememanager( TQWidget *parent, const char *name ) : KCModule( parent, name ), m_theme( 0 ), m_origTheme( 0 ) { - KAboutData *about = new KAboutData("kthememanager", I18N_NOOP("TDE Theme Manager"), + TDEAboutData *about = new TDEAboutData("kthememanager", I18N_NOOP("TDE Theme Manager"), "0.4", I18N_NOOP("This control module handles installing, removing and " "creating visual TDE themes."), - KAboutData::License_GPL, "(c) 2003, 2004, 2006 Lukáš Tinkl", 0, + TDEAboutData::License_GPL, "(c) 2003, 2004, 2006 Lukáš Tinkl", 0, "http://developer.kde.org/~lukas/kthememanager"); setAboutData( about ); diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h index fba803ec5..0d7059729 100644 --- a/kcontrol/kthememanager/kthememanager.h +++ b/kcontrol/kthememanager/kthememanager.h @@ -29,7 +29,7 @@ class TQString; -class KAboutData; +class TDEAboutData; #define ORIGINAL_THEME "original" // no i18n() here!!! diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index 086d05d92..f561ecaf6 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -49,11 +49,11 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, const TQStringList &args) : KCModule( KLocaleFactory::instance(), parent, args) { - KAboutData* aboutData = new KAboutData("kcmlocale", + TDEAboutData* aboutData = new TDEAboutData("kcmlocale", I18N_NOOP("KCMLocale"), "3.0", I18N_NOOP("Regional settings"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(C) 1998 Matthias Hoelzer, " "(C) 1999-2003 Hans Petter Bieker", 0, 0, "[email protected]"); diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp index 1a5500b2d..6d2acf1e9 100644 --- a/kcontrol/nics/nic.cpp +++ b/kcontrol/nics/nic.cpp @@ -106,10 +106,10 @@ KCMNic::KCMNic(TQWidget *parent, const char * name, const TQStringList &) connect(m_updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(update())); connect(timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update())); update(); - KAboutData *about = - new KAboutData(I18N_NOOP("kcminfo"), + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcminfo"), I18N_NOOP("TDE Panel System Information Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2001 - 2002 Alexander Neundorf")); about->addAuthor("Alexander Neundorf", 0, "[email protected]"); diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index d0a503c6b..bc25083a6 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -45,9 +45,9 @@ Privacy::Privacy(TQWidget *parent, const char *name) setButtons( KCModule::Default|KCModule::Apply|KCModule::Help ); - KAboutData *about = - new KAboutData(I18N_NOOP("kcm_privacy"), I18N_NOOP("TDE Privacy Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcm_privacy"), I18N_NOOP("TDE Privacy Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2003 Ralf Hoelzer")); about->addAuthor("Ralf Hoelzer", 0, "[email protected]"); diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp index c1a9e6a41..18df71fbc 100644 --- a/kcontrol/randr/main.cpp +++ b/kcontrol/randr/main.cpp @@ -35,7 +35,7 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData aboutData("randr", I18N_NOOP("Resize and Rotate"), krandrtrayVersion, I18N_NOOP("Resize and Rotate System Tray App"), KAboutData::License_GPL, "(c) 2009,2010 Timothy Pearson", 0L, ""); + TDEAboutData aboutData("randr", I18N_NOOP("Resize and Rotate"), krandrtrayVersion, I18N_NOOP("Resize and Rotate System Tray App"), TDEAboutData::License_GPL, "(c) 2009,2010 Timothy Pearson", 0L, ""); aboutData.addAuthor("Timothy Pearson",I18N_NOOP("Developer and maintainer"), "[email protected]"); aboutData.addAuthor("Hamish Rodda",I18N_NOOP("Original developer and maintainer"), "[email protected]"); aboutData.addCredit("Lubos Lunak",I18N_NOOP("Many fixes"), "[email protected]"); diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp index 11095bc60..5c2856c32 100644 --- a/kcontrol/samba/main.cpp +++ b/kcontrol/samba/main.cpp @@ -81,10 +81,10 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin " is parsed. On some systems showmount is in /usr/sbin, check if you have" " showmount in your PATH.")); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmsamba"), + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmsamba"), I18N_NOOP("TDE Panel System Information Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2002 KDE Information Control Module Samba Team")); about->addAuthor("Michael Glauche", 0, "[email protected]"); about->addAuthor("Matthias Hoelzer", 0, "[email protected]"); diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 01b4cf944..85d1aa628 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -281,9 +281,9 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mChanged = false; emit changed(false); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmscreensaver"), I18N_NOOP("TDE Screen Saver Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmscreensaver"), I18N_NOOP("TDE Screen Saver Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1997-2002 Martin R. Jones\n" "(c) 2003-2004 Chris Howells")); about->addAuthor("Chris Howells", 0, "[email protected]"); diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index 4d4f7b071..fcc70a66d 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -55,9 +55,9 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) _ok = false; dc->remoteInterfaces("kded", "kardsvc", &_ok); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmsmartcard"), I18N_NOOP("TDE Smartcard Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmsmartcard"), I18N_NOOP("TDE Smartcard Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2001 George Staikos")); about->addAuthor("George Staikos", 0, "[email protected]"); diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 78126222e..274113bfb 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -130,10 +130,10 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) KGlobal::dirs()->addResourceType("themes", KStandardDirs::kde_default("data") + "kstyle/themes"); - KAboutData *about = - new KAboutData( I18N_NOOP("kcmstyle"), + TDEAboutData *about = + new TDEAboutData( I18N_NOOP("kcmstyle"), I18N_NOOP("TDE Style Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2002 Karol Szwed, Daniel Molkentin")); about->addAuthor("Karol Szwed", 0, "[email protected]"); diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index d21f39df2..053330367 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -237,9 +237,9 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL } connect( m_widget->showAllScreens, TQT_SIGNAL( stateChanged( int )), TQT_SLOT( changed())); - KAboutData *about = new KAboutData(I18N_NOOP("kcmtaskbar"), + TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmtaskbar"), I18N_NOOP("TDE Taskbar Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2000 - 2001 Matthias Elter")); about->addAuthor("Matthias Elter", 0, "[email protected]"); diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp index 096634e17..d3693768e 100644 --- a/kcontrol/tdm/main.cpp +++ b/kcontrol/tdm/main.cpp @@ -84,9 +84,9 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &) , maxshowuid(0) , updateOK(false) { - KAboutData *about = - new KAboutData(I18N_NOOP("kcmtdm"), I18N_NOOP("TDE Login Manager Config Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmtdm"), I18N_NOOP("TDE Login Manager Config Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1996 - 2005 The TDM Authors")); about->addAuthor("Thomas Tanghus", I18N_NOOP("Original author"), "[email protected]"); diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp index 5d4d5387e..8739783de 100644 --- a/kcontrol/usbview/kcmusb.cpp +++ b/kcontrol/usbview/kcmusb.cpp @@ -67,9 +67,9 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &) connect(_devices, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(selectionChanged(TQListViewItem*))); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmusb"), I18N_NOOP("TDE USB Viewer"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmusb"), I18N_NOOP("TDE USB Viewer"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2001 Matthias Hoelzer-Kluepfel")); about->addAuthor("Matthias Hoelzer-Kluepfel", 0, "[email protected]"); diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index 3be527fe1..c70330779 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -44,10 +44,10 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name) : KCModule(parent, name) { _indicators.setAutoDelete(true); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmxinerama"), + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmxinerama"), I18N_NOOP("TDE Multiple Monitor Configurator"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2002-2003 George Staikos")); about->addAuthor("George Staikos", 0, "[email protected]"); diff --git a/kdcop/kdcop.cpp b/kdcop/kdcop.cpp index 9ab6d4428..8a347c26c 100644 --- a/kdcop/kdcop.cpp +++ b/kdcop/kdcop.cpp @@ -17,9 +17,9 @@ static const KCmdLineOptions options[] = int main( int argc, char ** argv ) { - KAboutData aboutData( "kdcop", I18N_NOOP("KDCOP"), + TDEAboutData aboutData( "kdcop", I18N_NOOP("KDCOP"), "0.1", I18N_NOOP( "A graphical DCOP browser/client" ), - KAboutData::License_Artistic, + TDEAboutData::License_Artistic, "(c) 2000, Matthias Kalle Dalheimer"); aboutData.addAuthor("Matthias Kalle Dalheimer",0, "[email protected]"); aboutData.addAuthor("Rik Hemsley",0, "[email protected]"); diff --git a/kdebugdialog/main.cpp b/kdebugdialog/main.cpp index fb19097dc..fbaa54f3e 100644 --- a/kdebugdialog/main.cpp +++ b/kdebugdialog/main.cpp @@ -77,9 +77,9 @@ static KCmdLineOptions options[] = int main(int argc, char ** argv) { - KAboutData data( "kdebugdialog", I18N_NOOP( "KDebugDialog"), + TDEAboutData data( "kdebugdialog", I18N_NOOP( "KDebugDialog"), "1.0", I18N_NOOP("A dialog box for setting preferences for debug output"), - KAboutData::License_GPL, "(c) 2009,2010, Timothy Pearson <[email protected]>"); + TDEAboutData::License_GPL, "(c) 2009,2010, Timothy Pearson <[email protected]>"); data.addAuthor("Timothy Pearson", I18N_NOOP("Maintainer"), "[email protected]"); data.addAuthor("David Faure", I18N_NOOP("Original maintainer/developer"), "[email protected]"); TDECmdLineArgs::init( argc, argv, &data ); diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index 5192c9d1d..11ac07242 100644 --- a/kdepasswd/kcm/main.cpp +++ b/kdepasswd/kcm/main.cpp @@ -78,9 +78,9 @@ KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name, _mw->lblUsername->setText( _ku->loginName() ); _mw->lblUID->setText( TQString().number(_ku->uid()) ); - KAboutData *about = new KAboutData(I18N_NOOP("kcm_useraccount"), + TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcm_useraccount"), I18N_NOOP("Password & User Information"), 0, 0, - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(C) 2002, Braden MacDonald, " "(C) 2004 Ravikiran Rajagopal")); diff --git a/kdepasswd/kcm/main.h b/kdepasswd/kcm/main.h index c39f69184..4ca6c77f9 100644 --- a/kdepasswd/kcm/main.h +++ b/kdepasswd/kcm/main.h @@ -23,7 +23,7 @@ #include "main_widget.h" -class KAboutData; +class TDEAboutData; class KUser; class KEmailSettings; class TQEvent; diff --git a/kdepasswd/kdepasswd.cpp b/kdepasswd/kdepasswd.cpp index 19e583659..47dbab6de 100644 --- a/kdepasswd/kdepasswd.cpp +++ b/kdepasswd/kdepasswd.cpp @@ -28,9 +28,9 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData aboutData("kdepasswd", I18N_NOOP("TDE passwd"), + TDEAboutData aboutData("kdepasswd", I18N_NOOP("TDE passwd"), VERSION, I18N_NOOP("Changes a UNIX password."), - KAboutData::License_Artistic, "Copyright (c) 2000 Geert Jansen"); + TDEAboutData::License_Artistic, "Copyright (c) 2000 Geert Jansen"); aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"), "[email protected]", "http://www.stack.nl/~geertj/"); diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index 2c8650f85..e845750a1 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/kdesktop/kwebdesktop/kwebdesktop.cpp @@ -86,10 +86,10 @@ void KWebDesktopRun::slotFinished( KIO::Job * job ) int main( int argc, char **argv ) { - KAboutData data( "kwebdesktop", I18N_NOOP("TDE Web Desktop"), + TDEAboutData data( "kwebdesktop", I18N_NOOP("TDE Web Desktop"), VERSION, I18N_NOOP("Displays an HTML page as the background of the desktop"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2000, David Faure <[email protected]>" ); data.addAuthor( "David Faure", I18N_NOOP("developer and maintainer"), "[email protected]" ); diff --git a/kdesktop/main.cc b/kdesktop/main.cc index 51eb7b2a3..a12f241b8 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -168,8 +168,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) twin_name.sprintf("twin-screen-%d", kdesktop_screen_number); } - KAboutData aboutData( kdesktop_name, I18N_NOOP("KDesktop"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData( kdesktop_name, I18N_NOOP("KDesktop"), + version, description, TDEAboutData::License_GPL, "(c) 1998-2000, The KDesktop Authors"); aboutData.addAuthor("David Faure", 0, "[email protected]"); aboutData.addAuthor("Martin Koller", 0, "[email protected]"); diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index e15564eb4..6533d51c3 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -676,9 +676,9 @@ static int directCommand(TDECmdLineArgs *args) int main(int argc, char *argv[]) { - KAboutData aboutData( "kdialog", I18N_NOOP("KDialog"), + TDEAboutData aboutData( "kdialog", I18N_NOOP("KDialog"), "1.0", I18N_NOOP( "KDialog can be used to show nice dialog boxes from shell scripts" ), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(C) 2000, Nick Thompson"); aboutData.addAuthor("David Faure", I18N_NOOP("Current maintainer"),"[email protected]"); aboutData.addAuthor("Brad Hards", 0, "[email protected]"); diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 92082019f..913a915a7 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -76,9 +76,9 @@ KFindPart::~KFindPart() { } -KAboutData *KFindPart::createAboutData() +TDEAboutData *KFindPart::createAboutData() { - return new KAboutData( "kfindpart", I18N_NOOP( "Find Component" ), "1.0" ); + return new TDEAboutData( "kfindpart", I18N_NOOP( "Find Component" ), "1.0" ); } bool KFindPart::doOpenURL( const KURL &url ) diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h index 19bdb73be..b2a8156c5 100644 --- a/kfind/kfindpart.h +++ b/kfind/kfindpart.h @@ -28,7 +28,7 @@ #include <konq_dirpart.h> class KQuery; -class KAboutData; +class TDEAboutData; //added class KonqPropsView; class KAction; @@ -48,7 +48,7 @@ public: TQObject *parent, const char *name, const TQStringList & /*args*/ ); virtual ~KFindPart(); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); virtual bool doOpenURL( const KURL &url ); virtual bool doCloseURL() { return true; } diff --git a/kfind/main.cpp b/kfind/main.cpp index b57177cb0..ece886956 100644 --- a/kfind/main.cpp +++ b/kfind/main.cpp @@ -22,8 +22,8 @@ static KCmdLineOptions options[] = int main( int argc, char ** argv ) { KLocale::setMainCatalogue("kfindpart"); - KAboutData aboutData( "kfind", I18N_NOOP("KFind"), - KFIND_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kfind", I18N_NOOP("KFind"), + KFIND_VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1998-2003, The KDE Developers")); aboutData.addAuthor("Eric Coquelle", I18N_NOOP("Current Maintainer"), "[email protected]"); diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp index 506a6eda5..6fa5aeca5 100644 --- a/khelpcenter/application.cpp +++ b/khelpcenter/application.cpp @@ -60,10 +60,10 @@ static KCmdLineOptions options[] = extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) { - KAboutData aboutData( "khelpcenter", I18N_NOOP("Trinity Help Center"), + TDEAboutData aboutData( "khelpcenter", I18N_NOOP("Trinity Help Center"), HELPCENTER_VERSION, I18N_NOOP("The Trinity Help Center"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2003, The KHelpCenter developers") ); aboutData.addAuthor( "Timothy Pearson", 0, "[email protected]" ); diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp index eb73d11cd..c7b5bce41 100644 --- a/khelpcenter/htmlsearch/index.cpp +++ b/khelpcenter/htmlsearch/index.cpp @@ -15,7 +15,7 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"), + TDEAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"), "", I18N_NOOP("TDE Index generator for help files.")); diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h index 8bf2f3b6c..a5a336afc 100644 --- a/khelpcenter/kcmhelpcenter.h +++ b/khelpcenter/kcmhelpcenter.h @@ -34,7 +34,7 @@ class TQLabel; class KProcess; class KConfig; -class KAboutData; +class TDEAboutData; class KTempFile; class KURLRequester; class KListView; @@ -164,7 +164,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface KConfig *mConfig; - KAboutData *mAboutData; + TDEAboutData *mAboutData; KHC::HtmlSearchConfig *mHtmlSearchTab; TQWidget *mScopeTab; diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp index 03a076651..3759b3048 100644 --- a/khelpcenter/khc_indexbuilder.cpp +++ b/khelpcenter/khc_indexbuilder.cpp @@ -170,11 +170,11 @@ static KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "khc_indexbuilder", + TDEAboutData aboutData( "khc_indexbuilder", I18N_NOOP("KHelpCenter Index Builder"), HELPCENTER_VERSION, I18N_NOOP("The TDE Help Center"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2003, The KHelpCenter developers") ); aboutData.addAuthor( "Cornelius Schumacher", 0, "[email protected]" ); diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp index e5d204461..a6fed9e09 100644 --- a/khelpcenter/testmetainfo.cpp +++ b/khelpcenter/testmetainfo.cpp @@ -88,7 +88,7 @@ class AsyncTraverser : public DocEntryTraverser int main(int argc,char **argv) { - KAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1"); + TDEAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDEApplication app; diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index bd3a055ca..45c406d0e 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -86,9 +86,9 @@ Module::Module( TQWidget* parent_P, const char* ) connect( buttons_widget, TQT_SIGNAL( global_settings_pressed()), TQT_SLOT( global_settings())); // listview_current_action_changed(); // init - KAboutData* about = new KAboutData("kcmkhotkeys", I18N_NOOP("KHotKeys"), KHOTKEYS_VERSION, + TDEAboutData* about = new TDEAboutData("kcmkhotkeys", I18N_NOOP("KHotKeys"), KHOTKEYS_VERSION, 0, - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2005 Lubos Lunak"), 0, 0); about->addAuthor("Lubos Lunak", I18N_NOOP("Maintainer"), "[email protected]"); setAboutData( about ); diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 3f46b6b11..7c693fc8f 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -496,9 +496,9 @@ void QuickLauncher::addAppBeforeManually(TQString url, TQString sender) void QuickLauncher::about() { - KAboutData about("quicklauncher", I18N_NOOP("Quick Launcher"), "2.0", + TDEAboutData about("quicklauncher", I18N_NOOP("Quick Launcher"), "2.0", I18N_NOOP("A simple application launcher"), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(C) 2000 Bill Nagel\n(C) 2004 Dan Bullok\n(C) 2005 Fred Schaettgen"); KAboutApplication a(&about, this); a.exec(); diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index 8f2d69ab7..61aefd673 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -89,11 +89,11 @@ MediaApplet::~MediaApplet() void MediaApplet::about() { - KAboutData data("mediaapplet", + TDEAboutData data("mediaapplet", I18N_NOOP("Media Applet"), "1.0", I18N_NOOP("\"media:/\" ioslave frontend applet"), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(c) 2004, Kevin Ottens"); data.addAuthor("Kevin \'ervin\' Ottens", diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index 3e276fe18..c7b50d4a4 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -156,13 +156,13 @@ NaughtyApplet::slotLoad(uint l) void NaughtyApplet::about() { - KAboutData about + TDEAboutData about ( "naughtyapplet", I18N_NOOP("Naughty applet"), "1.0", I18N_NOOP("Runaway process catcher"), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(C) 2000 Rik Hemsley (rikkus) <[email protected]>" ); diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index d363f3879..94d8a92db 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -75,11 +75,11 @@ TrashApplet::~TrashApplet() void TrashApplet::about() { - KAboutData data("trashapplet", + TDEAboutData data("trashapplet", I18N_NOOP("Trash Applet"), "1.0", I18N_NOOP("\"trash:/\" ioslave frontend applet"), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(c) 2004, Kevin Ottens"); data.addAuthor("Kevin \'ervin\' Ottens", diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 82f82502c..1085bd430 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -107,8 +107,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) else appname.sprintf("kicker-screen-%d", kicker_screen_number); - KAboutData aboutData( appname.data(), I18N_NOOP("TDE Panel"), - version, description, KAboutData::License_GPL_V2, + TDEAboutData aboutData( appname.data(), I18N_NOOP("TDE Panel"), + version, description, TDEAboutData::License_GPL_V2, I18N_NOOP("(c) 1999-2010, The KDE Team") ); aboutData.addAuthor("Timothy Pearson", I18N_NOOP("Current maintainer"), "[email protected]"); diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 328cec09c..734c6ef8c 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -70,10 +70,10 @@ static KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) { - KAboutData aboutData( "kicker", I18N_NOOP("Panel applet proxy.") + TDEAboutData aboutData( "kicker", I18N_NOOP("Panel applet proxy.") , "v0.1.0" ,I18N_NOOP("Panel applet proxy.") - , KAboutData::License_BSD + , TDEAboutData::License_BSD , "(c) 2000, The KDE Developers"); TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "[email protected]"); diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index 0910294b1..a27d59321 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -74,10 +74,10 @@ KPanelExtension* loadExtension(const AppletInfo& info) int main( int argc, char ** argv ) { - KAboutData aboutData( "extensionproxy", I18N_NOOP("Panel extension proxy.") + TDEAboutData aboutData( "extensionproxy", I18N_NOOP("Panel extension proxy.") , "v0.1.0" ,I18N_NOOP("Panel extension proxy.") - , KAboutData::License_BSD + , TDEAboutData::License_BSD , "(c) 2000, The KDE Developers"); TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "[email protected]"); diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index a5345dfcf..a2fc35ecc 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -56,10 +56,10 @@ static KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) { - KAboutData aboutData( "extensionproxy", I18N_NOOP("Panel Extension Proxy") + TDEAboutData aboutData( "extensionproxy", I18N_NOOP("Panel Extension Proxy") , "v0.1.0" ,I18N_NOOP("Panel extension proxy") - , KAboutData::License_BSD + , TDEAboutData::License_BSD , "(c) 2000, The KDE Developers"); TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "[email protected]"); diff --git a/kioslave/about/kio_about.cpp b/kioslave/about/kio_about.cpp index 5f012fdd6..5ef52196d 100644 --- a/kioslave/about/kio_about.cpp +++ b/kioslave/about/kio_about.cpp @@ -59,7 +59,7 @@ extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ) { - KInstance instance("kio_about"); + TDEInstance instance("kio_about"); if (argc != 4) { diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp index 7c92a1a76..0181c066a 100644 --- a/kioslave/cgi/cgi.cpp +++ b/kioslave/cgi/cgi.cpp @@ -257,7 +257,7 @@ extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); } int kdemain( int argc, char **argv ) { - KInstance instance( "kio_cgi" ); + TDEInstance instance( "kio_cgi" ); kdDebug(7124) << "kio_cgi starting " << getpid() << endl; diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/kioslave/cgi/kcmcgi/kcmcgi.cpp index d1a798aa2..9c8a8df5e 100644 --- a/kioslave/cgi/kcmcgi/kcmcgi.cpp +++ b/kioslave/cgi/kcmcgi/kcmcgi.cpp @@ -67,10 +67,10 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name) load(); updateButton(); - KAboutData *about = - new KAboutData( I18N_NOOP("kcmcgi"), + TDEAboutData *about = + new TDEAboutData( I18N_NOOP("kcmcgi"), I18N_NOOP("CGI KIO Slave Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2002 Cornelius Schumacher") ); about->addAuthor( "Cornelius Schumacher", 0, "[email protected]" ); diff --git a/kioslave/filter/filter.cc b/kioslave/filter/filter.cc index 8392dd160..7db846d17 100644 --- a/kioslave/filter/filter.cc +++ b/kioslave/filter/filter.cc @@ -36,7 +36,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } int kdemain( int argc, char ** argv) { - KInstance instance( "kio_filter" ); + TDEInstance instance( "kio_filter" ); kdDebug(7110) << "Starting " << getpid() << endl; diff --git a/kioslave/finger/kio_finger.cpp b/kioslave/finger/kio_finger.cpp index 4e62b6bb5..356d35c9d 100644 --- a/kioslave/finger/kio_finger.cpp +++ b/kioslave/finger/kio_finger.cpp @@ -45,7 +45,7 @@ extern "C" { KDE_EXPORT int kdemain( int argc, char **argv ) { - KInstance instance( "kio_finger" ); + TDEInstance instance( "kio_finger" ); //kdDebug() << "*** Starting kio_finger " << getpid() << endl; diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp index 95c91dc2c..ccd815048 100644 --- a/kioslave/fish/fish.cpp +++ b/kioslave/fish/fish.cpp @@ -127,7 +127,7 @@ static void ripper(int) int KDE_EXPORT kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("kio_fish"); - KInstance instance("fish"); + TDEInstance instance("fish"); myDebug( << "*** Starting fish " << endl); if (argc != 4) { diff --git a/kioslave/floppy/kio_floppy.cpp b/kioslave/floppy/kio_floppy.cpp index a0c68a9d2..c9f8daa80 100644 --- a/kioslave/floppy/kio_floppy.cpp +++ b/kioslave/floppy/kio_floppy.cpp @@ -53,7 +53,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } int kdemain( int argc, char **argv ) { - KInstance instance( "kio_floppy" ); + TDEInstance instance( "kio_floppy" ); if (argc != 4) { diff --git a/kioslave/info/info.cc b/kioslave/info/info.cc index ab35f282b..f220da589 100644 --- a/kioslave/info/info.cc +++ b/kioslave/info/info.cc @@ -244,7 +244,7 @@ extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); } int kdemain( int argc, char **argv ) { - KInstance instance( "kio_info" ); + TDEInstance instance( "kio_info" ); kdDebug() << "kio_info starting " << getpid() << endl; diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp index 46ce2e090..fe958c35c 100644 --- a/kioslave/ldap/kio_ldap.cpp +++ b/kioslave/ldap/kio_ldap.cpp @@ -34,7 +34,7 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } */ int kdemain( int argc, char **argv ) { - KInstance instance( "kio_ldap" ); + TDEInstance instance( "kio_ldap" ); kdDebug(7125) << "Starting " << getpid() << endl; diff --git a/kioslave/mac/kio_mac.cpp b/kioslave/mac/kio_mac.cpp index e64d22d65..d13b59f71 100644 --- a/kioslave/mac/kio_mac.cpp +++ b/kioslave/mac/kio_mac.cpp @@ -36,7 +36,7 @@ using namespace KIO; extern "C" { int KDE_EXPORT kdemain(int, char **argv) { - KInstance instance("kio_mac"); + TDEInstance instance("kio_mac"); MacProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); return 0; diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp index 12c13d601..67778aaca 100644 --- a/kioslave/man/kio_man.cpp +++ b/kioslave/man/kio_man.cpp @@ -692,7 +692,7 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) { - KInstance instance("kio_man"); + TDEInstance instance("kio_man"); kdDebug(7107) << "STARTING " << getpid() << endl; diff --git a/kioslave/man/kmanpart.cpp b/kioslave/man/kmanpart.cpp index a8d08908e..06ced93ec 100644 --- a/kioslave/man/kmanpart.cpp +++ b/kioslave/man/kmanpart.cpp @@ -36,8 +36,8 @@ extern "C" } } -KInstance* KManPartFactory::s_instance = 0L; -KAboutData* KManPartFactory::s_about = 0L; +TDEInstance* KManPartFactory::s_instance = 0L; +TDEAboutData* KManPartFactory::s_about = 0L; KManPartFactory::KManPartFactory( TQObject* parent, const char* name ) : KParts::Factory( parent, name ) @@ -57,13 +57,13 @@ KParts::Part* KManPartFactory::createPartObject( TQWidget * parentWidget, const return part; } -KInstance* KManPartFactory::instance() +TDEInstance* KManPartFactory::instance() { if( !s_instance ) { - s_about = new KAboutData( "kmanpart", + s_about = new TDEAboutData( "kmanpart", I18N_NOOP( "KMan" ), TDE_VERSION_STRING ); - s_instance = new KInstance( s_about ); + s_instance = new TDEInstance( s_about ); } return s_instance; } @@ -73,7 +73,7 @@ KManPart::KManPart( TQWidget * parent, const char * name ) : KHTMLPart( parent, name ) ,m_job(0) { - KInstance * instance = new KInstance( "kmanpart" ); + TDEInstance * instance = new TDEInstance( "kmanpart" ); setInstance( instance ); m_extension=new KParts::BrowserExtension(this); } diff --git a/kioslave/man/kmanpart.h b/kioslave/man/kmanpart.h index f2d9e3891..2f39af11f 100644 --- a/kioslave/man/kmanpart.h +++ b/kioslave/man/kmanpart.h @@ -30,8 +30,8 @@ #include <tqcstring.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; /** * Man Page Viewer @@ -48,11 +48,11 @@ class KManPartFactory: public KParts::Factory TQObject* parent, const char* name, const char * classname, const TQStringList &args); - static KInstance * instance(); + static TDEInstance * instance(); private: - static KInstance * s_instance; - static KAboutData * s_about; + static TDEInstance * s_instance; + static TDEAboutData * s_about; }; @@ -70,7 +70,7 @@ class KManPart : public KHTMLPart void jobDone( KIO::Job *); protected: virtual bool openFile(); - KInstance *m_instance; + TDEInstance *m_instance; KParts::BrowserExtension * m_extension; KIO::TransferJob *m_job; }; diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp index 48cee7ddf..6760b4e8f 100644 --- a/kioslave/media/kcmodule/main.cpp +++ b/kioslave/media/kcmodule/main.cpp @@ -59,11 +59,11 @@ MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList - KAboutData * about = new KAboutData("kcmmedia", + TDEAboutData * about = new TDEAboutData("kcmmedia", I18N_NOOP("Storage Media"), "0.6", I18N_NOOP("Storage Media Control Panel Module"), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, I18N_NOOP("(c) 2005 Jean-Remy Falleri")); about->addAuthor("Jean-Remy Falleri", I18N_NOOP("Maintainer"), "[email protected]"); about->addAuthor("Kevin Ottens", 0, "ervin ipsquad net"); diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp index 6e6d5b312..b8ae1aa76 100644 --- a/kioslave/nfs/kio_nfs.cpp +++ b/kioslave/nfs/kio_nfs.cpp @@ -113,7 +113,7 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } int kdemain( int argc, char **argv ) { - KInstance instance( "kio_nfs" ); + TDEInstance instance( "kio_nfs" ); if (argc != 4) { diff --git a/kioslave/nntp/nntp.cpp b/kioslave/nntp/nntp.cpp index b109bb58a..1169415b8 100644 --- a/kioslave/nntp/nntp.cpp +++ b/kioslave/nntp/nntp.cpp @@ -39,7 +39,7 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } int kdemain(int argc, char **argv) { - KInstance instance ("kio_nntp"); + TDEInstance instance ("kio_nntp"); if (argc != 4) { fprintf(stderr, "Usage: kio_nntp protocol domain-socket1 domain-socket2\n"); exit(-1); diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc index fe91a0747..f4a061521 100644 --- a/kioslave/pop3/pop3.cc +++ b/kioslave/pop3/pop3.cc @@ -104,7 +104,7 @@ int kdemain(int argc, char **argv) } #endif - KInstance instance("kio_pop3"); + TDEInstance instance("kio_pop3"); POP3Protocol *slave; // Are we looking to use SSL? diff --git a/kioslave/settings/kio_settings.cc b/kioslave/settings/kio_settings.cc index c508762c9..26e04d9e5 100644 --- a/kioslave/settings/kio_settings.cc +++ b/kioslave/settings/kio_settings.cc @@ -52,7 +52,7 @@ extern "C" { KDE_EXPORT int kdemain( int, char **argv ) { kdDebug() << "kdemain for settings kioslave" << endl; - KInstance instance( "kio_settings" ); + TDEInstance instance( "kio_settings" ); SettingsProtocol slave(argv[1], argv[2], argv[3]); slave.dispatchLoop(); return 0; diff --git a/kioslave/sftp/kio_sftp.cpp b/kioslave/sftp/kio_sftp.cpp index 04a2b331c..ac747fa02 100644 --- a/kioslave/sftp/kio_sftp.cpp +++ b/kioslave/sftp/kio_sftp.cpp @@ -79,7 +79,7 @@ extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ) { - KInstance instance( "kio_sftp" ); + TDEInstance instance( "kio_sftp" ); kdDebug(KIO_SFTP_DB) << "*** Starting kio_sftp " << endl; diff --git a/kioslave/smb/kio_smb.cpp b/kioslave/smb/kio_smb.cpp index fd86ebadb..8895588dd 100644 --- a/kioslave/smb/kio_smb.cpp +++ b/kioslave/smb/kio_smb.cpp @@ -59,7 +59,7 @@ SMBSlave* G_TheSlave; int KDE_EXPORT kdemain( int argc, char **argv ) { - KInstance instance( "kio_smb" ); + TDEInstance instance( "kio_smb" ); if( argc != 4 ) { kdDebug(KIO_SMB) << "Usage: kio_smb protocol domain-socket1 domain-socket2" diff --git a/kioslave/smtp/smtp.cc b/kioslave/smtp/smtp.cc index b9eb94d62..55352aed6 100644 --- a/kioslave/smtp/smtp.cc +++ b/kioslave/smtp/smtp.cc @@ -95,7 +95,7 @@ extern "C" { int kdemain(int argc, char **argv) { - KInstance instance("kio_smtp"); + TDEInstance instance("kio_smtp"); if (argc != 4) { fprintf(stderr, diff --git a/kioslave/tar/ktartest.cpp b/kioslave/tar/ktartest.cpp index bfbb216d4..efb1e42fe 100644 --- a/kioslave/tar/ktartest.cpp +++ b/kioslave/tar/ktartest.cpp @@ -35,7 +35,7 @@ int main( int argc, char** argv ) usage(); return 1; } - KInstance instance("ktartest"); + TDEInstance instance("ktartest"); TQString command = argv[1]; kdDebug() << "main: command=" << command << endl; diff --git a/kioslave/tar/tar.cc b/kioslave/tar/tar.cc index 2c3de0215..9af5062ab 100644 --- a/kioslave/tar/tar.cc +++ b/kioslave/tar/tar.cc @@ -32,7 +32,7 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } int kdemain( int argc, char **argv ) { - KInstance instance( "kio_tar" ); + TDEInstance instance( "kio_tar" ); kdDebug(7109) << "Starting " << getpid() << endl; diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp index b73528610..29c3c8620 100644 --- a/kioslave/thumbnail/thumbnail.cpp +++ b/kioslave/thumbnail/thumbnail.cpp @@ -53,7 +53,7 @@ #include "thumbnail.h" #include <kio/thumbcreator.h> -// Use correctly KInstance instead of TDEApplication (but then no TQPixmap) +// Use correctly TDEInstance instead of TDEApplication (but then no TQPixmap) #undef USE_KINSTANCE // Fix thumbnail: protocol #define THUMBNAIL_HACK (1) @@ -96,7 +96,7 @@ int kdemain(int argc, char **argv) #endif #ifdef USE_KINSTANCE - KInstance instance("kio_thumbnail"); + TDEInstance instance("kio_thumbnail"); #else // creating TDEApplication in a slave in not a very good idea, // as dispatchLoop() doesn't allow it to process its messages, diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp index edd0c372e..8b033abd4 100644 --- a/kioslave/trash/kio_trash.cpp +++ b/kioslave/trash/kio_trash.cpp @@ -52,7 +52,7 @@ static const KCmdLineOptions options[] = extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ) { - //KInstance instance( "kio_trash" ); + //TDEInstance instance( "kio_trash" ); // TDEApplication is necessary to use kio_file putenv(strdup("SESSION_MANAGER=")); TDEApplication::disableAutoDcopRegistration(); diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index 8e5e0df08..b16f5086f 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -1102,8 +1102,8 @@ static const char * const description = void KlipperWidget::createAboutData() { - about_data = new KAboutData("klipper", I18N_NOOP("Klipper"), - klipper_version, description, KAboutData::License_GPL, + about_data = new TDEAboutData("klipper", I18N_NOOP("Klipper"), + klipper_version, description, TDEAboutData::License_GPL, "(c) 1998, Andrew Stanley-Jones\n" "1998-2002, Carsten Pfeiffer\n" "2001, Patrick Dubroy"); @@ -1135,9 +1135,9 @@ void KlipperWidget::destroyAboutData() about_data = NULL; } -KAboutData* KlipperWidget::about_data; +TDEAboutData* KlipperWidget::about_data; -KAboutData* KlipperWidget::aboutData() +TDEAboutData* KlipperWidget::aboutData() { return about_data; } diff --git a/klipper/toplevel.h b/klipper/toplevel.h index 024fb87f7..59d7c7396 100644 --- a/klipper/toplevel.h +++ b/klipper/toplevel.h @@ -31,7 +31,7 @@ class TQClipboard; class KToggleAction; -class KAboutData; +class TDEAboutData; class URLGrabber; class ClipboardPoll; class TQTime; @@ -69,7 +69,7 @@ public: static void updateTimestamp(); static void createAboutData(); static void destroyAboutData(); - static KAboutData* aboutData(); + static TDEAboutData* aboutData(); public slots: void saveSession(); @@ -204,7 +204,7 @@ private: TQTimer m_pendingCheckTimer; bool m_pendingContentsCheck; ClipboardPoll* poll; - static KAboutData* about_data; + static TDEAboutData* about_data; bool blockFetchingNewData(); KlipperSessionManaged* session_managed; diff --git a/kmenuedit/kcontrol_main.cpp b/kmenuedit/kcontrol_main.cpp index 3555937b5..50e9055d2 100644 --- a/kmenuedit/kcontrol_main.cpp +++ b/kmenuedit/kcontrol_main.cpp @@ -35,8 +35,8 @@ static const char version[] = "1.0"; extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("kmenuedit"); - KAboutData aboutData("kcontroledit", I18N_NOOP("TDE Control Center Editor"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData("kcontroledit", I18N_NOOP("TDE Control Center Editor"), + version, description, TDEAboutData::License_GPL, "(C) 2000-2004, Waldo Bastian, Raffaele Sandrini, Matthias Elter"); aboutData.addAuthor("Waldo Bastian", I18N_NOOP("Maintainer"), "[email protected]"); aboutData.addAuthor("Raffaele Sandrini", I18N_NOOP("Previous Maintainer"), "[email protected]"); diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp index e2f70b62d..1addbbcaa 100644 --- a/kmenuedit/main.cpp +++ b/kmenuedit/main.cpp @@ -64,8 +64,8 @@ public: extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) { - KAboutData aboutData("kmenuedit", I18N_NOOP("TDE Menu Editor"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData("kmenuedit", I18N_NOOP("TDE Menu Editor"), + version, description, TDEAboutData::License_GPL, "(C) 2000-2003, Waldo Bastian, Raffaele Sandrini, Matthias Elter"); aboutData.addAuthor("Waldo Bastian", I18N_NOOP("Maintainer"), "[email protected]"); aboutData.addAuthor("Raffaele Sandrini", I18N_NOOP("Previous Maintainer"), "[email protected]"); diff --git a/knetattach/main.cpp b/knetattach/main.cpp index ba9acb637..41fe2975f 100644 --- a/knetattach/main.cpp +++ b/knetattach/main.cpp @@ -26,9 +26,9 @@ #include "knetattach.h" int main(int argc, char **argv) { - KAboutData about("knetattach", I18N_NOOP("TDE Network Wizard"), "1.0", + TDEAboutData about("knetattach", I18N_NOOP("TDE Network Wizard"), "1.0", I18N_NOOP("TDE Network Wizard"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2004 George Staikos"), 0, "http://www.kde.org/"); diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index d9e62d28a..6b573d438 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -21,7 +21,7 @@ K_EXPORT_COMPONENT_FACTORY( konq_aboutpage, KonqAboutPageFactory ) -KInstance *KonqAboutPageFactory::s_instance = 0; +TDEInstance *KonqAboutPageFactory::s_instance = 0; TQString *KonqAboutPageFactory::s_launch_html = 0; TQString *KonqAboutPageFactory::s_intro_html = 0; TQString *KonqAboutPageFactory::s_specs_html = 0; @@ -31,7 +31,7 @@ TQString *KonqAboutPageFactory::s_plugins_html = 0; KonqAboutPageFactory::KonqAboutPageFactory( TQObject *parent, const char *name ) : KParts::Factory( parent, name ) { - s_instance = new KInstance( "konqaboutpage" ); + s_instance = new TDEInstance( "konqaboutpage" ); } KonqAboutPageFactory::~KonqAboutPageFactory() diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h index c72a85250..96229c42c 100644 --- a/konqueror/about/konq_aboutpage.h +++ b/konqueror/about/konq_aboutpage.h @@ -5,7 +5,7 @@ #include <khtml_part.h> class KHTMLPart; -class KInstance; +class TDEInstance; class KonqAboutPageFactory : public KParts::Factory { @@ -17,7 +17,7 @@ public: TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - static KInstance *instance() { return s_instance; } + static TDEInstance *instance() { return s_instance; } static TQString launch(); static TQString intro(); @@ -28,7 +28,7 @@ public: private: static TQString loadFile( const TQString& file ); - static KInstance *s_instance; + static TDEInstance *s_instance; static TQString *s_launch_html, *s_intro_html, *s_specs_html, *s_tips_html, *s_plugins_html; }; diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index 30f5b9c6a..566bb543d 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -459,7 +459,7 @@ bool clientApp::doIt() if ( command == "openURL" || command == "newTab" ) { - KInstance inst(appName); + TDEInstance inst(appName); if( !TDEApplication::dcopClient()->attach()) { TDEApplication::startKdeinit(); @@ -484,7 +484,7 @@ bool clientApp::doIt() } else if ( command == "openProfile" ) { - KInstance inst(appName); + TDEInstance inst(appName); if( !TDEApplication::dcopClient()->attach()) { TDEApplication::startKdeinit(); diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index afe91c6ff..b3cc59d85 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -82,10 +82,10 @@ public: return obj; } - static KInstance *instance() + static TDEInstance *instance() { if ( !s_instance ) - s_instance = new KInstance( "konqiconview" ); + s_instance = new TDEInstance( "konqiconview" ); return s_instance; } @@ -98,11 +98,11 @@ public: } private: - static KInstance *s_instance; + static TDEInstance *s_instance; static KonqPropsView *s_defaultViewProps; }; -KInstance *KonqIconViewFactory::s_instance = 0; +TDEInstance *KonqIconViewFactory::s_instance = 0; KonqPropsView *KonqIconViewFactory::s_defaultViewProps = 0; diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp index b5dfe553f..1fbcd6c03 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp @@ -59,9 +59,9 @@ int main( int argc, char**argv ) { const bool kdeRunning = kdeIsRunning(); - KAboutData aboutData( "kbookmarkmerger", I18N_NOOP( "KBookmarkMerger" ), + TDEAboutData aboutData( "kbookmarkmerger", I18N_NOOP( "KBookmarkMerger" ), "1.0", I18N_NOOP( "Merges bookmarks installed by 3rd parties into the user's bookmarks" ), - KAboutData::License_BSD, + TDEAboutData::License_BSD, I18N_NOOP( "Copyright © 2005 Frerich Raabe" ) ); aboutData.addAuthor( "Frerich Raabe", I18N_NOOP( "Original author" ), "[email protected]" ); diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 50b7d2046..0c47ff65f 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -114,9 +114,9 @@ static int askUser(TDEApplication &app, TQString filename, bool &readonly) { extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { KLocale::setMainCatalogue("konqueror"); - KAboutData aboutData("keditbookmarks", I18N_NOOP("Bookmark Editor"), VERSION, + TDEAboutData aboutData("keditbookmarks", I18N_NOOP("Bookmark Editor"), VERSION, I18N_NOOP("Konqueror Bookmarks Editor"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2000 - 2003, KDE developers") ); aboutData.addAuthor("David Faure", I18N_NOOP("Initial author"), "[email protected]"); aboutData.addAuthor("Alexander Kellett", I18N_NOOP("Author"), "[email protected]"); diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc index 93bccfc01..be14f7e63 100644 --- a/konqueror/konq_extensionmanager.cc +++ b/konqueror/konq_extensionmanager.cc @@ -63,7 +63,7 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai // have their config in the same KConfig[Group]. So we can't show konqueror extensions and khtml extensions in the same tab. d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", KGlobal::config()); if ( activePart ) { - KInstance* instance = activePart->instance(); + TDEInstance* instance = activePart->instance(); d->pluginSelector->addPlugins(instance->instanceName(), i18n("Tools"), "Tools", instance->config()); d->pluginSelector->addPlugins(instance->instanceName(), i18n("Statusbar"), "Statusbar", instance->config()); } diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index 97da7b4f6..a61ae8068 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -35,7 +35,7 @@ #include <assert.h> -KAboutData *KonqFactory::s_aboutData = 0; +TDEAboutData *KonqFactory::s_aboutData = 0; KonqViewFactory::KonqViewFactory( KLibFactory *factory, const TQStringList &args, bool createBrowser ) @@ -211,14 +211,14 @@ void KonqFactory::getOffers( const TQString & serviceType, } -const KAboutData *KonqFactory::aboutData() +const TDEAboutData *KonqFactory::aboutData() { if (!s_aboutData) { - s_aboutData = new KAboutData( "konqueror", I18N_NOOP("Konqueror"), + s_aboutData = new TDEAboutData( "konqueror", I18N_NOOP("Konqueror"), KONQUEROR_VERSION, I18N_NOOP("Web browser, file manager, ..."), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2010, The Konqueror developers"), 0, I18N_NOOP("http://konqueror.kde.org") ); diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h index ac24061e6..4307defb9 100644 --- a/konqueror/konq_factory.h +++ b/konqueror/konq_factory.h @@ -32,7 +32,7 @@ class BrowserView; class KonqMainWindow; -class KAboutData; +class TDEAboutData; class KonqViewFactory { @@ -77,10 +77,10 @@ public: KTrader::OfferList *partServiceOffers = 0, KTrader::OfferList *appServiceOffers = 0); - static const KAboutData* aboutData(); + static const TDEAboutData* aboutData(); private: - static KAboutData *s_aboutData; + static TDEAboutData *s_aboutData; }; #endif diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc index 782d55e06..a2be33e4e 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cc @@ -33,7 +33,7 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow, { //giving a name to each guiclient: just for debugging // (needs delete instance() in the dtor if enabled for good) - //setInstance( new KInstance( "PopupMenuGUIClient" ) ); + //setInstance( new TDEInstance( "PopupMenuGUIClient" ) ); m_mainWindow = mainWindow; diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index 0e1a7f3dc..9b5c4e5b3 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -313,7 +313,7 @@ protected: const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage = false ); // Disabled - we do it ourselves - virtual void setActiveInstance( KInstance * ) {} + virtual void setActiveInstance( TDEInstance * ) {} private: diff --git a/konqueror/kttsplugin/khtmlkttsd.h b/konqueror/kttsplugin/khtmlkttsd.h index b4e5702ca..cfe1e7d38 100644 --- a/konqueror/kttsplugin/khtmlkttsd.h +++ b/konqueror/kttsplugin/khtmlkttsd.h @@ -20,7 +20,7 @@ #include <kparts/plugin.h> class KURL; -class KInstance; +class TDEInstance; /** * KHTML KParts Plugin diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index f256e8e3b..b3b886d8d 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -72,10 +72,10 @@ KParts::Part* KonqListViewFactory::createPartObject( TQWidget *parentWidget, con return obj; } -KInstance *KonqListViewFactory::instance() +TDEInstance *KonqListViewFactory::instance() { if ( !s_instance ) - s_instance = new KInstance( "konqlistview" ); + s_instance = new TDEInstance( "konqlistview" ); return s_instance; } @@ -88,7 +88,7 @@ KonqPropsView *KonqListViewFactory::defaultViewProps() return s_defaultViewProps; } -KInstance *KonqListViewFactory::s_instance = 0; +TDEInstance *KonqListViewFactory::s_instance = 0; KonqPropsView *KonqListViewFactory::s_defaultViewProps = 0; K_EXPORT_COMPONENT_FACTORY( konq_listview, KonqListViewFactory ) diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index a6dc8450e..40f8b2269 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -46,11 +46,11 @@ public: virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ); - static KInstance *instance(); + static TDEInstance *instance(); static KonqPropsView *defaultViewProps(); private: - static KInstance *s_instance; + static TDEInstance *s_instance; static KonqPropsView *s_defaultViewProps; }; diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index 29f8de794..61e0f3b82 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -41,7 +41,7 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, setWidget(TQT_TQWIDGET(m_widget)); } -KInstance *KonqSidebar::getInstance() +TDEInstance *KonqSidebar::getInstance() { kdDebug() << "KonqSidebar::getInstance()" << endl; return KonqSidebarFactory::instance(); @@ -76,13 +76,13 @@ void KonqSidebar::customEvent(TQCustomEvent* ev) // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include <kaboutdata.h> #include <klocale.h> #include <kinstance.h> -KInstance* KonqSidebarFactory::s_instance = 0L; -KAboutData* KonqSidebarFactory::s_about = 0L; +TDEInstance* KonqSidebarFactory::s_instance = 0L; +TDEAboutData* KonqSidebarFactory::s_about = 0L; KonqSidebarFactory::KonqSidebarFactory() : KParts::Factory() @@ -111,13 +111,13 @@ KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, cons return obj; } -KInstance* KonqSidebarFactory::instance() +TDEInstance* KonqSidebarFactory::instance() { if( !s_instance ) { - s_about = new KAboutData("konqsidebartng", I18N_NOOP("Extended Sidebar"), "0.1"); + s_about = new TDEAboutData("konqsidebartng", I18N_NOOP("Extended Sidebar"), "0.1"); s_about->addAuthor("Joseph WENNINGER", 0, "[email protected]"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; } diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h index 258bde835..660fda9df 100644 --- a/konqueror/sidebar/konqsidebar.h +++ b/konqueror/sidebar/konqsidebar.h @@ -90,7 +90,7 @@ public: virtual bool openURL(const KURL &url); KonqSidebarBrowserExtension* extension() const { return m_extension; } - KInstance *getInstance(); + TDEInstance *getInstance(); virtual bool universalMode() {return m_universalMode;} protected: /** @@ -106,8 +106,8 @@ private: bool m_universalMode; }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KonqSidebarFactory : public KParts::Factory { @@ -119,11 +119,11 @@ public: virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - static KInstance* instance(); + static TDEInstance* instance(); private: - static KInstance* s_instance; - static KAboutData* s_about; + static TDEInstance* s_instance; + static TDEAboutData* s_about; }; #endif // KPARTAPPPART_H diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp index 52cfc11f9..b9fb16f61 100644 --- a/konqueror/sidebar/konqsidebarplugin.cpp +++ b/konqueror/sidebar/konqsidebarplugin.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> -KonqSidebarPlugin::KonqSidebarPlugin(KInstance *instance,TQObject *parent, +KonqSidebarPlugin::KonqSidebarPlugin(TDEInstance *instance,TQObject *parent, TQWidget * /*widgetParent*/, TQString &desktopName_, const char* name) : TQObject(parent,name), desktopName(desktopName_) { @@ -31,7 +31,7 @@ KonqSidebarPlugin::KonqSidebarPlugin(KInstance *instance,TQObject *parent, KonqSidebarPlugin::~KonqSidebarPlugin() { } -KInstance *KonqSidebarPlugin::parentInstance(){return m_parentInstance;} +TDEInstance *KonqSidebarPlugin::parentInstance(){return m_parentInstance;} void KonqSidebarPlugin::openURL(const KURL& url){handleURL(url);} diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h index 8f3077b37..ad859d025 100644 --- a/konqueror/sidebar/konqsidebarplugin.h +++ b/konqueror/sidebar/konqsidebarplugin.h @@ -34,17 +34,17 @@ class KDE_EXPORT KonqSidebarPlugin : public TQObject { Q_OBJECT public: - KonqSidebarPlugin(KInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0); + KonqSidebarPlugin(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0); ~KonqSidebarPlugin(); virtual TQWidget *getWidget()=0; virtual void *provides(const TQString &)=0; - KInstance *parentInstance(); + TDEInstance *parentInstance(); protected: virtual void handleURL(const KURL &url)=0; virtual void handlePreview(const KFileItemList & items); virtual void handlePreviewOnMouseOver(const KFileItem &items); //not used yet, perhaps in KDE 3.1 TQString desktopName; - KInstance* m_parentInstance; + TDEInstance* m_parentInstance; private: KonqSidebarPluginPrivate *d; diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index dfdf90780..aba5e3a26 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -903,8 +903,8 @@ KonqSidebarPlugin *Sidebar_Widget::loadModule(TQWidget *par,TQString &desktopNam { // create the module - KonqSidebarPlugin* (*func)(KInstance*,TQObject *, TQWidget*, TQString&, const char *); - func = (KonqSidebarPlugin* (*)(KInstance*,TQObject *, TQWidget *, TQString&, const char *)) create; + KonqSidebarPlugin* (*func)(TDEInstance*,TQObject *, TQWidget*, TQString&, const char *); + func = (KonqSidebarPlugin* (*)(TDEInstance*,TQObject *, TQWidget *, TQString&, const char *)) create; TQString fullPath(m_path+desktopName); return (KonqSidebarPlugin*)func(getInstance(),bi,par,fullPath,0); } @@ -1084,7 +1084,7 @@ void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid) } } -KInstance *Sidebar_Widget::getInstance() +TDEInstance *Sidebar_Widget::getInstance() { return ((KonqSidebar*)m_partParent)->getInstance(); } diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index 75975f35e..d258c9c3b 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -137,7 +137,7 @@ signals: public: /* interface KonqSidebar_PluginInterface*/ - KInstance *getInstance(); + TDEInstance *getInstance(); // virtual void showError(TQString &); for later extension // virtual void showMessage(TQString &); for later extension /* end of interface implementation */ diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp index a790ee7e1..2032fe202 100644 --- a/konqueror/sidebar/test/konqsidebartest.cpp +++ b/konqueror/sidebar/test/konqsidebartest.cpp @@ -19,7 +19,7 @@ extern "C" { - KDE_EXPORT void* create_konq_sidebartest(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + KDE_EXPORT void* create_konq_sidebartest(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new SidebarTest(instance,par,widp,desktopname,name); } diff --git a/konqueror/sidebar/test/konqsidebartest.h b/konqueror/sidebar/test/konqsidebartest.h index 5c36080fd..c5abab26c 100644 --- a/konqueror/sidebar/test/konqsidebartest.h +++ b/konqueror/sidebar/test/konqsidebartest.h @@ -24,7 +24,7 @@ class SidebarTest : public KonqSidebarPlugin { Q_OBJECT public: - SidebarTest(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0): + SidebarTest(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0): KonqSidebarPlugin(inst,parent,widgetParent,desktopName_,name) { widget=new TQLabel("Init Value",widgetParent); diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index ffde542b0..0dc9303b4 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -14,7 +14,7 @@ #include <tqvbox.h> #include <tqapplication.h> -KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): +KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) { KSimpleConfig ksc(desktopName_); @@ -124,7 +124,7 @@ void KonqSidebar_Tree::rename() extern "C" { - KDE_EXPORT void* create_konqsidebar_tree(KInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + KDE_EXPORT void* create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new KonqSidebar_Tree(inst,par,widp,desktopname,name); } diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h index 06f6b16b5..b70230b9e 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.h +++ b/konqueror/sidebar/trees/konqsidebar_tree.h @@ -18,7 +18,7 @@ class KonqSidebar_Tree: public KonqSidebarPlugin { Q_OBJECT public: - KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); + KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_Tree(); virtual void *provides(const TQString &); // void emitStatusBarText (const TQString &); diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index 695bc4d69..3697c443f 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -32,7 +32,7 @@ #include <kstandarddirs.h> -KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name) +KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name) : KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name) { _htmlPart = new KHTMLSideBar(universalMode()); @@ -182,7 +182,7 @@ void KonqSideBarWebModule::pageLoaded() { extern "C" { - KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(KInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) { + KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(TDEInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) { return new KonqSideBarWebModule(instance, parent, widget, desktopName, name); } } diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index 36109ff86..4e0c3d6d7 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -166,7 +166,7 @@ class KonqSideBarWebModule : public KonqSidebarPlugin { Q_OBJECT public: - KonqSideBarWebModule(KInstance *instance, TQObject *parent, + KonqSideBarWebModule(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char *name); virtual ~KonqSideBarWebModule(); diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 1054ce826..b6fa5eedf 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -57,8 +57,8 @@ K_EXPORT_COMPONENT_FACTORY( libkonsolepart, konsoleFactory ) /** * We need one static instance of the factory for our C 'main' function */ -KInstance *konsoleFactory::s_instance = 0L; -KAboutData *konsoleFactory::s_aboutData = 0; +TDEInstance *konsoleFactory::s_instance = 0L; +TDEAboutData *konsoleFactory::s_aboutData = 0; konsoleFactory::konsoleFactory() { @@ -85,12 +85,12 @@ KParts::Part *konsoleFactory::createPartObject(TQWidget *parentWidget, const cha return obj; } -KInstance *konsoleFactory::instance() +TDEInstance *konsoleFactory::instance() { if ( !s_instance ) { - s_aboutData = new KAboutData("konsole", I18N_NOOP("Konsole"), "1.5"); - s_instance = new KInstance( s_aboutData ); + s_aboutData = new TDEAboutData("konsole", I18N_NOOP("Konsole"), "1.5"); + s_instance = new TDEInstance( s_aboutData ); } return s_instance; } diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h index 1f65106ad..ae97f553b 100644 --- a/konsole/konsole/konsole_part.h +++ b/konsole/konsole/konsole_part.h @@ -32,7 +32,7 @@ #include "schema.h" #include "session.h" -class KInstance; +class TDEInstance; class konsoleBrowserExtension; class TQPushButton; class TQSpinBox; @@ -57,11 +57,11 @@ public: const char* classname = "KParts::Part", const TQStringList &args = TQStringList()); - static KInstance *instance(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_aboutData; + static TDEInstance *s_instance; + static TDEAboutData *s_aboutData; }; ////////////////////////////////////////////////////////////////////// diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index f8859da75..840ac6ac1 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -162,8 +162,8 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) bool scrollbaron = true; bool showtip = true; - KAboutData aboutData( "konsole", I18N_NOOP("Konsole"), - KONSOLE_VERSION, description, KAboutData::License_GPL_V2, + TDEAboutData aboutData( "konsole", I18N_NOOP("Konsole"), + KONSOLE_VERSION, description, TDEAboutData::License_GPL_V2, "Copyright (c) 1997-2006, Lars Doelle"); aboutData.addAuthor("Robert Knight",I18N_NOOP("Maintainer"), "[email protected]"); aboutData.addAuthor("Lars Doelle",I18N_NOOP("Author"), "[email protected]"); diff --git a/kpager/main.cpp b/kpager/main.cpp index c7b385969..b13ec7b0c 100644 --- a/kpager/main.cpp +++ b/kpager/main.cpp @@ -64,8 +64,8 @@ public: int main(int argc, char **argv) { - KAboutData *aboutdata = new KAboutData("kpager", "KPager", "1.5", - I18N_NOOP("Desktop Overview"), KAboutData::License_GPL, + TDEAboutData *aboutdata = new TDEAboutData("kpager", "KPager", "1.5", + I18N_NOOP("Desktop Overview"), TDEAboutData::License_GPL, "(C) 1998-2002, Antonio Larrosa Jimenez","", "http://developer.kde.org/~larrosa/kpager.html"); diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp index 4342e5c8f..2916302fa 100644 --- a/kpersonalizer/main.cpp +++ b/kpersonalizer/main.cpp @@ -35,8 +35,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "kpersonalizer", I18N_NOOP("KPersonalizer"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kpersonalizer", I18N_NOOP("KPersonalizer"), + VERSION, description, TDEAboutData::License_GPL, "(c) 2001, Ralf Nolden", 0, 0, "[email protected]"); aboutData.addAuthor("Ralf Nolden",0, "[email protected]"); aboutData.addAuthor("Carsten Wolff",0, "[email protected]"); diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp index 1748b6549..4be41ccec 100644 --- a/kreadconfig/kreadconfig.cpp +++ b/kreadconfig/kreadconfig.cpp @@ -43,10 +43,10 @@ static KCmdLineOptions options[] = }; int main(int argc, char **argv) { - KAboutData aboutData("kreadconfig", I18N_NOOP("KReadConfig"), + TDEAboutData aboutData("kreadconfig", I18N_NOOP("KReadConfig"), "1.0.1", I18N_NOOP("Read KConfig entries - for use in shell scripts"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2001 Red Hat, Inc."); aboutData.addAuthor("Bernhard Rosenkraenzer", 0, "[email protected]"); TDECmdLineArgs::init(argc, argv, &aboutData); @@ -64,7 +64,7 @@ int main(int argc, char **argv) return 1; } - KInstance inst(&aboutData); + TDEInstance inst(&aboutData); KGlobal::config(); KConfig *konfig; diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp index b216a14df..259c37ffc 100644 --- a/kreadconfig/kwriteconfig.cpp +++ b/kreadconfig/kwriteconfig.cpp @@ -25,10 +25,10 @@ static KCmdLineOptions options[] = }; int main(int argc, char **argv) { - KAboutData aboutData("kwriteconfig", I18N_NOOP("KWriteConfig"), + TDEAboutData aboutData("kwriteconfig", I18N_NOOP("KWriteConfig"), "1.0.0", I18N_NOOP("Write KConfig entries - for use in shell scripts"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2001 Red Hat, Inc. & Lu�s Pedro Coelho"); aboutData.addAuthor("Lu�s Pedro Coelho", 0, "[email protected]"); aboutData.addAuthor("Bernhard Rosenkraenzer", "Wrote kreadconfig on which this is based", "[email protected]"); @@ -48,7 +48,7 @@ int main(int argc, char **argv) } TQCString value = args->arg( 0 ); - KInstance inst(&aboutData); + TDEInstance inst(&aboutData); KConfig *konfig; if (file.isEmpty()) diff --git a/krootbacking/main.cpp b/krootbacking/main.cpp index c1a36f54e..1e9c42835 100644 --- a/krootbacking/main.cpp +++ b/krootbacking/main.cpp @@ -46,8 +46,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("krootbacking", I18N_NOOP("krootbacking"), version, description, - KAboutData::License_GPL, "(C) 2011 Timothy Pearson", 0, 0, "[email protected]"); + TDEAboutData about("krootbacking", I18N_NOOP("krootbacking"), version, description, + TDEAboutData::License_GPL, "(C) 2011 Timothy Pearson", 0, 0, "[email protected]"); about.addAuthor( "Timothy Pearson", 0, "[email protected]" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 443a978e2..ba8c0454d 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -180,8 +180,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) { sanity_check(argc, argv); - KAboutData aboutData( "ksmserver", I18N_NOOP("The TDE Session Manager"), - version, description, KAboutData::License_BSD, + TDEAboutData aboutData( "ksmserver", I18N_NOOP("The TDE Session Manager"), + version, description, TDEAboutData::License_BSD, "(C) 2000, The KDE Developers"); aboutData.addAuthor("Matthias Ettrich",0, "[email protected]"); aboutData.addAuthor("Luboš Luňák", I18N_NOOP( "Maintainer" ), "[email protected]" ); diff --git a/ksmserver/test.cpp b/ksmserver/test.cpp index 5ccb4243a..126164db9 100644 --- a/ksmserver/test.cpp +++ b/ksmserver/test.cpp @@ -7,7 +7,7 @@ int main(int argc, char *argv[]) { - KAboutData about("kapptest", "kapptest", "version"); + TDEAboutData about("kapptest", "kapptest", "version"); TDECmdLineArgs::init(argc, argv, &about); TDEApplication a; diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp index 959b91280..53c5d45fd 100644 --- a/ksplashml/kcmksplash/main.cpp +++ b/ksplashml/kcmksplash/main.cpp @@ -60,11 +60,11 @@ KSplashThemeMgr::KSplashThemeMgr( TQWidget *parent, const char *name, const TQSt box->addWidget(mInstaller); #endif connect( mInstaller, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); - KAboutData *about = new KAboutData( "kcmksplash" + TDEAboutData *about = new TDEAboutData( "kcmksplash" ,I18N_NOOP("TDE splash screen theme manager") ,"0.1" ,0 - ,KAboutData::License_GPL + ,TDEAboutData::License_GPL ,I18N_NOOP("(c) 2003 KDE developers") ); about->addAuthor("Ravikiran Rajagopal", 0, "[email protected]"); about->addCredit("Brian Ledbetter", I18N_NOOP("Original KSplash/ML author"), "[email protected]"); diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp index e4f28855f..f184fb7a6 100644 --- a/ksplashml/main.cpp +++ b/ksplashml/main.cpp @@ -39,12 +39,12 @@ static KCmdLineOptions options[] = { int main( int argc, char **argv ) { - KAboutData about( + TDEAboutData about( "ksplash", I18N_NOOP("KSplash"), VERSION, I18N_NOOP("Trinity splash screen"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2001 - 2003, Flaming Sword Productions\n (c) 2003 KDE developers"), "http://www.kde.org"); about.addAuthor( "Ravikiran Rajagopal", I18N_NOOP("Author and maintainer"), "[email protected]" ); diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index b56f7bd91..d1117548f 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -286,12 +286,12 @@ static KCmdLineOptions options[] = int main( int argc, char *argv[] ) { // David, 05/03/2000 - KAboutData aboutData( "kstart", I18N_NOOP("KStart"), KSTART_VERSION, + TDEAboutData aboutData( "kstart", I18N_NOOP("KStart"), KSTART_VERSION, I18N_NOOP("" "Utility to launch applications with special window properties \n" "such as iconified, maximized, a certain virtual desktop, a special decoration\n" "and so on." ), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(C) 1997-2000 Matthias Ettrich ([email protected])" ); aboutData.addAuthor( "Matthias Ettrich", 0, "[email protected]" ); diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index 2dbe1bb5e..9b8fb0722 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -553,8 +553,8 @@ int main( int argc, char** argv ) close( initpipe[ 0 ] ); setsid(); - KAboutData aboutData( "ksysguard", I18N_NOOP( "TDE System Guard" ), - KSYSGUARD_VERSION, Description, KAboutData::License_GPL, + TDEAboutData aboutData( "ksysguard", I18N_NOOP( "TDE System Guard" ), + KSYSGUARD_VERSION, Description, TDEAboutData::License_GPL, I18N_NOOP( "(c) 1996-2002 The KSysGuard Developers" ) ); aboutData.addAuthor( "Chris Schlaeger", "Current Maintainer", "[email protected]" ); aboutData.addAuthor( "Tobias Koenig", 0, "[email protected]" ); diff --git a/ksystraycmd/main.cpp b/ksystraycmd/main.cpp index 792b7599f..3b33b768c 100644 --- a/ksystraycmd/main.cpp +++ b/ksystraycmd/main.cpp @@ -48,10 +48,10 @@ static KCmdLineOptions options[] = int main( int argc, char *argv[] ) { - KAboutData aboutData( "ksystraycmd", I18N_NOOP( "KSysTrayCmd" ), + TDEAboutData aboutData( "ksystraycmd", I18N_NOOP( "KSysTrayCmd" ), "KSysTrayCmd 0.1", I18N_NOOP( "Allows any application to be kept in the system tray" ), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(C) 2001-2002 Richard Moore ([email protected])" ); aboutData.addAuthor( "Richard Moore", 0, "[email protected]" ); diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp index 25633881e..8fa413645 100644 --- a/ktip/ktipwindow.cpp +++ b/ktip/ktipwindow.cpp @@ -33,8 +33,8 @@ static const char description[] = I18N_NOOP("Useful tips"); int main(int argc, char *argv[]) { - KAboutData aboutData("ktip", I18N_NOOP("KTip"), - "0.3", description, KAboutData::License_GPL, + TDEAboutData aboutData("ktip", I18N_NOOP("KTip"), + "0.3", description, TDEAboutData::License_GPL, "(c) 1998-2002, KDE Developers"); TDECmdLineArgs::init( argc, argv, &aboutData ); KUniqueApplication::addCmdLineOptions(); diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 572cb6852..5c2bf2cb0 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -374,8 +374,8 @@ const char * DESCRIPTION = extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { - KAboutData about("kxkb", I18N_NOOP("TDE Keyboard Tool"), "1.0", - DESCRIPTION, KAboutData::License_LGPL, + TDEAboutData about("kxkb", I18N_NOOP("TDE Keyboard Tool"), "1.0", + DESCRIPTION, TDEAboutData::License_LGPL, "Copyright (C) 2001, S.R.Haque\n(C) 2002-2003, 2006 Andriy Rysin"); TDECmdLineArgs::init(argc, argv, &about); KXKBApp::addCmdLineOptions(); diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc index 303fe044f..e1cee86d7 100644 --- a/libkonq/konq_propsview.cc +++ b/libkonq/konq_propsview.cc @@ -72,7 +72,7 @@ struct KonqPropsView::Private TQString sortcriterion; }; -KonqPropsView::KonqPropsView( KInstance * instance, KonqPropsView * defaultProps ) +KonqPropsView::KonqPropsView( TDEInstance * instance, KonqPropsView * defaultProps ) : m_bSaveViewPropertiesLocally( false ), // will be overridden by setSave... anyway // if this is the default properties instance, then keep config object for saving m_dotDirExists( true ), // HACK so that enterDir returns true initially diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h index c69b97966..4edfe8246 100644 --- a/libkonq/konq_propsview.h +++ b/libkonq/konq_propsview.h @@ -26,7 +26,7 @@ #include <kurl.h> #include <libkonq_export.h> -class KInstance; +class TDEInstance; class KConfigBase; class KConfig; @@ -51,7 +51,7 @@ public: * is the one used by a view, and its value can differ from the default ones. * The instance parameter should be the same for both... */ - KonqPropsView( KInstance * instance, KonqPropsView * defaultProps /*= 0L*/ ); + KonqPropsView( TDEInstance * instance, KonqPropsView * defaultProps /*= 0L*/ ); /** Destructor */ virtual ~KonqPropsView(); diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index 350da1098..9dab88c36 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -145,7 +145,7 @@ void NSPluginCallback::evalJavaScript( int id, TQString script ) * We need one static instance of the factory for our C 'main' * function */ -KInstance *PluginFactory::s_instance = 0L; +TDEInstance *PluginFactory::s_instance = 0L; PluginFactory::PluginFactory() @@ -182,18 +182,18 @@ KParts::Part * PluginFactory::createPartObject(TQWidget *parentWidget, const cha } -KInstance *PluginFactory::instance() +TDEInstance *PluginFactory::instance() { kdDebug(1432) << "PluginFactory::instance" << endl; if ( !s_instance ) - s_instance = new KInstance( aboutData() ); + s_instance = new TDEInstance( aboutData() ); return s_instance; } -KAboutData *PluginFactory::aboutData() +TDEAboutData *PluginFactory::aboutData() { - KAboutData *about = new KAboutData("plugin", I18N_NOOP("plugin"), "1.99"); + TDEAboutData *about = new TDEAboutData("plugin", I18N_NOOP("plugin"), "1.99"); return about; } diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h index 3e54af412..e29d91ee7 100644 --- a/nsplugins/plugin_part.h +++ b/nsplugins/plugin_part.h @@ -31,8 +31,8 @@ #include <tqwidget.h> #include <tqguardedptr.h> -class KAboutData; -class KInstance; +class TDEAboutData; +class TDEInstance; class PluginBrowserExtension; class PluginLiveConnectExtension; class TQLabel; @@ -72,12 +72,12 @@ public: const char *classname = "KParts::Part", const TQStringList &args = TQStringList()); - static KInstance *instance(); - static KAboutData *aboutData(); + static TDEInstance *instance(); + static TDEAboutData *aboutData(); private: - static KInstance *s_instance; + static TDEInstance *s_instance; class NSPluginLoader *_loader; }; diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index e6891ba97..116308a77 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -525,8 +525,8 @@ static KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "nspluginscan", I18N_NOOP("nspluginscan"), - "0.3", "nspluginscan", KAboutData::License_GPL, + TDEAboutData aboutData( "nspluginscan", I18N_NOOP("nspluginscan"), + "0.3", "nspluginscan", TDEAboutData::License_GPL, "(c) 2000,2001 by Stefan Schimanski" ); KLocale::setMainCatalogue("nsplugin"); diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp index 9f0086ef5..eb1a3ffc1 100644 --- a/tdeinit/displayconfig.cpp +++ b/tdeinit/displayconfig.cpp @@ -51,8 +51,8 @@ int main(int argc, char **argv) { int return_code = -1; - KAboutData about("tdeinit_displayconfig", I18N_NOOP("tdeinit_displayconfig"), version, description, - KAboutData::License_GPL, "(C) 2013 Timothy Pearson", 0, 0, "[email protected]"); + TDEAboutData about("tdeinit_displayconfig", I18N_NOOP("tdeinit_displayconfig"), version, description, + TDEAboutData::License_GPL, "(C) 2013 Timothy Pearson", 0, 0, "[email protected]"); about.addAuthor( "Timothy Pearson", 0, "[email protected]" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp index 6b4479c6c..467aa9b41 100644 --- a/tdeinit/phase1.cpp +++ b/tdeinit/phase1.cpp @@ -47,8 +47,8 @@ int main(int argc, char **argv) { int return_code = -1; - KAboutData about("tdeinit_phase1", I18N_NOOP("tdeinit_phase1"), version, description, - KAboutData::License_GPL, "(C) 2012 Timothy Pearson", 0, 0, "[email protected]"); + TDEAboutData about("tdeinit_phase1", I18N_NOOP("tdeinit_phase1"), version, description, + TDEAboutData::License_GPL, "(C) 2012 Timothy Pearson", 0, 0, "[email protected]"); about.addAuthor( "Timothy Pearson", 0, "[email protected]" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp index 417929339..a0671e5bc 100644 --- a/tdeprint/kjobviewer/main.cpp +++ b/tdeprint/kjobviewer/main.cpp @@ -35,7 +35,7 @@ static KCmdLineOptions options[] = { extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) { - KAboutData aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),KAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org"); + TDEAboutData aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),TDEAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org"); aboutData.addAuthor("Michael Goffioul",0,"[email protected]"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/tdeprint/printmgr/kcmprintmgr.cpp b/tdeprint/printmgr/kcmprintmgr.cpp index f24bf6c84..4dba35e70 100644 --- a/tdeprint/printmgr/kcmprintmgr.cpp +++ b/tdeprint/printmgr/kcmprintmgr.cpp @@ -47,9 +47,9 @@ KCMPrintMgr::KCMPrintMgr(TQWidget *parent, const char *name, const TQStringList main_->addWidget(m_mainview); main_->activate(); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmprintmgr"), I18N_NOOP("TDE Printing Management"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmprintmgr"), I18N_NOOP("TDE Printing Management"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2000 - 2002 Michael Goffioul")); about->addAuthor("Michael Goffioul", 0, "[email protected]"); setAboutData(about); diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp index 74142c994..946092d15 100644 --- a/tdeprint/slave/kio_print.cpp +++ b/tdeprint/slave/kio_print.cpp @@ -135,7 +135,7 @@ TQString buildGroupTable(DrGroup *grp, bool showHeader = true) int kdemain(int argc, char **argv) { - KInstance instance("kio_print"); + TDEInstance instance("kio_print"); PRINT_DEBUG << "starting ioslave" << endl; if (argc != 4) @@ -145,8 +145,8 @@ int kdemain(int argc, char **argv) } /* create fake KApplicatiom object, needed for job stuffs */ - KAboutData about( "kio_print", "kio_print", "fake_version", - "TDEPrint IO slave", KAboutData::License_GPL, "(c) 2003, Michael Goffioul" ); + TDEAboutData about( "kio_print", "kio_print", "fake_version", + "TDEPrint IO slave", TDEAboutData::License_GPL, "(c) 2003, Michael Goffioul" ); TDECmdLineArgs::init( &about ); TDEApplication app; diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp index 5d5d7b154..0ac1adcd2 100644 --- a/tdeprint/tdeprint_part/printpart.cpp +++ b/tdeprint/tdeprint_part/printpart.cpp @@ -54,9 +54,9 @@ PrintPart::~PrintPart() { } -KAboutData *PrintPart::createAboutData() +TDEAboutData *PrintPart::createAboutData() { - return new KAboutData(I18N_NOOP("tdeprint_part"), I18N_NOOP("A Konqueror Plugin for Print Management"), "0.1"); + return new TDEAboutData(I18N_NOOP("tdeprint_part"), I18N_NOOP("A Konqueror Plugin for Print Management"), "0.1"); } bool PrintPart::openFile() diff --git a/tdeprint/tdeprint_part/printpart.h b/tdeprint/tdeprint_part/printpart.h index df543b210..98881d0f9 100644 --- a/tdeprint/tdeprint_part/printpart.h +++ b/tdeprint/tdeprint_part/printpart.h @@ -25,7 +25,7 @@ class PrintPartExtension; class KMMainView; -class KAboutData; +class TDEAboutData; class PrintPart : public KParts::ReadOnlyPart { @@ -36,7 +36,7 @@ public: const TQStringList & ); virtual ~PrintPart(); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); protected: bool openFile(); diff --git a/tdeprint/tdeprintfax/main.cpp b/tdeprint/tdeprintfax/main.cpp index 219321907..82a07e97d 100644 --- a/tdeprint/tdeprintfax/main.cpp +++ b/tdeprint/tdeprintfax/main.cpp @@ -47,8 +47,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "tdeprintfax", I18N_NOOP("KdeprintFax"), - "1.0", description, KAboutData::License_GPL, + TDEAboutData aboutData( "tdeprintfax", I18N_NOOP("KdeprintFax"), + "1.0", description, TDEAboutData::License_GPL, "(c), 2001 Michael Goffioul", 0, "http://printing.kde.org"); aboutData.addAuthor("Michael Goffioul",0, "[email protected]"); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index 682b39646..167659915 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/tdesu/tdesu/tdesu.cpp @@ -97,9 +97,9 @@ int main(int argc, char *argv[]) if (duser && duser[0]) options[3].def = duser; - KAboutData aboutData("tdesu", I18N_NOOP("TDE su"), + TDEAboutData aboutData("tdesu", I18N_NOOP("TDE su"), Version, I18N_NOOP("Runs a program with elevated privileges."), - KAboutData::License_Artistic, + TDEAboutData::License_Artistic, "Copyright (c) 1998-2000 Geert Jansen, Pietro Iglio"); aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"), "[email protected]", "http://www.stack.nl/~geertj/"); diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp index 7d425e971..49eac9952 100644 --- a/tdesu/tdesud/tdesud.cpp +++ b/tdesu/tdesud/tdesud.cpp @@ -251,14 +251,14 @@ int main(int argc, char *argv[]) { prctl(PR_SET_DUMPABLE, 0); - KAboutData aboutData("tdesud", I18N_NOOP("TDE su daemon"), + TDEAboutData aboutData("tdesud", I18N_NOOP("TDE su daemon"), Version, I18N_NOOP("Daemon used by tdesu"), - KAboutData::License_Artistic, + TDEAboutData::License_Artistic, "Copyright (c) 1999,2000 Geert Jansen"); aboutData.addAuthor("Geert Jansen", I18N_NOOP("Author"), "[email protected]", "http://www.stack.nl/~geertj/"); TDECmdLineArgs::init(argc, argv, &aboutData); - KInstance instance(&aboutData); + TDEInstance instance(&aboutData); // Set core dump size to 0 struct rlimit rlim; diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp index a5e018ba1..349c0c6e5 100644 --- a/twin/data/update_default_rules.cpp +++ b/twin/data/update_default_rules.cpp @@ -20,7 +20,7 @@ int main( int argc, char* argv[] ) { if( argc != 2 ) return 1; - KInstance inst( "twin_update_default_rules" ); + TDEInstance inst( "twin_update_default_rules" ); TQString file = locate( "data", TQString( "twin/default_rules/" ) + argv[ 1 ] ); if( file.isEmpty()) { diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp index a82e26492..0cbd28353 100644 --- a/twin/data/update_window_settings.cpp +++ b/twin/data/update_window_settings.cpp @@ -155,7 +155,7 @@ void writeRules( KConfig& cfg ) int main() { - KInstance inst( "twin_update_window_settings" ); + TDEInstance inst( "twin_update_window_settings" ); KConfig src_cfg( "twinrc" ); KConfig dest_cfg( "twinrulesrc" ); loadFakeSessionInfo( &src_cfg ); diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 14d45cf80..4f9c82a21 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -378,10 +378,10 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c // Allow twin dcop signal to update our selection list connectDCOPSignal("twin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmtwindecoration"), + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmtwindecoration"), I18N_NOOP("Window Decoration Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2001 Karol Szwed")); about->addAuthor("Karol Szwed", 0, "[email protected]"); setAboutData(about); diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp index a10269eca..5b193ed5f 100644 --- a/twin/kcmtwin/twinoptions/main.cpp +++ b/twin/kcmtwin/twinoptions/main.cpp @@ -122,9 +122,9 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name) tab->addTab(mTranslucency, i18n("&Translucency")); connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); - KAboutData *about = - new KAboutData(I18N_NOOP("kcmtwinoptions"), I18N_NOOP("Window Behavior Configuration Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmtwinoptions"), I18N_NOOP("Window Behavior Configuration Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2002 KWin and KControl Authors")); about->addAuthor("Matthias Ettrich",0,"[email protected]"); diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp index c7cdc7587..d498a5e71 100644 --- a/twin/kcmtwin/twinrules/kcm.cpp +++ b/twin/kcmtwin/twinrules/kcm.cpp @@ -46,9 +46,9 @@ KCMRules::KCMRules( TQWidget *parent, const char *name ) widget = new KCMRulesList( this ); layout->addWidget( TQT_TQWIDGET(widget) ); connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool ))); - KAboutData *about = new KAboutData(I18N_NOOP( "kcmtwinrules" ), + TDEAboutData *about = new TDEAboutData(I18N_NOOP( "kcmtwinrules" ), I18N_NOOP( "Window-Specific Settings Configuration Module" ), - 0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" )); + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" )); about->addAuthor("Lubos Lunak",0,"[email protected]"); setAboutData(about); } diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h index 9fb307458..d02bfc112 100644 --- a/twin/kcmtwin/twinrules/kcm.h +++ b/twin/kcmtwin/twinrules/kcm.h @@ -24,7 +24,7 @@ #include <kconfig.h> class KConfig; -class KAboutData; +class TDEAboutData; namespace KWinInternal { diff --git a/twin/main.cpp b/twin/main.cpp index d53578caf..4a586cce2 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -309,8 +309,8 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) KGlobal::locale()->setMainCatalogue("twin"); - KAboutData aboutData( "twin", I18N_NOOP("TWin"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData( "twin", I18N_NOOP("TWin"), + version, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2005, The KDE Developers")); aboutData.addAuthor("Matthias Ettrich",0, "[email protected]"); aboutData.addAuthor("Cristian Tibirna",0, "[email protected]"); diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp index 4734da33c..8115c3534 100644 --- a/twin/tools/decobenchmark/main.cpp +++ b/twin/tools/decobenchmark/main.cpp @@ -101,7 +101,7 @@ int main(int argc, char** argv) { TQString style = "keramik"; // TDEApplication app(argc, argv); - KAboutData about("decobenchmark", "DecoBenchmark", "0.1", "twin decoration performance tester...", KAboutData::License_LGPL, "(C) 2005 Sandro Giessl"); + TDEAboutData about("decobenchmark", "DecoBenchmark", "0.1", "twin decoration performance tester...", TDEAboutData::License_LGPL, "(C) 2005 Sandro Giessl"); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); |