Commit 8af8346b authored by pvuorela's avatar pvuorela

Merge branch 'google_calendar_plugin' into 'master'

[buteo-sync-plugins-social] Fix google calendar plugin adaptation to api changes. JB#53994

See merge request !95
parents 3c32e3dd 8f1f76e5
......@@ -22,8 +22,6 @@
#include "googlecalendarsyncadaptor.h"
#include "socialnetworksyncadaptor.h"
GoogleCalendarsPlugin::GoogleCalendarsPlugin(const QString& pluginName,
const Buteo::SyncProfile& profile,
Buteo::PluginCbInterface *callbackInterface)
......@@ -41,3 +39,13 @@ SocialNetworkSyncAdaptor *GoogleCalendarsPlugin::createSocialNetworkSyncAdaptor(
{
return new GoogleCalendarSyncAdaptor(this);
}
Buteo::ClientPlugin* GoogleCalendarPluginLoader::createClientPlugin(
const QString& pluginName,
const Buteo::SyncProfile& profile,
Buteo::PluginCbInterface* cbInterface)
{
return new GoogleCalendarsPlugin(pluginName, profile, cbInterface);
}
......@@ -22,6 +22,7 @@
#define GOOGLECALENDARSPLUGIN_H
#include "socialdbuteoplugin.h"
#include <buteosyncfw5/SyncPluginLoader.h>
class Q_DECL_EXPORT GoogleCalendarsPlugin : public SocialdButeoPlugin
{
......@@ -37,6 +38,17 @@ protected:
SocialNetworkSyncAdaptor *createSocialNetworkSyncAdaptor();
};
class GoogleCalendarPluginLoader : public Buteo::SyncPluginLoader
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.sailfishos.plugins.sync.GoogleCalendarPluginLoader")
Q_INTERFACES(Buteo::SyncPluginLoader)
public:
Buteo::ClientPlugin* createClientPlugin(const QString& pluginName,
const Buteo::SyncProfile& profile,
Buteo::PluginCbInterface* cbInterface) override;
};
#endif // GOOGLECALENDARSPLUGIN_H
......@@ -171,3 +171,12 @@ void KnownContactsPlugin::connectivityStateChanged(Sync::ConnectivityType type,
FUNCTION_CALL_TRACE;
// Stub
}
Buteo::ClientPlugin* KnownContactsPluginLoader::createClientPlugin(
const QString& pluginName,
const Buteo::SyncProfile& profile,
Buteo::PluginCbInterface* cbInterface)
{
return new KnownContactsPlugin(pluginName, profile, cbInterface);
}
......@@ -25,6 +25,7 @@
#include <ClientPlugin.h>
#include <SyncResults.h>
#include <buteosyncfw5/SyncPluginLoader.h>
class KnownContactsSyncer;
......@@ -85,17 +86,16 @@ private:
KnownContactsSyncer *m_syncer;
};
/*! \brief Creates KnownContactsPlugin client plugin
*
* @param pluginName Name of this client plugin
* @param profile Profile to use
* @param cbInterface Pointer to the callback interface
* @return Client plugin on success, otherwise NULL
*/
/*! \brief Destroys KnownContactsPlugin client plugin
*
* @param client KnownContactsPlugin client plugin instance to destroy
*/
class KnownContactsPluginLoader : public Buteo::SyncPluginLoader
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.sailfishos.plugins.sync.KnownContactsPluginLoader")
Q_INTERFACES(Buteo::SyncPluginLoader)
public:
Buteo::ClientPlugin* createClientPlugin(const QString& pluginName,
const Buteo::SyncProfile& profile,
Buteo::PluginCbInterface* cbInterface) override;
};
#endif // KNOWNCONTACTSPLUGIN_H
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