2 files changed, 8 insertions, 11 deletions

diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index e0462b7..29b35fd 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -554,16 +554,16 @@ Sink::Resource *MaildirResourceFactory::createResource(const ResourceContext &co
     return new MaildirResource(context);
 }
 
-void MaildirResourceFactory::registerFacades(Sink::FacadeFactory &factory)
+void MaildirResourceFactory::registerFacades(const QByteArray &name, Sink::FacadeFactory &factory)
 {
-    factory.registerFacade<Sink::ApplicationDomain::Mail, MaildirResourceMailFacade>(PLUGIN_NAME);
-    factory.registerFacade<Sink::ApplicationDomain::Folder, MaildirResourceFolderFacade>(PLUGIN_NAME);
+    factory.registerFacade<Sink::ApplicationDomain::Mail, MaildirResourceMailFacade>(name);
+    factory.registerFacade<Sink::ApplicationDomain::Folder, MaildirResourceFolderFacade>(name);
 }
 
-void MaildirResourceFactory::registerAdaptorFactories(Sink::AdaptorFactoryRegistry &registry)
+void MaildirResourceFactory::registerAdaptorFactories(const QByteArray &name, Sink::AdaptorFactoryRegistry &registry)
 {
-    registry.registerFactory<Sink::ApplicationDomain::Mail, MaildirMailAdaptorFactory>(PLUGIN_NAME);
-    registry.registerFactory<Sink::ApplicationDomain::Folder, MaildirFolderAdaptorFactory>(PLUGIN_NAME);
+    registry.registerFactory<Sink::ApplicationDomain::Mail, MaildirMailAdaptorFactory>(name);
+    registry.registerFactory<Sink::ApplicationDomain::Folder, MaildirFolderAdaptorFactory>(name);
 }
 
 void MaildirResourceFactory::removeDataFromDisk(const QByteArray &instanceIdentifier)
diff --git a/examples/maildirresource/maildirresource.h b/examples/maildirresource/maildirresource.h
index 6265819..2d1090b 100644
--- a/examples/maildirresource/maildirresource.h
+++ b/examples/maildirresource/maildirresource.h
@@ -25,9 +25,6 @@
 
 #include <flatbuffers/flatbuffers.h>
 
-//TODO: a little ugly to have this in two places, once here and once in Q_PLUGIN_METADATA
-#define PLUGIN_NAME "sink.maildir"
-
 class MaildirMailAdaptorFactory;
 class MaildirFolderAdaptorFactory;
 
@@ -65,8 +62,8 @@ public:
     MaildirResourceFactory(QObject *parent = 0);
 
     Sink::Resource *createResource(const Sink::ResourceContext &context) Q_DECL_OVERRIDE;
-    void registerFacades(Sink::FacadeFactory &factory) Q_DECL_OVERRIDE;
-    void registerAdaptorFactories(Sink::AdaptorFactoryRegistry &registry) Q_DECL_OVERRIDE;
+    void registerFacades(const QByteArray &resourceName, Sink::FacadeFactory &factory) Q_DECL_OVERRIDE;
+    void registerAdaptorFactories(const QByteArray &resourceName, Sink::AdaptorFactoryRegistry &registry) Q_DECL_OVERRIDE;
     void removeDataFromDisk(const QByteArray &instanceIdentifier) Q_DECL_OVERRIDE;
 };