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

8 files changed, 13 insertions, 13 deletions

diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am
index 3d7faa44..072c6037 100644
--- a/kghostview/Makefile.am
+++ b/kghostview/Makefile.am
@@ -59,7 +59,7 @@ messages: rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kghostview.pot
 
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kghostview.upd
 update_SCRIPTS = update-to-xt-names.pl
 
diff --git a/kghostview/displayoptions.cpp b/kghostview/displayoptions.cpp
index 6e4dddc7..20931fca 100644
--- a/kghostview/displayoptions.cpp
+++ b/kghostview/displayoptions.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <tqregexp.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 namespace {
 	const double allowedMagnifications[] = {
diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp
index 3e108866..b226bb78 100644
--- a/kghostview/kgv_miniwidget.cpp
+++ b/kghostview/kgv_miniwidget.cpp
@@ -21,7 +21,7 @@
 #include <tqlistbox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <tdeversion.h>
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index e651c55d..57b1e7db 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -25,7 +25,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <kglobalsettings.h>
@@ -36,7 +36,7 @@
 #include <kstdaction.h>
 #include <kstdaccel.h>
 #include <ktempfile.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <kaboutdata.h>
 
 
diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h
index 158ef0ec..e9feb249 100644
--- a/kghostview/kgv_view.h
+++ b/kghostview/kgv_view.h
@@ -22,7 +22,7 @@
 #include <tqcstring.h> // TQByteArray
 #include <tqfile.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tdeparts/browserextension.h>
 #include <krun.h>
 
diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp
index 27f2664c..0982cc65 100644
--- a/kghostview/kgvconfigdialog.cpp
+++ b/kghostview/kgvconfigdialog.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlayout.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
@@ -30,7 +30,7 @@
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "configuration.h"
 #include "kgv_view.h"
@@ -75,7 +75,7 @@ namespace {
     /* On a related note:
      * We don't detect upgrades (or downgrades, for that matter) of gs.
      * I am seeing if I can get the version out of gs as a side effect to displaying a file.
-     * This way, using kconfig:/Ghostscript/GS Version we will see whether the version has changed
+     * This way, using tdeconfig:/Ghostscript/GS Version we will see whether the version has changed
      * and trigger a redetection without the trouble of running "gs --version" on each launch.
      *
      * LPC (9 April 2003)
diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp
index 673220a0..6303591e 100644
--- a/kghostview/kgvdocument.cpp
+++ b/kghostview/kgvdocument.cpp
@@ -21,8 +21,8 @@
 
 #include <tqfileinfo.h>
 
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kfilterdev.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
@@ -30,7 +30,7 @@
 #include <kprinter.h>
 #include <kprocess.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index 95aac5f9..75f27dad 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -21,7 +21,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klibloader.h>
 #include <klocale.h>