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

10 files changed, 16 insertions, 16 deletions

diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp
index 4f0d054a..9a2777b0 100644
--- a/kuickshow/src/filefinder.cpp
+++ b/kuickshow/src/filefinder.cpp
@@ -19,7 +19,7 @@
 #include <tqkeycode.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kcompletionbox.h>
 #include <kurlcompletion.h>
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
index 9f158c1a..bc931794 100644
--- a/kuickshow/src/filewidget.cpp
+++ b/kuickshow/src/filewidget.cpp
@@ -93,7 +93,7 @@ void FileWidget::initActions()
     if ( coll->action("kuick_delete") )
         menu->insert( coll->action("kuick_delete"), 9 );
 
-    // properties dialog is now in kfile, but not at the right position,
+    // properties dialog is now in tdefile, but not at the right position,
     // so we move it to the real bottom
     menu->remove( coll->action( "properties" ) );
 
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index 558e4c71..97aae529 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -37,14 +37,14 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #ifdef KDE_USE_FINAL
 #undef Unsorted
 #endif
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kimageeffect.h>
 #include <klocale.h>
@@ -59,7 +59,7 @@
 #include <twin.h>
 #include <netwm.h>
 #include <kurldrag.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "filecache.h"
 #include "imagewindow.h"
diff --git a/kuickshow/src/imdata.cpp b/kuickshow/src/imdata.cpp
index e084e898..c580f7e3 100644
--- a/kuickshow/src/imdata.cpp
+++ b/kuickshow/src/imdata.cpp
@@ -18,7 +18,7 @@
 
 #include <stdlib.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "imdata.h"
 
diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp
index 36420918..530875e8 100644
--- a/kuickshow/src/imlibwidget.cpp
+++ b/kuickshow/src/imlibwidget.cpp
@@ -33,7 +33,7 @@
 
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kimageio.h>
 
 #include "filecache.h"
diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp
index 263e98e7..e72062a8 100644
--- a/kuickshow/src/kuickconfigdlg.cpp
+++ b/kuickshow/src/kuickconfigdlg.cpp
@@ -26,7 +26,7 @@
 #include <tqvbox.h>
 
 #include <kaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/kuickshow/src/kuickdata.cpp b/kuickshow/src/kuickdata.cpp
index c7b5f203..84c4ff38 100644
--- a/kuickshow/src/kuickdata.cpp
+++ b/kuickshow/src/kuickdata.cpp
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 
 #include <tqcolor.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "kuickdata.h"
diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
index d0cff155..764210f0 100644
--- a/kuickshow/src/kuickfile.cpp
+++ b/kuickshow/src/kuickfile.cpp
@@ -5,8 +5,8 @@
 #include <kinstance.h>
 #include <klocale.h>
 #include <kprogress.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 
 #include "filecache.h"
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index 1e6352fa..da1651a4 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -33,15 +33,15 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <tdeversion.h>
-#include <kfiledialog.h>
-#include <kfilemetainfo.h>
+#include <tdefiledialog.h>
+#include <tdefilemetainfo.h>
 #include <kglobal.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
diff --git a/kuickshow/src/kuickshow.h b/kuickshow/src/kuickshow.h
index 31874153..baba06a3 100644
--- a/kuickshow/src/kuickshow.h
+++ b/kuickshow/src/kuickshow.h
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kmainwindow.h>
 #include <kurl.h>