Remaining plugins to use implptr

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>

src/MainWindow.cc

@@ -85,7 +85,7 @@ class MainWindow::Implementation
   public: std::string controlService{"/server_control"};
 
   /// \brief Communication node
-  public: gz::transport::Node node;
+  public: gz::transport::Node node {gz::transport::NodeOptions()};
 };
 
 /////////////////////////////////////////////////

src/PlottingInterface.cc

@@ -70,7 +70,7 @@ class Topic::Implementation
 class Transport::Implementation
 {
   /// \brief Node for Commincation
-  public: gz::transport::Node node;
+  public: gz::transport::Node node {gz::transport::NodeOptions()};
 
   /// \brief subscribed topics
   public: std::map<std::string, gz::gui::Topic*> topics;

src/plugins/camera_tracking/CameraTracking.cc

@@ -160,7 +160,7 @@ class CameraTracking::Implementation
 };
 
 /////////////////////////////////////////////////
-void CameraTrackingPrivate::Initialize()
+void CameraTracking::Implementation::Initialize()
 {
   // Attach to the first camera we find
   for (unsigned int i = 0; i < scene->NodeCount(); ++i)
@@ -170,7 +170,7 @@ void CameraTrackingPrivate::Initialize()
     if (cam)
     {
       this->camera = cam;
-      gzdbg << "CameraTrackingPrivate plugin is moving camera ["
+      gzdbg << "CameraTracking plugin is moving camera ["
              << this->camera->Name() << "]" << std::endl;
       break;
     }
@@ -184,22 +184,22 @@ void CameraTrackingPrivate::Initialize()
   // move to
   this->moveToService = "/gui/move_to";
   this->node.Advertise(this->moveToService,
-      &CameraTrackingPrivate::OnMoveTo, this);
+      &Implementation::OnMoveTo, this);
   gzmsg << "Move to service on ["
          << this->moveToService << "]" << std::endl;
 
   // follow
   this->followService = "/gui/follow";
   this->node.Advertise(this->followService,
-      &CameraTrackingPrivate::OnFollow, this);
+      &Implementation::OnFollow, this);
   gzmsg << "Follow service on ["
          << this->followService << "]" << std::endl;
 
   // move to pose service
   this->moveToPoseService =
       "/gui/move_to/pose";
   this->node.Advertise(this->moveToPoseService,
-      &CameraTrackingPrivate::OnMoveToPose, this);
+      &Implementation::OnMoveToPose, this);
   gzmsg << "Move to pose service on ["
          << this->moveToPoseService << "]" << std::endl;
 
@@ -210,16 +210,16 @@ void CameraTrackingPrivate::Initialize()
   gzmsg << "Camera pose topic advertised on ["
          << this->cameraPoseTopic << "]" << std::endl;
 
-   // follow offset
-   this->followOffsetService = "/gui/follow/offset";
-   this->node.Advertise(this->followOffsetService,
-       &CameraTrackingPrivate::OnFollowOffset, this);
-   gzmsg << "Follow offset service on ["
-          << this->followOffsetService << "]" << std::endl;
+  // follow offset
+  this->followOffsetService = "/gui/follow/offset";
+  this->node.Advertise(this->followOffsetService,
+      &Implementation::OnFollowOffset, this);
+  gzmsg << "Follow offset service on ["
+       << this->followOffsetService << "]" << std::endl;
 }
 
 /////////////////////////////////////////////////
