summaryrefslogtreecommitdiffstats
path: root/tderesources/groupwise
diff options
context:
space:
mode:
Diffstat (limited to 'tderesources/groupwise')
-rw-r--r--tderesources/groupwise/kabc_resourcegroupwise.cpp6
-rw-r--r--tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp4
-rw-r--r--tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp2
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwise.cpp4
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwise.h2
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp4
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp2
-rw-r--r--tderesources/groupwise/soap/contactconverter.cpp2
-rw-r--r--tderesources/groupwise/soap/contactconverter.h2
-rw-r--r--tderesources/groupwise/soap/groupwiseserver.cpp10
-rw-r--r--tderesources/groupwise/soap/groupwiseserver.h2
-rw-r--r--tderesources/groupwise/soap/gwjobs.cpp6
-rw-r--r--tderesources/groupwise/soap/gwjobs.h2
-rw-r--r--tderesources/groupwise/soap/incidenceconverter.cpp6
-rw-r--r--tderesources/groupwise/soap/ksslsocket.cpp4
-rw-r--r--tderesources/groupwise/soap/soapdebug.cpp2
-rw-r--r--tderesources/groupwise/tdeioslave/groupwise.cpp8
17 files changed, 34 insertions, 34 deletions
diff --git a/tderesources/groupwise/kabc_resourcegroupwise.cpp b/tderesources/groupwise/kabc_resourcegroupwise.cpp
index cf5c4e95d..8499aa9ff 100644
--- a/tderesources/groupwise/kabc_resourcegroupwise.cpp
+++ b/tderesources/groupwise/kabc_resourcegroupwise.cpp
@@ -21,11 +21,11 @@
#include <tqapplication.h>
#include <tqfile.h>
-#include <kabc/addressee.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/vcardconverter.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kabc_groupwiseprefs.h"
diff --git a/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp b/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp
index 3f973bc52..e71a66e5e 100644
--- a/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp
+++ b/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp
@@ -21,8 +21,8 @@
#include "kabc_resourcegroupwise.h"
#include "kabc_resourcegroupwiseconfig.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace KABC;
diff --git a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp
index 0f35e5b4c..1212a6bc5 100644
--- a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp
+++ b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp
@@ -26,7 +26,7 @@
#include <kcombobox.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <tdelistview.h>
#include <kurlrequester.h>
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp
index 7471b7cd6..0d385ae98 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise.cpp
+++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp
@@ -36,9 +36,9 @@
#include <tqstringlist.h>
#include <tqtimer.h>
-#include <kabc/locknull.h>
+#include <tdeabc/locknull.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tderesources/configwidget.h>
#include <kstandarddirs.h>
#include <kstringhandler.h>
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h
index f4417079c..e1cab8758 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise.h
+++ b/tderesources/groupwise/kcal_resourcegroupwise.h
@@ -27,7 +27,7 @@
#include <libkcal/resourcecached.h>
-#include <kabc/locknull.h>
+#include <tdeabc/locknull.h>
#include <tdeio/job.h>
#include <tdeconfig.h>
#include <tdepimmacros.h>
diff --git a/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp b/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp
index 1c1df762f..3bd7d088d 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp
+++ b/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp
@@ -21,8 +21,8 @@
#include "kcal_resourcegroupwise.h"
#include "kcal_resourcegroupwiseconfig.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace KCal;
diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
index 5f0152a21..cb9f44936 100644
--- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -24,7 +24,7 @@
#include <tqlayout.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <kdebug.h>
#include <kdialogbase.h>
diff --git a/tderesources/groupwise/soap/contactconverter.cpp b/tderesources/groupwise/soap/contactconverter.cpp
index 69c4b90f2..1ce391381 100644
--- a/tderesources/groupwise/soap/contactconverter.cpp
+++ b/tderesources/groupwise/soap/contactconverter.cpp
@@ -21,7 +21,7 @@
#include "contactconverter.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
ContactConverter::ContactConverter( struct soap* soap )
: GWConverter( soap )
diff --git a/tderesources/groupwise/soap/contactconverter.h b/tderesources/groupwise/soap/contactconverter.h
index 7dbc8c79c..2f98a328c 100644
--- a/tderesources/groupwise/soap/contactconverter.h
+++ b/tderesources/groupwise/soap/contactconverter.h
@@ -21,7 +21,7 @@
#ifndef KABC_GW_CONTACTCONVERTER_H
#define KABC_GW_CONTACTCONVERTER_H
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include "gwconverter.h"
diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp
index 780708347..4e2810777 100644
--- a/tderesources/groupwise/soap/groupwiseserver.cpp
+++ b/tderesources/groupwise/soap/groupwiseserver.cpp
@@ -27,16 +27,16 @@
#include <libkcal/incidence.h>
#include <libtdepim/kpimprefs.h>
-#include <kabc/addressee.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseelist.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <tdeio/netaccess.h>
-#include <kprotocolmanager.h>
-#include <ktempfile.h>
+#include <tdeprotocolmanager.h>
+#include <tdetempfile.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqnamespace.h>
#include <tqfile.h>
diff --git a/tderesources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h
index e1c25c0f3..71c6f6d54 100644
--- a/tderesources/groupwise/soap/groupwiseserver.h
+++ b/tderesources/groupwise/soap/groupwiseserver.h
@@ -32,7 +32,7 @@
#include <string>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <libkcal/freebusy.h>
#include "gwjobs.h"
diff --git a/tderesources/groupwise/soap/gwjobs.cpp b/tderesources/groupwise/soap/gwjobs.cpp
index 343a4a208..435bb2aef 100644
--- a/tderesources/groupwise/soap/gwjobs.cpp
+++ b/tderesources/groupwise/soap/gwjobs.cpp
@@ -19,9 +19,9 @@
*/
#include <kdebug.h>
-#include <klocale.h>
-#include <kabc/addressee.h>
-#include <kabc/resource.h>
+#include <tdelocale.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/resource.h>
#include <libkcal/incidence.h>
#include <libkcal/resourcecached.h>
diff --git a/tderesources/groupwise/soap/gwjobs.h b/tderesources/groupwise/soap/gwjobs.h
index bf60ecbd9..e3ce4a2fa 100644
--- a/tderesources/groupwise/soap/gwjobs.h
+++ b/tderesources/groupwise/soap/gwjobs.h
@@ -24,7 +24,7 @@
#include <string>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
namespace KABC {
class Resource;
diff --git a/tderesources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp
index 79ad94a57..580d84e6e 100644
--- a/tderesources/groupwise/soap/incidenceconverter.cpp
+++ b/tderesources/groupwise/soap/incidenceconverter.cpp
@@ -18,15 +18,15 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmdcodec.h>
#include <libtdepim/kpimprefs.h>
#include <libkcal/event.h>
#include <libkcal/journal.h>
#include <libkcal/recurrence.h>
#include <libkcal/kcalversion.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
#include <kdebug.h>
#include "incidenceconverter.h"
diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp
index 16ddf70db..6bf74da55 100644
--- a/tderesources/groupwise/soap/ksslsocket.cpp
+++ b/tderesources/groupwise/soap/ksslsocket.cpp
@@ -20,7 +20,7 @@
#include <tqsocketnotifier.h>
#include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kssl.h>
#include <ksslinfodlg.h>
@@ -28,7 +28,7 @@
#include <ksslcertchain.h>
#include <ksslcertificatecache.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "ksslsocket.h"
diff --git a/tderesources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp
index 5ea29cbea..3c9cfc802 100644
--- a/tderesources/groupwise/soap/soapdebug.cpp
+++ b/tderesources/groupwise/soap/soapdebug.cpp
@@ -5,7 +5,7 @@
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kabcresourcecached.h>
diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp
index fb58643cb..4eb240240 100644
--- a/tderesources/groupwise/tdeioslave/groupwise.cpp
+++ b/tderesources/groupwise/tdeioslave/groupwise.cpp
@@ -30,14 +30,14 @@
#include <libkcal/scheduler.h>
#include <libkcal/calendarlocal.h>
-#include <kabc/addressee.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/vcardconverter.h>
#include <kinstance.h>
#include <tdeio/global.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
#include <tdeversion.h>
#include <sys/types.h>