From 48087e1d5650499b6093a6816356d467c8461802 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:17:46 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kopete/plugins/highlight/CMakeLists.txt           | 2 +-
 kopete/plugins/highlight/Makefile.am              | 4 ++--
 kopete/plugins/highlight/highlightpreferences.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kopete/plugins/highlight')

diff --git a/kopete/plugins/highlight/CMakeLists.txt b/kopete/plugins/highlight/CMakeLists.txt
index 312252bf..78da77b7 100644
--- a/kopete/plugins/highlight/CMakeLists.txt
+++ b/kopete/plugins/highlight/CMakeLists.txt
@@ -47,6 +47,6 @@ tde_add_kpart( kcm_kopete_highlight AUTOMOC
   SOURCES
     highlightprefsbase.ui highlightpreferences.cpp
     filter.cpp highlightconfig.cpp
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kopete/plugins/highlight/Makefile.am b/kopete/plugins/highlight/Makefile.am
index f8ca5f88..489f911c 100644
--- a/kopete/plugins/highlight/Makefile.am
+++ b/kopete/plugins/highlight/Makefile.am
@@ -7,11 +7,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_highlight.la kcm_kopete_highlight.la
 
 kopete_highlight_la_SOURCES = highlightplugin.cpp highlightconfig.cpp filter.cpp
-kopete_highlight_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kopete_highlight_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 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_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kcm_kopete_highlight_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
 
 service_DATA = kopete_highlight.desktop
diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp
index a96e1475..875a0dee 100644
--- a/kopete/plugins/highlight/highlightpreferences.cpp
+++ b/kopete/plugins/highlight/highlightpreferences.cpp
@@ -20,7 +20,7 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <klocale.h>
 #include <klistview.h>
 #include <kgenericfactory.h>
-- 
cgit v1.2.1