Merge branch 'master' of github.com:introlab/rtabmap_ros into ros2

rtabmap_viz/CMakeLists.txt

@@ -39,8 +39,15 @@ SET(Libraries
 ## Build ##
 ###########
 
-add_executable(rtabmap_viz src/GuiNode.cpp src/GuiWrapper.cpp src/PreferencesDialogROS.cpp)
+add_executable(rtabmap_viz src/GuiNode.cpp src/GuiWrapper.cpp src/PreferencesDialogROS.cpp include/${PROJECT_NAME}/PreferencesDialogROS.h)
 ament_target_dependencies(rtabmap_viz ${Libraries})
+SET_TARGET_PROPERTIES(
+  rtabmap_viz
+   PROPERTIES
+	   AUTOUIC ON
+     AUTOMOC ON
+     AUTORCC ON
+)
 
 #############
 ## Install ##

rtabmap_viz/include/rtabmap_viz/PreferencesDialogROS.h

@@ -36,6 +36,7 @@ using namespace rtabmap;
 
 class PreferencesDialogROS : public PreferencesDialog
 {
+	Q_OBJECT
 public:
 	PreferencesDialogROS(rclcpp::Node * node, const QString & configFile, const std::string & rtabmapNodeName);
 	virtual ~PreferencesDialogROS();
@@ -44,7 +45,7 @@ public:
 	virtual QString getTmpIniFilePath() const;
 	bool hasAllParameters();
 
-public slots:
+public Q_SLOTS:
 	void readRtabmapNodeParameters();
 
 protected: