CMakeLists.txt conversion/commonconversion.cpp conversion/commonconversion.h conversion/kabcconversion.cpp kolabformatV2/contact.cpp kolabformatV2/incidence.cpp tests/kcalconversiontest.cpp

[Christian Mollekopf]

 CMakeLists.txt                  |    2 +-
 conversion/commonconversion.cpp |    4 ++--
 conversion/commonconversion.h   |    2 +-
 conversion/kabcconversion.cpp   |    3 ++-
 kolabformatV2/contact.cpp       |    3 ++-
 kolabformatV2/incidence.cpp     |    1 -
 tests/kcalconversiontest.cpp    |    2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit d7ad6b7bbe3857cff51240a4679c05a2c68a94dd
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Jul 20 13:22:27 2012 +0200

    Fixed libcalendaring build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f473d3..2887796 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ find_package(Qt4 4.6.0 REQUIRED)
 
 if (USE_LIBCALENDARING)
     find_package(Libcalendaring)
-    macro_log_feature(Libcalendaring_FOUND "Libcalendaring" "KDE Calendaring-Dependencies Library" "http://git.kolab.org/libcalendaring/" TRUE "" "Required if KDE libraries are not available.")
+    macro_log_feature(LIBCALENDARING_FOUND "Libcalendaring" "KDE Calendaring-Dependencies Library" "http://git.kolab.org/libcalendaring/" TRUE "" "Required if KDE libraries are not available.")
 else()
     find_package(KDE4 4.8 REQUIRED)
     find_package(KdepimLibs 4.8 REQUIRED)
diff --git a/conversion/commonconversion.cpp b/conversion/commonconversion.cpp
index 60128f3..41deb9a 100644
--- a/conversion/commonconversion.cpp
+++ b/conversion/commonconversion.cpp
@@ -19,8 +19,8 @@
 #include <kolabformat/errorhandler.h>
 
 #include <iostream>
-#include <KDE/KSystemTimeZones>
-#include <KDE/KDebug>
+#include <ksystemtimezone.h>
+#include <kdebug.h>
 #include <QUrl>
 
 namespace Kolab {
diff --git a/conversion/commonconversion.h b/conversion/commonconversion.h
index 559553e..a4b7a71 100644
--- a/conversion/commonconversion.h
+++ b/conversion/commonconversion.h
@@ -20,7 +20,7 @@
 
 #include "kolab_export.h"
 
-#include <KDE/KDateTime>
+#include <kdatetime.h>
 #include <QStringList>
 #include <kolabcontainers.h>
 
diff --git a/conversion/kabcconversion.cpp b/conversion/kabcconversion.cpp
index b7afce7..d08f264 100644
--- a/conversion/kabcconversion.cpp
+++ b/conversion/kabcconversion.cpp
@@ -21,7 +21,6 @@
 #include <kcalcore/freebusyurlstore.h>
 #include <kdebug.h>
 #include <qbuffer.h>
-#include <kio/netaccess.h>
 #include "kolabformat/errorhandler.h"
 
 namespace Kolab {
@@ -327,6 +326,8 @@ std::string fromPicture(const KABC::Picture &pic, std::string &mimetype)
         }
     } else if ( !pic.url().isEmpty() ) {
         QString tmpFile;
+        kWarning() << "external pictures are currently not supported";
+        //FIXME add kio support to libcalendaring or use libcurl
 //         if ( KIO::NetAccess::download( pic.url(), tmpFile, 0 /*no widget known*/ ) ) {
 //             img.load( tmpFile );
 //             KIO::NetAccess::removeTempFile( tmpFile );
diff --git a/kolabformatV2/contact.cpp b/kolabformatV2/contact.cpp
index 7e0e951..9a02b6d 100644
--- a/kolabformatV2/contact.cpp
+++ b/kolabformatV2/contact.cpp
@@ -34,7 +34,6 @@
 
 #include <kabc/addressee.h>
 #include <kcalcore/freebusyurlstore.h>
-#include <kio/netaccess.h>
 #include <kdebug.h>
 #include <QFile>
 #include <float.h>
@@ -1179,6 +1178,8 @@ QImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
   QImage img;
   if ( !picture.isIntern() && !picture.url().isEmpty() ) {
     QString tmpFile;
+    kWarning() << "external pictures are currently not supported";
+    //FIXME add kio support to libcalendaring or use libcurl
 //     if ( KIO::NetAccess::download( picture.url(), tmpFile, 0 /*no widget known*/ ) ) {
 //       img.load( tmpFile );
 //       KIO::NetAccess::removeTempFile( tmpFile );
diff --git a/kolabformatV2/incidence.cpp b/kolabformatV2/incidence.cpp
index a800193..4ac7a3e 100644
--- a/kolabformatV2/incidence.cpp
+++ b/kolabformatV2/incidence.cpp
@@ -39,7 +39,6 @@
 #include <kcalcore/journal.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
 
 #include <QBitArray>
 
diff --git a/tests/kcalconversiontest.cpp b/tests/kcalconversiontest.cpp
index 0a52108..dceb24d 100644
--- a/tests/kcalconversiontest.cpp
+++ b/tests/kcalconversiontest.cpp
@@ -20,7 +20,7 @@
 
 #include <QtCore/QObject>
 #include <QtTest/QtTest>
-#include <KDE/KSystemTimeZones>
+#include <ksystemtimezone.h>
 #include <kolabcontact.h>
 #include <kcalcore/recurrence.h>
 #include <kabc/addressee.h>