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

---
 kdesktop/kwebdesktop/CMakeLists.txt  | 2 +-
 kdesktop/kwebdesktop/Makefile.am     | 2 +-
 kdesktop/kwebdesktop/kwebdesktop.cpp | 4 ++--
 kdesktop/kwebdesktop/kwebdesktop.h   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kdesktop/kwebdesktop')

diff --git a/kdesktop/kwebdesktop/CMakeLists.txt b/kdesktop/kwebdesktop/CMakeLists.txt
index 3df328c0c..741b8df34 100644
--- a/kdesktop/kwebdesktop/CMakeLists.txt
+++ b/kdesktop/kwebdesktop/CMakeLists.txt
@@ -37,6 +37,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK khtml-shared
+  LINK tdehtml-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdesktop/kwebdesktop/Makefile.am b/kdesktop/kwebdesktop/Makefile.am
index 45634b174..2d0d21bdb 100644
--- a/kdesktop/kwebdesktop/Makefile.am
+++ b/kdesktop/kwebdesktop/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = 	kwebdesktop
 METASOURCES = AUTO
 
 kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc 
-kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
 kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index 58fd0b7b8..ff60d0fd6 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -33,7 +33,7 @@
 #include <tqscrollview.h>
 #include "kwebdesktop.h"
 #include <kmimetype.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include "kwebdesktopsettings.h"
 
 #include "kwebdesktop.moc"
@@ -129,7 +129,7 @@ int main( int argc, char **argv )
     TDEIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold.
     delete webDesktop;
     delete run;
-    //khtml::Cache::clear();
+    //tdehtml::Cache::clear();
 
     return ret;
 }
diff --git a/kdesktop/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h
index 089a25673..2641378cf 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.h
+++ b/kdesktop/kwebdesktop/kwebdesktop.h
@@ -21,8 +21,8 @@
 
 #include <tqobject.h>
 #include <tqcstring.h>
-#include <kparts/browserextension.h>
-#include <khtml_part.h>
+#include <tdeparts/browserextension.h>
+#include <tdehtml_part.h>
 
 namespace TDEIO { class Job; }
 
-- 
cgit v1.2.3