summaryrefslogtreecommitdiffstats
path: root/kcontrol/tdefontinst/tdefile-plugin
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
commita5430e4b98efd05937bd3bfe78c56eb826f145fa (patch)
tree1af88f74a9d800399de58491b215fb303cbfb1f3 /kcontrol/tdefontinst/tdefile-plugin
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/tdefontinst/tdefile-plugin')
-rw-r--r--kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt4
-rw-r--r--kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp2
-rw-r--r--kcontrol/tdefontinst/tdefile-plugin/Makefile.am2
3 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt b/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt
index d12537903..37fab1445 100644
--- a/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt
+++ b/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt
@@ -12,7 +12,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
+ ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@@ -31,6 +31,6 @@ install( FILES tdefile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
tde_add_kpart( tdefile_font
SOURCES KFileFont.cpp
- LINK kfontinst-shared tdeio-shared
+ LINK tdefontinst-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
index 4ac55807f..6cbeb5b3b 100644
--- a/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
+++ b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
@@ -260,7 +260,7 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt
}
typedef KGenericFactory<KFI::KFileFontPlugin> KFileFontPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(tdefile_font, KFileFontPluginFactory("kfontinst"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_font, KFileFontPluginFactory("tdefontinst"))
namespace KFI
{
diff --git a/kcontrol/tdefontinst/tdefile-plugin/Makefile.am b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
index 04ab41861..a7f829214 100644
--- a/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
+++ b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdefile_font.la
tdefile_font_la_SOURCES = KFileFont.cpp
tdefile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
-tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la
+tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libtdefontinst.la
kdelnkdir = $(kde_servicesdir)
kde_services_DATA = tdefile_font.desktop