Changeset 288 in pacpusframework for trunk/include/Pacpus/kernel/ComponentFactory.h

Timestamp:

03/26/14 21:27:30 (10 years ago)

Author:

Marek Kurdej

Message:

Using boost::shared_ptr for storing components.

File:

• trunk/include/Pacpus/kernel/ComponentFactory.h (modified) (7 diffs)

trunk/include/Pacpus/kernel/ComponentFactory.h

@@ -16 +16 @@
 #define DEF_PACPUS_COMPONENTFACTORY_H
 
-#include <cassert>
-
-//#include <boost/static_assert.hpp>
-//#include <boost/type_traits/is_base_of.hpp>
+#include <boost/assert.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/type_traits/is_base_of.hpp>
 
 #include <Pacpus/kernel/ComponentFactoryBase.h>
@@ -37 +36 @@
   static pacpus::ComponentFactory<className> sFactory(factoryName)
 
-namespace pacpus {
+#define PACPUS_REGISTER_COMPONENT(Class) \
+    static pacpus::ComponentFactory<Class> sFactory(#Class)
+
+namespace pacpus
+{
 
 /// Use it to interface your components with the application.
@@ -47 +50 @@
     : public ComponentFactoryBase
 {
-    //static_assert(,"T must inherit from ComponentBase")
-    //  BOOST_STATIC_ASSERT_MSG((boost::is_base_of<ComponentBase, T>::value), "T must inherit from ComponentBase");
+    BOOST_STATIC_ASSERT_MSG((boost::is_base_of<ComponentBase, T>::value), "component T must inherit from ComponentBase");
+
 public:
     /** Ctor of ComponentFactory, initialize the factory of the components of type @em T.
      * @param type Name of the type of the components.
      */
-    ComponentFactory(const QString& type);
+    ComponentFactory(QString const& type);
     
     /** Dtor of ComponentFactory. */
@@ -61 +64 @@
      * @return Name of the type of the components.
      */
-    const QString& getType() const;
+    QString const& getType() const;
 
 protected:
-    virtual ComponentBase* instantiateComponent(const QString& name);
-  
+    virtual ComponentSharedPointer instantiateComponent(QString const& name);
+
 private:
     QString mType;
@@ -71 +74 @@
 
 template <typename T>
-ComponentFactory<T>::ComponentFactory(const QString& type)
-  : mType(type)
+ComponentFactory<T>::ComponentFactory(QString const& type)
+    : mType(type)
 {
-    assert(!type.isEmpty());
+    BOOST_ASSERT(!type.isEmpty());
     addFactory(this, mType);
 }
@@ -84 +87 @@
 
 template <typename T>
-const QString& ComponentFactory<T>::getType() const
+QString const& ComponentFactory<T>::getType() const
 {
     return mType;
@@ -90 +93 @@
 
 template<typename T>
-ComponentBase* ComponentFactory<T>::instantiateComponent(const QString& name)
+ComponentSharedPointer ComponentFactory<T>::instantiateComponent(QString const& name)
 {
-    return new T(name);
+    return ComponentSharedPointer(new T(name));
 }
 
-} // pacpus
+} // namespace pacpus
 
 #endif // DEF_PACPUS_DBITEEXCEPTION_H