Commit d4fd4a22 authored by Laurent Montel's avatar Laurent Montel 😁

Compile++

parent 916fd356
......@@ -107,11 +107,11 @@ set( AKONADI_IMAPATTRIBUTES_SHARED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/shared/imapquotaattribute.cpp
)
#add_subdirectory( akonotes )
#add_subdirectory( kalarm )
#add_subdirectory( contacts )
add_subdirectory( akonotes )
add_subdirectory( kalarm )
add_subdirectory( contacts )
#add_subdirectory( dav )
#add_subdirectory( ical )
add_subdirectory( ical )
add_subdirectory( imap )
add_subdirectory( kdeaccounts )
#if (Libkolab_FOUND AND Libkolabxml_FOUND)
......
......@@ -3,7 +3,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../maildir
${CMAKE_CURRENT_BINARY_DIR}/../maildir
${CMAKE_CURRENT_SOURCE_DIR}/../maildir/libmaildir
${QT_QTDBUS_INCLUDE_DIR}
${Boost_INCLUDE_DIR}
)
......@@ -36,7 +35,7 @@ install( FILES akonotesresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/sha
add_library(akonadi_akonotes_resource MODULE ${akonotesresource_SRCS})
target_link_libraries(akonadi_akonotes_resource KF5::AkonadiCore KF5::AkonadiMime maildir KF5::KIOCore KF5::Mime folderarchivesettings)
target_link_libraries(akonadi_akonotes_resource KF5::AkonadiCore KF5::AkonadiMime maildir KF5::KIOCore KF5::Mime folderarchivesettings KF5::AkonadiAgentBase)
install(TARGETS akonadi_akonotes_resource DESTINATION ${PLUGIN_INSTALL_DIR})
......@@ -5,4 +5,4 @@ ItemAccessors=true
SetUserTexts=true
Singleton=false
GlobalEnums=true
Namespace=Akonadi_Contacts_Resource
NameSpace=Akonadi_Contacts_Resource
......@@ -25,7 +25,7 @@
#include <QTimer>
#include <KSharedConfig>
#include <KUrl>
using namespace Akonadi;
using namespace Akonadi_Contacts_Resource;
......
include_directories(
${kdepim-runtime_SOURCE_DIR}
${QT_QTDBUS_INCLUDE_DIR}
${Boost_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/shared
......
......@@ -30,6 +30,6 @@ qt5_add_dbus_adaptor(notesresource_SRCS
add_library(akonadi_notes_resource MODULE ${notesresource_SRCS})
target_link_libraries(akonadi_notes_resource KF5::AkonadiCore KF5::KIOCore KF5::CalendarCore)
target_link_libraries(akonadi_notes_resource KF5::AkonadiCore KF5::KIOCore KF5::CalendarCore KF5::AkonadiAgentBase)
install(TARGETS akonadi_notes_resource DESTINATION ${PLUGIN_INSTALL_DIR})
......@@ -6,4 +6,4 @@ SetUserTexts=true
Singleton=false
#IncludeFiles=
GlobalEnums=true
Namespace=Akonadi_Aknotes_Resource
NameSpace=Akonadi_Aknotes_Resource
......@@ -6,5 +6,5 @@ SetUserTexts=true
Singleton=false
#IncludeFiles=
GlobalEnums=true
Namespace=Akonadi_ICal_Resource
NameSpace=Akonadi_ICal_Resource
......@@ -77,8 +77,8 @@ void ICalResource::itemAdded( const Akonadi::Item &item, const Akonadi::Collecti
Incidence::Ptr i = item.payload<Incidence::Ptr>();
if ( !calendar()->addIncidence( Incidence::Ptr( i->clone() ) ) ) {
kError() << "akonadi_ical_resource: Error adding incidence with uid "
<< i->uid() << "; item.id() " << item.id() << i->recurrenceId();
//kError() << "akonadi_ical_resource: Error adding incidence with uid "
// << i->uid() << "; item.id() " << item.id() << i->recurrenceId();
cancelTask();
return;
}
......
......@@ -23,9 +23,9 @@
#include "kalarmresourcecommon.h"
#include "alarmtyperadiowidget.h"
#include <KAlarmCal/compatibilityattribute.h>
#include <KAlarmCal/kacalendar.h>
#include <KAlarmCal/kaevent.h>
#include <kalarmcal/compatibilityattribute.h>
#include <kalarmcal/kacalendar.h>
#include <kalarmcal/kaevent.h>
#include <agentfactory.h>
#include <attributefactory.h>
......
......@@ -24,7 +24,7 @@
#include "icalresourcebase.h"
#include <KAlarmCal/kacalendar.h>
#include <kalarmcal/kacalendar.h>
using namespace KAlarmCal;
......
......@@ -6,5 +6,5 @@ SetUserTexts=true
Singleton=false
#IncludeFiles=
GlobalEnums=true
Namespace=Akonadi_KAlarm_Resource
NameSpace=Akonadi_KAlarm_Resource
......@@ -28,7 +28,7 @@
#include "kalarmdirsettingsadaptor.h"
#include "settingsdialog.h"
#include <KAlarmCal/kacalendar.h>
#include <kalarmcal/kacalendar.h>
#include <KCalCore/FileStorage>
#include <KCalCore/ICalFormat>
......
......@@ -22,7 +22,7 @@
#ifndef KALARMDIRRESOURCE_H
#define KALARMDIRRESOURCE_H
#include <KAlarmCal/kaevent.h>
#include <kalarmcal/kaevent.h>
#include <resourcebase.h>
#include <QHash>
......
......@@ -5,4 +5,4 @@ ItemAccessors=true
SetUserTexts=true
Singleton=false
GlobalEnums=true
Namespace=Akonadi_KAlarm_Dir_Resource
NameSpace=Akonadi_KAlarm_Dir_Resource
......@@ -25,6 +25,7 @@
#include <KConfigDialogManager>
#include <KWindowSystem>
#include <KUrl>
#include <QTimer>
......
......@@ -25,9 +25,9 @@
#include "ui_settingsdialog.h"
#include "ui_alarmtypewidget.h"
#include <KAlarmCal/kacalendar.h>
#include <kalarmcal/kacalendar.h>
#include <KDE/KDialog>
#include <KDialog>
using namespace KAlarmCal;
......
......@@ -25,7 +25,7 @@
#include "singlefileresourceconfigdialogbase.h"
#include "ui_alarmtyperadiowidget.h"
#include <KAlarmCal/kacalendar.h>
#include <kalarmcal/kacalendar.h>
using namespace KAlarmCal;
......
......@@ -24,7 +24,7 @@
#include "ui_alarmtypewidget.h"
#include <KAlarmCal/kacalendar.h>
#include <kalarmcal/kacalendar.h>
using namespace KAlarmCal;
......
......@@ -21,8 +21,8 @@
#include "kalarmresourcecommon.h"
#include <KAlarmCal/compatibilityattribute.h>
#include <KAlarmCal/eventattribute.h>
#include <kalarmcal/compatibilityattribute.h>
#include <kalarmcal/eventattribute.h>
#include <attributefactory.h>
#include <collectionmodifyjob.h>
......@@ -35,6 +35,8 @@
#include <kdebug.h>
#include <KLocale>
#include <QTime>
using namespace Akonadi;
using namespace KCalCore;
using namespace KAlarmCal;
......
......@@ -22,8 +22,8 @@
#ifndef KALARMRESOURCECOMMON_H
#define KALARMRESOURCECOMMON_H
#include <KAlarmCal/kacalendar.h>
#include <KAlarmCal/kaevent.h>
#include <kalarmcal/kacalendar.h>
#include <kalarmcal/kaevent.h>
#include <QObject>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment