Changeset 194 in pacpusframework for trunk/src

Timestamp:

Oct 24, 2013, 3:59:43 PM (11 years ago)

Author:

Marek Kurdej

Message:

Minor: NewComponent modifications.

Location:

trunk/src/_NewComponent

Files:

• CMakeLists.txt.in (modified) (2 diffs)
• NewComponent.cpp.in (modified) (2 diffs)
• NewComponent.h.in (modified) (1 diff)

trunk/src/_NewComponent/CMakeLists.txt.in

@@ -7 +7 @@
 create_export(EXPORT_HDR ${PROJECT_NAME})
 pacpus_plugin(PLUGIN_CPP PLUGIN_HDR ${PROJECT_NAME})
-
-################################################################################
-# Qt
-set(QT_USE_QTXML true)
-set(QT_USE_QTNETWORK true)
-include(${QT_USE_FILE})
-
-add_definitions(
-    ${QT_DEFINITIONS}
-)
 
 ################################################################################
@@ -46 +36 @@
 set(MOC_FILES
     ${PLUGIN_HDR}
-    #@PACPUS_COMPONENT_NAME@.h
+    @PACPUS_COMPONENT_NAME@.h
 )
 

trunk/src/_NewComponent/NewComponent.cpp.in

@@ -40 +40 @@
 void @PACPUS_COMPONENT_NAME@::addInputs()
 {
+    // must inherit from QObject to use addInput
     //addInput<InputType, @PACPUS_COMPONENT_NAME@>("input-name", &@PACPUS_COMPONENT_NAME@::processInput);
 }
@@ -45 +46 @@
 void @PACPUS_COMPONENT_NAME@::addOutputs()
 {
+    // must inherit from QObject to use addOutput
     //addOutput<OutputType, @PACPUS_COMPONENT_NAME@>("output-name");
 }

trunk/src/_NewComponent/NewComponent.h.in

@@ -16 +16 @@
 #define @PACPUS_COMPONENT_NAME_CAPS@_H
 
+#include "@PACPUS_COMPONENT_NAME@Config.h"
+
 #include <Pacpus/kernel/ComponentBase.h>
-//#include <QObject>
 
-#include "@PACPUS_COMPONENT_NAME@Config.h"
+#include <QObject>
 
 namespace pacpus {
 
 class @PACPUS_COMPONENT_NAME_CAPS@_API @PACPUS_COMPONENT_NAME@
-    // : public QObject
-    // , public ComponentBase // must be after QObject
-    : public ComponentBase
+    : public QObject
+    , public ComponentBase // must be after QObject
 {
-    //Q_OBJECT
+    Q_OBJECT
 
 public: