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

7 files changed, 11 insertions, 11 deletions

diff --git a/kghostview/CMakeLists.txt b/kghostview/CMakeLists.txt
index cdf00f75..316f387e 100644
--- a/kghostview/CMakeLists.txt
+++ b/kghostview/CMakeLists.txt
@@ -47,7 +47,7 @@ tde_add_library( kghostviewlib SHARED AUTOMOC
     displayoptions.cpp kpswidget.cpp fullscreenfilter.cpp
     kgvfactory.cpp  generalsettingswidget.ui gssettingswidget.ui
     thumbnailservice.cpp  configuration.kcfgc
-  LINK dscparse-static tdeprint-shared kparts-shared
+  LINK dscparse-static tdeprint-shared tdeparts-shared
   VERSION 0.0.0
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am
index 5cf5cc67..3d7faa44 100644
--- a/kghostview/Makefile.am
+++ b/kghostview/Makefile.am
@@ -28,7 +28,7 @@ libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
 libkghostviewpart_la_SOURCES = part_init.cpp
 
 kghostview_SOURCES = main.cpp
-kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kghostview_LDADD = libkghostviewlib.la
 
 libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined
diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h
index 8457c050..158ef0ec 100644
--- a/kghostview/kgv_view.h
+++ b/kghostview/kgv_view.h
@@ -23,7 +23,7 @@
 #include <tqfile.h>
 
 #include <kio/job.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <krun.h>
 
 #include "displayoptions.h"
diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp
index dfeea82a..738fba57 100644
--- a/kghostview/kgvfactory.cpp
+++ b/kghostview/kgvfactory.cpp
@@ -1,6 +1,6 @@
 /**
  * Copyright (C) 2003, Luís Pedro Coelho,
- * based on tdelibs/kparts/genericfactory.h
+ * based on tdelibs/tdeparts/genericfactory.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
 #include <kdebug.h>
diff --git a/kghostview/kgvfactory.h b/kghostview/kgvfactory.h
index 1b2e0801..d0ac9550 100644
--- a/kghostview/kgvfactory.h
+++ b/kghostview/kgvfactory.h
@@ -1,6 +1,6 @@
 /**
  * Copyright (C) 2003, Luís Pedro Coelho,
- * based on tdelibs/kparts/genericfactory.h
+ * based on tdelibs/tdeparts/genericfactory.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8 @@
 #ifndef KGVPart_H_INCLUDE_GUARD_
 #define KGVPart_H_INCLUDE_GUARD_
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 
 class TDEInstance;
 class TDEAboutData;
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index ec2348fc..95aac5f9 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -38,7 +38,7 @@
 #include <kicontheme.h>
 #include <kglobal.h>
 #include <kpopupmenu.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <twin.h>
 
diff --git a/kghostview/kgvshell.h b/kghostview/kgvshell.h
index ea794e35..0f1fa60f 100644
--- a/kghostview/kgvshell.h
+++ b/kghostview/kgvshell.h
@@ -21,7 +21,7 @@
 
 #include <tqstring.h>
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class TQTimer;