summaryrefslogtreecommitdiffstats
path: root/korganizer/actionmanager.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:15 -0600
commit64df902cf71a8ee258fb85f6be26248f399aa01f (patch)
treedba58f705042c22cea26b678d5b0e4e9a34bf202 /korganizer/actionmanager.cpp
parentde53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff)
downloadtdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz
tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/actionmanager.cpp')
-rw-r--r--korganizer/actionmanager.cpp8
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 * ) ) );