From ef71f46965855308db367f74956513eccc71bc46 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:21:16 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- dcoprss/feedbrowser.cpp | 2 +- dcoprss/main.cpp | 4 ++-- kdict/main.cpp | 4 ++-- kget/kget_plug_in/kget_plug_in.cpp | 4 ++-- kget/kget_plug_in/kget_plug_in.h | 4 ++-- kget/main.cpp | 2 +- knewsticker/knewsticker.cpp | 6 +++--- knewsticker/knewsticker.h | 8 ++++---- knewsticker/knewstickerstub/knewstickerstub.cpp | 4 ++-- kopete/kopete/chatwindow/kopeteemoticonaction.cpp | 2 +- kopete/kopete/chatwindow/krichtexteditpart.cpp | 6 +++--- kopete/kopete/chatwindow/krichtexteditpart.h | 4 ++-- kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp | 4 ++-- kopete/kopete/config/appearance/appearanceconfig.cpp | 4 ++-- kopete/kopete/kconf_update/kopete-nameTracking.cpp | 2 +- kopete/kopete/main.cpp | 4 ++-- kopete/libkopete/kcautoconfigmodule.cpp | 4 ++-- kopete/libkopete/kcautoconfigmodule.h | 6 +++--- kopete/libkopete/kopeteplugin.cpp | 2 +- kopete/libkopete/kopeteplugin.h | 4 ++-- kopete/libkopete/kopeteprotocol.cpp | 2 +- kopete/libkopete/kopeteprotocol.h | 4 ++-- kopete/libkopete/tests/kopetemessage_test.cpp | 2 +- kopete/libkopete/tests/kopetepasswordtest_program.cpp | 2 +- kopete/libkopete/tests/kopetewallettest_program.cpp | 2 +- kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp | 2 +- kopete/libkopete/tests/mock/kopeteprotocol_mock.h | 4 ++-- kopete/libkopete/ui/kopete.widgets | 2 +- kopete/libkopete/ui/kopeteviewplugin.cpp | 2 +- kopete/libkopete/ui/kopeteviewplugin.h | 2 +- kopete/libkopete/ui/kopetewidgets.cpp | 2 +- kopete/plugins/cryptography/cryptographyplugin.cpp | 2 +- kopete/plugins/history/historyplugin.cpp | 2 +- kopete/plugins/netmeeting/netmeetingplugin.cpp | 2 +- kopete/plugins/smpppdcs/unittest/main.cpp | 4 ++-- kopete/plugins/statistics/statisticsplugin.cpp | 2 +- kopete/plugins/translator/translatorplugin.cpp | 2 +- kopete/protocols/msn/msnprotocol.cpp | 2 +- kpf/src/Applet.cpp | 4 ++-- kppp/logview/main.cpp | 4 ++-- kppp/main.cpp | 4 ++-- krdc/main.cpp | 4 ++-- krfb/kcm_krfb/kcm_krfb.cpp | 4 ++-- krfb/krfb/main.cpp | 4 ++-- ksirc/KSTicker/ksttest.cpp | 4 ++-- ksirc/ksirc.cpp | 4 ++-- ktalkd/ChangeLog | 2 +- ktalkd/ktalkd/readcfg++.cpp | 4 ++-- ktalkd/ktalkd/talkd.cpp | 2 +- lanbrowsing/kio_lan/kio_lan.cpp | 2 +- librss/testlibrss.cpp | 2 +- wifi/main.cpp | 4 ++-- 52 files changed, 85 insertions(+), 85 deletions(-) diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp index 84ccf5d9..d5f1268c 100644 --- a/dcoprss/feedbrowser.cpp +++ b/dcoprss/feedbrowser.cpp @@ -132,7 +132,7 @@ void FeedBrowserDlg::itemSelected( TQListViewItem *item ) int main( int argc, char **argv ) { KGlobal::locale()->setMainCatalogue( "dcoprss" ); - KAboutData aboutData( "feedbrowser", I18N_NOOP( "Feed Browser" ), "0.1" ); + TDEAboutData aboutData( "feedbrowser", I18N_NOOP( "Feed Browser" ), "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; FeedBrowserDlg *dlg = new FeedBrowserDlg( 0 ); diff --git a/dcoprss/main.cpp b/dcoprss/main.cpp index fde9a7b5..3dd84415 100644 --- a/dcoprss/main.cpp +++ b/dcoprss/main.cpp @@ -13,9 +13,9 @@ int main (int argc, char *argv[]) { KLocale::setMainCatalogue("dcoprss"); - KAboutData aboutdata("rssservice", I18N_NOOP("TDE RSS Service"), + TDEAboutData aboutdata("rssservice", I18N_NOOP("TDE RSS Service"), "0.8", I18N_NOOP("A RSS data service."), - KAboutData::License_GPL, "(C) 2003, Ian Reinhart Geiser"); + TDEAboutData::License_GPL, "(C) 2003, Ian Reinhart Geiser"); aboutdata.addAuthor("Ian Reinhart Geiser",I18N_NOOP("Developer"),"geiseri@kde.org"); TDECmdLineArgs::init( argc, argv, &aboutdata ); diff --git a/kdict/main.cpp b/kdict/main.cpp index 17e6e6dd..55b6899d 100644 --- a/kdict/main.cpp +++ b/kdict/main.cpp @@ -31,11 +31,11 @@ static KCmdLineOptions knoptions[] = extern "C" KDE_EXPORT int kdemain(int argc, char* argv[]) { - KAboutData aboutData("kdict", + TDEAboutData aboutData("kdict", I18N_NOOP("Dictionary"), KDICT_VERSION, I18N_NOOP("The TDE Dictionary Client"), - KAboutData:: License_Artistic, + TDEAboutData:: License_Artistic, "Copyright (c) 1999-2001, Christian Gebauer\nCopyright (c) 1998, Matthias Hoelzer", 0, 0); diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp index c73406a2..65ca3c99 100644 --- a/kget/kget_plug_in/kget_plug_in.cpp +++ b/kget/kget_plug_in/kget_plug_in.cpp @@ -160,7 +160,7 @@ void KGet_plug_in::slotShowLinks() KPluginFactory::KPluginFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { - s_instance = new KInstance("KPluginFactory"); + s_instance = new TDEInstance("KPluginFactory"); } TQObject* KPluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) @@ -184,6 +184,6 @@ extern "C" } -KInstance* KPluginFactory::s_instance = 0L; +TDEInstance* KPluginFactory::s_instance = 0L; #include "kget_plug_in.moc" diff --git a/kget/kget_plug_in/kget_plug_in.h b/kget/kget_plug_in/kget_plug_in.h index c1c2ca71..b0366d5c 100644 --- a/kget/kget_plug_in/kget_plug_in.h +++ b/kget/kget_plug_in/kget_plug_in.h @@ -22,7 +22,7 @@ #include #include -class KInstance; +class TDEInstance; class KGet_plug_in : public KParts::Plugin { @@ -54,7 +54,7 @@ public: const TQStringList &args = TQStringList() ); private: - static KInstance* s_instance; + static TDEInstance* s_instance; }; #endif diff --git a/kget/main.cpp b/kget/main.cpp index ffa891f1..ffefb2ce 100644 --- a/kget/main.cpp +++ b/kget/main.cpp @@ -197,7 +197,7 @@ public: int main(int argc, char *argv[]) { - KAboutData aboutData("kget", I18N_NOOP("KGet"), version, description, KAboutData::License_GPL, "(C) 2001 - 2002, Patrick Charbonnier \n(C) 2002, Carsten Pfeiffer\n(C) 1998 - 2000, Matej Koss", "kget@kde.org", 0); + TDEAboutData aboutData("kget", I18N_NOOP("KGet"), version, description, TDEAboutData::License_GPL, "(C) 2001 - 2002, Patrick Charbonnier \n(C) 2002, Carsten Pfeiffer\n(C) 1998 - 2000, Matej Koss", "kget@kde.org", 0); aboutData.addAuthor("Patrick Charbonnier", 0, "pch@freeshell.org"); aboutData.addAuthor("Carsten Pfeiffer", 0, "pfeiffer@kde.org"); diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index 89c78232..46930a5a 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -37,14 +37,14 @@ KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget *parent, const char *name) : ConfigIface(), DCOPObject("KNewsTicker"), KPanelApplet(cfgFile, t, actions, parent, name), - m_instance(new KInstance("knewsticker")), + m_instance(new TDEInstance("knewsticker")), m_dcopClient(new DCOPClient()), m_cfg(new ConfigAccess(config())), m_newsTimer(new TQTimer(this)), m_updateTimer(new TQTimer(this)), m_newsIconMgr(NewsIconMgr::self()), - m_aboutData(new KAboutData("knewsticker", I18N_NOOP("KNewsTicker"), "v0.2", - I18N_NOOP("A news ticker applet."), KAboutData::License_BSD, + m_aboutData(new TDEAboutData("knewsticker", I18N_NOOP("KNewsTicker"), "v0.2", + I18N_NOOP("A news ticker applet."), TDEAboutData::License_BSD, I18N_NOOP("(c) 2000, 2001 The KNewsTicker developers"))) { TQHBoxLayout *layout = new TQHBoxLayout(this); diff --git a/knewsticker/knewsticker.h b/knewsticker/knewsticker.h index 739734e7..85c57ce3 100644 --- a/knewsticker/knewsticker.h +++ b/knewsticker/knewsticker.h @@ -25,13 +25,13 @@ #include "configaccess.h" #include "newsengine.h" -class KInstance; +class TDEInstance; class NewsSource; class KArrowButton; class NewsIconMgr; class NewsScroller; class KNewsTickerMenu; -class KAboutData; +class TDEAboutData; class TQTimer; class KNewsTicker : public KPanelApplet, virtual public ConfigIface, @@ -104,7 +104,7 @@ class KNewsTicker : public KPanelApplet, virtual public ConfigIface, private: void setupArrowButton(); - KInstance *m_instance; + TDEInstance *m_instance; DCOPClient *m_dcopClient; ConfigAccess *m_cfg; KArrowButton *m_arrowButton; @@ -112,7 +112,7 @@ class KNewsTicker : public KPanelApplet, virtual public ConfigIface, TQTimer *m_updateTimer; NewsIconMgr *m_newsIconMgr; NewsScroller *m_scroller; - KAboutData *m_aboutData; + TDEAboutData *m_aboutData; KNewsTickerMenu *m_contextMenu; bool m_newNews; NewsSourceBase::List m_newsSources; diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp index 8263c202..a50e8244 100644 --- a/knewsticker/knewstickerstub/knewstickerstub.cpp +++ b/knewsticker/knewstickerstub/knewstickerstub.cpp @@ -36,8 +36,8 @@ int main(int argc, char **argv) { KLocale::setMainCatalogue("knewsticker"); - KAboutData aboutData(name, verbname, version, description, - KAboutData::License_BSD, copyright); + TDEAboutData aboutData(name, verbname, version, description, + TDEAboutData::License_BSD, copyright); aboutData.addAuthor("Frerich Raabe", I18N_NOOP("Author"), "raabe@kde.org"); TDECmdLineArgs::init(argc, argv, &aboutData); diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp index a35dc5bc..6cdfedbd 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp @@ -172,7 +172,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) } else { - KInstance *instance; + TDEInstance *instance; if ( m_parentCollection ) instance = m_parentCollection->instance(); diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp index 9d8ba1bf..ed05e036 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.cpp +++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp @@ -112,11 +112,11 @@ void KopeteRichTextEditPart::createActions() createActions( actionCollection() ); } -KAboutData *KopeteRichTextEditPart::createAboutData() +TDEAboutData *KopeteRichTextEditPart::createAboutData() { - KAboutData *aboutData = new KAboutData("kopeterichtexteditpart", I18N_NOOP("KopeteRichTextEditPart"), "0.1", + TDEAboutData *aboutData = new TDEAboutData("kopeterichtexteditpart", I18N_NOOP("KopeteRichTextEditPart"), "0.1", I18N_NOOP("A simple rich text editor part for Kopete"), - KAboutData::License_LGPL ); + TDEAboutData::License_LGPL ); aboutData->addAuthor("Richard J. Moore", 0, "rich@kde.org", "http://xmelegance.org/" ); aboutData->addAuthor("Jason Keirstead", 0, "jason@keirstead.org", "http://www.keirstead.org/" ); return aboutData; diff --git a/kopete/kopete/chatwindow/krichtexteditpart.h b/kopete/kopete/chatwindow/krichtexteditpart.h index c560145e..32050cd6 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.h +++ b/kopete/kopete/chatwindow/krichtexteditpart.h @@ -8,7 +8,7 @@ #include #include -class KAboutData; +class TDEAboutData; class KTextEdit; class KFontAction; class KFontSizeAction; @@ -51,7 +51,7 @@ class KopeteRichTextEditPart : public KParts::ReadOnlyPart bool buttonsEnabled() { return !m_richTextAvailable || m_richTextEnabled; } - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); virtual bool openFile() { return false; }; diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index f779dcfa..fad57bb2 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -61,7 +61,7 @@ public: class FakeProtocol : public Kopete::Protocol { public: -FakeProtocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name) +FakeProtocol( TDEInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name) { } @@ -122,7 +122,7 @@ class ChatWindowStyleRendering_Test::Private public: Private() { - protocol = new FakeProtocol( new KInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message"); + protocol = new FakeProtocol( new TDEInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message"); account = new FakeAccount(protocol, TQString("testaccount"), 0); // Create fake meta/contacts diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 8bce4350..4ce921aa 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -714,7 +714,7 @@ public: class FakeProtocol : public Kopete::Protocol { public: -FakeProtocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name){} +FakeProtocol( TDEInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name){} Kopete::Account* createNewAccount( const TQString &/*accountId*/ ){return 0L;} AddContactPage* createAddContactWidget( TQWidget */*parent*/, Kopete::Account */*account*/){return 0L;} KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, TQWidget */*parent */){return 0L;} @@ -735,7 +735,7 @@ void setOnlineStatus( const Kopete::OnlineStatus& /*status*/ , const TQString &/ void AppearanceConfig::createPreviewChatSession() { - d->previewProtocol = new FakeProtocol( new KInstance(TQCString("kopete-preview-chatwindowstyle")), 0L, "kopete-preview-chatwindowstyle"); + d->previewProtocol = new FakeProtocol( new TDEInstance(TQCString("kopete-preview-chatwindowstyle")), 0L, "kopete-preview-chatwindowstyle"); d->previewAccount = new FakeAccount(d->previewProtocol, TQString("previewaccount"), 0); // Create fake meta/contacts diff --git a/kopete/kopete/kconf_update/kopete-nameTracking.cpp b/kopete/kopete/kconf_update/kopete-nameTracking.cpp index c0a556e7..d56dfc76 100644 --- a/kopete/kopete/kconf_update/kopete-nameTracking.cpp +++ b/kopete/kopete/kconf_update/kopete-nameTracking.cpp @@ -24,7 +24,7 @@ static TQTextStream qcerr( stderr, IO_WriteOnly ); int main() { - KInstance* inst = new KInstance( "Update script" ); + TDEInstance* inst = new TDEInstance( "Update script" ); TQString filename = locateLocal( "data", TQString::fromLatin1( "kopete/contactlist.xml" ) ); // Load contact list & save backup. diff --git a/kopete/kopete/main.cpp b/kopete/kopete/main.cpp index eaa0ff68..679277ad 100644 --- a/kopete/kopete/main.cpp +++ b/kopete/kopete/main.cpp @@ -49,8 +49,8 @@ static KCmdLineOptions options[] = int main( int argc, char *argv[] ) { - KAboutData aboutData( "kopete", I18N_NOOP("Kopete"), - KOPETE_VERSION_STRING, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kopete", I18N_NOOP("Kopete"), + KOPETE_VERSION_STRING, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 2009-2010, Timothy Pearson\n(c) 2001-2004, Duncan Mac-Vicar Prett\n(c) 2002-2005, Kopete Development Team"), "kopete-devel@kde.org", "http://kopete.kde.org"); aboutData.addAuthor ( "Duncan Mac-Vicar Prett", I18N_NOOP("Developer and Project founder"), "duncan@kde.org", "http://www.mac-vicar.org/~duncan" ); diff --git a/kopete/libkopete/kcautoconfigmodule.cpp b/kopete/libkopete/kcautoconfigmodule.cpp index 437f1bff..b6911215 100644 --- a/kopete/libkopete/kcautoconfigmodule.cpp +++ b/kopete/libkopete/kcautoconfigmodule.cpp @@ -39,7 +39,7 @@ KCAutoConfigModule::KCAutoConfigModule( TQWidget * parent, const char * name, co connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified())); } -KCAutoConfigModule::KCAutoConfigModule( KInstance * instance, TQWidget * parent, const TQStringList & args ) +KCAutoConfigModule::KCAutoConfigModule( TDEInstance * instance, TQWidget * parent, const TQStringList & args ) : KCModule( instance, parent, args ) , d( new KCAutoConfigModulePrivate ) { @@ -58,7 +58,7 @@ KCAutoConfigModule::KCAutoConfigModule( KConfig *config,TQWidget * parent, const connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified())); } -KCAutoConfigModule::KCAutoConfigModule( KConfig *config , KInstance * instance, TQWidget * parent, const TQStringList & args ) +KCAutoConfigModule::KCAutoConfigModule( KConfig *config , TDEInstance * instance, TQWidget * parent, const TQStringList & args ) : KCModule( instance, parent, args ) , d( new KCAutoConfigModulePrivate ) { diff --git a/kopete/libkopete/kcautoconfigmodule.h b/kopete/libkopete/kcautoconfigmodule.h index 1fe15acf..91ce9886 100644 --- a/kopete/libkopete/kcautoconfigmodule.h +++ b/kopete/libkopete/kcautoconfigmodule.h @@ -63,18 +63,18 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule /** * Standard KCModule constructor. Use KGlobal::config() */ - KCAutoConfigModule( KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); /** * Constructor. * @param config the KConfig to use - * @param instance KInstance object for this KCM + * @param instance TDEInstance object for this KCM * @param parent parent widget * @param args special arguments for this KCM * * @todo document what the args mean (inherited from KCModule?) */ - KCAutoConfigModule(KConfig* config, KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule(KConfig* config, TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); /** * Constructor, much like the one above, except with diff --git a/kopete/libkopete/kopeteplugin.cpp b/kopete/libkopete/kopeteplugin.cpp index 9b6a7dc1..0e83498a 100644 --- a/kopete/libkopete/kopeteplugin.cpp +++ b/kopete/libkopete/kopeteplugin.cpp @@ -32,7 +32,7 @@ public: TQString indexField; }; -Plugin::Plugin( KInstance *instance, TQObject *parent, const char *name ) +Plugin::Plugin( TDEInstance *instance, TQObject *parent, const char *name ) : TQObject( parent, name ), KXMLGUIClient(), d(new Private) { setInstance( instance ); diff --git a/kopete/libkopete/kopeteplugin.h b/kopete/libkopete/kopeteplugin.h index 7744ca7e..1b56eb1c 100644 --- a/kopete/libkopete/kopeteplugin.h +++ b/kopete/libkopete/kopeteplugin.h @@ -68,7 +68,7 @@ Comment=Plugin that do some nice stuff * * \code typedef KGenericFactory MyPluginFactory; - static const KAboutData aboutdata("kopete_myplugin", I18N_NOOP("MyPlugin") , "1.0" ); + static const TDEAboutData aboutdata("kopete_myplugin", I18N_NOOP("MyPlugin") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_myplugin, MyPluginFactory( &aboutdata ) ) MyPlugin::MyPlugin( TQObject *parent, const char *name, const TQStringList & args ) @@ -93,7 +93,7 @@ class KOPETE_EXPORT Plugin : public TQObject, public KXMLGUIClient public: - Plugin( KInstance *instance, TQObject *parent, const char *name ); + Plugin( TDEInstance *instance, TQObject *parent, const char *name ); virtual ~Plugin(); /** diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp index e361abf6..1543b8d8 100644 --- a/kopete/libkopete/kopeteprotocol.cpp +++ b/kopete/libkopete/kopeteprotocol.cpp @@ -50,7 +50,7 @@ public: Kopete::OnlineStatus accountNotConnectedStatus; }; -Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) +Protocol::Protocol( TDEInstance *instance, TQObject *parent, const char *name ) : Plugin( instance, parent, name ) { d = new Private; diff --git a/kopete/libkopete/kopeteprotocol.h b/kopete/libkopete/kopeteprotocol.h index 1b1d7c08..f27c90f5 100644 --- a/kopete/libkopete/kopeteprotocol.h +++ b/kopete/libkopete/kopeteprotocol.h @@ -160,11 +160,11 @@ protected: /** * @brief Constructor for Protocol * - * @param instance The protocol's instance, every plugin needs to have a KInstance of its own + * @param instance The protocol's instance, every plugin needs to have a TDEInstance of its own * @param parent The protocol's parent object * @param name The protocol's name */ - Protocol( KInstance *instance, TQObject *parent, const char *name ); + Protocol( TDEInstance *instance, TQObject *parent, const char *name ); /** * @brief Sets the capabilities of this protcol. diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp index c2881d2f..ff18f587 100644 --- a/kopete/libkopete/tests/kopetemessage_test.cpp +++ b/kopete/libkopete/tests/kopetemessage_test.cpp @@ -53,7 +53,7 @@ KopeteMessage_Test::KopeteMessage_Test() setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); // create fake objects needed to build a reasonable testeable message - m_protocol = new Kopete::Test::Mock::Protocol( new KInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message"); + m_protocol = new Kopete::Test::Mock::Protocol( new TDEInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message"); m_account = new Kopete::Test::Mock::Account(m_protocol, "testaccount"); m_metaContactMyself = new Kopete::Test::Mock::MetaContact(); m_metaContactOther = new Kopete::Test::Mock::MetaContact(); diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp index df0dcc64..63c9929d 100644 --- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp +++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp @@ -66,7 +66,7 @@ void PasswordRetriever::timer() int main( int argc, char *argv[] ) { - KAboutData aboutData( "kopetepasswordtest", "kopetepasswordtest", "version" ); + TDEAboutData aboutData( "kopetepasswordtest", "kopetepasswordtest", "version" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( opts ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp index 092f59ff..63467d34 100644 --- a/kopete/libkopete/tests/kopetewallettest_program.cpp +++ b/kopete/libkopete/tests/kopetewallettest_program.cpp @@ -61,7 +61,7 @@ void WalletReciever::timer() int main( int argc, char *argv[] ) { - KAboutData aboutData( "kopetewallettest", "kopetewallettest", "version" ); + TDEAboutData aboutData( "kopetewallettest", "kopetewallettest", "version" ); TDECmdLineArgs::init( argc, argv, &aboutData ); KCmdLineOptions opts[] = { {"+action",0,0}, KCmdLineLastOption }; TDECmdLineArgs::addCmdLineOptions( opts ); diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp index d9ae1d3a..5b2e3bed 100644 --- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp +++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp @@ -24,7 +24,7 @@ namespace Test namespace Mock { -Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name) +Protocol::Protocol( TDEInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name) { } diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h index d2502790..31418f66 100644 --- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h +++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h @@ -20,7 +20,7 @@ #include "kopeteprotocol.h" -class KInstance; +class TDEInstance; class TQObject; class KopeteEditAccountWidget; @@ -37,7 +37,7 @@ namespace Mock class Protocol : public Kopete::Protocol { public: - Protocol( KInstance *instance, TQObject *parent, const char *name ); + Protocol( TDEInstance *instance, TQObject *parent, const char *name ); // pure virtual functions implemented virtual Account *createNewAccount( const TQString &accountId ); virtual AddContactPage *createAddContactWidget( TQWidget *parent, Kopete::Account *account ); diff --git a/kopete/libkopete/ui/kopete.widgets b/kopete/libkopete/ui/kopete.widgets index 7c441d0f..bb4ee05f 100644 --- a/kopete/libkopete/ui/kopete.widgets +++ b/kopete/libkopete/ui/kopete.widgets @@ -1,7 +1,7 @@ [Global] PluginName=KopeteWidgets Includes=kinstance.h -Init=new KInstance("kopetewidgets"); +Init=new TDEInstance("kopetewidgets"); [Kopete::UI::ListView::ListView] ToolTip=List View (Kopete) diff --git a/kopete/libkopete/ui/kopeteviewplugin.cpp b/kopete/libkopete/ui/kopeteviewplugin.cpp index 843fe939..f0000998 100644 --- a/kopete/libkopete/ui/kopeteviewplugin.cpp +++ b/kopete/libkopete/ui/kopeteviewplugin.cpp @@ -16,7 +16,7 @@ #include "kopeteviewplugin.h" -Kopete::ViewPlugin::ViewPlugin( KInstance *instance, TQObject *parent, const char *name ) : +Kopete::ViewPlugin::ViewPlugin( TDEInstance *instance, TQObject *parent, const char *name ) : Kopete::Plugin( instance, parent, name ) { diff --git a/kopete/libkopete/ui/kopeteviewplugin.h b/kopete/libkopete/ui/kopeteviewplugin.h index 25ce704b..9ebc57a6 100644 --- a/kopete/libkopete/ui/kopeteviewplugin.h +++ b/kopete/libkopete/ui/kopeteviewplugin.h @@ -41,7 +41,7 @@ class KOPETE_EXPORT ViewPlugin : public Plugin /** * @brief Create and initialize the plugin */ - ViewPlugin( KInstance *instance, TQObject *parent = 0L, const char *name = 0L ); + ViewPlugin( TDEInstance *instance, TQObject *parent = 0L, const char *name = 0L ); /** * @brief Creates a view to be associated with the passed in session diff --git a/kopete/libkopete/ui/kopetewidgets.cpp b/kopete/libkopete/ui/kopetewidgets.cpp index a1d7d1e1..b7addd10 100644 --- a/kopete/libkopete/ui/kopetewidgets.cpp +++ b/kopete/libkopete/ui/kopetewidgets.cpp @@ -107,7 +107,7 @@ KopeteWidgets::KopeteWidgets() widget.isContainer = false; m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::SearchLine"), widget); - new KInstance("kopetewidgets"); + new TDEInstance("kopetewidgets"); } KopeteWidgets::~KopeteWidgets() { diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index 9ee1a3c7..903e73d3 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -48,7 +48,7 @@ const TQRegExp CryptographyPlugin::isHTML( TQString::fromLatin1( "^[^<>]*(|[\\s/][^><]*>)[^><]*)+$" ) , false ); typedef KGenericFactory CryptographyPluginFactory; -static const KAboutData aboutdata("kopete_cryptography", I18N_NOOP("Cryptography") , "1.0" ); +static const TDEAboutData aboutdata("kopete_cryptography", I18N_NOOP("Cryptography") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_cryptography, CryptographyPluginFactory( &aboutdata ) ) CryptographyPlugin::CryptographyPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index a6069289..ce579ea8 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -38,7 +38,7 @@ #include "historyconfig.h" typedef KGenericFactory HistoryPluginFactory; -static const KAboutData aboutdata("kopete_history", I18N_NOOP("History") , "1.0" ); +static const TDEAboutData aboutdata("kopete_history", I18N_NOOP("History") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_history, HistoryPluginFactory( &aboutdata ) ) HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp index 075fd04f..827270f7 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.cpp +++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp @@ -32,7 +32,7 @@ #include "netmeetingguiclient.h" -static const KAboutData aboutdata("kopete_netmeeting", I18N_NOOP("NetMeeting") , "1.0" ); +static const TDEAboutData aboutdata("kopete_netmeeting", I18N_NOOP("NetMeeting") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_netmeeting, KGenericFactory( &aboutdata ) ) NetMeetingPlugin::NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) diff --git a/kopete/plugins/smpppdcs/unittest/main.cpp b/kopete/plugins/smpppdcs/unittest/main.cpp index f1215602..41153444 100644 --- a/kopete/plugins/smpppdcs/unittest/main.cpp +++ b/kopete/plugins/smpppdcs/unittest/main.cpp @@ -28,8 +28,8 @@ static const char version[] = "0.1"; static KCmdLineOptions options[] = { KCmdLineLastOption }; int main( int argc, char** argv ) { - KAboutData about("SMPPPDClientTests", I18N_NOOP("SMPPPDClientTests"), version, description, - KAboutData::License_BSD, "(C) 2006 Heiko Schäfer", 0, 0, "heiko@rangun.de"); + TDEAboutData about("SMPPPDClientTests", I18N_NOOP("SMPPPDClientTests"), version, description, + TDEAboutData::License_BSD, "(C) 2006 Heiko Schäfer", 0, 0, "heiko@rangun.de"); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp index 5e19b73c..8bb3c16d 100644 --- a/kopete/plugins/statistics/statisticsplugin.cpp +++ b/kopete/plugins/statistics/statisticsplugin.cpp @@ -43,7 +43,7 @@ typedef KGenericFactory StatisticsPluginFactory; -static const KAboutData aboutdata("kopete_statistics", I18N_NOOP("Statistics") , "0.1" ); +static const TDEAboutData aboutdata("kopete_statistics", I18N_NOOP("Statistics") , "0.1" ); K_EXPORT_COMPONENT_FACTORY( kopete_statistics, StatisticsPluginFactory( &aboutdata ) ) StatisticsPlugin::StatisticsPlugin( TQObject *parent, const char *name, const TQStringList &) diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index 64febcaa..f4a9e8a0 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -45,7 +45,7 @@ typedef KGenericFactory TranslatorPluginFactory; #if KDE_IS_VERSION(3,2,90) -static const KAboutData aboutdata("kopete_translator", I18N_NOOP("Translator") , "1.0" ); +static const TDEAboutData aboutdata("kopete_translator", I18N_NOOP("Translator") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_translator, TranslatorPluginFactory( &aboutdata ) ) #else K_EXPORT_COMPONENT_FACTORY( kopete_translator, TranslatorPluginFactory( "kopete_translator" ) ) diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp index b7eaf57b..9ef32e04 100644 --- a/kopete/protocols/msn/msnprotocol.cpp +++ b/kopete/protocols/msn/msnprotocol.cpp @@ -39,7 +39,7 @@ typedef KGenericFactory MSNProtocolFactory; #if KDE_IS_VERSION(3,2,90) -static const KAboutData aboutdata("kopete_msn", I18N_NOOP("MSN Messenger") , "1.0" ); +static const TDEAboutData aboutdata("kopete_msn", I18N_NOOP("MSN Messenger") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( libkopete_msn_shared, MSNProtocolFactory( &aboutdata ) ) #else K_EXPORT_COMPONENT_FACTORY( libkopete_msn_shared, MSNProtocolFactory( "kopete_msn" ) ) diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp index 98c91a0b..04a355c6 100644 --- a/kpf/src/Applet.cpp +++ b/kpf/src/Applet.cpp @@ -177,13 +177,13 @@ namespace KPF void Applet::about() { - KAboutData about + TDEAboutData about ( "kpf", I18N_NOOP("kpf"), kpfVersion, I18N_NOOP("TDE public fileserver"), - KAboutData::License_Custom, + TDEAboutData::License_Custom, "(C) 2001 Rik Hemsley (rikkus) ", I18N_NOOP( "File sharing applet, using the HTTP (Hyper Text Transfer Protocol)" diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp index 4d0bba30..89356ea2 100644 --- a/kppp/logview/main.cpp +++ b/kppp/logview/main.cpp @@ -103,8 +103,8 @@ void TopWidget::menuCallback(int id) { } int main(int argc, char **argv) { - KAboutData aboutData("kppplogview", I18N_NOOP("KPPP Log Viewer"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData("kppplogview", I18N_NOOP("KPPP Log Viewer"), + version, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2002, The KPPP Developers")); aboutData.addAuthor("Bernd Wuebben",0, "wuebben@kde.org"); aboutData.addAuthor("Mario Weilguni",0, ""); diff --git a/kppp/main.cpp b/kppp/main.cpp index 93f31f6d..379529ee 100644 --- a/kppp/main.cpp +++ b/kppp/main.cpp @@ -200,8 +200,8 @@ int main( int argc, char **argv ) { (void) new Requester(sockets[0]); - KAboutData aboutData("kppp", I18N_NOOP("KPPP"), - KPPPVERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData("kppp", I18N_NOOP("KPPP"), + KPPPVERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2002, The KPPP Developers")); aboutData.addAuthor("Harri Porten", I18N_NOOP("Current maintainer"), "porten@kde.org"); aboutData.addAuthor("Bernd Wuebben", I18N_NOOP("Original author"), "wuebben@kde.org"); diff --git a/krdc/main.cpp b/krdc/main.cpp index e21c0dfa..c3928fc0 100644 --- a/krdc/main.cpp +++ b/krdc/main.cpp @@ -72,8 +72,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "krdc", I18N_NOOP("Remote Desktop Connection"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "krdc", I18N_NOOP("Remote Desktop Connection"), + VERSION, description, TDEAboutData::License_GPL, "(c) 2009-2010, Timothy Pearson\n" "(c) 2001-2003, Tim Jansen\n" "(c) 2002-2003, Arend van Beelen jr.\n" diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp index ff3760e9..38fb5ad3 100644 --- a/krfb/kcm_krfb/kcm_krfb.cpp +++ b/krfb/kcm_krfb/kcm_krfb.cpp @@ -64,9 +64,9 @@ KcmKRfb::KcmKRfb(TQWidget *p, const char *name, const TQStringList &) : setButtons(Default|Apply|Reset); - KAboutData* about = new KAboutData( "kcm_krfb", I18N_NOOP("Desktop Sharing Control Module"), + TDEAboutData* about = new TDEAboutData( "kcm_krfb", I18N_NOOP("Desktop Sharing Control Module"), VERSION, - I18N_NOOP("Configure desktop sharing"), KAboutData::License_GPL, + I18N_NOOP("Configure desktop sharing"), TDEAboutData::License_GPL, "(c) 2002, Tim Jansen\n", 0, "http://www.tjansen.de/krfb", "tim@tjansen.de"); about->addAuthor("Tim Jansen", 0, "tim@tjansen.de"); diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp index db730dcf..8991be48 100644 --- a/krfb/krfb/main.cpp +++ b/krfb/krfb/main.cpp @@ -70,8 +70,8 @@ void checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) { int main(int argc, char *argv[]) { - KAboutData aboutData( "krfb", I18N_NOOP("Desktop Sharing"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "krfb", I18N_NOOP("Desktop Sharing"), + VERSION, description, TDEAboutData::License_GPL, "(c) 2001-2003, Tim Jansen\n" "(c) 2001, Johannes E. Schindelin\n" "(c) 2000, heXoNet Support GmbH, D-66424 Homburg\n" diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp index 2c633295..880626b4 100644 --- a/ksirc/KSTicker/ksttest.cpp +++ b/ksirc/KSTicker/ksttest.cpp @@ -64,8 +64,8 @@ void StdInTicker::closeEvent ( TQCloseEvent *e ) int main(int argc, char **argv){ - KAboutData aboutData( "ksirc", I18N_NOOP("KSirc"), - "2.0.0", "", KAboutData::License_Artistic, + TDEAboutData aboutData( "ksirc", I18N_NOOP("KSirc"), + "2.0.0", "", TDEAboutData::License_Artistic, I18N_NOOP("(c) 1997-2002, Andrew Stanley-Jones")); aboutData.addAuthor("Andrew Stanley-Jones",I18N_NOOP("Original Author"), "asj-ksirc@cban.com"); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp index c8b72bcd..cd6018bb 100644 --- a/ksirc/ksirc.cpp +++ b/ksirc/ksirc.cpp @@ -68,8 +68,8 @@ public: extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) { - KAboutData aboutData( "ksirc", I18N_NOOP("KSirc"), - KSIRC_VERSION, description, KAboutData::License_Artistic, + TDEAboutData aboutData( "ksirc", I18N_NOOP("KSirc"), + KSIRC_VERSION, description, TDEAboutData::License_Artistic, I18N_NOOP("(c) 1997-2002, The KSirc Developers")); aboutData.addAuthor("Andrew Stanley-Jones",I18N_NOOP("Original Author"), "asj-ksirc@cban.com"); aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org"); diff --git a/ktalkd/ChangeLog b/ktalkd/ChangeLog index 775b08a1..e5ee3d5d 100644 --- a/ktalkd/ChangeLog +++ b/ktalkd/ChangeLog @@ -17,7 +17,7 @@ 2000-03-04 David Faure - * talkd.cpp, ktalkdrc: Some fixes for KDE2 (KInstance, kvt->konsole... + * talkd.cpp, ktalkdrc: Some fixes for KDE2 (TDEInstance, kvt->konsole... 2000-03-04 David Smith diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp index 115554d3..02115bea 100644 --- a/ktalkd/ktalkd/readcfg++.cpp +++ b/ktalkd/ktalkd/readcfg++.cpp @@ -91,12 +91,12 @@ int init_user_config(const char * l_name) struct stat buf; TQString cfgFileName, tkannFileName; - /* Set $HOME, because KInstance uses it */ + /* Set $HOME, because TDEInstance uses it */ setenv("HOME",pw->pw_dir,1 /* overwrite */); unsetenv("TDEHOME"); unsetenv("XAUTHORITY"); ktalk_debug("%s",pw->pw_dir); - KInstance tmpInstance("tmpInstance"); + TDEInstance tmpInstance("tmpInstance"); cfgFileName = locateLocal("config", "ktalkdrc", &tmpInstance ); tkannFileName = locateLocal("config", "ktalkannouncerc", &tmpInstance); endpwent(); diff --git a/ktalkd/ktalkd/talkd.cpp b/ktalkd/ktalkd/talkd.cpp index 0bd156f4..76355121 100644 --- a/ktalkd/ktalkd/talkd.cpp +++ b/ktalkd/ktalkd/talkd.cpp @@ -350,7 +350,7 @@ main(int argc, char *argv[]) socklen_t sz = sizeof(sn); int do_debug=0, do_badpackets=0, ch; - new KInstance("ktalkd"); // for KConfig and friends + new TDEInstance("ktalkd"); // for KConfig and friends ktable = new KTalkdTable(); /* make sure we're a daemon */ diff --git a/lanbrowsing/kio_lan/kio_lan.cpp b/lanbrowsing/kio_lan/kio_lan.cpp index 870f01f8..442957ad 100644 --- a/lanbrowsing/kio_lan/kio_lan.cpp +++ b/lanbrowsing/kio_lan/kio_lan.cpp @@ -66,7 +66,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } int kdemain( int argc, char **argv ) { - KInstance instance( "kio_lan" ); + TDEInstance instance( "kio_lan" ); if (argc != 4) { diff --git a/librss/testlibrss.cpp b/librss/testlibrss.cpp index 45daf23b..37c78228 100644 --- a/librss/testlibrss.cpp +++ b/librss/testlibrss.cpp @@ -28,7 +28,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 ); TDEApplication app; diff --git a/wifi/main.cpp b/wifi/main.cpp index 1168d961..5edc8a9f 100644 --- a/wifi/main.cpp +++ b/wifi/main.cpp @@ -36,8 +36,8 @@ static KCmdLineOptions options[] = { int main (int argc, char *argv[]) { - KAboutData aboutData ("kwifimanager", I18N_NOOP ("KWiFiManager"), VERSION, - description, KAboutData::License_GPL, + TDEAboutData aboutData ("kwifimanager", I18N_NOOP ("KWiFiManager"), VERSION, + description, TDEAboutData::License_GPL, "(c) 2001-05, Stefan Winter"); aboutData.addAuthor ("Stefan Winter", I18N_NOOP("Original Author and Maintainer"), "swinter@kde.org"); aboutData.addCredit ("Helge Deller", I18N_NOOP("Lots of Fixes and Optimizations, added Session Management"), -- cgit v1.2.1