From b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:04:58 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kopete/plugins/netmeeting/CMakeLists.txt            | 2 +-
 kopete/plugins/netmeeting/Makefile.am               | 2 +-
 kopete/plugins/netmeeting/netmeetinginvitation.cpp  | 2 +-
 kopete/plugins/netmeeting/netmeetingpreferences.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kopete/plugins/netmeeting')

diff --git a/kopete/plugins/netmeeting/CMakeLists.txt b/kopete/plugins/netmeeting/CMakeLists.txt
index a53e1ff2..dfda84e3 100644
--- a/kopete/plugins/netmeeting/CMakeLists.txt
+++ b/kopete/plugins/netmeeting/CMakeLists.txt
@@ -31,7 +31,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_netmeeting.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_netmeeting_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_netmeeting_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES netmeetingchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_netmeeting )
 
 
diff --git a/kopete/plugins/netmeeting/Makefile.am b/kopete/plugins/netmeeting/Makefile.am
index 1710f136..27c5b0cb 100644
--- a/kopete/plugins/netmeeting/Makefile.am
+++ b/kopete/plugins/netmeeting/Makefile.am
@@ -20,4 +20,4 @@ kcm_kopete_netmeeting_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
 
 
 kcm_DATA = kopete_netmeeting_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
index 7581ac62..4373cb05 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
index 9981351d..3c63bc7e 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
@@ -21,7 +21,7 @@
 #include <klineedit.h>
 #include <tdeparts/componentfactory.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kcombobox.h>
 #include <klistview.h>
-- 
cgit v1.2.1