From a5430e4b98efd05937bd3bfe78c56eb826f145fa Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:19:22 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kcontrol/tdefontinst/thumbnail/CMakeLists.txt | 4 ++--
 kcontrol/tdefontinst/thumbnail/Makefile.am    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kcontrol/tdefontinst/thumbnail')

diff --git a/kcontrol/tdefontinst/thumbnail/CMakeLists.txt b/kcontrol/tdefontinst/thumbnail/CMakeLists.txt
index 8d3c04b86..7d4ce2fb5 100644
--- a/kcontrol/tdefontinst/thumbnail/CMakeLists.txt
+++ b/kcontrol/tdefontinst/thumbnail/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
+  ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -30,6 +30,6 @@ install( FILES fontthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 tde_add_kpart( fontthumbnail
   SOURCES FontThumbnail.cpp
-  LINK kfontinst-shared
+  LINK tdefontinst-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/tdefontinst/thumbnail/Makefile.am b/kcontrol/tdefontinst/thumbnail/Makefile.am
index 49213a019..d9005a335 100644
--- a/kcontrol/tdefontinst/thumbnail/Makefile.am
+++ b/kcontrol/tdefontinst/thumbnail/Makefile.am
@@ -1,7 +1,7 @@
 kde_module_LTLIBRARIES = fontthumbnail.la
 
 fontthumbnail_la_SOURCES = FontThumbnail.cpp
-fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libkfontinst.la
+fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libtdefontinst.la
 fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
 METASOURCES = AUTO
 
-- 
cgit v1.2.1