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

1 files changed, 4 insertions, 4 deletions

diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 68fd6b4d1..e4c906fad 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -56,9 +56,9 @@
 
 #include <dcopclient.h>
 #include <kaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
@@ -1038,7 +1038,7 @@ bool ActionManager::saveURL()
 void ActionManager::exportHTML()
 {
   HTMLExportSettings settings( "KOrganizer" );
-  // Manually read in the config, because parametrized kconfigxt objects don't
+  // Manually read in the config, because parametrized tdeconfigxt objects don't
   // seem to load the config theirselves
   settings.readConfig();
 
@@ -1291,7 +1291,7 @@ void ActionManager::setDestinationPolicy()
 void ActionManager::configureDateTime()
 {
   TDEProcess *proc = new TDEProcess;
-  *proc << "kcmshell" << "language";
+  *proc << "tdecmshell" << "language";
 
   connect( proc,TQT_SIGNAL( processExited( TDEProcess * ) ),
           TQT_SLOT( configureDateTimeFinished( TDEProcess * ) ) );