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

List:       kde-commits
Subject:    [kdepim] noteshared: Enable MaildirSettings
From:       Dāvis Mosāns <davispuh () gmail ! com>
Date:       2015-09-01 1:02:11
Message-ID: E1ZWZxj-0003cz-F4 () scm ! kde ! org
[Download RAW message or body]

Git commit e0aef8439fa51ec3f1ed3a84aef9e975d4f45163 by Dāvis Mosāns.
Committed on 01/09/2015 at 01:01.
Pushed by davism into branch 'master'.

Enable MaildirSettings

Differential Revision: https://phabricator.kde.org/D288

M  +7    -7    noteshared/CMakeLists.txt
M  +2    -4    noteshared/resources/localresourcecreator.cpp

http://commits.kde.org/kdepim/e0aef8439fa51ec3f1ed3a84aef9e975d4f45163

diff --git a/noteshared/CMakeLists.txt b/noteshared/CMakeLists.txt
index 6d89ac2..6136ae7 100644
--- a/noteshared/CMakeLists.txt
+++ b/noteshared/CMakeLists.txt
@@ -40,18 +40,18 @@ macro(add_resource_iface _kcfgFile _ifaceName _className)
   kcfg_generate_dbus_interface(${_kcfgFile} ${_ifaceName})
   string(TOLOWER ${_className} _codeFile)
   set_source_files_properties( ${CMAKE_CURRENT_BINARY_DIR}/${_ifaceName}.xml \
                PROPERTIES INCLUDE "resources/metatype.h")
-  qt5_add_dbus_interfaces(libnoteshared_SRCS
+  qt5_add_dbus_interface(libnoteshared_SRCS
     ${CMAKE_CURRENT_BINARY_DIR}/${_ifaceName}.xml ${_codeFile} ${_className}
   )
 endmacro()
 
-#add_resource_iface( ${CMAKE_CURRENT_SOURCE_DIR}/resources/maildirresource.kcfg
-#                    org.kde.Akonadi.Maildir.Settings MaildirSettings )
+add_resource_iface( ${CMAKE_CURRENT_SOURCE_DIR}/resources/maildirresource.kcfg
+                   org.kde.Akonadi.Maildir.Settings MaildirSettings )
 
-#add_custom_target(noteshared_settings_xml ALL
-#  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml
-#  SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/resources/maildirresource.kcfg
-#)
+add_custom_target(noteshared_settings_xml ALL
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml
+  SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/resources/maildirresource.kcfg
+)
 
 
 
diff --git a/noteshared/resources/localresourcecreator.cpp \
b/noteshared/resources/localresourcecreator.cpp index 7fc3b3b..c70ba91 100644
--- a/noteshared/resources/localresourcecreator.cpp
+++ b/noteshared/resources/localresourcecreator.cpp
@@ -23,7 +23,7 @@
 #include <AkonadiCore/agentinstancecreatejob.h>
 #pragma message("port QT5")
 
-//QT5 #include "maildirsettings.h"
+#include "maildirsettings.h"
 
 #include <Akonadi/Notes/NoteUtils>
 
@@ -83,8 +83,7 @@ void LocalResourceCreator::slotInstanceCreated(KJob *job)
     Akonadi::AgentInstance instance = createJob->instance();
 
     instance.setName(i18nc("Default name for resource holding notes", "Local \
                Notes"));
-#if 0 //QT5
-    OrgKdeAkonadiMaildirSettingsInterface *iface = new \
OrgKdeAkonadiMaildirSettingsInterface( +    org::kde::Akonadi::Maildir::Settings \
                *iface = new org::kde::Akonadi::Maildir::Settings(
         QLatin1String("org.freedesktop.Akonadi.Resource.") + instance.identifier(),
         QLatin1String("/Settings"), QDBusConnection::sessionBus(), this);
 
@@ -96,7 +95,6 @@ void LocalResourceCreator::slotInstanceCreated(KJob *job)
         return;
     }
     delete iface;
-#endif
     instance.reconfigure();
 
     Akonadi::ResourceSynchronizationJob *syncJob = new \
Akonadi::ResourceSynchronizationJob(instance, this);


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