-bool CameraTrackingPrivate::OnMoveTo(const msgs::StringMsg &_msg,
+bool CameraTracking::Implementation::OnMoveTo(const msgs::StringMsg &_msg,
   msgs::Boolean &_res)
 {
   std::lock_guard<std::mutex> lock(this->mutex);
@@ -230,7 +230,7 @@ bool CameraTrackingPrivate::OnMoveTo(const msgs::StringMsg &_msg,
 }
 
 /////////////////////////////////////////////////
-bool CameraTrackingPrivate::OnFollow(const msgs::StringMsg &_msg,
+bool CameraTracking::Implementation::OnFollow(const msgs::StringMsg &_msg,
   msgs::Boolean &_res)
 {
   std::lock_guard<std::mutex> lock(this->mutex);
@@ -241,19 +241,19 @@ bool CameraTrackingPrivate::OnFollow(const msgs::StringMsg &_msg,
 }
 
 /////////////////////////////////////////////////
-void CameraTrackingPrivate::OnMoveToComplete()
+void CameraTracking::Implementation::OnMoveToComplete()
 {
   this->moveToTarget.clear();
 }
 
 /////////////////////////////////////////////////
-void CameraTrackingPrivate::OnMoveToPoseComplete()
+void CameraTracking::Implementation::OnMoveToPoseComplete()
 {
   this->moveToPoseValue.reset();
 }
 
 /////////////////////////////////////////////////
-bool CameraTrackingPrivate::OnFollowOffset(const msgs::Vector3d &_msg,
+bool CameraTracking::Implementation::OnFollowOffset(const msgs::Vector3d &_msg,
   msgs::Boolean &_res)
 {
   std::lock_guard<std::mutex> lock(this->mutex);
@@ -268,7 +268,7 @@ bool CameraTrackingPrivate::OnFollowOffset(const msgs::Vector3d &_msg,
 }
 
 /////////////////////////////////////////////////
-bool CameraTrackingPrivate::OnMoveToPose(const msgs::GUICamera &_msg,
+bool CameraTracking::Implementation::OnMoveToPose(const msgs::GUICamera &_msg,
   msgs::Boolean &_res)
 {
   std::lock_guard<std::mutex> lock(this->mutex);
@@ -295,7 +295,7 @@ bool CameraTrackingPrivate::OnMoveToPose(const msgs::GUICamera &_msg,
 }
 
 /////////////////////////////////////////////////
-void CameraTrackingPrivate::OnRender()
+void CameraTracking::Implementation::OnRender()
 {
   std::lock_guard<std::mutex> lock(this->mutex);
 
@@ -313,7 +313,7 @@ void CameraTrackingPrivate::OnRender()
 
   // Move To
   {
-    GZ_PROFILE("CameraTrackingPrivate::OnRender MoveTo");
+    GZ_PROFILE("CameraTracking::Implementation::OnRender MoveTo");
     if (!this->moveToTarget.empty())
     {
       if (this->moveToHelper.Idle())
@@ -323,7 +323,7 @@ void CameraTrackingPrivate::OnRender()
         if (target)
         {
           this->moveToHelper.MoveTo(this->camera, target, 0.5,
-              std::bind(&CameraTrackingPrivate::OnMoveToComplete, this));
+              std::bind(&Implementation::OnMoveToComplete, this));
           this->prevMoveToTime = std::chrono::system_clock::now();
         }
         else
@@ -345,14 +345,14 @@ void CameraTrackingPrivate::OnRender()
 
   // Move to pose
   {
-    GZ_PROFILE("CameraTrackingPrivate::OnRender MoveToPose");
+    GZ_PROFILE("CameraTracking::Implementation::OnRender MoveToPose");
     if (this->moveToPoseValue)
     {
       if (this->moveToHelper.Idle())
       {
         this->moveToHelper.MoveTo(this->camera,
             *(this->moveToPoseValue),
-            0.5, std::bind(&CameraTrackingPrivate::OnMoveToPoseComplete, this));
+            0.5, std::bind(&Implementation::OnMoveToPoseComplete, this));
         this->prevMoveToTime = std::chrono::system_clock::now();
       }
       else
@@ -367,7 +367,7 @@ void CameraTrackingPrivate::OnRender()
 
   // Follow
   {
-    GZ_PROFILE("CameraTrackingPrivate::OnRender Follow");
+    GZ_PROFILE("CameraTracking::Implementation::OnRender Follow");
     // reset follow mode if target node got removed
     if (!this->followTarget.empty())
     {

src/plugins/grid_config/GridConfig.cc

@@ -52,7 +52,7 @@ struct GridParam
   math::Color color{math::Color(0.7f, 0.7f, 0.7f, 1.0f)};
 };
 
-class GridConfigPrivate
+class GridConfig::Implementation
 {
   /// \brief List of grid names.
   public: QStringList nameList;
@@ -84,7 +84,7 @@ class GridConfigPrivate
 
 /////////////////////////////////////////////////
 GridConfig::GridConfig()
-  : gz::gui::Plugin(), dataPtr(std::make_unique<GridConfigPrivate>())
+  : dataPtr(gz::utils::MakeUniqueImpl<Implementation>())
 {
 }
 

src/plugins/grid_config/GridConfig.hh

@@ -22,6 +22,8 @@
 
 #include <gz/gui/Plugin.hh>
 
+#include <gz/utils/ImplPtr.hh>
+
 namespace gz::gui::plugins
 {
 class GridConfigPrivate;
@@ -139,7 +141,7 @@ class GridConfig : public gz::gui::Plugin
 
   /// \internal
   /// \brief Pointer to private data.
-  private: std::unique_ptr<GridConfigPrivate> dataPtr;
+  private: GZ_UTILS_UNIQUE_IMPL_PTR(dataPtr)
 };
 }  // namespace gz::gui::plugins
 #endif  // GZ_GUI_PLUGINS_GRIDCONFIG_HH_

src/plugins/image_display/ImageDisplay.cc

@@ -35,7 +35,7 @@
 
 namespace gz::gui::plugins
 {
-class ImageDisplayPrivate
+class ImageDisplay::Implementation
 {
   /// \brief List of topics publishing image messages.
   public: QStringList topicList;
@@ -55,7 +55,7 @@ class ImageDisplayPrivate
 
 /////////////////////////////////////////////////
 ImageDisplay::ImageDisplay()
-  : Plugin(), dataPtr(new ImageDisplayPrivate)
+  : dataPtr(gz::utils::MakeUniqueImpl<Implementation>())
 {
 }
 

src/plugins/image_display/ImageDisplay.hh

@@ -36,10 +36,10 @@
 
 #include "gz/gui/Plugin.hh"
 
+#include <gz/utils/ImplPtr.hh>
+
 namespace gz::gui::plugins
 {
-class ImageDisplayPrivate;
-
 class ImageProvider : public QQuickImageProvider
 {
   public: ImageProvider()
@@ -130,7 +130,7 @@ class ImageDisplay_EXPORTS_API ImageDisplay : public Plugin
 
   /// \internal
   /// \brief Pointer to private data.
-  private: std::unique_ptr<ImageDisplayPrivate> dataPtr;
+  GZ_UTILS_UNIQUE_IMPL_PTR(dataPtr)
 };
 }  // namespace gz::gui::plugins
 #endif  // GZ_GUI_PLUGINS_IMAGEDISPLAY_HH_

src/plugins/interactive_view_control/InteractiveViewControl.cc

@@ -19,6 +19,7 @@
 #include <gz/msgs/double.pb.h>
 #include <gz/msgs/stringmsg.pb.h>
 
+#include <gz/utils/ImplPtr.hh>
 #include <string>
 #include <mutex>
 
@@ -46,7 +47,7 @@
 namespace gz::gui::plugins
 {
 /// \brief Private data class for InteractiveViewControl
-class InteractiveViewControlPrivate
+class InteractiveViewControl::Implementation
 {
   /// \brief Perform rendering calls in the rendering thread.
   public: void OnRender();
@@ -147,7 +148,7 @@ class InteractiveViewControlPrivate
 };
 
 /////////////////////////////////////////////////
-void InteractiveViewControlPrivate::OnRender()
+void InteractiveViewControl::Implementation::OnRender()
 {
   if (!this->scene)
   {
@@ -315,7 +316,7 @@ void InteractiveViewControlPrivate::OnRender()
 }
 
 /////////////////////////////////////////////////
-void InteractiveViewControlPrivate::UpdateReferenceVisual()
+void InteractiveViewControl::Implementation::UpdateReferenceVisual()
 {
   if (!this->refVisual || !this->enableRefVisual)
     return;
@@ -331,8 +332,8 @@ void InteractiveViewControlPrivate::UpdateReferenceVisual()
 }
 
 /////////////////////////////////////////////////
-bool InteractiveViewControlPrivate::OnViewControl(const msgs::StringMsg &_msg,
-  msgs::Boolean &_res)
+bool InteractiveViewControl::Implementation::OnViewControl(
+  const msgs::StringMsg &_msg, msgs::Boolean &_res)
 {
   std::lock_guard<std::mutex> lock(this->mutex);
 
@@ -355,8 +356,8 @@ bool InteractiveViewControlPrivate::OnViewControl(const msgs::StringMsg &_msg,
 }
 
 /////////////////////////////////////////////////
-bool InteractiveViewControlPrivate::OnReferenceVisual(const msgs::Boolean &_msg,
-  msgs::Boolean &_res)
+bool InteractiveViewControl::Implementation::OnReferenceVisual(
+  const msgs::Boolean &_msg, msgs::Boolean &_res)
 {
   std::lock_guard<std::mutex> lock(this->mutex);
   this->enableRefVisual = _msg.data();
@@ -366,7 +367,7 @@ bool InteractiveViewControlPrivate::OnReferenceVisual(const msgs::Boolean &_msg,
 }
 
 /////////////////////////////////////////////////
-bool InteractiveViewControlPrivate::OnViewControlSensitivity(
+bool InteractiveViewControl::Implementation::OnViewControlSensitivity(
   const msgs::Double &_msg, msgs::Boolean &_res)
 {
   std::lock_guard<std::mutex> lock(this->mutex);
@@ -387,7 +388,7 @@ bool InteractiveViewControlPrivate::OnViewControlSensitivity(
 
 /////////////////////////////////////////////////
 InteractiveViewControl::InteractiveViewControl()
-  : Plugin(), dataPtr(std::make_unique<InteractiveViewControlPrivate>())
+  : dataPtr(gz::utils::MakeUniqueImpl<Implementation>())
 {
 }
 
@@ -404,15 +405,15 @@ void InteractiveViewControl::LoadConfig(
   // camera view control mode
   this->dataPtr->cameraViewControlService = "/gui/camera/view_control";
   this->dataPtr->node.Advertise(this->dataPtr->cameraViewControlService,
-      &InteractiveViewControlPrivate::OnViewControl, this->dataPtr.get());
+      &Implementation::OnViewControl, this->dataPtr.get());
   gzmsg << "Camera view controller topic advertised on ["
          << this->dataPtr->cameraViewControlService << "]" << std::endl;
 
   // camera reference visual
   this->dataPtr->cameraRefVisualService =
       "/gui/camera/view_control/reference_visual";
   this->dataPtr->node.Advertise(this->dataPtr->cameraRefVisualService,
-      &InteractiveViewControlPrivate::OnReferenceVisual, this->dataPtr.get());
+      &Implementation::OnReferenceVisual, this->dataPtr.get());
   gzmsg << "Camera reference visual topic advertised on ["
         << this->dataPtr->cameraRefVisualService << "]" << std::endl;
 
@@ -421,7 +422,7 @@ void InteractiveViewControl::LoadConfig(
       "/gui/camera/view_control/sensitivity";
   this->dataPtr->node.Advertise(
       this->dataPtr->cameraViewControlSensitivityService,
-      &InteractiveViewControlPrivate::OnViewControlSensitivity,
+      &Implementation::OnViewControlSensitivity,
       this->dataPtr.get());
   gzmsg << "Camera view control sensitivity advertised on ["
         << this->dataPtr->cameraViewControlSensitivityService << "]"
@@ -501,7 +502,6 @@ bool InteractiveViewControl::eventFilter(QObject *_obj, QEvent *_event)
   return QObject::eventFilter(_obj, _event);
 }
 }  // namespace gz::gui::plugins
-
 // Register this plugin
 GZ_ADD_PLUGIN(gz::gui::plugins::InteractiveViewControl,
               gz::gui::Plugin)

src/plugins/interactive_view_control/InteractiveViewControl.hh

@@ -22,6 +22,8 @@
 
 #include "gz/gui/Plugin.hh"
 
+#include <gz/utils/ImplPtr.hh>
+
 namespace gz::gui::plugins
 {
 class InteractiveViewControlPrivate;
@@ -64,7 +66,7 @@ class InteractiveViewControl : public Plugin
 
   /// \internal
   /// \brief Pointer to private data.
-  private: std::unique_ptr<InteractiveViewControlPrivate> dataPtr;
+  GZ_UTILS_UNIQUE_IMPL_PTR(dataPtr)
 };
 }  // namespace gz::gui::plugins
 #endif  // GZ_GUI_PLUGINS_INTERACTIVEVIEWCONTROL_HH_