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

---
 kcontrol/kfontinst/viewpart/CMakeLists.txt  | 4 ++--
 kcontrol/kfontinst/viewpart/FontViewPart.h  | 2 +-
 kcontrol/kfontinst/viewpart/FontViewerApp.h | 4 ++--
 kcontrol/kfontinst/viewpart/Makefile.am     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kcontrol/kfontinst/viewpart')

diff --git a/kcontrol/kfontinst/viewpart/CMakeLists.txt b/kcontrol/kfontinst/viewpart/CMakeLists.txt
index 630d1aff4..7fb621fec 100644
--- a/kcontrol/kfontinst/viewpart/CMakeLists.txt
+++ b/kcontrol/kfontinst/viewpart/CMakeLists.txt
@@ -33,7 +33,7 @@ install( FILES kfontviewpart.rc kfontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/k
 
 tde_add_kpart( libkfontviewpart AUTOMOC
   SOURCES FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
-  LINK kfontinstprint-static kfontinst-shared kparts-shared
+  LINK kfontinstprint-static kfontinst-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -42,7 +42,7 @@ tde_add_kpart( libkfontviewpart AUTOMOC
 
 tde_add_executable( kfontview AUTOMOC
   SOURCES FontViewerApp.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h
index 21de2e074..1e4500c5a 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.h
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.h
@@ -29,7 +29,7 @@
 // (C) Craig Drummond, 2002, 2003, 2004
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class TQPushButton;
 class TQFrame;
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.h b/kcontrol/kfontinst/viewpart/FontViewerApp.h
index 0364e0bbd..150c8ccab 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.h
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.h
@@ -30,8 +30,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <kapplication.h>
-#include <kparts/part.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/part.h>
+#include <tdeparts/mainwindow.h>
 
 namespace KFI
 {
diff --git a/kcontrol/kfontinst/viewpart/Makefile.am b/kcontrol/kfontinst/viewpart/Makefile.am
index 011f057ec..dc6bbd115 100644
--- a/kcontrol/kfontinst/viewpart/Makefile.am
+++ b/kcontrol/kfontinst/viewpart/Makefile.am
@@ -17,7 +17,7 @@ AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFR
 METASOURCES = AUTO
 
 kfontview_LDADD = $(LIB_KPARTS)
-kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 bin_PROGRAMS = kfontview
 xdg_apps_DATA = kfontview.desktop
-- 
cgit v1.2.1