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/protocols/msn/msnprotocol.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kopete/protocols') 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