From e9061a4dde3f0636be12589e37222a90cea691a6 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 1 Mar 2017 22:22:15 +0100 Subject: Adapt to KAsync changes --- CMakeLists.txt | 3 ++- common/CMakeLists.txt | 2 +- common/asyncutils.h | 2 +- common/changereplay.h | 2 +- common/commandprocessor.h | 2 +- common/facade.h | 2 +- common/facadeinterface.h | 2 +- common/inspector.h | 2 +- common/messagequeue.h | 2 +- common/notifier.h | 2 +- common/pipeline.h | 2 +- common/resource.h | 2 +- common/resourceaccess.h | 2 +- common/resourcecontrol.h | 2 +- common/resourcefacade.h | 2 +- common/store.h | 2 +- examples/davresource/davresource.h | 2 +- examples/dummyresource/resourcefactory.h | 2 +- examples/imapresource/imapresource.h | 2 +- examples/imapresource/imapserverproxy.h | 2 +- examples/maildirresource/maildirresource.h | 2 +- synchronizer/CMakeLists.txt | 2 +- tests/testimplementations.h | 2 +- 23 files changed, 24 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8e90fa..a76fdcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,9 @@ include(ECMSetupVersion) include(KDEInstallDirs) find_package(Qt5 COMPONENTS REQUIRED Core Network Gui) -find_package(KF5 COMPONENTS REQUIRED Async Mime Contacts) +find_package(KF5 COMPONENTS REQUIRED Mime Contacts) find_package(FlatBuffers REQUIRED) +find_package(KAsync REQUIRED 0.1.0) find_program(MEMORYCHECK_COMMAND valgrind) set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full") diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 34e48c6..b5275e0 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -122,7 +122,7 @@ qt5_use_modules(${PROJECT_NAME} LINK_PUBLIC Network) qt5_use_modules(${PROJECT_NAME} LINK_PRIVATE Gui) target_link_libraries(${PROJECT_NAME} PUBLIC - KF5::Async + KAsync PRIVATE ${storage_LIBS} KF5::Mime diff --git a/common/asyncutils.h b/common/asyncutils.h index 6cbcee8..7b62eb2 100644 --- a/common/asyncutils.h +++ b/common/asyncutils.h @@ -18,7 +18,7 @@ */ #pragma once -#include +#include #include #include #include diff --git a/common/changereplay.h b/common/changereplay.h index 4ec115c..3ca896e 100644 --- a/common/changereplay.h +++ b/common/changereplay.h @@ -21,7 +21,7 @@ #include "sink_export.h" #include -#include +#include #include "storage.h" #include "resourcecontext.h" diff --git a/common/commandprocessor.h b/common/commandprocessor.h index a4beed6..f3a0742 100644 --- a/common/commandprocessor.h +++ b/common/commandprocessor.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include "log.h" diff --git a/common/facade.h b/common/facade.h index 2149acd..45c718b 100644 --- a/common/facade.h +++ b/common/facade.h @@ -23,7 +23,7 @@ #include "facadeinterface.h" #include -#include +#include #include "resourceaccess.h" #include "domaintypeadaptorfactoryinterface.h" diff --git a/common/facadeinterface.h b/common/facadeinterface.h index 26a8407..6b3ce4c 100644 --- a/common/facadeinterface.h +++ b/common/facadeinterface.h @@ -20,7 +20,7 @@ #pragma once -#include +#include #include #include #include diff --git a/common/inspector.h b/common/inspector.h index a746f03..5ee995e 100644 --- a/common/inspector.h +++ b/common/inspector.h @@ -21,7 +21,7 @@ #include "sink_export.h" #include -#include +#include #include "notification.h" #include "resourcecontext.h" diff --git a/common/messagequeue.h b/common/messagequeue.h index f23ddcf..a2b7226 100644 --- a/common/messagequeue.h +++ b/common/messagequeue.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "storage.h" /** diff --git a/common/notifier.h b/common/notifier.h index df8f34b..290458a 100644 --- a/common/notifier.h +++ b/common/notifier.h @@ -24,7 +24,7 @@ #include #include -#include +#include class QAbstractItemModel; diff --git a/common/pipeline.h b/common/pipeline.h index c9982b7..c6dc5fe 100644 --- a/common/pipeline.h +++ b/common/pipeline.h @@ -29,7 +29,7 @@ #include "sink_export.h" #include -#include +#include #include #include diff --git a/common/resource.h b/common/resource.h index 046f236..a50ffb5 100644 --- a/common/resource.h +++ b/common/resource.h @@ -21,7 +21,7 @@ #include "sink_export.h" -#include +#include #include "notification.h" namespace Sink { diff --git a/common/resourceaccess.h b/common/resourceaccess.h index e0e9545..c32566b 100644 --- a/common/resourceaccess.h +++ b/common/resourceaccess.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include "notification.h" diff --git a/common/resourcecontrol.h b/common/resourcecontrol.h index b910441..d063db7 100644 --- a/common/resourcecontrol.h +++ b/common/resourcecontrol.h @@ -23,7 +23,7 @@ #include "sink_export.h" #include -#include +#include #include "inspection.h" #include "flush.h" diff --git a/common/resourcefacade.h b/common/resourcefacade.h index f72132d..1cc075c 100644 --- a/common/resourcefacade.h +++ b/common/resourcefacade.h @@ -21,7 +21,7 @@ #include "common/facadeinterface.h" -#include +#include #include "common/resultprovider.h" #include "common/domain/applicationdomaintype.h" #include "common/configstore.h" diff --git a/common/store.h b/common/store.h index f787a3e..86e4d20 100644 --- a/common/store.h +++ b/common/store.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include "query.h" #include "applicationdomaintype.h" diff --git a/examples/davresource/davresource.h b/examples/davresource/davresource.h index 3b228c2..415527a 100644 --- a/examples/davresource/davresource.h +++ b/examples/davresource/davresource.h @@ -22,7 +22,7 @@ #include "common/genericresource.h" #include -#include +#include #include diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h index bc35d82..cfc6577 100644 --- a/examples/dummyresource/resourcefactory.h +++ b/examples/dummyresource/resourcefactory.h @@ -22,7 +22,7 @@ #include "common/genericresource.h" #include "common/messagequeue.h" -#include +#include #include diff --git a/examples/imapresource/imapresource.h b/examples/imapresource/imapresource.h index aeb1200..3b8b670 100644 --- a/examples/imapresource/imapresource.h +++ b/examples/imapresource/imapresource.h @@ -21,7 +21,7 @@ #include "common/genericresource.h" -#include +#include #include diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h index a8d5ac1..6eb47ee 100644 --- a/examples/imapresource/imapserverproxy.h +++ b/examples/imapresource/imapserverproxy.h @@ -19,7 +19,7 @@ #pragma once -#include +#include #include #include diff --git a/examples/maildirresource/maildirresource.h b/examples/maildirresource/maildirresource.h index 61fe438..8ceb2f5 100644 --- a/examples/maildirresource/maildirresource.h +++ b/examples/maildirresource/maildirresource.h @@ -21,7 +21,7 @@ #include "common/genericresource.h" -#include +#include #include diff --git a/synchronizer/CMakeLists.txt b/synchronizer/CMakeLists.txt index 1422105..ff9ec86 100644 --- a/synchronizer/CMakeLists.txt +++ b/synchronizer/CMakeLists.txt @@ -7,6 +7,6 @@ set(sinksynchronizer_SRCS ) add_executable(${PROJECT_NAME} ${sinksynchronizer_SRCS}) -target_link_libraries(${PROJECT_NAME} sink KF5::Async ${CMAKE_DL_LIBS}) +target_link_libraries(${PROJECT_NAME} sink KAsync ${CMAKE_DL_LIBS}) qt5_use_modules(${PROJECT_NAME} Network) install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/tests/testimplementations.h b/tests/testimplementations.h index d1a912a..a145265 100644 --- a/tests/testimplementations.h +++ b/tests/testimplementations.h @@ -19,7 +19,7 @@ */ #pragma once -#include +#include #include #include -- cgit v1.2.3