diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
commit | ef71f46965855308db367f74956513eccc71bc46 (patch) | |
tree | 71f1aca189b7beda22f9e95b19608dccfa4f3050 /kopete/protocols | |
parent | bdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff) | |
download | tdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols')
-rw-r--r-- | kopete/protocols/msn/msnprotocol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<MSNProtocol> 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" ) ) |