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

---
 kioslave/thumbnail/CMakeLists.txt  | 2 +-
 kioslave/thumbnail/Makefile.am     | 2 +-
 kioslave/thumbnail/htmlcreator.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kioslave/thumbnail')

diff --git a/kioslave/thumbnail/CMakeLists.txt b/kioslave/thumbnail/CMakeLists.txt
index eb50589ab..9000b3494 100644
--- a/kioslave/thumbnail/CMakeLists.txt
+++ b/kioslave/thumbnail/CMakeLists.txt
@@ -85,7 +85,7 @@ set( target htmlthumbnail )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES htmlcreator.cpp
-  LINK khtml-shared
+  LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kioslave/thumbnail/Makefile.am b/kioslave/thumbnail/Makefile.am
index 5a63c88bb..ecd2e492b 100644
--- a/kioslave/thumbnail/Makefile.am
+++ b/kioslave/thumbnail/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of tdebase/kioslave/thumbnail
 
 INCLUDES = $(all_includes) $(EXR_FLAGS)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 METASOURCES = AUTO
 
 if have_xcursor
diff --git a/kioslave/thumbnail/htmlcreator.cpp b/kioslave/thumbnail/htmlcreator.cpp
index 43aec5f39..a928e4253 100644
--- a/kioslave/thumbnail/htmlcreator.cpp
+++ b/kioslave/thumbnail/htmlcreator.cpp
@@ -23,7 +23,7 @@
 #include <tqimage.h>
 #include <tqpainter.h>
 #include <kapplication.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 #include "htmlcreator.h"
 
-- 
cgit v1.2.3