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

---
 kcharselect/Makefile.am       | 2 +-
 kcharselect/kcharselectdia.cc | 2 +-
 kcharselect/main.cc           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kcharselect')

diff --git a/kcharselect/Makefile.am b/kcharselect/Makefile.am
index 38014b3..665537d 100644
--- a/kcharselect/Makefile.am
+++ b/kcharselect/Makefile.am
@@ -6,7 +6,7 @@ kcharselect_SOURCES = kcharselectdia.cc main.cc
 kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kcharselect_METASOURCES = kcharselectdia.moc
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kcharselect.upd
 
 KDE_ICON = kcharselect
diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc
index 8d6b399..f5086d6 100644
--- a/kcharselect/kcharselectdia.cc
+++ b/kcharselect/kcharselectdia.cc
@@ -12,7 +12,7 @@
 #include <kdialog.h>
 #include <kapplication.h>
 #include <kaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kaction.h>
 
diff --git a/kcharselect/main.cc b/kcharselect/main.cc
index 0595370..006d095 100644
--- a/kcharselect/main.cc
+++ b/kcharselect/main.cc
@@ -7,7 +7,7 @@
 #include "kcharselectdia.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kglobalsettings.h>
-- 
cgit v1.2.1