Rename KInstance and KAboutData to avoid conflicts with KDE4

6 files changed, 7 insertions, 7 deletions

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( "^[^<>]*(</?(html|body|br|p|font|center|b|i|u|span|div|pre)(>|[\\s/][^><]*>)[^><]*)+$" ) , false );
 
 typedef KGenericFactory<CryptographyPlugin> 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<HistoryPlugin> 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<NetMeetingPlugin>( &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<StatisticsPlugin> 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<TranslatorPlugin> 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" )  )