summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2012-06-27 07:44:58 (GMT)
committerChristian Mollekopf <chrigi_1@fastmail.fm>2012-06-27 07:44:58 (GMT)
commitebd590406589e76676064ef301c681d61f6f5b4f (patch)
tree93ddd90223a38d9570e3061680ee99810c34dfc7
parenta79b766c00ffd198cde3601011503c4bf203efbf (diff)
downloadlibcalendaring-ebd590406589e76676064ef301c681d61f6f5b4f.tar.gz
kimap compiles and contains everything for it to work
-rw-r--r--kimap/CMakeLists.txt68
-rw-r--r--kimap/acljobbase.cpp1
-rw-r--r--kimap/appendjob.cpp1
-rw-r--r--kimap/capabilitiesjob.cpp1
-rw-r--r--kimap/closejob.cpp1
-rw-r--r--kimap/copyjob.cpp1
-rw-r--r--kimap/createjob.cpp2
-rw-r--r--kimap/deleteacljob.cpp2
-rw-r--r--kimap/deletejob.cpp1
-rw-r--r--kimap/expungejob.cpp1
-rw-r--r--kimap/fetchjob.cpp2
-rw-r--r--kimap/getacljob.cpp1
-rw-r--r--kimap/getmetadatajob.cpp1
-rw-r--r--kimap/getquotajob.cpp1
-rw-r--r--kimap/getquotarootjob.cpp1
-rw-r--r--kimap/idlejob.cpp2
-rw-r--r--kimap/job.cpp6
-rw-r--r--kimap/job.h2
-rw-r--r--kimap/listjob.cpp2
-rw-r--r--kimap/listrightsjob.cpp2
-rw-r--r--kimap/loginjob.cpp2
-rw-r--r--kimap/logoutjob.cpp1
-rw-r--r--kimap/metadatajobbase.cpp2
-rw-r--r--kimap/myrightsjob.cpp1
-rw-r--r--kimap/namespacejob.cpp1
-rw-r--r--kimap/quotajobbase.cpp2
-rw-r--r--kimap/renamejob.cpp2
-rw-r--r--kimap/searchjob.cpp1
-rw-r--r--kimap/selectjob.cpp1
-rw-r--r--kimap/session.cpp4
-rw-r--r--kimap/sessionthread.cpp2
-rw-r--r--kimap/setacljob.cpp1
-rw-r--r--kimap/setmetadatajob.cpp1
-rw-r--r--kimap/setquotajob.cpp1
-rw-r--r--kimap/storejob.cpp1
-rw-r--r--kimap/subscribejob.cpp2
-rw-r--r--kimap/unsubscribejob.cpp2
37 files changed, 97 insertions, 29 deletions
diff --git a/kimap/CMakeLists.txt b/kimap/CMakeLists.txt
index d5ed81d..e05b1cc 100644
--- a/kimap/CMakeLists.txt
+++ b/kimap/CMakeLists.txt
@@ -96,22 +96,70 @@ set(kimap_LIB_SRCS
getmetadatajob.cpp
)
-# QT4_AUTOMOC(${kimap_LIB_SRCS})
-QT4_WRAP_CPP(MOC ${kimap_LIB_SRCS})
+# MOCFILES
+
+# foreach (SOURCEFILE ${kimap_LIB_SRCS})
+# string (REGEX REPLACE "^(.+)\\.cpp" "\\1.h" HEADERFILE ${SOURCEFILE})
+# QT4_WRAP_CPP(MOC ${HEADERFILE})
+# set(MOCFILES "${MOCFILES} ${MOC}")
+# endforeach()
+#
+# include_directories(${CMAKE_CURRENT_BINARY_DIR})
+#
+# message("${kimap_LIB_HEADERS}")
+
+
+QT4_AUTOMOC("${kimap_LIB_SRCS}")
+# QT4_WRAP_CPP(MOC ${kimap_LIB_HEADERS})
+# message("${MOC}")
+# QT4_GENERATE_MOC(fetchjob.h moc_fetchjob.cpp)
+# QT4_GENERATE_MOC(idlejob.h moc_idlejob.cpp)
+# QT4_GENERATE_MOC(listjob.h moc_listjob.cpp)
+# QT4_GENERATE_MOC(loginjob.h moc_loginjob.cpp)
+# QT4_GENERATE_MOC(session.h moc_session.cpp)
+# QT4_GENERATE_MOC(session_p.h moc_session_p.cpp)
+
+# QT4_WRAP_CPP(MOCFILES
+# job.h
+# fetchjob.h
+# idlejob.h
+# listjob.h
+# loginjob.h
+# session.h
+# session_p.h
+# sessionthread_p.h
+# namespacejob.h
+# deletejob.h
+# getquotajob.h
+# getmetadatajob.h
+# listrightsjob.h
+# metadatajobbase.h
+# )
+# add_custom_target(dummy ALL DEPENDS ${MOCFILES})
+#
+# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/deleteacljob.h ${CMAKE_CURRENT_BINARY_DIR}/deleteacljob.moc)
+# message("${CMAKE_CURRENT_SOURCE_DIR}/deleteacljob.h")
+# message("${CMAKE_CURRENT_BINARY_DIR}/deleteacljob.moc")
+# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/closejob.h ${CMAKE_CURRENT_BINARY_DIR}/closejob.moc)
+# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/getquotajob.h ${CMAKE_CURRENT_BINARY_DIR}/getquotajob.moc)
+# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/expungejob.h ${CMAKE_CURRENT_BINARY_DIR}/expungejob.moc)
+# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/selectjob.h ${CMAKE_CURRENT_BINARY_DIR}/selectjob.moc)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_library(calendaring-kimap ${LIBRARY_TYPE} ${kimap_LIB_SRCS} ${MOC})
+add_library(calendaring-kimap ${LIBRARY_TYPE} ${kimap_LIB_SRCS} )
-target_link_libraries(calendaring-kimap kdecore ${QT_QTNETWORK_LIBRARY} calendaring-kmime ${SASL2_LIBRARIES})
+target_link_libraries(calendaring-kimap kdecore ${QT_QTNETWORK_LIBRARY} ${QT_QTCORE_LIBRARY} calendaring-kmime ${SASL2_LIBRARIES})
include_directories( ${SASL2_INCLUDE_DIR} ${Boost_INCLUDE_DIR} )
set_target_properties(calendaring-kimap PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-# install(TARGETS kimap EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS calendaring-kimap EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
-# install( FILES kimap_export.h acl.h imapset.h job.h appendjob.h capabilitiesjob.h fetchjob.h idlejob.h listjob.h loginjob.h logoutjob.h namespacejob.h rfccodecs.h
-# selectjob.h closejob.h expungejob.h deletejob.h createjob.h subscribejob.h unsubscribejob.h renamejob.h
-# session.h sessionuiproxy.h storejob.h copyjob.h searchjob.h acljobbase.h setacljob.h getacljob.h deleteacljob.h
-# myrightsjob.h listrightsjob.h quotajobbase.h setquotajob.h getquotajob.h getquotarootjob.h metadatajobbase.h setmetadatajob.h getmetadatajob.h
-# DESTINATION ${INCLUDE_INSTALL_DIR}/kimap COMPONENT Devel)
+install( FILES kimap_export.h acl.h imapset.h job.h appendjob.h capabilitiesjob.h fetchjob.h idlejob.h listjob.h loginjob.h logoutjob.h namespacejob.h rfccodecs.h
+ selectjob.h closejob.h expungejob.h deletejob.h createjob.h subscribejob.h unsubscribejob.h renamejob.h
+ session.h sessionuiproxy.h storejob.h copyjob.h searchjob.h acljobbase.h setacljob.h getacljob.h deleteacljob.h
+ myrightsjob.h listrightsjob.h quotajobbase.h setquotajob.h getquotajob.h getquotarootjob.h metadatajobbase.h setmetadatajob.h getmetadatajob.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kimap COMPONENT Devel)
diff --git a/kimap/acljobbase.cpp b/kimap/acljobbase.cpp
index 7a83627..db5d961 100644
--- a/kimap/acljobbase.cpp
+++ b/kimap/acljobbase.cpp
@@ -97,3 +97,4 @@ QString AclJobBase::mailBox() const
return d->mailBox;
}
+#include "acljobbase.moc" \ No newline at end of file
diff --git a/kimap/appendjob.cpp b/kimap/appendjob.cpp
index 2125f17..7d8104c 100644
--- a/kimap/appendjob.cpp
+++ b/kimap/appendjob.cpp
@@ -136,3 +136,4 @@ void AppendJob::handleResponse( const Message &response )
}
}
+#include "appendjob.moc"
diff --git a/kimap/capabilitiesjob.cpp b/kimap/capabilitiesjob.cpp
index 3e7b2ff..c21938c 100644
--- a/kimap/capabilitiesjob.cpp
+++ b/kimap/capabilitiesjob.cpp
@@ -75,3 +75,4 @@ void CapabilitiesJob::handleResponse( const Message &response )
}
}
+#include "capabilitiesjob.moc"
diff --git a/kimap/closejob.cpp b/kimap/closejob.cpp
index d3f3d8f..18abf79 100644
--- a/kimap/closejob.cpp
+++ b/kimap/closejob.cpp
@@ -52,3 +52,4 @@ void CloseJob::doStart()
d->tags << d->sessionInternal()->sendCommand( "CLOSE" );
}
+#include "closejob.moc"
diff --git a/kimap/copyjob.cpp b/kimap/copyjob.cpp
index fe4d9d8..de41458 100644
--- a/kimap/copyjob.cpp
+++ b/kimap/copyjob.cpp
@@ -133,3 +133,4 @@ void CopyJob::handleResponse( const Message &response )
handleErrorReplies( response );
}
+#include "copyjob.moc"
diff --git a/kimap/createjob.cpp b/kimap/createjob.cpp
index e26cf19..43a06dd 100644
--- a/kimap/createjob.cpp
+++ b/kimap/createjob.cpp
@@ -68,4 +68,4 @@ QString CreateJob::mailBox() const
return d->mailBox;
}
-
+#include "createjob.moc"
diff --git a/kimap/deleteacljob.cpp b/kimap/deleteacljob.cpp
index 7d81110..d19d081 100644
--- a/kimap/deleteacljob.cpp
+++ b/kimap/deleteacljob.cpp
@@ -69,4 +69,4 @@ QByteArray DeleteAclJob::identifier()
return d->identifier();
}
-
+#include "deleteacljob.moc"
diff --git a/kimap/deletejob.cpp b/kimap/deletejob.cpp
index b24ff94..28debaf 100644
--- a/kimap/deletejob.cpp
+++ b/kimap/deletejob.cpp
@@ -68,3 +68,4 @@ QString DeleteJob::mailBox() const
return d->mailBox;
}
+#include "deletejob.moc" \ No newline at end of file
diff --git a/kimap/expungejob.cpp b/kimap/expungejob.cpp
index 8f7a1b0..5966f21 100644
--- a/kimap/expungejob.cpp
+++ b/kimap/expungejob.cpp
@@ -81,3 +81,4 @@ void ExpungeJob::handleResponse( const Message &response )
}
}
+#include "expungejob.moc"
diff --git a/kimap/fetchjob.cpp b/kimap/fetchjob.cpp
index 044e4ad..f820b70 100644
--- a/kimap/fetchjob.cpp
+++ b/kimap/fetchjob.cpp
@@ -528,4 +528,4 @@ void FetchJobPrivate::skipLeadingSpaces( const QByteArray &structure, int &pos )
while ( structure[pos]==' ' && pos<structure.size() ) pos++;
}
-// #include "moc_fetchjob.cpp"
+#include "fetchjob.moc"
diff --git a/kimap/getacljob.cpp b/kimap/getacljob.cpp
index 9e51ddb..b170c09 100644
--- a/kimap/getacljob.cpp
+++ b/kimap/getacljob.cpp
@@ -111,3 +111,4 @@ QMap<QByteArray, Acl::Rights> GetAclJob::allRights() const
return d->userRights;
}
+#include "getacljob.moc" \ No newline at end of file
diff --git a/kimap/getmetadatajob.cpp b/kimap/getmetadatajob.cpp
index 1e41361..e6a800e 100644
--- a/kimap/getmetadatajob.cpp
+++ b/kimap/getmetadatajob.cpp
@@ -209,3 +209,4 @@ QMap<QByteArray, QMap<QByteArray, QByteArray> > GetMetaDataJob::allMetaData(cons
return d->metadata[mailBox];
}
+#include "getmetadatajob.moc" \ No newline at end of file
diff --git a/kimap/getquotajob.cpp b/kimap/getquotajob.cpp
index 3f6e5e1..52a67bd 100644
--- a/kimap/getquotajob.cpp
+++ b/kimap/getquotajob.cpp
@@ -81,3 +81,4 @@ QByteArray GetQuotaJob::root() const
return d->root;
}
+#include "getquotajob.moc" \ No newline at end of file
diff --git a/kimap/getquotarootjob.cpp b/kimap/getquotarootjob.cpp
index 484c200..9f7bae7 100644
--- a/kimap/getquotarootjob.cpp
+++ b/kimap/getquotarootjob.cpp
@@ -183,3 +183,4 @@ QMap<QByteArray, qint64> GetQuotaRootJob::allLimits(const QByteArray &root) cons
return result;
}
+#include "getquotarootjob.moc"
diff --git a/kimap/idlejob.cpp b/kimap/idlejob.cpp
index 720693f..39489ee 100644
--- a/kimap/idlejob.cpp
+++ b/kimap/idlejob.cpp
@@ -157,4 +157,4 @@ int KIMAP::IdleJob::lastRecentCount() const
return d->lastRecentCount;
}
-// #include "moc_idlejob.cpp"
+#include "idlejob.moc"
diff --git a/kimap/job.cpp b/kimap/job.cpp
index f195c52..cd30eec 100644
--- a/kimap/job.cpp
+++ b/kimap/job.cpp
@@ -22,8 +22,8 @@
#include "message_p.h"
#include "session_p.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
using namespace KIMAP;
@@ -91,4 +91,4 @@ Job::HandlerResponse Job::handleErrorReplies(const Message &response)
return NotHandled;
}
-
+#include "job.moc"
diff --git a/kimap/job.h b/kimap/job.h
index 4656049..79dd9a6 100644
--- a/kimap/job.h
+++ b/kimap/job.h
@@ -22,7 +22,7 @@
#include "kimap_export.h"
-#include <KDE/KJob>
+#include <kjob.h>
namespace KIMAP {
diff --git a/kimap/listjob.cpp b/kimap/listjob.cpp
index 178bfe7..01d9906 100644
--- a/kimap/listjob.cpp
+++ b/kimap/listjob.cpp
@@ -217,4 +217,4 @@ void ListJob::convertInboxName(KIMAP::MailBoxDescriptor& descriptor)
descriptor.name += descriptor.separator + pathParts.join( descriptor.separator );
}
}
-// #include "moc_listjob.cpp"
+#include "listjob.moc"
diff --git a/kimap/listrightsjob.cpp b/kimap/listrightsjob.cpp
index b3492de..c72ff8d 100644
--- a/kimap/listrightsjob.cpp
+++ b/kimap/listrightsjob.cpp
@@ -104,4 +104,4 @@ QList<Acl::Rights> ListRightsJob::possibleRights()
return d->possibleRights;
}
-
+#include "listrightsjob.moc"
diff --git a/kimap/loginjob.cpp b/kimap/loginjob.cpp
index d2d11e3..707d0ed 100644
--- a/kimap/loginjob.cpp
+++ b/kimap/loginjob.cpp
@@ -530,4 +530,4 @@ QString LoginJob::serverGreeting() const
return d->serverGreeting;
}
-// #include "moc_loginjob.cpp"
+#include "loginjob.moc"
diff --git a/kimap/logoutjob.cpp b/kimap/logoutjob.cpp
index 477c1bb..b291f56 100644
--- a/kimap/logoutjob.cpp
+++ b/kimap/logoutjob.cpp
@@ -57,3 +57,4 @@ void LogoutJob::connectionLost()
emitResult();
}
+#include "logoutjob.moc"
diff --git a/kimap/metadatajobbase.cpp b/kimap/metadatajobbase.cpp
index da86124..df04a60 100644
--- a/kimap/metadatajobbase.cpp
+++ b/kimap/metadatajobbase.cpp
@@ -68,4 +68,4 @@ MetaDataJobBase::ServerCapability MetaDataJobBase::serverCapability() const
return d->serverCapability;
}
-
+#include "metadatajobbase.moc"
diff --git a/kimap/myrightsjob.cpp b/kimap/myrightsjob.cpp
index b3d78c0..49a69e1 100644
--- a/kimap/myrightsjob.cpp
+++ b/kimap/myrightsjob.cpp
@@ -81,3 +81,4 @@ Acl::Rights MyRightsJob::rights()
return d->myRights;
}
+#include "myrightsjob.moc"
diff --git a/kimap/namespacejob.cpp b/kimap/namespacejob.cpp
index 6d01a1a..dd0c1a0 100644
--- a/kimap/namespacejob.cpp
+++ b/kimap/namespacejob.cpp
@@ -140,3 +140,4 @@ void NamespaceJob::handleResponse( const Message &response )
}
}
+#include "namespacejob.moc"
diff --git a/kimap/quotajobbase.cpp b/kimap/quotajobbase.cpp
index 6b6d2af..e85d1c3 100644
--- a/kimap/quotajobbase.cpp
+++ b/kimap/quotajobbase.cpp
@@ -87,5 +87,5 @@ qint64 QuotaJobBase::limit(const QByteArray& resource)
return -1;
}
-
+#include "quotajobbase.moc"
diff --git a/kimap/renamejob.cpp b/kimap/renamejob.cpp
index e8b9cd3..6797a91 100644
--- a/kimap/renamejob.cpp
+++ b/kimap/renamejob.cpp
@@ -82,4 +82,4 @@ QString RenameJob::destinationMailBox() const
return d->destinationMailBox;
}
-
+#include "renamejob.moc"
diff --git a/kimap/searchjob.cpp b/kimap/searchjob.cpp
index 7668222..09cb876 100644
--- a/kimap/searchjob.cpp
+++ b/kimap/searchjob.cpp
@@ -314,3 +314,4 @@ QList<int> SearchJob::foundItems()
return results;
}
+#include "searchjob.moc" \ No newline at end of file
diff --git a/kimap/selectjob.cpp b/kimap/selectjob.cpp
index fab1c53..7478d2f 100644
--- a/kimap/selectjob.cpp
+++ b/kimap/selectjob.cpp
@@ -192,3 +192,4 @@ void SelectJob::handleResponse( const Message &response )
}
}
+#include "selectjob.moc" \ No newline at end of file
diff --git a/kimap/session.cpp b/kimap/session.cpp
index ddfb6ad..ccdba0a 100644
--- a/kimap/session.cpp
+++ b/kimap/session.cpp
@@ -492,5 +492,5 @@ void Session::setTimeout( int timeout )
d->setSocketTimeout( timeout * 1000 );
}
-// #include "moc_session.cpp"
-// #include "moc_session_p.cpp"
+#include "session.moc"
+#include "session_p.moc"
diff --git a/kimap/sessionthread.cpp b/kimap/sessionthread.cpp
index b7e6aa5..cf53327 100644
--- a/kimap/sessionthread.cpp
+++ b/kimap/sessionthread.cpp
@@ -228,5 +228,5 @@ void SessionThread::sslErrorHandlerResponse(bool response)
}
}
-// #include "moc_sessionthread_p.cpp"
+#include "sessionthread_p.moc"
diff --git a/kimap/setacljob.cpp b/kimap/setacljob.cpp
index ebc5d65..409549d 100644
--- a/kimap/setacljob.cpp
+++ b/kimap/setacljob.cpp
@@ -79,3 +79,4 @@ QByteArray SetAclJob::identifier()
return d->identifier();
}
+#include "setacljob.moc"
diff --git a/kimap/setmetadatajob.cpp b/kimap/setmetadatajob.cpp
index a779403..33b973e 100644
--- a/kimap/setmetadatajob.cpp
+++ b/kimap/setmetadatajob.cpp
@@ -151,3 +151,4 @@ SetMetaDataJob::MetaDataErrors SetMetaDataJob::metaDataErrors() const
return d->metaDataErrors;
}
+#include "setmetadatajob.moc"
diff --git a/kimap/setquotajob.cpp b/kimap/setquotajob.cpp
index 36af7b4..8b84adc 100644
--- a/kimap/setquotajob.cpp
+++ b/kimap/setquotajob.cpp
@@ -102,3 +102,4 @@ QByteArray SetQuotaJob::root() const
return d->root;
}
+#include "setquotajob.moc"
diff --git a/kimap/storejob.cpp b/kimap/storejob.cpp
index 7be31c5..ff7db49 100644
--- a/kimap/storejob.cpp
+++ b/kimap/storejob.cpp
@@ -192,3 +192,4 @@ void StoreJob::handleResponse( const Message &response )
}
}
+#include "storejob.moc" \ No newline at end of file
diff --git a/kimap/subscribejob.cpp b/kimap/subscribejob.cpp
index b3f9676..60371fa 100644
--- a/kimap/subscribejob.cpp
+++ b/kimap/subscribejob.cpp
@@ -68,4 +68,4 @@ QString SubscribeJob::mailBox() const
return d->mailBox;
}
-
+#include "subscribejob.moc"
diff --git a/kimap/unsubscribejob.cpp b/kimap/unsubscribejob.cpp
index 24db31e..e0fe1f5 100644
--- a/kimap/unsubscribejob.cpp
+++ b/kimap/unsubscribejob.cpp
@@ -68,4 +68,4 @@ QString UnsubscribeJob::mailBox() const
return d->mailBox;
}
-
+#include "unsubscribejob.moc"