summaryrefslogtreecommitdiffstats
path: root/tderesources/remote
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 /tderesources/remote
parentde53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff)
downloadtdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz
tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/remote')
-rw-r--r--tderesources/remote/resourceremote.cpp2
-rw-r--r--tderesources/remote/resourceremote.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp
index ed05f8405..78b650658 100644
--- a/tderesources/remote/resourceremote.cpp
+++ b/tderesources/remote/resourceremote.cpp
@@ -28,7 +28,7 @@
#include <kdebug.h>
#include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h
index 2c3fd5fad..04099ff97 100644
--- a/tderesources/remote/resourceremote.h
+++ b/tderesources/remote/resourceremote.h
@@ -26,7 +26,7 @@
#include <tqdatetime.h>
#include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdirwatch.h>
#include <tdepimmacros.h>