summaryrefslogtreecommitdiffstats
path: root/tderesources/slox
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/slox
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/slox')
-rw-r--r--tderesources/slox/kabcresourceslox.cpp4
-rw-r--r--tderesources/slox/kabcsloxprefs.kcfgc2
-rw-r--r--tderesources/slox/kcalresourceslox.cpp4
-rw-r--r--tderesources/slox/kcalresourceslox.h2
-rw-r--r--tderesources/slox/kcalsloxprefs.kcfgc2
-rw-r--r--tderesources/slox/sloxaccounts.cpp6
-rw-r--r--tderesources/slox/sloxfoldermanager.cpp4
-rw-r--r--tderesources/slox/webdavhandler.cpp2
8 files changed, 13 insertions, 13 deletions
diff --git a/tderesources/slox/kabcresourceslox.cpp b/tderesources/slox/kabcresourceslox.cpp
index e7ab6ecae..04ce9555e 100644
--- a/tderesources/slox/kabcresourceslox.cpp
+++ b/tderesources/slox/kabcresourceslox.cpp
@@ -22,7 +22,7 @@
#include <tqapplication.h>
#include <kabc/picture.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmdcodec.h>
@@ -30,7 +30,7 @@
#include <kstringhandler.h>
#include <libtdepim/kpimprefs.h>
#include <libtdepim/progressmanager.h>
-#include <kio/davjob.h>
+#include <tdeio/davjob.h>
#include "webdavhandler.h"
#include "sloxaccounts.h"
diff --git a/tderesources/slox/kabcsloxprefs.kcfgc b/tderesources/slox/kabcsloxprefs.kcfgc
index 11e2f2c21..51bd1ac16 100644
--- a/tderesources/slox/kabcsloxprefs.kcfgc
+++ b/tderesources/slox/kabcsloxprefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=tderesources_kabc_slox.kcfg
ClassName=SloxPrefs
NameSpace=KABC
diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp
index 1311ebc52..a877622e9 100644
--- a/tderesources/slox/kcalresourceslox.cpp
+++ b/tderesources/slox/kcalresourceslox.cpp
@@ -30,8 +30,8 @@
#include <kdebug.h>
#include <kurl.h>
-#include <kio/job.h>
-#include <kio/davjob.h>
+#include <tdeio/job.h>
+#include <tdeio/davjob.h>
#include <klocale.h>
#include <kstandarddirs.h>
diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h
index 6735b9934..8b2b68d26 100644
--- a/tderesources/slox/kcalresourceslox.h
+++ b/tderesources/slox/kcalresourceslox.h
@@ -29,7 +29,7 @@
#include <tqdom.h>
#include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdirwatch.h>
#include <tdepimmacros.h>
diff --git a/tderesources/slox/kcalsloxprefs.kcfgc b/tderesources/slox/kcalsloxprefs.kcfgc
index 3b352a214..e971d32d8 100644
--- a/tderesources/slox/kcalsloxprefs.kcfgc
+++ b/tderesources/slox/kcalsloxprefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=tderesources_kcal_slox.kcfg
ClassName=SloxPrefs
NameSpace=KCal
diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp
index aa648d1bc..1831d79ae 100644
--- a/tderesources/slox/sloxaccounts.cpp
+++ b/tderesources/slox/sloxaccounts.cpp
@@ -28,10 +28,10 @@
#include <kstaticdeleter.h>
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <kio/job.h>
-#include <kio/davjob.h>
+#include <tdeio/job.h>
+#include <tdeio/davjob.h>
#include <kstringhandler.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqfile.h>
#include <tqdom.h>
diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp
index a60cd7885..728420555 100644
--- a/tderesources/slox/sloxfoldermanager.cpp
+++ b/tderesources/slox/sloxfoldermanager.cpp
@@ -22,8 +22,8 @@
#include <tqstring.h>
#include <kdebug.h>
-#include <kio/job.h>
-#include <kio/davjob.h>
+#include <tdeio/job.h>
+#include <tdeio/davjob.h>
#include <klocale.h>
#include <kstandarddirs.h>
diff --git a/tderesources/slox/webdavhandler.cpp b/tderesources/slox/webdavhandler.cpp
index 32d3c4167..65caebf23 100644
--- a/tderesources/slox/webdavhandler.cpp
+++ b/tderesources/slox/webdavhandler.cpp
@@ -37,7 +37,7 @@
#include <libtdepim/kpimprefs.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqfile.h>