Rename a number of libraries and executables to avoid conflicts with KDE4

7 files changed, 10 insertions, 10 deletions

diff --git a/kview/kviewviewer/CMakeLists.txt b/kview/kviewviewer/CMakeLists.txt
index aea04495..78829f61 100644
--- a/kview/kviewviewer/CMakeLists.txt
+++ b/kview/kviewviewer/CMakeLists.txt
@@ -35,6 +35,6 @@ tde_add_kpart( libkviewviewer AUTOMOC
   SOURCES
     printimagesettings.ui imagesettings.cpp
     kviewkonqextension.cpp kviewviewer.cpp
-  LINK kimageviewer-shared kutils-shared tdeprint-shared
+  LINK kimageviewer-shared tdeutils-shared tdeprint-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/kviewviewer/config/CMakeLists.txt b/kview/kviewviewer/config/CMakeLists.txt
index 34a7e4a6..d3640df6 100644
--- a/kview/kviewviewer/config/CMakeLists.txt
+++ b/kview/kviewviewer/config/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES
 
 tde_add_kpart( kcm_kviewviewerpluginsconfig AUTOMOC
   SOURCES kviewviewerpluginsconfig.cpp
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/kviewviewer/kviewkonqextension.h b/kview/kviewviewer/kviewkonqextension.h
index f49f577d..e46e78f6 100644
--- a/kview/kviewviewer/kviewkonqextension.h
+++ b/kview/kviewviewer/kviewkonqextension.h
@@ -20,7 +20,7 @@
 #ifndef __kviewkonqextension_h__
 #define __kviewkonqextension_h__
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 namespace KImageViewer { class Canvas; }
 class KViewViewer;
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 7db68102..3e3c7085 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -40,9 +40,9 @@
 #include <kio/job.h>
 #include <kxmlguifactory.h>
 #include <kfiledialog.h>
-#include <kparts/genericfactory.h>
-#include <kparts/componentfactory.h>
-#include <kparts/plugin.h>
+#include <tdeparts/genericfactory.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/plugin.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kapplication.h>
@@ -595,7 +595,7 @@ void KViewViewer::slotData( TDEIO::Job *, const TQByteArray & data )
 
 	//show partial image XXX: is this really the way to do it?
 	//No. :) It takes forever like this.
-	//OK. So I really have to look at khtml...
+	//OK. So I really have to look at tdehtml...
 	//later...
 	//m_pCanvas->setImage( TQImage( m_pBuffer->buffer() ) );
 }
diff --git a/kview/kviewviewer/test/Makefile.am b/kview/kviewviewer/test/Makefile.am
index 65c3527f..197e9cea 100644
--- a/kview/kviewviewer/test/Makefile.am
+++ b/kview/kviewviewer/test/Makefile.am
@@ -5,5 +5,5 @@ METASOURCES = AUTO
 check_PROGRAMS = test
 
 test_SOURCES = main.cpp test.cpp
-test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test_LDADD   = $(LIB_KPARTS)
diff --git a/kview/kviewviewer/test/test.cpp b/kview/kviewviewer/test/test.cpp
index 2bc20372..dfcdc918 100644
--- a/kview/kviewviewer/test/test.cpp
+++ b/kview/kviewviewer/test/test.cpp
@@ -8,7 +8,7 @@
 #include <kurl.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kapplication.h>
 
 #include <tqimage.h>
diff --git a/kview/kviewviewer/test/test.h b/kview/kviewviewer/test/test.h
index ab5d700b..b3a24c91 100644
--- a/kview/kviewviewer/test/test.h
+++ b/kview/kviewviewer/test/test.h
@@ -6,7 +6,7 @@
 #endif 
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 namespace KParts { class ReadWritePart; }