Commit 0f025edd authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas
Browse files

must add export name as second argument to DTK_DECLARE_XXX macros for plugins

parent 701b4508
......@@ -39,8 +39,8 @@
#define DTK_DECLARE_PLUGIN_INTERFACE(type) \
DTK_DECLARE_PLUGIN_INTERFACE_NAME_STRINGIFIED(DTK_DECLARE_PLUGIN_INTERFACE_NAME(type))
#define DTK_DECLARE_PLUGIN(type) \
class DTKCORE_EXPORT type##Plugin : public QObject \
#define DTK_DECLARE_PLUGIN(type, Export) \
class Export type##Plugin : public QObject \
{ \
Q_OBJECT \
\
......@@ -59,16 +59,16 @@
// DTK_DECLARE_PLUGIN_FACTORY
// ///////////////////////////////////////////////////////////////////
#define DTK_DECLARE_PLUGIN_FACTORY(type) \
class DTKCORE_EXPORT type##PluginFactory : public dtkCorePluginFactory<type> {}; \
#define DTK_DECLARE_PLUGIN_FACTORY(type,Export) \
class Export type##PluginFactory : public dtkCorePluginFactory<type> {}; \
template <typename T> type *type##Creator() { return new T; };
// ///////////////////////////////////////////////////////////////////
// DTK_DECLARE_PLUGIN_MANAGER
// ///////////////////////////////////////////////////////////////////
#define DTK_DECLARE_PLUGIN_MANAGER(type) \
class DTKCORE_EXPORT type##PluginManager : public dtkCorePluginManager<type##Plugin> {};
#define DTK_DECLARE_PLUGIN_MANAGER(type,Export) \
class Export type##PluginManager : public dtkCorePluginManager<type##Plugin> {};
// ///////////////////////////////////////////////////////////////////
// DTK_DEFINE_PLUGIN
......
......@@ -148,9 +148,9 @@ public:
};
DTK_DECLARE_OBJECT(dtkDistributedCommunicator*)
DTK_DECLARE_PLUGIN(dtkDistributedCommunicator)
DTK_DECLARE_PLUGIN_FACTORY(dtkDistributedCommunicator)
DTK_DECLARE_PLUGIN_MANAGER(dtkDistributedCommunicator)
DTK_DECLARE_PLUGIN(dtkDistributedCommunicator, DTKDISTRIBUTED_EXPORT)
DTK_DECLARE_PLUGIN_FACTORY(dtkDistributedCommunicator, DTKDISTRIBUTED_EXPORT)
DTK_DECLARE_PLUGIN_MANAGER(dtkDistributedCommunicator, DTKDISTRIBUTED_EXPORT)
//
// dtkDistributedCommunicator.h ends here
......@@ -76,9 +76,9 @@ DTKMATH_EXPORT QDebug operator<<(QDebug debug, const dtkMatrix *matrix);
DTKMATH_EXPORT QDebug operator<<(QDebug debug, const dtkMatrix& matrix);
DTK_DECLARE_OBJECT(dtkMatrix*)
DTK_DECLARE_PLUGIN(dtkMatrix)
DTK_DECLARE_PLUGIN_FACTORY(dtkMatrix)
DTK_DECLARE_PLUGIN_MANAGER(dtkMatrix)
DTK_DECLARE_PLUGIN(dtkMatrix, DTKMATH_EXPORT)
DTK_DECLARE_PLUGIN_FACTORY(dtkMatrix, DTKMATH_EXPORT)
DTK_DECLARE_PLUGIN_MANAGER(dtkMatrix, DTKMATH_EXPORT)
//
// dtkMatrix.h ends here
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