summaryrefslogtreecommitdiffstats
path: root/tderesources/slox
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
commitcfb328d59024a251690b6e47c9f8d343fd8c241c (patch)
tree7c11070cd07e5e023a26ddcfa41832c208c63732 /tderesources/slox
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/slox')
-rw-r--r--tderesources/slox/kabcresourceslox.cpp4
-rw-r--r--tderesources/slox/kabcresourceslox.h2
-rw-r--r--tderesources/slox/kabcresourceslox_plugin.cpp4
-rw-r--r--tderesources/slox/kabcresourcesloxconfig.cpp2
-rw-r--r--tderesources/slox/kcalresourceslox.cpp6
-rw-r--r--tderesources/slox/kcalresourceslox_plugin.cpp4
-rw-r--r--tderesources/slox/kcalresourcesloxconfig.cpp2
-rw-r--r--tderesources/slox/sloxaccounts.h2
-rw-r--r--tderesources/slox/sloxfolder.cpp2
-rw-r--r--tderesources/slox/sloxfolderdialog.cpp2
-rw-r--r--tderesources/slox/sloxfoldermanager.cpp2
-rw-r--r--tderesources/slox/webdavhandler.h2
12 files changed, 17 insertions, 17 deletions
diff --git a/tderesources/slox/kabcresourceslox.cpp b/tderesources/slox/kabcresourceslox.cpp
index 04ce9555e..426d86add 100644
--- a/tderesources/slox/kabcresourceslox.cpp
+++ b/tderesources/slox/kabcresourceslox.cpp
@@ -21,10 +21,10 @@
#include <tqapplication.h>
-#include <kabc/picture.h>
+#include <tdeabc/picture.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmdcodec.h>
#include <kstandarddirs.h>
#include <kstringhandler.h>
diff --git a/tderesources/slox/kabcresourceslox.h b/tderesources/slox/kabcresourceslox.h
index d5251bdc7..d51b06a17 100644
--- a/tderesources/slox/kabcresourceslox.h
+++ b/tderesources/slox/kabcresourceslox.h
@@ -25,7 +25,7 @@
#include <libtdepim/kabcresourcecached.h>
#include <tdepimmacros.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <tqmap.h>
#include <tqdom.h>
diff --git a/tderesources/slox/kabcresourceslox_plugin.cpp b/tderesources/slox/kabcresourceslox_plugin.cpp
index cbc02f25e..0ee425179 100644
--- a/tderesources/slox/kabcresourceslox_plugin.cpp
+++ b/tderesources/slox/kabcresourceslox_plugin.cpp
@@ -21,8 +21,8 @@
#include "kabcresourceslox.h"
#include "kabcresourcesloxconfig.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace KABC;
diff --git a/tderesources/slox/kabcresourcesloxconfig.cpp b/tderesources/slox/kabcresourcesloxconfig.cpp
index d9e32a556..72ba39d01 100644
--- a/tderesources/slox/kabcresourcesloxconfig.cpp
+++ b/tderesources/slox/kabcresourcesloxconfig.cpp
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kurlrequester.h>
diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp
index a877622e9..238b71832 100644
--- a/tderesources/slox/kcalresourceslox.cpp
+++ b/tderesources/slox/kcalresourceslox.cpp
@@ -32,7 +32,7 @@
#include <kurl.h>
#include <tdeio/job.h>
#include <tdeio/davjob.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <libtdepim/progressmanager.h>
@@ -48,8 +48,8 @@
#include <libkcal/filestorage.h>
#include <libkcal/confirmsavedialog.h>
-#include <kabc/locknull.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/locknull.h>
+#include <tdeabc/stdaddressbook.h>
#include <tderesources/configwidget.h>
diff --git a/tderesources/slox/kcalresourceslox_plugin.cpp b/tderesources/slox/kcalresourceslox_plugin.cpp
index 8a5cf6906..97e2bbebc 100644
--- a/tderesources/slox/kcalresourceslox_plugin.cpp
+++ b/tderesources/slox/kcalresourceslox_plugin.cpp
@@ -21,8 +21,8 @@
#include "kcalresourcesloxconfig.h"
#include "kcalresourceslox.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace KCal;
diff --git a/tderesources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp
index e09cf85c1..83246a033 100644
--- a/tderesources/slox/kcalresourcesloxconfig.cpp
+++ b/tderesources/slox/kcalresourcesloxconfig.cpp
@@ -24,7 +24,7 @@
#include <tqlayout.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klineedit.h>
diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h
index 214e3c707..8bb7a1b5b 100644
--- a/tderesources/slox/sloxaccounts.h
+++ b/tderesources/slox/sloxaccounts.h
@@ -20,7 +20,7 @@
#ifndef SLOXACCOUNTS_H
#define SLOXACCOUNTS_H
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <tdepimmacros.h>
#include <tqobject.h>
diff --git a/tderesources/slox/sloxfolder.cpp b/tderesources/slox/sloxfolder.cpp
index fbfb9f051..cf75868cb 100644
--- a/tderesources/slox/sloxfolder.cpp
+++ b/tderesources/slox/sloxfolder.cpp
@@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "sloxfolder.h"
diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp
index f7d19697d..716c2d40e 100644
--- a/tderesources/slox/sloxfolderdialog.cpp
+++ b/tderesources/slox/sloxfolderdialog.cpp
@@ -20,7 +20,7 @@
#include <kiconloader.h>
#include <kguiitem.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "sloxfolderdialog.h"
#include "sloxfoldermanager.h"
diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp
index 728420555..d7284d3a0 100644
--- a/tderesources/slox/sloxfoldermanager.cpp
+++ b/tderesources/slox/sloxfoldermanager.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <tdeio/job.h>
#include <tdeio/davjob.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include "sloxbase.h"
diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h
index 136be879e..5b835f2ad 100644
--- a/tderesources/slox/webdavhandler.h
+++ b/tderesources/slox/webdavhandler.h
@@ -26,7 +26,7 @@
#include <tqdom.h>
#include <tdepimmacros.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
namespace KCal {
class Incidence;