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

16 files changed, 24 insertions, 24 deletions

diff --git a/kmailcvt/CMakeLists.txt b/kmailcvt/CMakeLists.txt
index 26b2ce6b7..9a566690c 100644
--- a/kmailcvt/CMakeLists.txt
+++ b/kmailcvt/CMakeLists.txt
@@ -44,6 +44,6 @@ tde_add_executable( kmailcvt AUTOMOC
     filter_opera.cxx filter_thunderbird.cxx filter_kmail_maildir.cxx
     filter_sylpheed.cxx filter_thebat.cxx filter_lnotes.cxx
     filter_kmail_archive.cxx
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx
index 900b134bd..017385d4f 100644
--- a/kmailcvt/filter_evolution.cxx
+++ b/kmailcvt/filter_evolution.cxx
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 
 
diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx
index d60953195..34192f6a5 100644
--- a/kmailcvt/filter_evolution_v2.cxx
+++ b/kmailcvt/filter_evolution_v2.cxx
@@ -20,7 +20,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 
 
@@ -56,7 +56,7 @@ void FilterEvolution_v2::import(FilterInfo *info)
 
     //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent());
     KFileDialog *kfd;
-    kfd = new KFileDialog( evolDir, "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( evolDir, "", 0, "tdefiledialog", true );
     kfd->setMode(KFile::Directory | KFile::LocalOnly);
     kfd->exec();
     mailDir = kfd->selectedFile();
diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx
index 594313ae9..9305e6448 100644
--- a/kmailcvt/filter_kmail_maildir.cxx
+++ b/kmailcvt/filter_kmail_maildir.cxx
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 /** Default constructor. */
 FilterKMail_maildir::FilterKMail_maildir( void ) :
@@ -47,7 +47,7 @@ void FilterKMail_maildir::import( FilterInfo *info )
     TQString _homeDir = TQDir::homeDirPath();
 
     KFileDialog *kfd;
-    kfd = new KFileDialog( _homeDir, "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( _homeDir, "", 0, "tdefiledialog", true );
     kfd->setMode( KFile::Directory | KFile::LocalOnly );
     kfd->exec();
     mailDir = kfd->selectedFile();
diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx
index 4bd3c423f..8d987d0db 100644
--- a/kmailcvt/filter_lnotes.cxx
+++ b/kmailcvt/filter_lnotes.cxx
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Wed Feb 16, 2005
     copyright            : (C) 2005 by Robert Rockers
-    email                : kconfigure@rockerssoft.com
+    email                : tdeconfigure@rockerssoft.com
  ***************************************************************************/
 
 /***************************************************************************
@@ -18,7 +18,7 @@
 #include <config.h>
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 #include <tqfileinfo.h>
diff --git a/kmailcvt/filter_lnotes.hxx b/kmailcvt/filter_lnotes.hxx
index 709fa6ce2..430ae83e8 100644
--- a/kmailcvt/filter_lnotes.hxx
+++ b/kmailcvt/filter_lnotes.hxx
@@ -3,7 +3,7 @@
                              -------------------
     begin                : Wed Feb 16, 2005
     copyright            : (C) 2005 by Robert Rockers
-    email                : kconfigure@rockerssoft.com
+    email                : tdeconfigure@rockerssoft.com
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx
index 90e05aff8..51df32359 100644
--- a/kmailcvt/filter_mailapp.cxx
+++ b/kmailcvt/filter_mailapp.cxx
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 
diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx
index 1ecc6c79b..78bfec072 100644
--- a/kmailcvt/filter_mbox.cxx
+++ b/kmailcvt/filter_mbox.cxx
@@ -17,7 +17,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 
diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx
index a87ee39af..22c7a615a 100644
--- a/kmailcvt/filter_oe.cxx
+++ b/kmailcvt/filter_oe.cxx
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 
diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx
index 65e2eae4b..784c0b101 100644
--- a/kmailcvt/filter_opera.cxx
+++ b/kmailcvt/filter_opera.cxx
@@ -17,7 +17,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 
@@ -50,7 +50,7 @@ void FilterOpera::import(FilterInfo *info)
 
     //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent());
     KFileDialog *kfd;
-    kfd = new KFileDialog( startdir, "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( startdir, "", 0, "tdefiledialog", true );
     kfd->setMode(KFile::Directory | KFile::LocalOnly);
     kfd->exec();
     TQString operaDir = kfd->selectedFile();
diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cxx
index a5a9f407c..63d2848b1 100644
--- a/kmailcvt/filter_outlook.cxx
+++ b/kmailcvt/filter_outlook.cxx
@@ -18,7 +18,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 
diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx
index 04abea3d3..b29d13389 100644
--- a/kmailcvt/filter_plain.cxx
+++ b/kmailcvt/filter_plain.cxx
@@ -17,7 +17,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <libgen.h>
 
 #include "filter_plain.hxx"
diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx
index 699e3adb3..d79c8f4b7 100644
--- a/kmailcvt/filter_pmail.cxx
+++ b/kmailcvt/filter_pmail.cxx
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqregexp.h>
 #include <ktempfile.h>
 #include <kdebug.h>
@@ -46,7 +46,7 @@ void FilterPMail::import(FilterInfo *info)
     
     // Select directory from where I have to import files
     KFileDialog *kfd;
-    kfd = new KFileDialog( TQDir::homeDirPath(), "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( TQDir::homeDirPath(), "", 0, "tdefiledialog", true );
     kfd->setMode(KFile::Directory | KFile::LocalOnly);
     kfd->exec();
     chosenDir = kfd->selectedFile();
diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx
index 2174c681f..af03a0990 100644
--- a/kmailcvt/filter_sylpheed.cxx
+++ b/kmailcvt/filter_sylpheed.cxx
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 
 /** Default constructor. */
@@ -46,7 +46,7 @@ void FilterSylpheed::import( FilterInfo *info )
     TQString _homeDir = TQDir::homeDirPath();
 
     KFileDialog *kfd;
-    kfd = new KFileDialog( _homeDir, "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( _homeDir, "", 0, "tdefiledialog", true );
     kfd->setMode( KFile::Directory | KFile::LocalOnly );
     kfd->exec();
     mailDir = kfd->selectedFile();
diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx
index 52cd98589..499caedba 100644
--- a/kmailcvt/filter_thebat.cxx
+++ b/kmailcvt/filter_thebat.cxx
@@ -23,7 +23,7 @@
 #include <tqvaluelist.h>
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 
 #include <kmessagebox.h>
@@ -52,7 +52,7 @@ void FilterTheBat::import( FilterInfo *info )
     TQString _homeDir = TQDir::homeDirPath();
 
     KFileDialog *kfd;
-    kfd = new KFileDialog( _homeDir, "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( _homeDir, "", 0, "tdefiledialog", true );
     kfd->setMode( KFile::Directory | KFile::LocalOnly );
     kfd->exec();
     mailDir = kfd->selectedFile();
diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx
index ea739dac1..d92e7efdf 100644
--- a/kmailcvt/filter_thunderbird.cxx
+++ b/kmailcvt/filter_thunderbird.cxx
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 
 
@@ -55,7 +55,7 @@ void FilterThunderbird::import(FilterInfo *info)
     }
 
     KFileDialog *kfd;
-    kfd = new KFileDialog( thunderDir, "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( thunderDir, "", 0, "tdefiledialog", true );
     kfd->setMode(KFile::Directory | KFile::LocalOnly);
     kfd->exec();
     mailDir  = kfd->selectedFile();