@wip implptr plugins

Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Oct 5, 2023 · 11b9da4 · 11b9da4
1 parent f3e8923
commit 11b9da4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/src/plugins/camera_fps/CameraFps.cc b/src/plugins/camera_fps/CameraFps.cc
@@ -15,6 +15,7 @@
  *
 */
 
+#include <gz/utils/ImplPtr.hh>
 #include <list>
 #include <string>
 
@@ -31,9 +32,8 @@
 
 namespace gz::gui::plugins
 {
-
 /// \brief Private data class for CameraFps
-class CameraFpsPrivate
+class CameraFps::Implementation
 {
   /// \brief Previous camera update time
   public: std::optional<std::chrono::steady_clock::time_point>
@@ -83,14 +83,12 @@ void CameraFps::OnRender()
 
 /////////////////////////////////////////////////
 CameraFps::CameraFps()
-  : Plugin(), dataPtr(new CameraFpsPrivate)
+  : dataPtr(gz::utils::MakeUniqueImpl<Implementation>())
 {
 }
 
 /////////////////////////////////////////////////
-CameraFps::~CameraFps()
-{
-}
+CameraFps::~CameraFps() = default;
 
 /////////////////////////////////////////////////
 void CameraFps::LoadConfig(const tinyxml2::XMLElement *)

diff --git a/src/plugins/camera_fps/CameraFps.hh b/src/plugins/camera_fps/CameraFps.hh
@@ -18,15 +18,13 @@
 #ifndef GZ_GUI_PLUGINS_CAMERAFPS_HH_
 #define GZ_GUI_PLUGINS_CAMERAFPS_HH_
 
+#include <gz/utils/ImplPtr.hh>
 #include <memory>
 
 #include "gz/gui/Plugin.hh"
 
 namespace gz::gui::plugins
 {
-/// Forward declarations
-class CameraFpsPrivate;
-
 /// \brief This plugin displays the GUI camera's Framerate Per Second (FPS)
 class CameraFps : public Plugin
 {
@@ -69,7 +67,7 @@ class CameraFps : public Plugin
 
   /// \internal
   /// \brief Pointer to private data.
-  private: std::unique_ptr<CameraFpsPrivate> dataPtr;
+  GZ_UTILS_UNIQUE_IMPL_PTR(dataPtr)
 };
 }  // namespace gz::gui::plugins
 #endif  // GZ_GUI_PLUGINS_CAMERAFPS_HH_
diff --git a/src/plugins/camera_tracking/CameraTracking.cc b/src/plugins/camera_tracking/CameraTracking.cc
@@ -15,6 +15,7 @@
  *
 */
 
+#include <gz/utils/ImplPtr.hh>
 #include <mutex>
 #include <string>
 
@@ -44,7 +45,7 @@
 namespace gz::gui::plugins
 {
 /// \brief Private data class for CameraTracking
-class CameraTrackingPrivate
+class CameraTracking::Implementation
 {
   /// \brief Perform rendering calls in the rendering thread.
   public: void OnRender();
@@ -430,7 +431,7 @@ void CameraTrackingPrivate::OnRender()
 
 /////////////////////////////////////////////////
 CameraTracking::CameraTracking()
-  : Plugin(), dataPtr(new CameraTrackingPrivate)
+  : dataPtr(gz::utils::MakeUniqueImpl<Implementation>())
 {
   this->dataPtr->timer = new QTimer(this);
   this->connect(this->dataPtr->timer, &QTimer::timeout, [=]()
@@ -449,9 +450,7 @@ CameraTracking::CameraTracking()
 }
 
 /////////////////////////////////////////////////
-CameraTracking::~CameraTracking()
-{
-}
+CameraTracking::~CameraTracking() = default;
 
 /////////////////////////////////////////////////
 void CameraTracking::LoadConfig(const tinyxml2::XMLElement *)
@@ -463,7 +462,8 @@ void CameraTracking::LoadConfig(const tinyxml2::XMLElement *)
 }
 
 /////////////////////////////////////////////////
-void CameraTrackingPrivate::HandleKeyRelease(events::KeyReleaseOnScene *_e)
+void CameraTracking::Implementation::HandleKeyRelease(
+  events::KeyReleaseOnScene *_e)
 {
   if (_e->Key().Key() == Qt::Key_Escape)
   {

diff --git a/src/plugins/camera_tracking/CameraTracking.hh b/src/plugins/camera_tracking/CameraTracking.hh
@@ -18,6 +18,7 @@
 #ifndef GZ_GUI_PLUGINS_CAMERATRACKING_HH_
 #define GZ_GUI_PLUGINS_CAMERATRACKING_HH_
 
+#include <gz/utils/ImplPtr.hh>
 #include <memory>
 
 #include "gz/gui/Plugin.hh"
@@ -58,7 +59,7 @@ class CameraTracking : public Plugin
 
   /// \internal
   /// \brief Pointer to private data.
-  private: std::unique_ptr<CameraTrackingPrivate> dataPtr;
+  GZ_UTILS_UNIQUE_IMPL_PTR(dataPtr)
 };
 }  // namespace gz::gui::plugins
 #endif  // GZ_GUI_PLUGINS_CAMERATRACKING_HH_