From 5fc6f26e12b596addd235f87320c31761bd5a84d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:22:15 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- 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 ++-- 26 files changed, 51 insertions(+), 51 deletions(-) (limited to 'kontact/plugins') 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 -- cgit v1.2.3