Commit ca4d89ae authored by Daniel Vrátil's avatar Daniel Vrátil 🤖

Adjust includes of KF5AkonadiPrivate in libs, minor CMake fixes

parent 230cceb4
......@@ -27,8 +27,7 @@
#include "collectionfetchscope.h"
#include "itemfetchscope.h"
#include "akonaditestfake_export.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
template<typename T, typename Cache>
class FakeEntityCache : public Cache
......
......@@ -20,8 +20,7 @@
#include "fakesession.h"
#include "session_p.h"
#include "job.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
#include <QCoreApplication>
......
......@@ -18,7 +18,7 @@
*/
#include "imapparsertest.h"
#include <akonadi/private/imapparser_p.h>
#include "private/imapparser_p.h"
#include <qtest.h>
#include <QtCore/QDebug>
......
......@@ -18,7 +18,7 @@
*/
#include "imapsettest.h"
#include <private/imapset_p.h>
#include "private/imapset_p.h"
#include <qtest.h>
......
......@@ -52,18 +52,18 @@ target_link_libraries(KF5AkonadiAgentBase
PUBLIC
Qt5::Widgets # for QApplication
KF5::AkonadiCore
KF5::AkonadiPrivate
KF5::ConfigCore
KF5::ConfigGui # for KConfigSkeleton
PRIVATE
KF5::AkonadiPrivate
KF5::DBusAddons
KF5::I18n
Qt5::Network
)
set_target_properties(KF5AkonadiAgentBase PROPERTIES
VERSION ${AKONADILIBRARIES_VERSION_STRING}
SOVERSION ${AKONADILIBRARIES_SOVERSION}
VERSION ${AKONADI_VERSION_STRING}
SOVERSION ${AKONADI_SOVERSION}
EXPORT_NAME AkonadiAgentBase
)
......
......@@ -34,8 +34,8 @@
#include "session.h"
#include "session_p.h"
#include "statusadaptor.h"
#include "private/standarddirs_p.h"
#include <akonadi/private/standarddirs_p.h>
#include "akonadiagentbase_debug.h"
......
......@@ -28,7 +28,7 @@
#include "collectionfetchscope.h"
#include "servermanager.h"
#include "agentbase.h"
#include <akonadi/private/imapset_p.h>
#include "private/imapset_p.h"
using namespace Akonadi;
......
......@@ -31,7 +31,7 @@
#include "relationsync.h"
#include "resourcescheduler_p.h"
#include "tracerinterface.h"
#include <akonadi/private/xdgbasedirs_p.h>
#include "private/xdgbasedirs_p.h"
#include "changerecorder.h"
#include "collectionfetchjob.h"
......
......@@ -265,16 +265,17 @@ if (NOT "${std_exception_file}" STREQUAL "")
)
endif()
set(akonadicore_dbus_xml ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.NotificationManager.xml)
set(akonadicore_dbus_xml ${Akonadi_SOURCE_DIR}/org.freedesktop.Akonadi.NotificationManager.xml)
qt5_add_dbus_interface(akonadicore_dbus_SRCS ${akonadicore_dbus_xml} notificationmanagerinterface)
set(akonadicore_dbus_xml ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.NotificationSource.xml)
set_source_files_properties(${akonadicore_dbus_xml} PROPERTIES INCLUDE "${AKONADI_INCLUDE_DIR}/akonadi/private/protocol_p.h" )
set(akonadicore_dbus_xml ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.NotificationSource.xml)
set_source_files_properties(${akonadicore_dbus_xml} PROPERTIES INCLUDE "${Akonadi_SOURCE_DIR}/src/private/protocol_p.h" )
qt5_add_dbus_interface(akonadicore_dbus_SRCS ${akonadicore_dbus_xml} notificationsourceinterface)
qt5_add_dbus_interfaces(akonadicore_dbus_SRCS ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.AgentManager.xml)
qt5_add_dbus_interfaces(akonadicore_dbus_SRCS ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Tracer.xml)
qt5_add_dbus_interfaces(akonadicore_dbus_SRCS ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Agent.Control.xml)
qt5_add_dbus_interfaces(akonadicore_dbus_SRCS ${Akonadi_SOURCE_DIR}/org.freedesktop.Akonadi.AgentManager.xml)
qt5_add_dbus_interfaces(akonadicore_dbus_SRCS ${Akonadi_SOURCE_DIR}/org.freedesktop.Akonadi.Tracer.xml)
qt5_add_dbus_interfaces(akonadicore_dbus_SRCS ${Akonadi_SOURCE_DIR}/org.freedesktop.Akonadi.Agent.Control.xml)
set(akonadicore_SRCS
${akonadicore_base_SRCS}
......@@ -288,10 +289,9 @@ add_library(KF5AkonadiCore ${akonadicore_SRCS})
generate_export_header(KF5AkonadiCore BASE_NAME akonadicore)
add_library(KF5::AkonadiCore ALIAS KF5AkonadiCore)
target_include_directories(KF5AkonadiCore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/AkonadiCore;${Boost_INCLUDE_DIR};${AKONADI_INCLUDE_DIR};${AKONADI_INCLUDE_DIR}/akonadi/private>")
target_include_directories(KF5AkonadiCore PUBLIC "$<BUILD_INTERFACE:${Akonadi_SOURCE_DIR}/src/core;${Akonadi_BINARY_DIR}/src/core>")
target_include_directories(KF5AkonadiCore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/AkonadiCore;${Boost_INCLUDE_DIR}>")
target_include_directories(KF5AkonadiCore PUBLIC "$<BUILD_INTERFACE:${Akonadi_SOURCE_DIR}/src/core;${Akonadi_BINARY_DIR}/src/core;${Akonadi_BINARY_DIR}/src/private>")
target_include_directories(KF5AkonadiCore PUBLIC "$<BUILD_INTERFACE:${Akonadi_BINARY_DIR};${Akonadi_SOURCE_DIR}/src/core/jobs;${Akonadi_SOURCE_DIR}/src/core/models>")
target_include_directories(KF5AkonadiCore PUBLIC "$<BUILD_INTERFACE:${AKONADI_INCLUDE_DIR}>")
target_include_directories(KF5AkonadiCore PUBLIC "$<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>")
kde_target_enable_exceptions(KF5AkonadiCore PUBLIC)
......@@ -309,11 +309,12 @@ PRIVATE
KF5::I18n
KF5::IconThemes
KF5::ConfigCore
KF5AkonadiPrivate
)
set_target_properties(KF5AkonadiCore PROPERTIES
VERSION ${AKONADILIBRARIES_VERSION_STRING}
SOVERSION ${AKONADILIBRARIES_SOVERSION}
VERSION ${AKONADI_VERSION_STRING}
SOVERSION ${AKONADI_SOVERSION}
EXPORT_NAME AkonadiCore
)
......
......@@ -19,7 +19,7 @@
#include "collectionidentificationattribute.h"
#include <akonadi/private/imapparser_p.h>
#include <private/imapparser_p.h>
#include <QByteArray>
#include <QList>
......
......@@ -30,9 +30,9 @@
#include <QtCore/QElapsedTimer>
#include <QtWidgets/QApplication>
#include <akonadi/private/xdgbasedirs_p.h>
#include <akonadi/private/protocol_exception_p.h>
#include <akonadi/private/standarddirs_p.h>
#include <private/xdgbasedirs_p.h>
#include <private/protocol_exception_p.h>
#include <private/standarddirs_p.h>
using namespace Akonadi;
......
......@@ -25,7 +25,7 @@
#include <QtCore/QQueue>
#include <QtNetwork/QLocalSocket>
#include <akonadi/private/protocol_p.h>
#include <private/protocol_p.h>
class QAbstractSocket;
class QFile;
......
......@@ -19,7 +19,7 @@
#include "entitydeletedattribute.h"
#include <akonadi/private/imapparser_p.h>
#include "private/imapparser_p.h"
#include <QtCore/QByteArray>
#include <QtCore/QString>
......
......@@ -19,7 +19,7 @@
#include "entitydisplayattribute.h"
#include <akonadi/private/imapparser_p.h>
#include "private/imapparser_p.h"
#include <QIcon>
......
......@@ -19,7 +19,7 @@
#include "indexpolicyattribute.h"
#include <akonadi/private/imapparser_p.h>
#include "private/imapparser_p.h"
#include <QtCore/QString>
......
......@@ -21,7 +21,7 @@
#include "item_p.h"
#include "itemserializer_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
#include <QUrl>
#include <qdebug.h>
......
......@@ -24,7 +24,7 @@
#include "typepluginloader_p.h"
#include "protocolhelper_p.h"
#include <akonadi/private/externalpartstorage_p.h>
#include "private/externalpartstorage_p.h"
// Qt
#include <QtCore/QBuffer>
......
......@@ -21,10 +21,10 @@
#include "collection.h"
#include "job_p.h"
#include "protocolhelper_p.h"
#include "private/protocol_p.h"
#include <KLocalizedString>
#include <akonadi/private/protocol_p.h>
using namespace Akonadi;
......
......@@ -20,8 +20,7 @@
#include "collectioncreatejob.h"
#include "protocolhelper_p.h"
#include "job_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
#include <KLocalizedString>
......
......@@ -20,9 +20,8 @@
#include "collectiondeletejob.h"
#include "collection.h"
#include "job_p.h"
#include <protocolhelper_p.h>
#include <akonadi/private/protocol_p.h>
#include "protocolhelper_p.h"
#include "private/protocol_p.h"
#include <KLocalizedString>
......
......@@ -25,7 +25,7 @@
#include "collectionfetchscope.h"
#include "collectionutils.h"
#include "protocolhelper_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
#include <qdebug.h>
#include <KLocalizedString>
......
......@@ -24,8 +24,7 @@
#include "collectionstatistics.h"
#include "job_p.h"
#include "protocolhelper_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
using namespace Akonadi;
......
......@@ -21,10 +21,10 @@
#include "collection.h"
#include "job_p.h"
#include "protocolhelper_p.h"
#include "private/protocol_p.h"
#include <KLocalizedString>
#include <akonadi/private/protocol_p.h>
using namespace Akonadi;
......
......@@ -23,8 +23,7 @@
#include "collectionstatistics.h"
#include "job_p.h"
#include "protocolhelper_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
using namespace Akonadi;
......
......@@ -22,8 +22,7 @@
#include "collection.h"
#include "job_p.h"
#include "protocolhelper_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
using namespace Akonadi;
......
......@@ -28,13 +28,13 @@
#include "job_p.h"
#include "protocolhelper_p.h"
#include "gidextractor_p.h"
#include "private/protocol_p.h"
#include <QtCore/QDateTime>
#include <QtCore/QFile>
#include <KLocalizedString>
#include <akonadi/private/protocol_p.h>
using namespace Akonadi;
......
......@@ -23,8 +23,7 @@
#include "item.h"
#include "job_p.h"
#include "protocolhelper_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
using namespace Akonadi;
......
......@@ -25,8 +25,7 @@
#include "job_p.h"
#include "protocolhelper_p.h"
#include "session_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
#include <qdebug.h>
......
......@@ -23,8 +23,7 @@
#include "item.h"
#include "job_p.h"
#include "protocolhelper_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
#include <KLocalizedString>
......
......@@ -23,8 +23,7 @@
#include "job_p.h"
#include "protocolhelper_p.h"
#include "searchquery.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
#include <QtCore/QTimer>
#include <QThreadStorage>
......
......@@ -23,7 +23,7 @@
#include "job_p.h"
#include "KDBusConnectionPool"
#include <QTime>
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
#include "session.h"
#include "session_p.h"
......
......@@ -25,8 +25,7 @@
#include "job.h"
#include "job_p.h"
#include "protocolhelper_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
#include <qdebug.h>
#include <KLocalizedString>
......
......@@ -21,10 +21,9 @@
#include "job_p.h"
#include "relation.h"
#include "protocolhelper_p.h"
#include "private/protocol_p.h"
#include <KLocalizedString>
#include <akonadi/private/protocol_p.h>
using namespace Akonadi;
struct Akonadi::RelationCreateJobPrivate : public JobPrivate {
......
......@@ -21,9 +21,9 @@
#include "job_p.h"
#include "relation.h"
#include "protocolhelper_p.h"
#include "private/protocol_p.h"
#include <KLocalizedString>
#include <akonadi/private/protocol_p.h>
using namespace Akonadi;
......
......@@ -21,9 +21,9 @@
#include "job_p.h"
#include "relation.h"
#include "protocolhelper_p.h"
#include "private/protocol_p.h"
#include <QTimer>
#include <akonadi/private/protocol_p.h>
using namespace Akonadi;
......
......@@ -19,9 +19,9 @@
#include "resourceselectjob_p.h"
#include <akonadi/private/imapparser_p.h>
#include "job_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/imapparser_p.h"
#include "private/protocol_p.h"
using namespace Akonadi;
......
......@@ -20,7 +20,6 @@
#ifndef AKONADI_RESOURCESELECTJOB_P_H
#define AKONADI_RESOURCESELECTJOB_P_H
#include "akonadiprivate_export.h"
#include "akonadicore_export.h"
#include "job.h"
......
......@@ -25,7 +25,7 @@
#include "protocolhelper_p.h"
#include "job_p.h"
#include "searchquery.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
using namespace Akonadi;
......
......@@ -20,8 +20,7 @@
#include "searchresultjob_p.h"
#include "job_p.h"
#include "protocolhelper_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
namespace Akonadi
{
......
......@@ -20,8 +20,7 @@
#include "transactionjobs.h"
#include "job_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
using namespace Akonadi;
......
......@@ -44,7 +44,7 @@
#include "itemmovejob.h"
#include "linkjob.h"
#include "session.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
#include <qdebug.h>
#include <QMessageBox>
......
......@@ -34,7 +34,7 @@
#include "changenotificationdependenciesfactory_p.h"
#include "notificationsource_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
#include <QtCore/QObject>
#include <QtCore/QTimer>
......
......@@ -21,7 +21,7 @@
#include "session_p.h"
#include "connectionthread_p.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
#include <QTimer>
......
......@@ -28,7 +28,7 @@
#include "collection.h"
#include "item.h"
#include <akonadi/private/protocol_p.h>
#include "private/protocol_p.h"
namespace Akonadi
{
......
......@@ -20,7 +20,7 @@
#include "persistentsearchattribute.h"
#include "collection.h"
#include <akonadi/private/imapparser_p.h>
#include "private/imapparser_p.h"
#include <QtCore/QString>
#include <QtCore/QStringList>
......
......@@ -30,9 +30,9 @@
#include "tagfetchscope.h"
#include "persistentsearchattribute.h"
#include <akonadi/private/protocol_p.h>
#include <akonadi/private/xdgbasedirs_p.h>
#include <akonadi/private/externalpartstorage_p.h>
#include "private/protocol_p.h"
#include "private/xdgbasedirs_p.h"
#include "private/externalpartstorage_p.h"
#include <QtCore/QDateTime>
#include <QtCore/QFile>
......
......@@ -28,10 +28,10 @@
#include "sharedvaluepool_p.h"
#include "tag.h"
#include <akonadi/private/imapparser_p.h>
#include <akonadi/private/protocol_p.h>
#include <akonadi/private/scope_p.h>
#include <akonadi/private/tristate_p.h>
#include "private/imapparser_p.h"
#include "private/protocol_p.h"
#include "private/scope_p.h"
#include "private/tristate_p.h"
#include <QString>
......
......@@ -30,10 +30,10 @@
#include <QDebug>
#include <akonadi/private/protocol_p.h>
#include <akonadi/private/standarddirs_p.h>
#include <akonadi/private/dbus_p.h>
#include <akonadi/private/instance_p.h>
#include "private/protocol_p.h"
#include "private/standarddirs_p.h"
#include "private/dbus_p.h"
#include "private/instance_p.h"
#include <QtDBus>
#include <QTimer>
......
......@@ -26,8 +26,8 @@
#include "servermanager_p.h"
#include "protocolhelper_p.h"
#include "connectionthread_p.h"
#include <akonadi/private/standarddirs_p.h>
#include <akonadi/private/protocol_p.h>
#include "private/standarddirs_p.h"
#include "private/protocol_p.h"
#include <QDebug>
#include <KLocalizedString>
......
......@@ -19,7 +19,7 @@
#include "tagattribute.h"
#include <akonadi/private/imapparser_p.h>
#include "private/imapparser_p.h"
using namespace Akonadi;
......
......@@ -109,8 +109,8 @@ PRIVATE
)
set_target_properties(KF5AkonadiWidgets PROPERTIES
VERSION ${AKONADILIBRARIES_VERSION_STRING}
SOVERSION ${AKONADILIBRARIES_SOVERSION}
VERSION ${AKONADI_VERSION_STRING}
SOVERSION ${AKONADI_SOVERSION}
EXPORT_NAME AkonadiWidgets
)
......
......@@ -23,9 +23,8 @@
#include "session_p.h"