[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/libkcal
From:       Volker Krause <volker.krause () rwth-aachen ! de>
Date:       2006-04-29 14:35:48
Message-ID: 1146321348.687420.30694.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 535400 by vkrause:

No need to link to libkmime just for base64 coding, QByteArray can do
this as well.


 M  +2 -2      CMakeLists.txt  
 M  +2 -8      attachment.cpp  


--- trunk/KDE/kdepim/libkcal/CMakeLists.txt #535399:535400
@@ -12,7 +12,6 @@
 	${CMAKE_SOURCE_DIR}/
 	${CMAKE_SOURCE_DIR}/ktnef
 	${CMAKE_SOURCE_DIR}/libemailfunctions
-	${CMAKE_SOURCE_DIR}/libkmime
 	${KDE4_INCLUDES}
 )
 
@@ -196,6 +195,7 @@
 ########### next target ###############
 
 set(kcal_LIB_SRCS ${libversit_SRCS} ${libical_SRCS} ${libicalss_SRCS}
+   ${libemailfunctions_SRCS}
    incidencebase.cpp 
    incidence.cpp 
    journal.cpp 
@@ -249,7 +249,7 @@
 
 kde4_add_library(kcal SHARED ${kcal_LIB_SRCS})
 
-target_link_libraries(kcal  ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTXML_LIBRARY} ktnef kmime kresources kabc  )
+target_link_libraries(kcal  ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTXML_LIBRARY} ktnef kresources kabc  )
 
 set_target_properties(kcal PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install_targets(${LIB_INSTALL_DIR} kcal )
--- trunk/KDE/kdepim/libkcal/attachment.cpp #535399:535400
@@ -21,8 +21,6 @@
 
 #include "attachment.h"
 
-#include <libkmime/kmime_codecs.h>
-//Added by qt3to4:
 #include <QByteArray>
 
 using namespace KCal;
@@ -106,10 +104,7 @@
 QByteArray &Attachment::decodedData() const
 {
   if ( d->mDataCache.isNull() ) {
-    QByteArray in;
-    const QByteArray data = mData.toUtf8();
-    KMime::Codec * codec = KMime::Codec::codecForName( "base64" );
-    d->mDataCache = codec->decode( data );
+    d->mDataCache = QByteArray::fromBase64( mData.toUtf8() );
   }
   
   return d->mDataCache;
@@ -117,8 +112,7 @@
 
 void Attachment::setDecodedData( const QByteArray &data )
 {
-  KMime::Codec *codec = KMime::Codec::codecForName( "base64" );
-  setData( codec->encode( data ).data() );
+  setData( data.toBase64() );
   d->mDataCache = data;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]