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

List:       kde-commits
Subject:    KDE/kdepimlibs/akonadi
From:       Volker Krause <vkrause () kde ! org>
Date:       2008-03-21 13:03:37
Message-ID: 1206104617.652091.23324.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 788374 by vkrause:

move libakonadi-kmime here


 M  +1 -0      CMakeLists.txt  
 A             kmime (directory)   trunk/KDE/kdepim/akonadi/kmime#788366
 M  +6 -6      kmime/CMakeLists.txt  
 M  +1 -1      kmime/Mainpage.dox  
 A             kmime/akonadi-kmime_export.h   [License: LGPL (v2+)]
 M  +2 -2      kmime/messagemodel.cpp  
 M  +3 -3      kmime/messagemodel.h  
 M  +11 -10    kmime/messagethreaderproxymodel.cpp  
 M  +1 -1      kmime/messagethreaderproxymodel.h  


--- trunk/KDE/kdepimlibs/akonadi/CMakeLists.txt #788373:788374
@@ -22,6 +22,7 @@
 
 configure_file(akonadi-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/akonadi-prefix.h)
 
+add_subdirectory( kmime )
 add_subdirectory( tests )
 
 include_directories(
--- trunk/KDE/kdepimlibs/akonadi/kmime/CMakeLists.txt #788366:788374
@@ -1,6 +1,5 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}/
-	${CMAKE_SOURCE_DIR}/akonadi
 	${QT_QTDBUS_INCLUDE_DIR}
         ${Boost_INCLUDE_DIR}
 )
@@ -14,16 +13,17 @@
   messagethreaderproxymodel.cpp
 )
 
-kde4_add_library( kmimeakonadi SHARED ${kmimeakonadi_LIB_SRC} )
+kde4_add_library( akonadi-kmime SHARED ${kmimeakonadi_LIB_SRC} )
 
-target_link_libraries( kmimeakonadi akonadicore ${KDE4_KMIME_LIBS} )
-set_target_properties( kmimeakonadi PROPERTIES VERSION ${GENERIC_LIB_VERSION} \
                SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kmimeakonadi DESTINATION ${LIB_INSTALL_DIR})
+target_link_libraries( akonadi-kmime akonadi-kde kmime )
+set_target_properties( akonadi-kmime PROPERTIES VERSION ${GENERIC_LIB_VERSION} \
SOVERSION ${GENERIC_LIB_SOVERSION} ) +install(TARGETS akonadi-kmime DESTINATION \
${LIB_INSTALL_DIR})  
 ########### install files ###############
 
 install( FILES
+  akonadi-kmime_export.h
   messagemodel.h
   messagethreaderproxymodel.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/libakonadi/kmime
+  DESTINATION ${INCLUDE_INSTALL_DIR}/akonadi/kmime
 )
--- trunk/KDE/kdepimlibs/akonadi/kmime/Mainpage.dox #788366:788374
@@ -1 +1 @@
-// DOXYGEN_REFERENCES = kdecore kmime akonadi/libakonadi
+// DOXYGEN_REFERENCES = kdecore kmime akonadi
--- trunk/KDE/kdepimlibs/akonadi/kmime/messagemodel.cpp #788366:788374
@@ -19,8 +19,8 @@
 
 #include "messagemodel.h"
 
-#include <libakonadi/monitor.h>
-#include <libakonadi/session.h>
+#include <akonadi/monitor.h>
+#include <akonadi/session.h>
 
 #include <kmime/kmime_message.h>
 #include <boost/shared_ptr.hpp>
--- trunk/KDE/kdepimlibs/akonadi/kmime/messagemodel.h #788366:788374
@@ -20,9 +20,9 @@
 #ifndef AKONADI_MESSAGEMODEL_H
 #define AKONADI_MESSAGEMODEL_H
 
-#include <libakonadi/akonadi_export.h>
-#include <libakonadi/itemmodel.h>
-#include <libakonadi/job.h>
+#include "akonadi-kmime_export.h"
+#include <akonadi/itemmodel.h>
+#include <akonadi/job.h>
 
 namespace Akonadi {
 
--- trunk/KDE/kdepimlibs/akonadi/kmime/messagethreaderproxymodel.cpp #788366:788374
@@ -18,10 +18,10 @@
 */
 
 #include "messagethreaderproxymodel.h"
-#include <libakonadi/itemfetchjob.h>
-#include <agents/mailthreader/mailthreaderagent.h>
-#include <messagemodel.h>
-#include <libakonadi/datareference.h>
+#include <akonadi/itemfetchjob.h>
+//#include <agents/mailthreader/mailthreaderagent.h>
+#include "messagemodel.h"
+#include <akonadi/datareference.h>
 
 #include <QtCore/QString>
 #include <QtCore/QStringList>
@@ -29,6 +29,13 @@
 #include <QtCore/QTime>
 #include <QtCore/QModelIndex>
 
+// ### Awful ! Already in mailthreaderagent.cpp ; just for testing purposes, though
+namespace MailThreaderAgent {
+const QLatin1String PartPerfectParents = QLatin1String( \
"AkonadiMailThreaderAgentPerfectParents" ); +const QLatin1String PartUnperfectParents \
= QLatin1String( "AkonadiMailThreaderAgentUnperfectParents"); +const QLatin1String \
PartSubjectParents = QLatin1String( "AkonadiMailThreaderAgentSubjectParents" ); +}
+
 using namespace Akonadi;
 
 class MessageThreaderProxyModel::Private
@@ -294,12 +301,6 @@
   delete d;
 }
 
-
-// ### Awful ! Already in mailthreaderagent.cpp ; just for testing purposes, though
-const QLatin1String MailThreaderAgent::PartPerfectParents = QLatin1String( \
                "AkonadiMailThreaderAgentPerfectParents" );
-const QLatin1String MailThreaderAgent::PartUnperfectParents = QLatin1String( \
                "AkonadiMailThreaderAgentUnperfectParents");
-const QLatin1String MailThreaderAgent::PartSubjectParents = QLatin1String( \
                "AkonadiMailThreaderAgentSubjectParents" );
-
 QModelIndex MessageThreaderProxyModel::index( int row, int column, const \
QModelIndex& parent ) const  {
   int parentId = d->idForIndex( parent );
--- trunk/KDE/kdepimlibs/akonadi/kmime/messagethreaderproxymodel.h #788366:788374
@@ -20,7 +20,7 @@
 #ifndef AKONADI_MESSAGETHREADERPROXYMODEL_H
 #define AKONADI_MESSAGETHREADERPROXYMODEL_H
 
-#include <libakonadi/akonadi_export.h>
+#include "akonadi-kmime_export.h"
 #include <QtGui/QAbstractProxyModel>
 #include <QtCore/QModelIndex>
 


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