Remove use of KDE_IS_VERSION

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

7 files changed, 6 insertions, 10 deletions

diff --git a/kopete/plugins/alias/Makefile.am b/kopete/plugins/alias/Makefile.am
index d49f5ed6..f8465016 100644
--- a/kopete/plugins/alias/Makefile.am
+++ b/kopete/plugins/alias/Makefile.am
@@ -9,7 +9,7 @@ kopete_alias_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_alias_la_SOURCES     = aliaspreferences.cpp aliasdialogbase.ui aliasdialog.ui editaliasdialog.cpp
 kcm_kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kcm_kopete_alias_la_LIBADD      = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS) ../../libkopete/libkopete.la
+kcm_kopete_alias_la_LIBADD      = $(LIB_TDEUTILS) ../../libkopete/libkopete.la
 
 service_DATA = kopete_alias.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/highlight/Makefile.am b/kopete/plugins/highlight/Makefile.am
index 1075b5f7..2d167288 100644
--- a/kopete/plugins/highlight/Makefile.am
+++ b/kopete/plugins/highlight/Makefile.am
@@ -12,7 +12,7 @@ kopete_highlight_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_highlight_la_SOURCES = highlightprefsbase.ui highlightpreferences.cpp filter.cpp highlightconfig.cpp
 kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kcm_kopete_highlight_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
+kcm_kopete_highlight_la_LIBADD  = $(LIB_TDEUTILS)
 
 service_DATA = kopete_highlight.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/latex/Makefile.am b/kopete/plugins/latex/Makefile.am
index f3a94679..bebf17cf 100644
--- a/kopete/plugins/latex/Makefile.am
+++ b/kopete/plugins/latex/Makefile.am
@@ -12,7 +12,7 @@ kopete_latex_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_latex_la_SOURCES = latexprefsbase.ui latexpreferences.cpp latexconfig.kcfgc
 kcm_kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kcm_kopete_latex_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
+kcm_kopete_latex_la_LIBADD  = $(LIB_TDEUTILS)
 
 service_DATA = kopete_latex.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/motionautoaway/Makefile.am b/kopete/plugins/motionautoaway/Makefile.am
index 2b349ca4..8ed5d3d8 100644
--- a/kopete/plugins/motionautoaway/Makefile.am
+++ b/kopete/plugins/motionautoaway/Makefile.am
@@ -10,7 +10,7 @@ kopete_motionaway_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_motionaway_la_SOURCES = motionawayprefs.ui motionawaypreferences.cpp motionawayconfig.kcfgc
 kcm_kopete_motionaway_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
-kcm_kopete_motionaway_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
+kcm_kopete_motionaway_la_LIBADD  = $(LIB_TDEUTILS)
 
 
 
diff --git a/kopete/plugins/netmeeting/Makefile.am b/kopete/plugins/netmeeting/Makefile.am
index 54b08a5b..3e89d265 100644
--- a/kopete/plugins/netmeeting/Makefile.am
+++ b/kopete/plugins/netmeeting/Makefile.am
@@ -16,7 +16,7 @@ mydata_DATA = netmeetingchatui.rc
 
 kcm_kopete_netmeeting_la_SOURCES = netmeetingprefs_ui.ui netmeetingpreferences.cpp
 kcm_kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kcm_kopete_netmeeting_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
+kcm_kopete_netmeeting_la_LIBADD  = $(LIB_TDEUTILS)
 
 
 kcm_DATA = kopete_netmeeting_config.desktop
diff --git a/kopete/plugins/nowlistening/Makefile.am b/kopete/plugins/nowlistening/Makefile.am
index 60ca64e2..b18c8b6c 100644
--- a/kopete/plugins/nowlistening/Makefile.am
+++ b/kopete/plugins/nowlistening/Makefile.am
@@ -10,7 +10,7 @@ kopete_nowlistening_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc
 kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kcm_kopete_nowlistening_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
+kcm_kopete_nowlistening_la_LIBADD  = $(LIB_TDEUTILS)
 
 service_DATA = kopete_nowlistening.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index dc94304d..3e640ebc 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -44,12 +44,8 @@
 #include "translatorlanguages.h"
 
 typedef KGenericFactory<TranslatorPlugin> TranslatorPluginFactory;
-#if KDE_IS_VERSION(3,2,90)
 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" )  )
-#endif
 
 TranslatorPlugin::TranslatorPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ )
 : Kopete::Plugin( TranslatorPluginFactory::instance(), parent, name )