From 5fc6f26e12b596addd235f87320c31761bd5a84d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:22:15 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- akregator/src/aboutdata.cpp | 2 +- akregator/src/aboutdata.h | 2 +- akregator/src/akregator_part.cpp | 6 +++--- akregator/src/akregator_part.h | 6 +++--- akregator/src/librss/testlibrss.cpp | 2 +- akregator/src/notificationmanager.cpp | 2 +- akregator/src/notificationmanager.h | 4 ++-- certmanager/aboutdata.cpp | 2 +- certmanager/aboutdata.h | 2 +- certmanager/kwatchgnupg/aboutdata.cpp | 2 +- certmanager/kwatchgnupg/aboutdata.h | 2 +- certmanager/lib/tests/test_cryptoconfig.cpp | 2 +- certmanager/lib/tests/test_gnupgprocessbase.cpp | 2 +- certmanager/lib/tests/test_jobs.cpp | 2 +- certmanager/lib/tests/test_keygen.cpp | 2 +- certmanager/lib/tests/test_keylister.cpp | 2 +- certmanager/lib/tests/test_keyselectiondialog.cpp | 2 +- certmanager/lib/tests/test_verify.cpp | 2 +- kabc/frontend/main.cpp | 2 +- kabc/kabcdistlistupdater/kabcdistlistupdater.cpp | 2 +- kaddressbook/interfaces/xxport.cpp | 2 +- kaddressbook/kabcore.cpp | 6 +++--- kaddressbook/kabcore.h | 4 ++-- kaddressbook/kaddressbook_part.cpp | 2 +- kaddressbook/kaddressbook_part.h | 6 +++--- kaddressbook/kcmconfigs/kcmkabconfig.cpp | 4 ++-- kaddressbook/kcmconfigs/kcmkabldapconfig.cpp | 4 ++-- kalarm/kalarmd/admain.cpp | 4 ++-- kalarm/main.cpp | 4 ++-- kandy/src/main.cpp | 4 ++-- karm/karm_part.cpp | 12 ++++++------ karm/karm_part.h | 10 +++++----- karm/main.cpp | 4 ++-- kioslaves/imap4/imap4.cc | 2 +- kioslaves/mbox/mbox.cc | 2 +- kioslaves/opengroupware/opengroupware.cpp | 2 +- kioslaves/sieve/sieve.cpp | 2 +- kitchensync/src/main.cpp | 2 +- kitchensync/src/mainwidget.cpp | 6 +++--- kitchensync/src/mainwidget.h | 4 ++-- kitchensync/src/part.cpp | 2 +- kitchensync/src/part.h | 4 ++-- kmail/aboutdata.cpp | 2 +- kmail/aboutdata.h | 2 +- kmail/dcoptest.cpp | 2 +- kmail/kmail_part.cpp | 2 +- kmail/kmail_part.h | 6 +++--- kmail/kmkernel.h | 8 ++++---- kmail/kmstartup.cpp | 2 +- kmail/recipientseditortest.cpp | 2 +- kmailcvt/main.cpp | 4 ++-- kmobile/kioslave/kio_mobile.cpp | 2 +- kmobile/main.cpp | 4 ++-- knode/aboutdata.cpp | 4 ++-- knode/aboutdata.h | 2 +- knode/knglobals.h | 4 ++-- knode/knode_part.cpp | 2 +- knode/knode_part.h | 6 +++--- knotes/ChangeLog | 2 +- knotes/main.cpp | 4 ++-- kode/kodemain.cpp | 6 +++--- kode/kwsdl/kung/main.cpp | 4 ++-- kode/kwsdl/main.cpp | 4 ++-- kode/kwsdl/tests/google/main.cc | 2 +- kode/kxml_compiler/kxml_compiler.cpp | 6 +++--- konsolekalendar/main.cpp | 4 ++-- kontact/interfaces/plugin.cpp | 4 ++-- kontact/interfaces/plugin.h | 4 ++-- kontact/plugins/akregator/akregator_plugin.h | 2 +- kontact/plugins/kaddressbook/kaddressbook_plugin.h | 2 +- kontact/plugins/karm/karm_plugin.h | 2 +- kontact/plugins/kitchensync/kitchensync_plugin.h | 2 +- kontact/plugins/kmail/kcmkmailsummary.cpp | 4 ++-- kontact/plugins/knotes/knotes_part.cpp | 2 +- kontact/plugins/knotes/knotes_part_p.h | 2 +- kontact/plugins/knotes/knotes_plugin.cpp | 6 +++--- kontact/plugins/knotes/knotes_plugin.h | 4 ++-- kontact/plugins/korganizer/kcmkorgsummary.cpp | 4 ++-- kontact/plugins/kpilot/kpilot_plugin.cpp | 6 +++--- kontact/plugins/kpilot/kpilot_plugin.h | 4 ++-- kontact/plugins/newsticker/kcmkontactknt.cpp | 6 +++--- kontact/plugins/newsticker/kcmkontactknt.h | 4 ++-- kontact/plugins/specialdates/kcmsdsummary.cpp | 6 +++--- kontact/plugins/specialdates/kcmsdsummary.h | 4 ++-- kontact/plugins/specialdates/specialdates_plugin.cpp | 6 +++--- kontact/plugins/specialdates/specialdates_plugin.h | 4 ++-- kontact/plugins/summary/kcmkontactsummary.cpp | 4 ++-- kontact/plugins/summary/summaryview_part.cpp | 4 ++-- kontact/plugins/summary/summaryview_part.h | 2 +- kontact/plugins/summary/summaryview_plugin.cpp | 6 +++--- kontact/plugins/summary/summaryview_plugin.h | 4 ++-- kontact/plugins/test/test_part.cpp | 2 +- kontact/plugins/weather/weather_plugin.cpp | 6 +++--- kontact/plugins/weather/weather_plugin.h | 4 ++-- kontact/src/aboutdialog.cpp | 4 ++-- kontact/src/aboutdialog.h | 6 +++--- kontact/src/kcmkontact.cpp | 6 +++--- kontact/src/kcmkontact.h | 4 ++-- kontact/src/main.cpp | 6 +++--- korganizer/aboutdata.cpp | 4 ++-- korganizer/aboutdata.h | 2 +- korganizer/koglobals.cpp | 4 ++-- korganizer/koglobals.h | 4 ++-- korganizer/korgac/korgacmain.cpp | 4 ++-- korganizer/korgac/testalarmdlg.cpp | 2 +- korganizer/korganizer_part.cpp | 2 +- korganizer/korganizer_part.h | 6 +++--- korganizer/korgplugins.cpp | 2 +- korganizer/plugins/exchange/exchange.cpp | 2 +- korganizer/plugins/projectview/projectview.cpp | 2 +- korganizer/plugins/timespanview/timespanview.cpp | 2 +- korganizer/timezone.cpp | 2 +- korn/main.cpp | 4 ++-- kresources/featureplan/benchmarkfeaturelist.cpp | 2 +- kresources/featureplan/dumpfeaturelist.cpp | 2 +- kresources/groupwise/kioslave/groupwise.cpp | 2 +- kresources/groupwise/soap/soapdebug.cpp | 2 +- kresources/scalix/scalixadmin/main.cpp | 4 ++-- kresources/slox/testsloxaccounts.cpp | 2 +- ktnef/gui/main.cpp | 4 ++-- ktnef/tests/parsertest.cpp | 2 +- libkcal/convertqtopia.cpp | 2 +- libkcal/tests/readandwrite.cpp | 2 +- libkcal/tests/testcalendar.cpp | 2 +- libkcal/tests/testfields.cpp | 2 +- libkcal/tests/testincidence.cpp | 2 +- libkcal/tests/testrecurprevious.cpp | 2 +- libkcal/tests/testrecurrence.cpp | 2 +- libkcal/tests/testrecurrencetype.cpp | 2 +- libkcal/tests/testrecurson.cpp | 2 +- libkcal/tests/testvcalexport.cpp | 2 +- libkmime/tests/test_dates.cpp | 2 +- libkmime/tests/test_kmime_header_parsing.cpp | 2 +- libtdepim/cfgc/autoexample.cpp | 2 +- libtdepim/cfgc/example.cpp | 2 +- libtdepim/kcmdesignerfields.cpp | 4 ++-- libtdepim/komposer/core/core.cpp | 2 +- libtdepim/komposer/core/prefsmodule.cpp | 6 +++--- libtdepim/komposer/core/prefsmodule.h | 4 ++-- libtdepim/komposer/core/tests/main.cpp | 2 +- libtdepim/komposer/test/test.cpp | 4 ++-- libtdepim/tdepim.widgets | 2 +- libtdepim/tests/test_kregexp.cpp | 2 +- libtdepim/tests/testaddresseelineedit.cpp | 2 +- libtdepim/tests/testaddresseeselector.cpp | 2 +- libtdepim/tests/testdateedit.cpp | 2 +- libtdepim/tests/testwizard.cpp | 2 +- wizards/egroupwaremain.cpp | 2 +- wizards/exchangemain.cpp | 2 +- wizards/groupwisemain.cpp | 2 +- wizards/kolabmain.cpp | 2 +- wizards/main.cpp | 2 +- wizards/scalixmain.cpp | 2 +- wizards/sloxmain.cpp | 2 +- 154 files changed, 251 insertions(+), 251 deletions(-) diff --git a/akregator/src/aboutdata.cpp b/akregator/src/aboutdata.cpp index 5400acb9..21810183 100644 --- a/akregator/src/aboutdata.cpp +++ b/akregator/src/aboutdata.cpp @@ -29,7 +29,7 @@ namespace Akregator { AboutData::AboutData() - : KAboutData("akregator", I18N_NOOP("Akregator"), AKREGATOR_VERSION, I18N_NOOP("A TDE Feed Aggregator"), + : TDEAboutData("akregator", I18N_NOOP("Akregator"), AKREGATOR_VERSION, I18N_NOOP("A TDE Feed Aggregator"), License_GPL, I18N_NOOP("(C) 2004, 2005 Akregator developers"), 0, "http://akregator.kde.org/") { diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h index cae660b5..4ccc3a2d 100644 --- a/akregator/src/aboutdata.h +++ b/akregator/src/aboutdata.h @@ -34,7 +34,7 @@ namespace Akregator { /** @author Teemu Rytilahti */ -class KDE_EXPORT AboutData : public KAboutData +class KDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index ffa7c905..9d9c574e 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -766,14 +766,14 @@ void Part::addFeed() m_view->slotFeedAdd(); } -KAboutData *Part::createAboutData() +TDEAboutData *Part::createAboutData() { return new Akregator::AboutData; } void Part::showKNotifyOptions() { - KAboutData* about = new Akregator::AboutData; + TDEAboutData* about = new Akregator::AboutData; KNotifyDialog::configure(m_view, "akregator_knotify_config", about); delete about; } @@ -934,7 +934,7 @@ bool Part::tryToLock(const TQString& backendName) appName = "akregator"; TQString programName; - const KAboutData *about = kapp->aboutData(); + const TDEAboutData *about = kapp->aboutData(); if ( about ) programName = about->programName(); if ( programName.isEmpty() ) diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h index d74d4d42..276fb14c 100644 --- a/akregator/src/akregator_part.h +++ b/akregator/src/akregator_part.h @@ -37,7 +37,7 @@ class TQDomDocument; class TQTimer; -class KAboutData; +class TDEAboutData; class KConfig; class KURL; @@ -88,8 +88,8 @@ namespace Akregator /** Destructor. */ virtual ~Part(); - /** Create KAboutData for this KPart. */ - static KAboutData *createAboutData(); + /** Create TDEAboutData for this KPart. */ + static TDEAboutData *createAboutData(); /** Opens feedlist diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index 721c1123..154facbc 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -58,7 +58,7 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status ) int main( int argc, char **argv ) { - KAboutData aboutData( "testlibrss", "testlibrss", "0.1" ); + TDEAboutData aboutData( "testlibrss", "testlibrss", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); TDEApplication app; diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp index 6220e97c..0ab3a4e8 100644 --- a/akregator/src/notificationmanager.cpp +++ b/akregator/src/notificationmanager.cpp @@ -52,7 +52,7 @@ NotificationManager::~NotificationManager() m_self = 0; } -void NotificationManager::setWidget(TQWidget* widget, KInstance* inst) +void NotificationManager::setWidget(TQWidget* widget, TDEInstance* inst) { m_widget = widget; m_instance = inst != NULL ? inst : KGlobal::instance(); diff --git a/akregator/src/notificationmanager.h b/akregator/src/notificationmanager.h index 0cc6db2e..1ff1d888 100644 --- a/akregator/src/notificationmanager.h +++ b/akregator/src/notificationmanager.h @@ -44,7 +44,7 @@ class NotificationManager : public TQObject ~NotificationManager(); /** the widget used for notification, normally either the mainwindow or the tray icon */ - void setWidget(TQWidget* widget, KInstance* inst=0); + void setWidget(TQWidget* widget, TDEInstance* inst=0); public slots: @@ -74,7 +74,7 @@ class NotificationManager : public TQObject bool m_running; bool m_addedInLastInterval; TQWidget* m_widget; - KInstance* m_instance; + TDEInstance* m_instance; TQValueList
m_articles; diff --git a/certmanager/aboutdata.cpp b/certmanager/aboutdata.cpp index 672d8a8c..8941ae00 100644 --- a/certmanager/aboutdata.cpp +++ b/certmanager/aboutdata.cpp @@ -76,7 +76,7 @@ static const about_data credits[] = { AboutData::AboutData() - : KAboutData( "kleopatra", I18N_NOOP("Kleopatra"), + : TDEAboutData( "kleopatra", I18N_NOOP("Kleopatra"), kleopatra_version, description, License_GPL, "(c) 2002 Steffen Hansen, Jesper Pedersen,\n" "Kalle Dalheimer, Klar\xC3\xA4lvdalens Datakonsult AB\n\n" diff --git a/certmanager/aboutdata.h b/certmanager/aboutdata.h index ca96f684..5161b9c2 100644 --- a/certmanager/aboutdata.h +++ b/certmanager/aboutdata.h @@ -35,7 +35,7 @@ #include -class AboutData : public KAboutData { +class AboutData : public TDEAboutData { public: AboutData(); }; diff --git a/certmanager/kwatchgnupg/aboutdata.cpp b/certmanager/kwatchgnupg/aboutdata.cpp index 2759ee31..5727003f 100644 --- a/certmanager/kwatchgnupg/aboutdata.cpp +++ b/certmanager/kwatchgnupg/aboutdata.cpp @@ -56,7 +56,7 @@ static const about_data credits[] = { #endif AboutData::AboutData() - : KAboutData( "kwatchgnupg", I18N_NOOP("KWatchGnuPG"), + : TDEAboutData( "kwatchgnupg", I18N_NOOP("KWatchGnuPG"), kwatchgnupg_version, description, License_GPL, "(c) 2004 Klar\xC3\xA4lvdalens Datakonsult AB\n" ) { diff --git a/certmanager/kwatchgnupg/aboutdata.h b/certmanager/kwatchgnupg/aboutdata.h index 2a332410..de8d2be2 100644 --- a/certmanager/kwatchgnupg/aboutdata.h +++ b/certmanager/kwatchgnupg/aboutdata.h @@ -35,7 +35,7 @@ #include -class AboutData : public KAboutData { +class AboutData : public TDEAboutData { public: AboutData(); }; diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp index e11ca2ab..10e750c7 100644 --- a/certmanager/lib/tests/test_cryptoconfig.cpp +++ b/certmanager/lib/tests/test_cryptoconfig.cpp @@ -42,7 +42,7 @@ using namespace std; int main( int argc, char** argv ) { - KAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" ); + TDEAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app( false, false ); diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index 35a350ad..dd94b8d6 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -119,7 +119,7 @@ int main( int argc, char** argv ) { kdDebug() << "Need at least two arguments" << endl; return 1; } - KAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" ); + TDEAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" ); TDECmdLineArgs::init( &aboutData ); TDEApplication app; diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp index 92aaf9b4..5c2c8606 100644 --- a/certmanager/lib/tests/test_jobs.cpp +++ b/certmanager/lib/tests/test_jobs.cpp @@ -100,7 +100,7 @@ int main( int argc, char** argv ) { protocol = argv[1]; argc = 1; // hide from KDE } - KAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" ); + TDEAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index 4ec5c29e..e0406e80 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -146,7 +146,7 @@ int main( int argc, char** argv ) { protocol = argv[1]; argc = 1; // hide from KDE } - KAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" ); + TDEAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp index 904671fb..78d09bc2 100644 --- a/certmanager/lib/tests/test_keylister.cpp +++ b/certmanager/lib/tests/test_keylister.cpp @@ -130,7 +130,7 @@ void CertListView::slotStart() { int main( int argc, char** argv ) { - KAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" ); + TDEAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp index eacbb5f6..e74c18d8 100644 --- a/certmanager/lib/tests/test_keyselectiondialog.cpp +++ b/certmanager/lib/tests/test_keyselectiondialog.cpp @@ -44,7 +44,7 @@ #include int main( int argc, char ** argv ) { - KAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" ); + TDEAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; diff --git a/certmanager/lib/tests/test_verify.cpp b/certmanager/lib/tests/test_verify.cpp index 469d1895..85a1b32f 100644 --- a/certmanager/lib/tests/test_verify.cpp +++ b/certmanager/lib/tests/test_verify.cpp @@ -53,7 +53,7 @@ int main( int argc, char **argv ) setenv("LC_ALL", "C", 1); setenv("TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-unit-test" ), 1); - KAboutData aboutData( "test_verify", "verify job test", "0.1" ); + TDEAboutData aboutData( "test_verify", "verify job test", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app( false, false ); diff --git a/kabc/frontend/main.cpp b/kabc/frontend/main.cpp index 169e52a3..f98f7ee9 100644 --- a/kabc/frontend/main.cpp +++ b/kabc/frontend/main.cpp @@ -8,7 +8,7 @@ int main( int argc, char ** argv ) { - KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1"); + TDEAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDEApplication app; diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp index 78fa54ee..d8f5e996 100644 --- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp +++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp @@ -72,7 +72,7 @@ int main( int argc, char **argv ) { TDEApplication::disableAutoDcopRegistration(); - KAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" ); + TDEAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" ); aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index ea4a93ce..68b88312 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -45,7 +45,7 @@ XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent, : TQObject( parent, name ), mAddressBook( ab ), mParentWidget( parent ), d( new XXPortPrivate ) { - setInstance( new KInstance( "kaddressbook" ) ); + setInstance( new TDEInstance( "kaddressbook" ) ); d->mExportMapper = new TQSignalMapper( this ); d->mImportMapper = new TQSignalMapper( this ); diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 6e3c3510..8d4dd2fd 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -310,11 +310,11 @@ TQWidget *KABCore::widget() const return mWidget; } -KAboutData *KABCore::createAboutData() +TDEAboutData *KABCore::createAboutData() { - KAboutData *about = new KAboutData( "kaddressbook", I18N_NOOP( "KAddressBook" ), + TDEAboutData *about = new TDEAboutData( "kaddressbook", I18N_NOOP( "KAddressBook" ), "3.5.13", I18N_NOOP( "The TDE Address Book" ), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, I18N_NOOP( "(c) 2008-2010, The Trinity Team\n(c) 1997-2005, The KDE PIM Team" ) ); about->addAuthor( "Timothy Pearson", I18N_NOOP( "Current maintainer" ), "kb9vqf@pearsoncomputing.net" ); about->addAuthor( "Tobias Koenig", I18N_NOOP( "Previous maintainer" ), "tokoe@kde.org" ); diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index bba0ec9c..d3ce562b 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -46,7 +46,7 @@ class CategoryEditDialog; class CategorySelectDialog; } -class KAboutData; +class TDEAboutData; class KAction; class KActionCollection; class KConfig; @@ -138,7 +138,7 @@ class KDE_EXPORT KABCore : public KAB::Core */ TQWidget *widget() const; - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); void setStatusBar( KStatusBar *statusBar ); diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 063c6e60..9ffe7375 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -77,7 +77,7 @@ KAddressbookPart::~KAddressbookPart() closeURL(); } -KAboutData *KAddressbookPart::createAboutData() +TDEAboutData *KAddressbookPart::createAboutData() { return KABCore::createAboutData(); } diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h index 92ad97c9..5ab27d3a 100644 --- a/kaddressbook/kaddressbook_part.h +++ b/kaddressbook/kaddressbook_part.h @@ -29,8 +29,8 @@ #include "kaddressbookiface.h" -class KAboutData; -class KInstance; +class TDEAboutData; +class TDEInstance; class KABCore; @@ -44,7 +44,7 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook TQObject *parent, const char *name, const TQStringList& ); virtual ~KAddressbookPart(); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); virtual void saveToProfile( const TQString& path ) const; virtual void loadProfile( const TQString& path ); diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 823f24f7..296f7955 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -51,9 +51,9 @@ KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name ) load(); - KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabconfig" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkabconfig" ), I18N_NOOP( "KAddressBook Configure Dialog" ), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c), 2003 - 2004 Tobias Koenig" ) ); about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index a3a9ee1b..66fcde2f 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -52,9 +52,9 @@ KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name ) load(); - KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabldapconfig" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkabldapconfig" ), I18N_NOOP( "KAB LDAP Configure Dialog" ), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c), 2003 - 2004 Tobias Koenig" ) ); about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp index 282f368b..bd5c8bf1 100644 --- a/kalarm/kalarmd/admain.cpp +++ b/kalarm/kalarmd/admain.cpp @@ -39,8 +39,8 @@ static const KCmdLineOptions options[] = int main(int argc, char** argv) { - KAboutData aboutData(DAEMON_APP_NAME, I18N_NOOP("KAlarm Daemon"), - DAEMON_VERSION, I18N_NOOP("KAlarm Alarm Daemon"), KAboutData::License_GPL, + TDEAboutData aboutData(DAEMON_APP_NAME, I18N_NOOP("KAlarm Daemon"), + DAEMON_VERSION, I18N_NOOP("KAlarm Alarm Daemon"), TDEAboutData::License_GPL, "Copyright 1997-1999 Preston Brown\nCopyright 2000-2001 Cornelius Schumacher\nCopyright 2001,2004-2007 David Jarvie", 0, "http://www.astrojar.org.uk/kalarm"); aboutData.addAuthor("David Jarvie", I18N_NOOP("Maintainer"), "software@astrojar.org.uk"); diff --git a/kalarm/main.cpp b/kalarm/main.cpp index 038a3ab7..12a6332c 100644 --- a/kalarm/main.cpp +++ b/kalarm/main.cpp @@ -107,9 +107,9 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData(PROGRAM_NAME, I18N_NOOP("KAlarm"), KALARM_VERSION, + TDEAboutData aboutData(PROGRAM_NAME, I18N_NOOP("KAlarm"), KALARM_VERSION, I18N_NOOP("Personal alarm message, command and email scheduler for TDE"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "Copyright 2001-2007, David Jarvie", 0, "http://www.astrojar.org.uk/kalarm"); aboutData.addAuthor("David Jarvie", 0, "software@astrojar.org.uk"); diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp index 0ba62eb6..288a6687 100644 --- a/kandy/src/main.cpp +++ b/kandy/src/main.cpp @@ -87,8 +87,8 @@ void initModem(Modem *modem) int main(int argc, char **argv) { - KAboutData about("kandy", I18N_NOOP("Kandy"), version, description, - KAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0, + TDEAboutData about("kandy", I18N_NOOP("Kandy"), version, description, + TDEAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0, "http://kandy.kde.org/"); about.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); about.addAuthor( "Heiko Falk", 0, "hf2@ls12.cs.uni-dortmund.de" ); diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index 4cf84190..a8187373 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -367,12 +367,12 @@ void karmPart::fileSaveAs() // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -KInstance* karmPartFactory::s_instance = 0L; -KAboutData* karmPartFactory::s_about = 0L; +TDEInstance* karmPartFactory::s_instance = 0L; +TDEAboutData* karmPartFactory::s_about = 0L; karmPartFactory::karmPartFactory() : KParts::Factory() @@ -401,13 +401,13 @@ KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const c return obj; } -KInstance* karmPartFactory::instance() +TDEInstance* karmPartFactory::instance() { if( !s_instance ) { - s_about = new KAboutData("karmpart", I18N_NOOP("karmPart"), "0.1"); + s_about = new TDEAboutData("karmpart", I18N_NOOP("karmPart"), "0.1"); s_about->addAuthor("Thorsten Staerk", 0, "thorsten@staerk.de"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; } diff --git a/karm/karm_part.h b/karm/karm_part.h index 797ae47f..f04d48ff 100644 --- a/karm/karm_part.h +++ b/karm/karm_part.h @@ -116,8 +116,8 @@ protected slots: void startNewSession(); }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class karmPartFactory : public KParts::Factory { @@ -129,11 +129,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 // _KARMPART_H_ diff --git a/karm/main.cpp b/karm/main.cpp index f2fab8fc..a40b7e39 100644 --- a/karm/main.cpp +++ b/karm/main.cpp @@ -27,8 +27,8 @@ static const KCmdLineOptions options[] = int main( int argc, char *argv[] ) { - KAboutData aboutData( "karm", I18N_NOOP("KArm"), - KARM_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "karm", I18N_NOOP("KArm"), + KARM_VERSION, description, TDEAboutData::License_GPL, "(c) 1997-2004, KDE PIM Developers" ); aboutData.addAuthor( "Mark Bucciarelli", I18N_NOOP( "Current Maintainer" ), diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc index 81a941b3..e17808a0 100644 --- a/kioslaves/imap4/imap4.cc +++ b/kioslaves/imap4/imap4.cc @@ -109,7 +109,7 @@ kdemain (int argc, char **argv) { kdDebug(7116) << "IMAP4::kdemain" << endl; - KInstance instance ("kio_imap4"); + TDEInstance instance ("kio_imap4"); if (argc != 4) { fprintf(stderr, "Usage: kio_imap4 protocol domain-socket1 domain-socket2\n"); diff --git a/kioslaves/mbox/mbox.cc b/kioslaves/mbox/mbox.cc index 250fbe1c..d351bdba 100644 --- a/kioslaves/mbox/mbox.cc +++ b/kioslaves/mbox/mbox.cc @@ -43,7 +43,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char* argv[]); } int kdemain( int argc, char * argv[] ) { KLocale::setMainCatalogue("tdelibs"); - KInstance instance("kio_mbox"); + TDEInstance instance("kio_mbox"); (void) KGlobal::locale(); if (argc != 4) { diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp index 0b1a8a55..70ffd7dc 100644 --- a/kioslaves/opengroupware/opengroupware.cpp +++ b/kioslaves/opengroupware/opengroupware.cpp @@ -69,7 +69,7 @@ KDE_EXPORT int kdemain( int argc, char **argv ); int kdemain( int argc, char **argv ) { - KInstance instance( "kio_OpenGroupware" ); + TDEInstance instance( "kio_OpenGroupware" ); kdDebug(7000) << "Starting kio_OpenGroupware(pid: " << getpid() << ")" << endl; diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp index 8132834a..4e95c5a1 100644 --- a/kioslaves/sieve/sieve.cpp +++ b/kioslaves/sieve/sieve.cpp @@ -82,7 +82,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv) { - KInstance instance("kio_sieve" ); + TDEInstance instance("kio_sieve" ); ksDebug() << "*** Starting kio_sieve " << endl; diff --git a/kitchensync/src/main.cpp b/kitchensync/src/main.cpp index 95a25a8b..c544326f 100644 --- a/kitchensync/src/main.cpp +++ b/kitchensync/src/main.cpp @@ -34,7 +34,7 @@ static KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData *about = MainWidget::aboutData(); + TDEAboutData *about = MainWidget::aboutData(); TDECmdLineArgs::init( argc, argv, about ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp index 534de1c9..a277e189 100644 --- a/kitchensync/src/mainwidget.cpp +++ b/kitchensync/src/mainwidget.cpp @@ -72,11 +72,11 @@ KXMLGUIClient *MainWidget::guiClient() const return mGUIClient; } -KAboutData *MainWidget::aboutData() +TDEAboutData *MainWidget::aboutData() { - KAboutData *about = new KAboutData( "kitchensync", I18N_NOOP( "KitchenSync" ), + TDEAboutData *about = new TDEAboutData( "kitchensync", I18N_NOOP( "KitchenSync" ), "0.1", I18N_NOOP( "The TDE Syncing Application" ), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, I18N_NOOP( "(c) 2005, The KDE PIM Team" ) ); about->addAuthor( "Tobias Koenig", I18N_NOOP( "Current maintainer" ), "tokoe@kde.org" ); about->addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); diff --git a/kitchensync/src/mainwidget.h b/kitchensync/src/mainwidget.h index 28df4f5d..0963aff4 100644 --- a/kitchensync/src/mainwidget.h +++ b/kitchensync/src/mainwidget.h @@ -25,7 +25,7 @@ #include -class KAboutData; +class TDEAboutData; class KAction; class KXMLGUIClient; class GroupView; @@ -45,7 +45,7 @@ class KDE_EXPORT MainWidget : public TQWidget ~MainWidget(); virtual KXMLGUIClient *guiClient() const; - static KAboutData *aboutData(); + static TDEAboutData *aboutData(); public slots: void addGroup(); diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp index f66eece6..b60e75f0 100644 --- a/kitchensync/src/part.cpp +++ b/kitchensync/src/part.cpp @@ -58,7 +58,7 @@ KitchenSyncPart::~KitchenSyncPart() closeURL(); } -KAboutData *KitchenSyncPart::createAboutData() +TDEAboutData *KitchenSyncPart::createAboutData() { return MainWidget::aboutData(); } diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h index ff9685c6..7a716de1 100644 --- a/kitchensync/src/part.h +++ b/kitchensync/src/part.h @@ -25,7 +25,7 @@ #include #include -class KAboutData; +class TDEAboutData; class KitchenSyncPart: public KParts::ReadOnlyPart { @@ -37,7 +37,7 @@ class KitchenSyncPart: public KParts::ReadOnlyPart TQObject *parent, const char *name, const TQStringList& ); virtual ~KitchenSyncPart(); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); virtual void exit(); virtual bool openURL( const KURL &url ); diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp index 201acb61..c655583c 100644 --- a/kmail/aboutdata.cpp +++ b/kmail/aboutdata.cpp @@ -209,7 +209,7 @@ namespace KMail { }; AboutData::AboutData() - : KAboutData( "kmail", I18N_NOOP("KMail"),KMAIL_VERSION, + : TDEAboutData( "kmail", I18N_NOOP("KMail"),KMAIL_VERSION, I18N_NOOP("TDE Email Client"), License_GPL, I18N_NOOP("(c) 1997-2008, The KMail developers"), 0, "http://kontact.kde.org/kmail/" ) diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h index 843e7aa6..39fe5662 100644 --- a/kmail/aboutdata.h +++ b/kmail/aboutdata.h @@ -37,7 +37,7 @@ namespace KMail { - class KDE_EXPORT AboutData : public KAboutData { + class KDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); ~AboutData(); diff --git a/kmail/dcoptest.cpp b/kmail/dcoptest.cpp index 04ba43b9..b960b55c 100644 --- a/kmail/dcoptest.cpp +++ b/kmail/dcoptest.cpp @@ -15,7 +15,7 @@ int main(int argc,char **argv) { kdDebug(5006) << "Test KMail DCOP interface." << endl; - KAboutData aboutData( "testKMailDCOP", + TDEAboutData aboutData( "testKMailDCOP", "Test for KMail DCOP interface", "0.0" ); TDECmdLineArgs::init(argc, argv, &aboutData); TDEApplication app; diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index ac418a95..45da1cd7 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -165,7 +165,7 @@ KMailPart::~KMailPart() KMail::cleanup(); // pid file (see kmstartup.cpp) } -KAboutData *KMailPart::createAboutData() +TDEAboutData *KMailPart::createAboutData() { return new KMail::AboutData(); } diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index 8501519f..dd5d261a 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -37,8 +37,8 @@ #include #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KMailStatusBarExtension; class KMKernel; class KMMainWidget; @@ -60,7 +60,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar TQWidget* parentWidget() const; - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); public slots: virtual void save() { /*TODO*/ } diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index c334291e..0b9aa51e 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -59,7 +59,7 @@ namespace KPIM { class KMKernel; class KProcess; class KProgressDialog; -class KInstance; +class TDEInstance; class TQTimer; class KProgress; class KPassivePopup; @@ -291,8 +291,8 @@ public: */ KMFolder* findFolderById( const TQString& idString ); - KInstance *xmlGuiInstance() { return mXmlGuiInstance; } - void setXmlGuiInstance( KInstance *instance ) { mXmlGuiInstance = instance; } + TDEInstance *xmlGuiInstance() { return mXmlGuiInstance; } + void setXmlGuiInstance( TDEInstance *instance ) { mXmlGuiInstance = instance; } KMFolder *inboxFolder() { return the_inboxFolder; } KMFolder *outboxFolder() { return the_outboxFolder; } @@ -489,7 +489,7 @@ private: static KMKernel *mySelf; KSharedConfig::Ptr mConfig; TQTextCodec *netCodec; - KInstance* mXmlGuiInstance; + TDEInstance* mXmlGuiInstance; ConfigureDialog *mConfigureDialog; TQTimer *mBackgroundTasksTimer; diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index 264e4b05..4069aaa7 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -142,7 +142,7 @@ void lockOrDie() { appName = "kmail"; TQString programName; - const KAboutData *about = kapp->aboutData(); + const TDEAboutData *about = kapp->aboutData(); if ( about ) programName = about->programName(); if ( programName.isEmpty() ) diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp index 54141bb5..22140e85 100644 --- a/kmail/recipientseditortest.cpp +++ b/kmail/recipientseditortest.cpp @@ -90,7 +90,7 @@ void Composer::slotClose() int main( int argc, char **argv ) { - KAboutData aboutData( "testrecipienteditor", + TDEAboutData aboutData( "testrecipienteditor", "Test Recipient Editor", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kmailcvt/main.cpp b/kmailcvt/main.cpp index f8ad5e22..e6c4e243 100644 --- a/kmailcvt/main.cpp +++ b/kmailcvt/main.cpp @@ -30,8 +30,8 @@ int main(int argc, char *argv[]) { KLocale::setMainCatalogue("kmailcvt"); - KAboutData aboutData( "kmailcvt", I18N_NOOP("KMailCVT"), - "3", I18N_NOOP("KMail Import Filters"), KAboutData::License_GPL_V2, + TDEAboutData aboutData( "kmailcvt", I18N_NOOP("KMailCVT"), + "3", I18N_NOOP("KMail Import Filters"), TDEAboutData::License_GPL_V2, I18N_NOOP("(c) 2000-2005, The KMailCVT developers")); aboutData.addAuthor("Hans Dijkema",I18N_NOOP("Original author"), "kmailcvt@hum.org"); aboutData.addAuthor("Danny Kukawka", I18N_NOOP("Maintainer & New filters"), "danny.kukawka@web.de"); diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/kioslave/kio_mobile.cpp index e359b902..8c4e3853 100644 --- a/kmobile/kioslave/kio_mobile.cpp +++ b/kmobile/kioslave/kio_mobile.cpp @@ -47,7 +47,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } */ int kdemain(int argc, char **argv) { - KInstance instance( "kio_mobile" ); + TDEInstance instance( "kio_mobile" ); PRINT_DEBUG << "Starting " << getpid() << endl; diff --git a/kmobile/main.cpp b/kmobile/main.cpp index be36a08c..1318352b 100644 --- a/kmobile/main.cpp +++ b/kmobile/main.cpp @@ -37,8 +37,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kmobile", I18N_NOOP("KMobile"), version, description, - KAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller@kde.org"); + TDEAboutData about("kmobile", I18N_NOOP("KMobile"), version, description, + TDEAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller@kde.org"); about.addAuthor( "Helge Deller", 0, "deller@kde.org" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/knode/aboutdata.cpp b/knode/aboutdata.cpp index 5d3afd29..0ded58c9 100644 --- a/knode/aboutdata.cpp +++ b/knode/aboutdata.cpp @@ -42,11 +42,11 @@ namespace KNode }; AboutData::AboutData() - : KAboutData( "knode", + : TDEAboutData( "knode", I18N_NOOP("KNode"), KNODE_VERSION, I18N_NOOP("A newsreader for TDE"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("Copyright (c) 1999-2005 the KNode authors"), 0, "http://knode.sourceforge.net/" ) diff --git a/knode/aboutdata.h b/knode/aboutdata.h index 05f8dc3f..b1796897 100644 --- a/knode/aboutdata.h +++ b/knode/aboutdata.h @@ -22,7 +22,7 @@ namespace KNode { - class KDE_EXPORT AboutData : public KAboutData + class KDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); diff --git a/knode/knglobals.h b/knode/knglobals.h index 9db4f22e..568a9ef8 100644 --- a/knode/knglobals.h +++ b/knode/knglobals.h @@ -22,7 +22,7 @@ #include -class KInstance; +class TDEInstance; class KNConfigManager; class KNNetAccess; class KNProgress; @@ -63,7 +63,7 @@ class KDE_EXPORT KNGlobals { KNArticleFactory *artFactory; Kpgp::Module *pgp; KConfig *config(); - KInstance *instance; + TDEInstance *instance; KNConfigManager *configManager(); KNNetAccess *netAccess(); diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp index b20a5bb8..23bb3fba 100644 --- a/knode/knode_part.cpp +++ b/knode/knode_part.cpp @@ -94,7 +94,7 @@ KNodePart::~KNodePart() mainWidget->prepareShutdown(); } -KAboutData *KNodePart::createAboutData() +TDEAboutData *KNodePart::createAboutData() { return new KNode::AboutData(); } diff --git a/knode/knode_part.h b/knode/knode_part.h index 1f9d9b3b..badfbee5 100644 --- a/knode/knode_part.h +++ b/knode/knode_part.h @@ -33,8 +33,8 @@ #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class ActionManager; class KNMainWidget; @@ -50,7 +50,7 @@ class KNodePart: public KParts::ReadOnlyPart TQWidget* parentWidget() const; - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); protected: virtual bool openFile(); diff --git a/knotes/ChangeLog b/knotes/ChangeLog index 3567dcef..b0d0c047 100644 --- a/knotes/ChangeLog +++ b/knotes/ChangeLog @@ -816,7 +816,7 @@ ChangeLog for KNotes 2000/01/30 Charles Samuels - This is my daily huge commit for KAboutData. There are also patches for + This is my daily huge commit for TDEAboutData. There are also patches for TDECmdLineArgs (so it works). Ktop is really doing bad folks. 2000/01/03 Espen Sand diff --git a/knotes/main.cpp b/knotes/main.cpp index f1f78c5b..13a525cf 100644 --- a/knotes/main.cpp +++ b/knotes/main.cpp @@ -90,12 +90,12 @@ int main( int argc, char* argv[] ) { TQString version = TQString::number( KNOTES_VERSION ); - KAboutData aboutData( + TDEAboutData aboutData( "knotes", I18N_NOOP("KNotes"), version.latin1(), I18N_NOOP( "TDE Notes" ), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1997-2006, The KNotes Developers") ); diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index d8a1113e..5d2f3c62 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -415,7 +415,7 @@ int create( TDECmdLineArgs *args ) main.addArgument( "char **argv" ); code.clear(); - code += "KAboutData aboutData(\"test\",\"Test\",\"0.1\");"; + code += "TDEAboutData aboutData(\"test\",\"Test\",\"0.1\");"; code += "TDECmdLineArgs::init(argc,argv,&aboutData);"; code += "TDECmdLineArgs::addCmdLineOptions( options );"; code += ""; @@ -490,7 +490,7 @@ int create( TDECmdLineArgs *args ) code.clear(); - code += "KInstance instance( \"kio_" + protocol + "\" );"; + code += "TDEInstance instance( \"kio_" + protocol + "\" );"; code += ""; code += "kdDebug(7000) << \"Starting kio_" + protocol + "(pid: \" << getpid() << \")\" << endl;"; code += ""; @@ -609,7 +609,7 @@ int create( TDECmdLineArgs *args ) int main(int argc,char **argv) { - KAboutData aboutData( "kode", I18N_NOOP("TDE Code Generator"), "0.1" ); + TDEAboutData aboutData( "kode", I18N_NOOP("TDE Code Generator"), "0.1" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp index 79718616..ab8bdcd6 100644 --- a/kode/kwsdl/kung/main.cpp +++ b/kode/kwsdl/kung/main.cpp @@ -37,9 +37,9 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "kung", I18N_NOOP( "TDE WSDL Interpreter" ), "0.1", + TDEAboutData aboutData( "kung", I18N_NOOP( "TDE WSDL Interpreter" ), "0.1", I18N_NOOP( "TDE WSDL Interpreter" ), - KAboutData::License_LGPL ); + TDEAboutData::License_LGPL ); aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp index 97e7ad5a..0a6a1beb 100644 --- a/kode/kwsdl/main.cpp +++ b/kode/kwsdl/main.cpp @@ -43,9 +43,9 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "kwsdl_compiler", I18N_NOOP( "TDE wsdl compiler" ), "0.1", + TDEAboutData aboutData( "kwsdl_compiler", I18N_NOOP( "TDE wsdl compiler" ), "0.1", I18N_NOOP( "TDE WSDL Compiler" ), - KAboutData::License_LGPL ); + TDEAboutData::License_LGPL ); aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kode/kwsdl/tests/google/main.cc b/kode/kwsdl/tests/google/main.cc index 01f54d28..269c022f 100644 --- a/kode/kwsdl/tests/google/main.cc +++ b/kode/kwsdl/tests/google/main.cc @@ -7,7 +7,7 @@ int main( int argc, char **argv ) { - KAboutData aboutData( "kgooglesearch", "TDE Google Search", "0.1", "", KAboutData::License_GPL ); + TDEAboutData aboutData( "kgooglesearch", "TDE Google Search", "0.1", "", TDEAboutData::License_GPL ); aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp index 89be13aa..bb4b2425 100644 --- a/kode/kxml_compiler/kxml_compiler.cpp +++ b/kode/kxml_compiler/kxml_compiler.cpp @@ -57,14 +57,14 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "kxml_compiler", I18N_NOOP("TDE xml compiler"), "0.1", - I18N_NOOP("TDE XML Compiler") , KAboutData::License_LGPL ); + TDEAboutData aboutData( "kxml_compiler", I18N_NOOP("TDE xml compiler"), "0.1", + I18N_NOOP("TDE XML Compiler") , TDEAboutData::License_LGPL ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KInstance app( &aboutData ); + TDEInstance app( &aboutData ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index 8439f344..decdbb12 100644 --- a/konsolekalendar/main.cpp +++ b/konsolekalendar/main.cpp @@ -167,12 +167,12 @@ static KCmdLineOptions options[] = int main( int argc, char *argv[] ) { - KAboutData aboutData( + TDEAboutData aboutData( progName, // internal program name I18N_NOOP( progDisplay ), // displayable program name. progVersion, // version string I18N_NOOP( progDesc ), // short porgram description - KAboutData::License_GPL, // license type + TDEAboutData::License_GPL, // license type "(c) 2002-2005, Tuukka Pasanen and Allen Winter", // copyright statement 0, // any free form text progURL, // program home page address diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index 14248250..bedd52c3 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -126,11 +126,11 @@ KParts::ReadOnlyPart *Plugin::loadPart() return core()->createPart( d->partLibraryName ); } -const KAboutData *Plugin::aboutData() +const TDEAboutData *Plugin::aboutData() { kdDebug(5601) << "Plugin::aboutData(): libname: " << d->partLibraryName << endl; - const KInstance *instance = + const TDEInstance *instance = KParts::Factory::partInstanceFromLibrary( d->partLibraryName ); if ( instance ) { diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index 09bc25c7..6e0abdfb 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -32,7 +32,7 @@ class TQStringList; class DCOPClient; class DCOPObject; -class KAboutData; +class TDEAboutData; class KAction; class KConfig; class TQWidget; @@ -142,7 +142,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient Reimplement this method if you want to add your credits to the Kontact about dialog. */ - virtual const KAboutData *aboutData(); + virtual const TDEAboutData *aboutData(); /** You can use this method if you need to access the current part. You can be diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h index 27b6b417..bbc0063b 100644 --- a/kontact/plugins/akregator/akregator_plugin.h +++ b/kontact/plugins/akregator/akregator_plugin.h @@ -33,7 +33,7 @@ #include "akregator_partiface_stub.h" #include -class KAboutData; +class TDEAboutData; namespace Akregator { diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h index 44f3441f..3295dc14 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.h @@ -32,7 +32,7 @@ #include "plugin.h" #include -class KAboutData; +class TDEAboutData; class KABUniqueAppHandler : public Kontact::UniqueAppHandler { diff --git a/kontact/plugins/karm/karm_plugin.h b/kontact/plugins/karm/karm_plugin.h index 7b3d1077..9eb867d2 100644 --- a/kontact/plugins/karm/karm_plugin.h +++ b/kontact/plugins/karm/karm_plugin.h @@ -32,7 +32,7 @@ #include "plugin.h" -class KAboutData; +class TDEAboutData; class KarmPlugin : public Kontact::Plugin { diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.h b/kontact/plugins/kitchensync/kitchensync_plugin.h index a391436a..dcd867ae 100644 --- a/kontact/plugins/kitchensync/kitchensync_plugin.h +++ b/kontact/plugins/kitchensync/kitchensync_plugin.h @@ -30,7 +30,7 @@ #include "plugin.h" -class KAboutData; +class TDEAboutData; class KitchenSyncPlugin : public Kontact::Plugin { diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 7409fcd1..c9d46777 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -59,9 +59,9 @@ KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name ) load(); - KAboutData *about = new KAboutData( I18N_NOOP( "kcmkmailsummary" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkmailsummary" ), I18N_NOOP( "Mail Summary Configuration Dialog" ), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 Tobias Koenig" ) ); about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 0e5d806b..0752ade0 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -47,7 +47,7 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) { mNoteList.setAutoDelete( true ); - setInstance( new KInstance( "knotes" ) ); + setInstance( new TDEInstance( "knotes" ) ); // create the actions new KAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ), diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index b8a66b96..a9eb11bd 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -125,7 +125,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient // this dialog is modal to prevent one from editing the same note twice in two // different windows - setInstance( new KInstance( "knotes" ) ); // TODO: hm, memleak?? + setInstance( new TDEInstance( "knotes" ) ); // TODO: hm, memleak?? setXMLFile( "knotesui.rc" ); actionCollection()->setWidget( this ); diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp index 5010bf7d..2f3f470b 100644 --- a/kontact/plugins/knotes/knotes_plugin.cpp +++ b/kontact/plugins/knotes/knotes_plugin.cpp @@ -64,12 +64,12 @@ Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *parentWidget ) return new KNotesSummaryWidget( this, parentWidget ); } -const KAboutData *KNotesPlugin::aboutData() +const TDEAboutData *KNotesPlugin::aboutData() { if ( !mAboutData ) { - mAboutData = new KAboutData( "knotes", I18N_NOOP( "Notes Management" ), + mAboutData = new TDEAboutData( "knotes", I18N_NOOP( "Notes Management" ), "0.5", I18N_NOOP( "Notes Management" ), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(c) 2003-2004 The Kontact developers" ); mAboutData->addAuthor( "Michael Brade", "Current Maintainer", "brade@kde.org" ); mAboutData->addAuthor( "Tobias Koenig", "", "tokoe@kde.org" ); diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h index 12d48540..fe17bad5 100644 --- a/kontact/plugins/knotes/knotes_plugin.h +++ b/kontact/plugins/knotes/knotes_plugin.h @@ -42,7 +42,7 @@ class KNotesPlugin : public Kontact::Plugin int weight() const { return 600; } - const KAboutData *aboutData(); + const TDEAboutData *aboutData(); protected: KParts::ReadOnlyPart* createPart(); @@ -52,7 +52,7 @@ class KNotesPlugin : public Kontact::Plugin void slotSyncNotes(); private: - KAboutData *mAboutData; + TDEAboutData *mAboutData; }; #endif diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 170e3195..48b6d3c8 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -64,9 +64,9 @@ KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name ) load(); - KAboutData *about = new KAboutData( I18N_NOOP( "kcmkorgsummary" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkorgsummary" ), I18N_NOOP( "Schedule Configuration Dialog" ), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2003 - 2004 Tobias Koenig" ) ); about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp index 7993b0a2..fa3bc182 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.cpp +++ b/kontact/plugins/kpilot/kpilot_plugin.cpp @@ -48,13 +48,13 @@ Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *parentWidget ) return new SummaryWidget( parentWidget ); } -const KAboutData *KPilotPlugin::aboutData() +const TDEAboutData *KPilotPlugin::aboutData() { if ( !mAboutData ) { - mAboutData = new KAboutData("kpilotplugin", I18N_NOOP("KPilot Information"), + mAboutData = new TDEAboutData("kpilotplugin", I18N_NOOP("KPilot Information"), KPILOT_VERSION, I18N_NOOP("KPilot - HotSync software for TDE\n\n"), - KAboutData::License_GPL, "(c) 2004 Reinhold Kainhofer"); + TDEAboutData::License_GPL, "(c) 2004 Reinhold Kainhofer"); mAboutData->addAuthor("Reinhold Kainhofer", I18N_NOOP("Plugin Developer"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/Linux/"); mAboutData->addAuthor("Dan Pilone", diff --git a/kontact/plugins/kpilot/kpilot_plugin.h b/kontact/plugins/kpilot/kpilot_plugin.h index 5695d260..66a4d042 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.h +++ b/kontact/plugins/kpilot/kpilot_plugin.h @@ -38,12 +38,12 @@ class KPilotPlugin : public Kontact::Plugin virtual bool showInSideBar() const { return false; } // virtual TQStringList configModules() const; - const KAboutData *aboutData(); + const TDEAboutData *aboutData(); protected: virtual KParts::ReadOnlyPart *createPart() { return 0; } private: - KAboutData *mAboutData; + TDEAboutData *mAboutData; }; #endif diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index cfcbc43d..0a059da3 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -437,11 +437,11 @@ void KCMKontactKNT::defaults() { } -const KAboutData* KCMKontactKNT::aboutData() const +const TDEAboutData* KCMKontactKNT::aboutData() const { - KAboutData *about = new KAboutData( I18N_NOOP( "kcmkontactknt" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkontactknt" ), I18N_NOOP( "Newsticker Configuration Dialog" ), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2003 - 2004 Tobias Koenig" ) ); about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h index b3a56d0a..0f9c1548 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.h +++ b/kontact/plugins/newsticker/kcmkontactknt.h @@ -29,7 +29,7 @@ class TQListViewItem; class TQSpinxBox; -class KAboutData; +class TDEAboutData; class KListView; class KPushButton; @@ -46,7 +46,7 @@ class KCMKontactKNT : public KCModule virtual void load(); virtual void save(); virtual void defaults(); - virtual const KAboutData* aboutData() const; + virtual const TDEAboutData* aboutData() const; private slots: void addNews(); diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index 7d7cae93..4ce846d0 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -232,11 +232,11 @@ void KCMSDSummary::defaults() emit changed( true ); } -const KAboutData* KCMSDSummary::aboutData() const +const TDEAboutData* KCMSDSummary::aboutData() const { - KAboutData *about = new KAboutData( I18N_NOOP( "kcmsdsummary" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmsdsummary" ), I18N_NOOP( "Special Dates Configuration Dialog" ), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 Tobias Koenig" ) ); about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h index bdff28b7..9a4e56e5 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.h +++ b/kontact/plugins/specialdates/kcmsdsummary.h @@ -31,7 +31,7 @@ class TQButtonGroup; class TQCheckBox; class TQSpinBox; -class KAboutData; +class TDEAboutData; class KCMSDSummary : public KCModule { @@ -44,7 +44,7 @@ class KCMSDSummary : public KCModule virtual void load(); virtual void save(); virtual void defaults(); - virtual const KAboutData* aboutData() const; + virtual const TDEAboutData* aboutData() const; private slots: void modified(); diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp index c71b9e72..f9d850ac 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.cpp +++ b/kontact/plugins/specialdates/specialdates_plugin.cpp @@ -54,14 +54,14 @@ Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( TQWidget *parentWidge return new SDSummaryWidget( this, parentWidget ); } -const KAboutData *SpecialdatesPlugin::aboutData() +const TDEAboutData *SpecialdatesPlugin::aboutData() { if ( !mAboutData ) { - mAboutData = new KAboutData( "specialdates", + mAboutData = new TDEAboutData( "specialdates", I18N_NOOP( "Special Dates Summary" ), "1.0", I18N_NOOP( "Kontact Special Dates Summary" ), - KAboutData::License_LGPL, + TDEAboutData::License_LGPL, I18N_NOOP( "(c) 2004-2005 The KDE PIM Team" ) ); mAboutData->addAuthor( "Allen Winter", "Current Maintainer", "winter@kde.org" ); mAboutData->addAuthor( "Tobias Koenig", "", "tokoe@kde.org" ); diff --git a/kontact/plugins/specialdates/specialdates_plugin.h b/kontact/plugins/specialdates/specialdates_plugin.h index f1feb68b..53c0621e 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.h +++ b/kontact/plugins/specialdates/specialdates_plugin.h @@ -37,7 +37,7 @@ class SpecialdatesPlugin : public Kontact::Plugin int weight() const { return 310; } - const KAboutData *aboutData(); + const TDEAboutData *aboutData(); virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); @@ -45,7 +45,7 @@ class SpecialdatesPlugin : public Kontact::Plugin virtual KParts::ReadOnlyPart *createPart() { return false; } private: - KAboutData *mAboutData; + TDEAboutData *mAboutData; }; diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 80550802..360da023 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -107,9 +107,9 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); load(); - KAboutData *about = new KAboutData( I18N_NOOP( "kontactsummary" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactsummary" ), I18N_NOOP( "TDE Kontact Summary" ), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c), 2004 Tobias Koenig" ) ); about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index 01c5a7f1..da0c160d 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -66,12 +66,12 @@ namespace Kontact } SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, - const KAboutData *aboutData, + const TDEAboutData *aboutData, TQObject *parent, const char *name ) : KParts::ReadOnlyPart( parent, name ), mCore( core ), mFrame( 0 ), mConfigAction( 0 ) { - setInstance( new KInstance( aboutData ) ); + setInstance( new TDEInstance( aboutData ) ); loadLayout(); diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h index 9a7b605c..5b57d45c 100644 --- a/kontact/plugins/summary/summaryview_part.h +++ b/kontact/plugins/summary/summaryview_part.h @@ -56,7 +56,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart public: SummaryViewPart( Kontact::Core *core, const char *widgetName, - const KAboutData *aboutData, + const TDEAboutData *aboutData, TQObject *parent = 0, const char *name = 0 ); ~SummaryViewPart(); diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp index 74b8e3d7..8f4b7065 100644 --- a/kontact/plugins/summary/summaryview_plugin.cpp +++ b/kontact/plugins/summary/summaryview_plugin.cpp @@ -106,13 +106,13 @@ KParts::ReadOnlyPart *SummaryView::createPart() return mPart; } -const KAboutData *SummaryView::aboutData() +const TDEAboutData *SummaryView::aboutData() { if ( !mAboutData ) { - mAboutData = new KAboutData( "kontactsummary", I18N_NOOP("Kontact Summary"), + mAboutData = new TDEAboutData( "kontactsummary", I18N_NOOP("Kontact Summary"), "1.1", I18N_NOOP("Kontact Summary View"), - KAboutData::License_LGPL, + TDEAboutData::License_LGPL, I18N_NOOP("(c) 2003 The Kontact developers" ) ); mAboutData->addAuthor( "Sven Lueppken", "", "sven@kde.org" ); mAboutData->addAuthor( "Cornelius Schumacher", "", "schumacher@kde.org" ); diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h index 1be750fe..450980dc 100644 --- a/kontact/plugins/summary/summaryview_plugin.h +++ b/kontact/plugins/summary/summaryview_plugin.h @@ -43,7 +43,7 @@ class SummaryView : public Kontact::Plugin int weight() const { return 100; } - const KAboutData *aboutData(); + const TDEAboutData *aboutData(); protected: virtual KParts::ReadOnlyPart* createPart(); @@ -55,7 +55,7 @@ class SummaryView : public Kontact::Plugin void fillSyncActionSubEntries(); private: - KAboutData *mAboutData; + TDEAboutData *mAboutData; SummaryViewPart *mPart; KSelectAction *mSyncAction; }; diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index 3c900a53..b8e6f70c 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -44,7 +44,7 @@ TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget : KParts::ReadOnlyPart(parent, name) { - setInstance( new KInstance("testpart") ); // ## memleak + setInstance( new TDEInstance("testpart") ); // ## memleak m_edit = new TQTextEdit; setWidget(m_edit); setXMLFile("testpartui.rc"); diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp index 564465be..af4f9f5c 100644 --- a/kontact/plugins/weather/weather_plugin.cpp +++ b/kontact/plugins/weather/weather_plugin.cpp @@ -42,13 +42,13 @@ Kontact::Summary *WeatherPlugin::createSummaryWidget( TQWidget *parentWidget ) return new SummaryWidget( parentWidget ); } -const KAboutData *WeatherPlugin::aboutData() +const TDEAboutData *WeatherPlugin::aboutData() { if ( !mAboutData ) { - mAboutData = new KAboutData( "weatherplugin", I18N_NOOP( "Weather Information" ), + mAboutData = new TDEAboutData( "weatherplugin", I18N_NOOP( "Weather Information" ), "0.1", I18N_NOOP( "Weather Information" ), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(c) 2003 The Kontact developers" ); mAboutData->addAuthor( "Ian Reinhart Geiser", "", "geiseri@kde.org" ); mAboutData->addAuthor( "Tobias Koenig", "", "tokoe@kde.org" ); diff --git a/kontact/plugins/weather/weather_plugin.h b/kontact/plugins/weather/weather_plugin.h index 4ab01964..ecf2a6fe 100644 --- a/kontact/plugins/weather/weather_plugin.h +++ b/kontact/plugins/weather/weather_plugin.h @@ -33,12 +33,12 @@ class WeatherPlugin : public Kontact::Plugin virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); - const KAboutData *aboutData(); + const TDEAboutData *aboutData(); protected: virtual KParts::ReadOnlyPart *createPart() { return 0; } private: - KAboutData *mAboutData; + TDEAboutData *mAboutData; }; #endif diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index 8f6be2b0..ae0d0965 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -63,7 +63,7 @@ void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin ) } void AboutDialog::addAboutData( const TQString &title, const TQString &icon, - const KAboutData *about ) + const TDEAboutData *about ) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon, KIcon::Desktop, 48 ); @@ -155,7 +155,7 @@ TQString AboutDialog::formatPerson( const TQString &name, const TQString &email return text; } -void AboutDialog::addLicenseText( const KAboutData *about ) +void AboutDialog::addLicenseText( const TDEAboutData *about ) { if ( !about || about->license().isEmpty() ) return; diff --git a/kontact/src/aboutdialog.h b/kontact/src/aboutdialog.h index c2d29a5a..f407f46a 100644 --- a/kontact/src/aboutdialog.h +++ b/kontact/src/aboutdialog.h @@ -25,7 +25,7 @@ #define KONTACT_ABOUTDIALOG_H #include -class KAboutData; +class TDEAboutData; namespace Kontact { class Core; @@ -43,9 +43,9 @@ class AboutDialog : public KDialogBase void addAboutPlugin( Kontact::Plugin *plugin ); void addAboutData( const TQString &title, const TQString &icon, - const KAboutData *about ); + const TDEAboutData *about ); - void addLicenseText( const KAboutData *about ); + void addLicenseText( const TDEAboutData *about ); TQString formatPerson( const TQString &name, const TQString &email ); diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 2f5849bf..9e46eef2 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -86,11 +86,11 @@ KcmKontact::KcmKontact( TQWidget *parent, const char *name ) load(); } -const KAboutData* KcmKontact::aboutData() const +const TDEAboutData* KcmKontact::aboutData() const { - KAboutData *about = new KAboutData( I18N_NOOP( "kontactconfig" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactconfig" ), I18N_NOOP( "TDE Kontact" ), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c), 2003 Cornelius Schumacher" ) ); about->addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h index 0affd92d..c15ecf04 100644 --- a/kontact/src/kcmkontact.h +++ b/kontact/src/kcmkontact.h @@ -33,7 +33,7 @@ class TQGroupBox; class TQComboBox; class TQListViewItem; -class KAboutData; +class TDEAboutData; class KListView; class KcmKontact : public KPrefsModule @@ -44,7 +44,7 @@ class KcmKontact : public KPrefsModule public: KcmKontact( TQWidget *parent = 0, const char *name = 0 ); - virtual const KAboutData* aboutData() const; + virtual const TDEAboutData* aboutData() const; }; class PluginSelection : public KPrefsWid diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 54a58622..0fa50b21 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -74,7 +74,7 @@ class KontactApp : public KUniqueApplication { static void listPlugins() { - KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options + TDEInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options KTrader::OfferList offers = KTrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); @@ -144,8 +144,8 @@ int KontactApp::newInstance() int main( int argc, char **argv ) { - KAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description, - KAboutData::License_GPL, I18N_NOOP("(C) 2008-2010 The Trinity Desktop Project\n(C) 2001-2008 The Kontact developers"), 0, "http://trinity.pearsoncomputing.net" ); + TDEAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description, + TDEAboutData::License_GPL, I18N_NOOP("(C) 2008-2010 The Trinity Desktop Project\n(C) 2001-2008 The Kontact developers"), 0, "http://trinity.pearsoncomputing.net" ); about.addAuthor( "Daniel Molkentin", 0, "molkentin@kde.org" ); about.addAuthor( "Don Sanders", 0, "sanders@kde.org" ); about.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); diff --git a/korganizer/aboutdata.cpp b/korganizer/aboutdata.cpp index 179b5561..6153d92c 100644 --- a/korganizer/aboutdata.cpp +++ b/korganizer/aboutdata.cpp @@ -29,9 +29,9 @@ using namespace KOrg; AboutData::AboutData() - : KAboutData( "korganizer", I18N_NOOP("KOrganizer"), korgVersion, + : TDEAboutData( "korganizer", I18N_NOOP("KOrganizer"), korgVersion, I18N_NOOP("A Personal Organizer for TDE"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 1997-1999 Preston Brown\n" "(c) 2000-2004 Cornelius Schumacher\n" "(c) 2004-2005 Reinhold Kainhofer\n" diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h index ef3f19de..c78361ee 100644 --- a/korganizer/aboutdata.h +++ b/korganizer/aboutdata.h @@ -29,7 +29,7 @@ namespace KOrg { -class KDE_EXPORT AboutData : public KAboutData +class KDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp index e4caf058..3077e0cd 100644 --- a/korganizer/koglobals.cpp +++ b/korganizer/koglobals.cpp @@ -67,9 +67,9 @@ KOGlobals *KOGlobals::self() KOGlobals::KOGlobals() : mHolidays(0) { - // Needed to distinguish from global KInstance + // Needed to distinguish from global TDEInstance // in case we are a KPart - mOwnInstance = new KInstance( "korganizer" ); + mOwnInstance = new TDEInstance( "korganizer" ); mOwnInstance->config()->setGroup( "General" ); mOwnInstance->iconLoader()->addAppDir( "tdepim" ); KGlobal::iconLoader()->addAppDir( "tdepim" ); diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h index f3248862..4c1c5474 100644 --- a/korganizer/koglobals.h +++ b/korganizer/koglobals.h @@ -33,7 +33,7 @@ class KCalendarSystem; class AlarmClient; class KConfig; -class KInstance; +class TDEInstance; class KHolidays; class KDE_EXPORT KOGlobals @@ -110,7 +110,7 @@ class KDE_EXPORT KOGlobals private: static KOGlobals *mSelf; - KInstance *mOwnInstance; + TDEInstance *mOwnInstance; AlarmClient *mAlarmClient; diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp index 95a728de..8b901238 100644 --- a/korganizer/korgac/korgacmain.cpp +++ b/korganizer/korgac/korgacmain.cpp @@ -62,9 +62,9 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { KLocale::setMainCatalogue( "korganizer" ); - KAboutData aboutData( "korgac", I18N_NOOP("KOrganizer Reminder Daemon"), + TDEAboutData aboutData( "korgac", I18N_NOOP("KOrganizer Reminder Daemon"), korgacVersion, I18N_NOOP("KOrganizer Reminder Daemon"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2003 Cornelius Schumacher", 0, "http://pim.kde.org" ); aboutData.addAuthor( "Cornelius Schumacher", I18N_NOOP("Maintainer"), diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp index e7be364b..833e6b34 100644 --- a/korganizer/korgac/testalarmdlg.cpp +++ b/korganizer/korgac/testalarmdlg.cpp @@ -36,7 +36,7 @@ int main(int argc,char **argv) { - KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1"); + TDEAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDEApplication app; diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index 9bcdc8ed..4bea20a7 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -135,7 +135,7 @@ KOrganizerPart::~KOrganizerPart() KOCore::self()->removeXMLGUIClient( mTopLevelWidget ); } -KAboutData *KOrganizerPart::createAboutData() +TDEAboutData *KOrganizerPart::createAboutData() { return new KOrg::AboutData; } diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h index ef307c55..ff35d9ba 100644 --- a/korganizer/korganizer_part.h +++ b/korganizer/korganizer_part.h @@ -31,8 +31,8 @@ #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KProcess; class CalendarView; @@ -63,7 +63,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart, TQObject *parent, const char *name, const TQStringList & ); virtual ~KOrganizerPart(); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); virtual KOrg::CalendarViewBase *view() const; diff --git a/korganizer/korgplugins.cpp b/korganizer/korgplugins.cpp index e5fd0358..3d371f9d 100644 --- a/korganizer/korgplugins.cpp +++ b/korganizer/korgplugins.cpp @@ -34,7 +34,7 @@ int main(int argc,char **argv) { - KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1"); + TDEAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDEApplication app; diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index a0062387..063c6756 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -59,7 +59,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorg_exchange, ExchangeFactory ) Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : KOrg::Part(parent,name) { - setInstance( new KInstance( "korganizer" ) ); + setInstance( new TDEInstance( "korganizer" ) ); kdDebug(5850) << "Creating Exchange Plugin...\n"; diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index 2e7b3dc6..64cdd7a3 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/korganizer/plugins/projectview/projectview.cpp @@ -48,7 +48,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorg_projectview, ProjectViewFactory ) ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) : KOrg::Part(parent,name), mView(0) { - setInstance( new KInstance( "korganizer" ) ); + setInstance( new TDEInstance( "korganizer" ) ); setXMLFile("plugins/projectviewui.rc"); diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index 24a45abb..bd910677 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/korganizer/plugins/timespanview/timespanview.cpp @@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorg_timespanview, TimespanViewFactory ) TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) : KOrg::Part(parent,name), mView(0) { - setInstance( new KInstance( "korganizer" ) ); + setInstance( new TDEInstance( "korganizer" ) ); setXMLFile( "plugins/timespanviewui.rc" ); diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp index 9d3c42d6..a8ef2233 100644 --- a/korganizer/timezone.cpp +++ b/korganizer/timezone.cpp @@ -36,7 +36,7 @@ int main(int argc,char **argv) { - KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1"); + TDEAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDEApplication app; diff --git a/korn/main.cpp b/korn/main.cpp index 32eed751..073a7fcc 100644 --- a/korn/main.cpp +++ b/korn/main.cpp @@ -16,8 +16,8 @@ static const char version[] = "0.4"; int main(int argc, char *argv[]) { - KAboutData aboutData(argv[0], I18N_NOOP("Korn"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData(argv[0], I18N_NOOP("Korn"), + version, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2004, The Korn Developers")); aboutData.addAuthor("Sirtaj Singh Kang",0, "taj@kde.org"); aboutData.addAuthor("Cristian Tibirna",0, "tibirna@kde.org"); diff --git a/kresources/featureplan/benchmarkfeaturelist.cpp b/kresources/featureplan/benchmarkfeaturelist.cpp index 106d8001..f9f88c5c 100644 --- a/kresources/featureplan/benchmarkfeaturelist.cpp +++ b/kresources/featureplan/benchmarkfeaturelist.cpp @@ -69,7 +69,7 @@ void displayCategory( const TQValueList categories ) int main( int argc, char **argv ) { - KAboutData aboutData( "benchmarkfeaturelist", + TDEAboutData aboutData( "benchmarkfeaturelist", "Benchmark for feature list XML parser", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kresources/featureplan/dumpfeaturelist.cpp b/kresources/featureplan/dumpfeaturelist.cpp index efab2cae..a007b70d 100644 --- a/kresources/featureplan/dumpfeaturelist.cpp +++ b/kresources/featureplan/dumpfeaturelist.cpp @@ -69,7 +69,7 @@ void displayCategory( const TQValueList categories ) int main( int argc, char **argv ) { - KAboutData aboutData( "dumpfeaturelist", "Dump XML feature list to stdout", + TDEAboutData aboutData( "dumpfeaturelist", "Dump XML feature list to stdout", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp index e257ba71..e22d95dd 100644 --- a/kresources/groupwise/kioslave/groupwise.cpp +++ b/kresources/groupwise/kioslave/groupwise.cpp @@ -69,7 +69,7 @@ KDE_EXPORT int kdemain( int argc, char **argv ); int kdemain( int argc, char **argv ) { - KInstance instance( "kio_groupwise" ); + TDEInstance instance( "kio_groupwise" ); kdDebug(7000) << "Starting kio_groupwise(pid: " << getpid() << ")" << endl; diff --git a/kresources/groupwise/soap/soapdebug.cpp b/kresources/groupwise/soap/soapdebug.cpp index e47dd747..415021a7 100644 --- a/kresources/groupwise/soap/soapdebug.cpp +++ b/kresources/groupwise/soap/soapdebug.cpp @@ -46,7 +46,7 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" ); + TDEAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kresources/scalix/scalixadmin/main.cpp b/kresources/scalix/scalixadmin/main.cpp index b455d963..b317d90d 100644 --- a/kresources/scalix/scalixadmin/main.cpp +++ b/kresources/scalix/scalixadmin/main.cpp @@ -34,8 +34,8 @@ static KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "scalixadmin", I18N_NOOP("ScalixAdmin"), "1.0", description, - KAboutData::License_GPL, "(c) 2007, Tobias Koenig" ); + TDEAboutData aboutData( "scalixadmin", I18N_NOOP("ScalixAdmin"), "1.0", description, + TDEAboutData::License_GPL, "(c) 2007, Tobias Koenig" ); aboutData.addAuthor( "Tobias Koenig",0, "tokoe@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/kresources/slox/testsloxaccounts.cpp b/kresources/slox/testsloxaccounts.cpp index 77a91d71..e173134c 100644 --- a/kresources/slox/testsloxaccounts.cpp +++ b/kresources/slox/testsloxaccounts.cpp @@ -35,7 +35,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KAboutData aboutData( "textsloxaccounts", + TDEAboutData aboutData( "textsloxaccounts", "SUSE LINUX Openexchange Server Configuration Wizard", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/ktnef/gui/main.cpp b/ktnef/gui/main.cpp index 8f655e67..24e2a602 100644 --- a/ktnef/gui/main.cpp +++ b/ktnef/gui/main.cpp @@ -36,8 +36,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "ktnef", I18N_NOOP("KTnef"), - "1.0", description, KAboutData::License_GPL, + TDEAboutData aboutData( "ktnef", I18N_NOOP("KTnef"), + "1.0", description, TDEAboutData::License_GPL, "(c) 2000, Michael Goffioul"); aboutData.addAuthor("Michael Goffioul",0, "tdeprint@swing.be"); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/ktnef/tests/parsertest.cpp b/ktnef/tests/parsertest.cpp index 6e3d3af3..cc7efe73 100644 --- a/ktnef/tests/parsertest.cpp +++ b/ktnef/tests/parsertest.cpp @@ -95,7 +95,7 @@ void ParserTest::testMAPIAttachments() int main( int argc, char** argv ) { - KInstance inst( "ktnef-parsertest" ); + TDEInstance inst( "ktnef-parsertest" ); ParserTest test; test.testSingleAttachment(); test.testTwoAttachments(); diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp index 2a8712c8..a546de19 100644 --- a/libkcal/convertqtopia.cpp +++ b/libkcal/convertqtopia.cpp @@ -50,7 +50,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KAboutData aboutData("convertqtopia",I18N_NOOP("TQtopia calendar file converter"),"0.1"); + TDEAboutData aboutData("convertqtopia",I18N_NOOP("TQtopia calendar file converter"),"0.1"); aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org"); TDECmdLineArgs::init(argc,argv,&aboutData); diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp index 0c8f5586..b2cd5b9c 100644 --- a/libkcal/tests/readandwrite.cpp +++ b/libkcal/tests/readandwrite.cpp @@ -46,7 +46,7 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "readandwrite", "Read and Write Calendar", "0.1" ); + TDEAboutData aboutData( "readandwrite", "Read and Write Calendar", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp index 323d9175..d2be3b71 100644 --- a/libkcal/tests/testcalendar.cpp +++ b/libkcal/tests/testcalendar.cpp @@ -37,7 +37,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KAboutData aboutData("testcalendar","Test Calendar","0.1"); + TDEAboutData aboutData("testcalendar","Test Calendar","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp index 9f57d3b2..c08af78e 100644 --- a/libkcal/tests/testfields.cpp +++ b/libkcal/tests/testfields.cpp @@ -39,7 +39,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KAboutData aboutData("testfields","Test calendar fields read/write","0.1"); + TDEAboutData aboutData("testfields","Test calendar fields read/write","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/libkcal/tests/testincidence.cpp b/libkcal/tests/testincidence.cpp index 4647c2b5..b6502ec8 100644 --- a/libkcal/tests/testincidence.cpp +++ b/libkcal/tests/testincidence.cpp @@ -39,7 +39,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KAboutData aboutData("testincidence","Test Incidence","0.1"); + TDEAboutData aboutData("testincidence","Test Incidence","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/libkcal/tests/testrecurprevious.cpp b/libkcal/tests/testrecurprevious.cpp index 0b1e756c..8ad8f169 100644 --- a/libkcal/tests/testrecurprevious.cpp +++ b/libkcal/tests/testrecurprevious.cpp @@ -49,7 +49,7 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "testrecurrencenew", "Load recurrence rules with the new class and print out debug messages", "0.1" ); + TDEAboutData aboutData( "testrecurrencenew", "Load recurrence rules with the new class and print out debug messages", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp index 9b165297..cbcec669 100644 --- a/libkcal/tests/testrecurrence.cpp +++ b/libkcal/tests/testrecurrence.cpp @@ -49,7 +49,7 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "testrecurrencenew", "Load recurrence rules with the new class and print out debug messages", "0.1" ); + TDEAboutData aboutData( "testrecurrencenew", "Load recurrence rules with the new class and print out debug messages", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp index 9b165297..cbcec669 100644 --- a/libkcal/tests/testrecurrencetype.cpp +++ b/libkcal/tests/testrecurrencetype.cpp @@ -49,7 +49,7 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "testrecurrencenew", "Load recurrence rules with the new class and print out debug messages", "0.1" ); + TDEAboutData aboutData( "testrecurrencenew", "Load recurrence rules with the new class and print out debug messages", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp index a1df982a..37694ae7 100644 --- a/libkcal/tests/testrecurson.cpp +++ b/libkcal/tests/testrecurson.cpp @@ -49,7 +49,7 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "testrecurson", "Tests all dates from 2002 to 2010 to test if the event recurs on each individual date. This is meant to test the Recurrence::recursOn method for errors.", "0.1" ); + TDEAboutData aboutData( "testrecurson", "Tests all dates from 2002 to 2010 to test if the event recurs on each individual date. This is meant to test the Recurrence::recursOn method for errors.", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp index 8d32e940..810a0a6c 100644 --- a/libkcal/tests/testvcalexport.cpp +++ b/libkcal/tests/testvcalexport.cpp @@ -50,7 +50,7 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData("testvcalexport", "Part of LibKCal's test suite. Checks if export to vCalendar still works correctly.", "0.1"); + TDEAboutData aboutData("testvcalexport", "Part of LibKCal's test suite. Checks if export to vCalendar still works correctly.", "0.1"); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/libkmime/tests/test_dates.cpp b/libkmime/tests/test_dates.cpp index 7087a01a..47441adf 100644 --- a/libkmime/tests/test_dates.cpp +++ b/libkmime/tests/test_dates.cpp @@ -8,7 +8,7 @@ using namespace KMime; int main() { - KInstance app("# "); + TDEInstance app("# "); DateFormatter t; time_t ntime = time(0); diff --git a/libkmime/tests/test_kmime_header_parsing.cpp b/libkmime/tests/test_kmime_header_parsing.cpp index 091b48a6..c272b006 100644 --- a/libkmime/tests/test_kmime_header_parsing.cpp +++ b/libkmime/tests/test_kmime_header_parsing.cpp @@ -120,7 +120,7 @@ int main( int argc, char * argv[] ) { if ( index >= tokenTypesLen ) usage( "unknown token type" ); - KInstance instance( "test_kmime_header_parsing" ); + TDEInstance instance( "test_kmime_header_parsing" ); TQFile stdIn; stdIn.open( IO_ReadOnly, stdin ); diff --git a/libtdepim/cfgc/autoexample.cpp b/libtdepim/cfgc/autoexample.cpp index fa9e9b52..595d195b 100644 --- a/libtdepim/cfgc/autoexample.cpp +++ b/libtdepim/cfgc/autoexample.cpp @@ -38,7 +38,7 @@ int main( int argc, char **argv ) { - KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" ); + TDEAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/libtdepim/cfgc/example.cpp b/libtdepim/cfgc/example.cpp index 183b4f26..28c09378 100644 --- a/libtdepim/cfgc/example.cpp +++ b/libtdepim/cfgc/example.cpp @@ -34,7 +34,7 @@ int main( int argc, char **argv ) { - KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" ); + TDEAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index d40d3f4b..d99128ec 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -131,9 +131,9 @@ KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name ) { TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) ); - KAboutData *about = new KAboutData( I18N_NOOP( "KCMDesignerfields" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "KCMDesignerfields" ), I18N_NOOP( "TQt Designer Fields Dialog" ), - 0, 0, KAboutData::License_LGPL, + 0, 0, TDEAboutData::License_LGPL, I18N_NOOP( "(c), 2004 Tobias Koenig" ) ); about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index f93e59cc..945c2231 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/libtdepim/komposer/core/core.cpp @@ -60,7 +60,7 @@ Core::Core( TQWidget *parent, const char *name ) initWidgets(); initCore(); initConnections(); - setInstance( new KInstance( "komposer" ) ); + setInstance( new TDEInstance( "komposer" ) ); createActions(); setXMLFile( "komposerui.rc" ); diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp index 5aed441a..80786948 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -56,12 +56,12 @@ PrefsModule::PrefsModule( TQWidget *parent, const char *name ) load(); } -const KAboutData* +const TDEAboutData* PrefsModule::aboutData() const { - KAboutData *about = new KAboutData( I18N_NOOP( "komposerconfig" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "komposerconfig" ), I18N_NOOP( "TDE Komposer" ), - 0, 0, KAboutData::License_LGPL, + 0, 0, TDEAboutData::License_LGPL, I18N_NOOP( "(c), 2003-2004 Zack Rusin" ) ); about->addAuthor( "Zack Rusin", 0, "zack@kde.org" );; diff --git a/libtdepim/komposer/core/prefsmodule.h b/libtdepim/komposer/core/prefsmodule.h index 9e60098e..a7733019 100644 --- a/libtdepim/komposer/core/prefsmodule.h +++ b/libtdepim/komposer/core/prefsmodule.h @@ -27,7 +27,7 @@ class TQGroupBox; class TQListViewItem; -class KAboutData; +class TDEAboutData; class KComboBox; namespace Komposer { @@ -38,7 +38,7 @@ namespace Komposer { public: PrefsModule( TQWidget *parent=0, const char *name=0 ); - virtual const KAboutData *aboutData() const; + virtual const TDEAboutData *aboutData() const; }; class EditorSelection : public KPrefsWid diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp index 80bf8fc9..e132ac88 100644 --- a/libtdepim/komposer/core/tests/main.cpp +++ b/libtdepim/komposer/core/tests/main.cpp @@ -38,7 +38,7 @@ static const KCmdLineOptions options[] = }; int main( int argc, char** argv ) { - KAboutData aboutData( "tests","Test","0.1" ); + TDEAboutData aboutData( "tests","Test","0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/libtdepim/komposer/test/test.cpp b/libtdepim/komposer/test/test.cpp index c6cf9151..4f811e90 100644 --- a/libtdepim/komposer/test/test.cpp +++ b/libtdepim/komposer/test/test.cpp @@ -36,8 +36,8 @@ static const char version[] = "0.0.1 (SVN)"; int main(int argc, char **argv) { - KAboutData about( "komposertest", I18N_NOOP( "KomposerTest" ), version, description, - KAboutData::License_GPL, "(C) 2001-2003 The Kontact developers", 0, "http://kontact.kde.org", "zack@kde.org" ); + TDEAboutData about( "komposertest", I18N_NOOP( "KomposerTest" ), version, description, + TDEAboutData::License_GPL, "(C) 2001-2003 The Kontact developers", 0, "http://kontact.kde.org", "zack@kde.org" ); about.addAuthor( "Zack Rusin", 0, "zack@kde.org" ); TDECmdLineArgs::init( argc, argv, &about ); diff --git a/libtdepim/tdepim.widgets b/libtdepim/tdepim.widgets index 765abc23..512efd15 100644 --- a/libtdepim/tdepim.widgets +++ b/libtdepim/tdepim.widgets @@ -1,7 +1,7 @@ [Global] PluginName=KDEPimWidgets Includes=kinstance.h -Init=new KInstance("tdepimwidgets"); +Init=new TDEInstance("tdepimwidgets"); [KPIM::AddresseeLineEdit] ToolTip=Addressee Line Edit (KDE-PIM) diff --git a/libtdepim/tests/test_kregexp.cpp b/libtdepim/tests/test_kregexp.cpp index a44e3be0..f02d60b1 100644 --- a/libtdepim/tests/test_kregexp.cpp +++ b/libtdepim/tests/test_kregexp.cpp @@ -5,7 +5,7 @@ int main() { - KInstance app("# "); + TDEInstance app("# "); // test for http://bugs.kde.org/show_bug.cgi?id=54886 KRegExp3 reg("^"); diff --git a/libtdepim/tests/testaddresseelineedit.cpp b/libtdepim/tests/testaddresseelineedit.cpp index b0299839..b08e1d8a 100644 --- a/libtdepim/tests/testaddresseelineedit.cpp +++ b/libtdepim/tests/testaddresseelineedit.cpp @@ -29,7 +29,7 @@ int main(int argc, char* argv[]) { - KAboutData aboutData("testaddresseelineedit","Test AddresseeLineEdit","0.1"); + TDEAboutData aboutData("testaddresseelineedit","Test AddresseeLineEdit","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDEApplication app; diff --git a/libtdepim/tests/testaddresseeselector.cpp b/libtdepim/tests/testaddresseeselector.cpp index af5a1dd4..0be82ca3 100644 --- a/libtdepim/tests/testaddresseeselector.cpp +++ b/libtdepim/tests/testaddresseeselector.cpp @@ -30,7 +30,7 @@ int main( int argc, char **argv ) { - KAboutData aboutData( "testaddresseeseletor", "Test AddresseeSelector", "0.1" ); + TDEAboutData aboutData( "testaddresseeseletor", "Test AddresseeSelector", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp index 612aca17..24bade10 100644 --- a/libtdepim/tests/testdateedit.cpp +++ b/libtdepim/tests/testdateedit.cpp @@ -53,7 +53,7 @@ void DateEdit::dateChanged( const TQDate &date ) int main(int argc,char **argv) { - KAboutData aboutData( "testdateedit", "Test KDateEdit", "0.1" ); + TDEAboutData aboutData( "testdateedit", "Test KDateEdit", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp index 03ee4ac4..4e3dec28 100644 --- a/libtdepim/tests/testwizard.cpp +++ b/libtdepim/tests/testwizard.cpp @@ -83,7 +83,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { - KAboutData aboutData("testwizard","Test KConfigWizard","0.1"); + TDEAboutData aboutData("testwizard","Test KConfigWizard","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp index 72d66fe5..a5fd9c67 100644 --- a/wizards/egroupwaremain.cpp +++ b/wizards/egroupwaremain.cpp @@ -36,7 +36,7 @@ int main(int argc,char **argv) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "egroupwarewizard", + TDEAboutData aboutData( "egroupwarewizard", "eGroupware Server Configuration Wizard", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp index 7d7bc894..627467b6 100644 --- a/wizards/exchangemain.cpp +++ b/wizards/exchangemain.cpp @@ -36,7 +36,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "exchangewizard", + TDEAboutData aboutData( "exchangewizard", I18N_NOOP( "Microsoft Exchange Server Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/wizards/groupwisemain.cpp b/wizards/groupwisemain.cpp index e305e214..86d2eae9 100644 --- a/wizards/groupwisemain.cpp +++ b/wizards/groupwisemain.cpp @@ -37,7 +37,7 @@ int main(int argc,char **argv) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "groupwisewizard", + TDEAboutData aboutData( "groupwisewizard", I18N_NOOP( "Novell GroupWise Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp index 3b5715aa..e24f7ac5 100644 --- a/wizards/kolabmain.cpp +++ b/wizards/kolabmain.cpp @@ -38,7 +38,7 @@ int main(int argc,char **argv) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "kolabwizard", I18N_NOOP( "Kolab Configuration Wizard" ), "0.1" ); + TDEAboutData aboutData( "kolabwizard", I18N_NOOP( "Kolab Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/wizards/main.cpp b/wizards/main.cpp index c45fdd52..ac9275a6 100644 --- a/wizards/main.cpp +++ b/wizards/main.cpp @@ -16,7 +16,7 @@ int main( int argc, char **argv ) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "groupwarewizard", + TDEAboutData aboutData( "groupwarewizard", I18N_NOOP( "TDE-PIM Groupware Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/wizards/scalixmain.cpp b/wizards/scalixmain.cpp index 1ae125fc..70243870 100644 --- a/wizards/scalixmain.cpp +++ b/wizards/scalixmain.cpp @@ -38,7 +38,7 @@ int main(int argc,char **argv) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "scalixwizard", I18N_NOOP( "Scalix Configuration Wizard" ), "0.1" ); + TDEAboutData aboutData( "scalixwizard", I18N_NOOP( "Scalix Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/wizards/sloxmain.cpp b/wizards/sloxmain.cpp index 93500b3c..3eab6b69 100644 --- a/wizards/sloxmain.cpp +++ b/wizards/sloxmain.cpp @@ -36,7 +36,7 @@ static const KCmdLineOptions options[] = int main(int argc,char **argv) { KLocale::setMainCatalogue( "tdepimwizards" ); - KAboutData aboutData( "sloxwizard", + TDEAboutData aboutData( "sloxwizard", I18N_NOOP( "SUSE LINUX Openexchange Server Configuration Wizard" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData );