summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-11-22 18:46:43 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-11-22 18:46:43 (GMT)
commit1d4663ecdc7a88fb81bd2b94f039ca68c412eff4 (patch)
tree940c646fdfadd89a44a5760aec60755b2c037cd7
parent25c2bf089bd8d3d74f67eb05ea7e6338523fe3f6 (diff)
downloadkolab-utils-1d4663ecdc7a88fb81bd2b94f039ca68c412eff4.tar.gz
Fixed includes. We must not include kolab/ as LibkolabConfig.cmake already includes "includes/kolab".
-rw-r--r--fbdaemon/authenticationjob.cpp2
-rw-r--r--fbdaemon/fbaggregatorjob.cpp10
-rw-r--r--fbdaemon/fbcoordinator.cpp2
-rw-r--r--fbdaemon/fbgeneratorjob.cpp8
-rw-r--r--fbdaemon/kolabjob.cpp2
-rw-r--r--fbdaemon/settings.cpp2
-rw-r--r--lib/jobs/getuserlistjob.cpp2
-rw-r--r--lib/jobs/imapjob.cpp2
-rw-r--r--lib/jobs/setupkolabfoldersjob.cpp6
-rw-r--r--lib/kolabaccount.cpp4
-rw-r--r--migrationutility/coordinationjob.cpp2
-rw-r--r--migrationutility/kolabserver.cpp2
-rw-r--r--migrationutility/main.cpp2
-rw-r--r--migrationutility/migratefolderjob.cpp2
-rw-r--r--migrationutility/migrateuserjob.cpp2
-rw-r--r--migrationutility/sourceaccount.cpp4
-rw-r--r--migrationutility/sourceserver.cpp4
-rw-r--r--upgradetool/imapupgradejob.cpp4
-rw-r--r--upgradetool/kolabformatupgradejob.cpp4
-rw-r--r--upgradetool/upgradetool.cpp2
-rw-r--r--upgradetool/upgradeutilities.cpp2
21 files changed, 35 insertions, 35 deletions
diff --git a/fbdaemon/authenticationjob.cpp b/fbdaemon/authenticationjob.cpp
index 7e906f7..fa5f03a 100644
--- a/fbdaemon/authenticationjob.cpp
+++ b/fbdaemon/authenticationjob.cpp
@@ -19,7 +19,7 @@
#include "settings.h"
#include <kimap/loginjob.h>
#include <qsettings.h>
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
AuthenticationJob::AuthenticationJob(const SessionSettings &settings, KIMAP::Session *session, QObject* parent)
: KJob(parent),
diff --git a/fbdaemon/fbaggregatorjob.cpp b/fbdaemon/fbaggregatorjob.cpp
index b91984b..73ba2ab 100644
--- a/fbdaemon/fbaggregatorjob.cpp
+++ b/fbdaemon/fbaggregatorjob.cpp
@@ -22,11 +22,11 @@
#include <kdebug.h>
#include <QFile>
#include <QDir>
-#include <kolab/kolabobject.h>
-#include <kolab/kolabdefinitions.h>
-#include <kolab/freebusy.h>
-#include <kolab/errorhandler.h>
-#include <kolab/commonconversion.h>
+#include <kolabobject.h>
+#include <kolabdefinitions.h>
+#include <freebusy.h>
+#include <errorhandler.h>
+#include <commonconversion.h>
FBAggregatorJob::FBAggregatorJob(const SessionSettings& settings, QObject* parent)
: KolabJob(settings, parent)
diff --git a/fbdaemon/fbcoordinator.cpp b/fbdaemon/fbcoordinator.cpp
index 2d39574..b94a501 100644
--- a/fbdaemon/fbcoordinator.cpp
+++ b/fbdaemon/fbcoordinator.cpp
@@ -22,7 +22,7 @@
#include <jobs/getuserlistjob.h>
#include "fbaggregatorjob.h"
#include "authenticationjob.h"
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
#include <jobs/sequentialcompositejob.h>
#include <kimap/logoutjob.h>
diff --git a/fbdaemon/fbgeneratorjob.cpp b/fbdaemon/fbgeneratorjob.cpp
index d55deab..58faff5 100644
--- a/fbdaemon/fbgeneratorjob.cpp
+++ b/fbdaemon/fbgeneratorjob.cpp
@@ -27,10 +27,10 @@
#include "jobs/fetchmessagesjob.h"
#include "jobs/sequentialcompositejob.h"
-#include <kolab/kolabdefinitions.h>
-#include <kolab/kolabobject.h>
-#include <kolab/commonconversion.h>
-#include <kolab/errorhandler.h>
+#include <kolabdefinitions.h>
+#include <kolabobject.h>
+#include <commonconversion.h>
+#include <errorhandler.h>
#include <kdebug.h>
#include <kimap/logoutjob.h>
#include <kimap/expungejob.h>
diff --git a/fbdaemon/kolabjob.cpp b/fbdaemon/kolabjob.cpp
index 23f632b..373b08b 100644
--- a/fbdaemon/kolabjob.cpp
+++ b/fbdaemon/kolabjob.cpp
@@ -19,7 +19,7 @@
#include <QTimer>
#include <kimap/logoutjob.h>
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
#include "uiproxy.h"
#include "authenticationjob.h"
diff --git a/fbdaemon/settings.cpp b/fbdaemon/settings.cpp
index b1fdae5..5e639a5 100644
--- a/fbdaemon/settings.cpp
+++ b/fbdaemon/settings.cpp
@@ -18,7 +18,7 @@
#include "settings.h"
#include <qsettings.h>
#include <QFile>
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
Settings::Settings()
: mTimeframe(-1),
diff --git a/lib/jobs/getuserlistjob.cpp b/lib/jobs/getuserlistjob.cpp
index 3e0b561..c13d513 100644
--- a/lib/jobs/getuserlistjob.cpp
+++ b/lib/jobs/getuserlistjob.cpp
@@ -19,7 +19,7 @@
#include <kimap/listjob.h>
#include <kimap/selectjob.h>
#include <kimap/namespacejob.h>
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
GetUserListJob::GetUserListJob(KIMAP::Session *session, QObject* parent)
diff --git a/lib/jobs/imapjob.cpp b/lib/jobs/imapjob.cpp
index 78a364a..87c2cb0 100644
--- a/lib/jobs/imapjob.cpp
+++ b/lib/jobs/imapjob.cpp
@@ -21,7 +21,7 @@
#include <jobs/probekolabserverjob.h>
#include <QTimer>
#include <kimap/logoutjob.h>
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
class UiProxy: public KIMAP::SessionUiProxy {
public:
diff --git a/lib/jobs/setupkolabfoldersjob.cpp b/lib/jobs/setupkolabfoldersjob.cpp
index 295658d..143cae9 100644
--- a/lib/jobs/setupkolabfoldersjob.cpp
+++ b/lib/jobs/setupkolabfoldersjob.cpp
@@ -22,9 +22,9 @@
#include <kimap/setmetadatajob.h>
#include <QStringList>
-#include <kolab/errorhandler.h>
-#include <kolab/kolabdefinitions.h>
-#include <kolab/formathelpers.h>
+#include <errorhandler.h>
+#include <kolabdefinitions.h>
+#include <formathelpers.h>
SetupKolabFoldersJob::SetupKolabFoldersJob(const QStringList &serverCapabilities, QString rootFolder, KIMAP::Session* session, QObject* parent)
: KJob(parent),
diff --git a/lib/kolabaccount.cpp b/lib/kolabaccount.cpp
index 4a52c06..e82f4a2 100644
--- a/lib/kolabaccount.cpp
+++ b/lib/kolabaccount.cpp
@@ -31,8 +31,8 @@
#include <kimap/selectjob.h>
#include <kimap/expungejob.h>
#include <kimap/setmetadatajob.h>
-#include <kolab/errorhandler.h>
-#include <kolab/kolabdefinitions.h>
+#include <errorhandler.h>
+#include <kolabdefinitions.h>
#include <formathelpers.h>
#include <kolabobject.h>
diff --git a/migrationutility/coordinationjob.cpp b/migrationutility/coordinationjob.cpp
index 57b68e6..583c4d1 100644
--- a/migrationutility/coordinationjob.cpp
+++ b/migrationutility/coordinationjob.cpp
@@ -19,7 +19,7 @@
#include "sourceserver.h"
#include "kolabserver.h"
#include "migrateuserjob.h"
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
#include <QDebug>
CoordinationJob::CoordinationJob(SourceServer *sourceServer, KolabServer *kolabServer, QObject* parent)
diff --git a/migrationutility/kolabserver.cpp b/migrationutility/kolabserver.cpp
index a967bc3..b04307f 100644
--- a/migrationutility/kolabserver.cpp
+++ b/migrationutility/kolabserver.cpp
@@ -17,7 +17,7 @@
#include "kolabserver.h"
#include "kolabaccount.h"
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
KolabServer::KolabServer(QObject* parent)
: QObject(parent),
diff --git a/migrationutility/main.cpp b/migrationutility/main.cpp
index f475ada..57034d1 100644
--- a/migrationutility/main.cpp
+++ b/migrationutility/main.cpp
@@ -19,7 +19,7 @@
#include <QtCore/QStringList>
#include <QtCore/qfile.h>
#include <kcmdlineargs.h>
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
#include "coordinationjob.h"
#include "sourceserver.h"
diff --git a/migrationutility/migratefolderjob.cpp b/migrationutility/migratefolderjob.cpp
index e3b05b6..b1ecb10 100644
--- a/migrationutility/migratefolderjob.cpp
+++ b/migrationutility/migratefolderjob.cpp
@@ -18,7 +18,7 @@
#include "migratefolderjob.h"
#include "sourceaccount.h"
#include "kolabaccount.h"
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
MigrateFolderJob::MigrateFolderJob(const QString &folder, SourceAccount* sourceAccount, KolabAccount *kolabAccount, QObject* parent)
: mSourceAccount(sourceAccount),
diff --git a/migrationutility/migrateuserjob.cpp b/migrationutility/migrateuserjob.cpp
index f46afee..c83412e 100644
--- a/migrationutility/migrateuserjob.cpp
+++ b/migrationutility/migrateuserjob.cpp
@@ -19,7 +19,7 @@
#include "migratefolderjob.h"
#include "sourceaccount.h"
#include "kolabaccount.h"
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
MigrateUserJob::MigrateUserJob(SourceAccount *sourceAccount, KolabAccount *kolabAccount, QObject* parent)
: KJob(parent),
diff --git a/migrationutility/sourceaccount.cpp b/migrationutility/sourceaccount.cpp
index 7966454..1786fe9 100644
--- a/migrationutility/sourceaccount.cpp
+++ b/migrationutility/sourceaccount.cpp
@@ -24,8 +24,8 @@
#include <kimap/logoutjob.h>
#include <kimap/capabilitiesjob.h>
#include <kimap/namespacejob.h>
-#include <kolab/errorhandler.h>
-#include <kolab/kolabobject.h>
+#include <errorhandler.h>
+#include <kolabobject.h>
#include <kabc/vcardconverter.h>
#include <kcalcore/memorycalendar.h>
#include <kcalcore/icalformat.h>
diff --git a/migrationutility/sourceserver.cpp b/migrationutility/sourceserver.cpp
index 3630c2e..ae8fd9e 100644
--- a/migrationutility/sourceserver.cpp
+++ b/migrationutility/sourceserver.cpp
@@ -20,8 +20,8 @@
#include <jobs/getuserlistjob.h>
#include <kimap/listjob.h>
#include <kimap/logoutjob.h>
-#include <kolab/commonconversion.h>
-#include <kolab/errorhandler.h>
+#include <commonconversion.h>
+#include <errorhandler.h>
SourceServer::SourceServer(QObject* parent): QObject(parent)
diff --git a/upgradetool/imapupgradejob.cpp b/upgradetool/imapupgradejob.cpp
index ec8d1fd..36f70fc 100644
--- a/upgradetool/imapupgradejob.cpp
+++ b/upgradetool/imapupgradejob.cpp
@@ -32,8 +32,8 @@
#include <kimap/capabilitiesjob.h>
#include <kmime/kmime_message.h>
-#include <kolab/errorhandler.h>
-#include <kolab/kolabdefinitions.h>
+#include <errorhandler.h>
+#include <kolabdefinitions.h>
class UiProxy: public KIMAP::SessionUiProxy {
public:
diff --git a/upgradetool/kolabformatupgradejob.cpp b/upgradetool/kolabformatupgradejob.cpp
index 4c48d37..eaf004f 100644
--- a/upgradetool/kolabformatupgradejob.cpp
+++ b/upgradetool/kolabformatupgradejob.cpp
@@ -22,8 +22,8 @@
#include "upgradeutilities.h"
#include "jobs/sequentialcompositejob.h"
#include "jobs/messagemodifyjob.h"
-#include <kolab/kolabobject.h>
-#include <kolab/errorhandler.h>
+#include <kolabobject.h>
+#include <errorhandler.h>
#include <kimap/selectjob.h>
#include <kimap/fetchjob.h>
diff --git a/upgradetool/upgradetool.cpp b/upgradetool/upgradetool.cpp
index 0c816fc..6fc1501 100644
--- a/upgradetool/upgradetool.cpp
+++ b/upgradetool/upgradetool.cpp
@@ -20,7 +20,7 @@
#include <QtCore/qfile.h>
#include <kdebug.h>
#include <kcmdlineargs.h>
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
#include "upgradeutilities.h"
#include "imapupgradejob.h"
diff --git a/upgradetool/upgradeutilities.cpp b/upgradetool/upgradeutilities.cpp
index 0bf6c6a..0b47d1e 100644
--- a/upgradetool/upgradeutilities.cpp
+++ b/upgradetool/upgradeutilities.cpp
@@ -23,7 +23,7 @@
#include <kolabevent.h>
#include <kolabformat.h>
-#include <kolab/errorhandler.h>
+#include <errorhandler.h>
namespace Kolab {
namespace Upgrade {