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 --- 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 +- 29 files changed, 42 insertions(+), 42 deletions(-) (limited to 'kopete') 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" ) ) -- cgit v1.2.1