Consolidate namespaces: plugins

Signed-off-by: Michael Carroll <[email protected]>

src/plugins/camera_fps/CameraFps.cc

@@ -29,8 +29,10 @@
 
 #include "CameraFps.hh"
 
+namespace gz::gui::plugins
+{
 /// \brief Private data class for CameraFps
-class gz::gui::plugins::CameraFpsPrivate
+class CameraFpsPrivate
 {
   /// \brief Previous camera update time
   public: std::optional<std::chrono::steady_clock::time_point>
@@ -50,10 +52,6 @@ class gz::gui::plugins::CameraFpsPrivate
   public: QString cameraFPSValue;
 };
 
-using namespace gz;
-using namespace gui;
-using namespace plugins;
-
 /////////////////////////////////////////////////
 void CameraFps::OnRender()
 {
@@ -125,6 +123,7 @@ void CameraFps::SetCameraFpsValue(const QString &_value)
   this->dataPtr->cameraFPSValue = _value;
   this->CameraFpsValueChanged();
 }
+}  // namespace gz::gui::plugins
 
 // Register this plugin
 GZ_ADD_PLUGIN(gz::gui::plugins::CameraFps,

src/plugins/camera_fps/CameraFps.hh

@@ -22,11 +22,7 @@
 
 #include "gz/gui/Plugin.hh"
 
-namespace gz
-{
-namespace gui
-{
-namespace plugins
+namespace gz::gui::plugins
 {
   class CameraFpsPrivate;
 
@@ -74,7 +70,6 @@ namespace plugins
     /// \brief Pointer to private data.
     private: std::unique_ptr<CameraFpsPrivate> dataPtr;
   };
-}
-}
-}
-#endif
+}  // namespace gz::gui::plugins
+
+#endif // GZ_GUI_PLUGINS_CAMERAFPS_HH_

src/plugins/camera_tracking/CameraTracking.cc

@@ -38,8 +38,10 @@
 
 #include "CameraTracking.hh"
 
+namespace gz::gui::plugins
+{
 /// \brief Private data class for CameraTracking
-class gz::gui::plugins::CameraTrackingPrivate
+class CameraTrackingPrivate
 {
   /// \brief Perform rendering calls in the rendering thread.
   public: void OnRender();
@@ -153,10 +155,6 @@ class gz::gui::plugins::CameraTrackingPrivate
   public: QTimer *timer{nullptr};
 };
 
-using namespace gz;
-using namespace gui;
-using namespace plugins;
-
 /////////////////////////////////////////////////
 void CameraTrackingPrivate::Initialize()
 {
@@ -494,6 +492,7 @@ bool CameraTracking::eventFilter(QObject *_obj, QEvent *_event)
   // Standard event processing
   return QObject::eventFilter(_obj, _event);
 }
+}  // namespace gz::gui::plugins
 
 // Register this plugin
 GZ_ADD_PLUGIN(gz::gui::plugins::CameraTracking,

src/plugins/camera_tracking/CameraTracking.hh

@@ -22,11 +22,7 @@
 
 #include "gz/gui/Plugin.hh"
 
-namespace gz
-{
-namespace gui
-{
-namespace plugins
+namespace gz::gui::plugins
 {
   class CameraTrackingPrivate;
 
@@ -64,7 +60,6 @@ namespace plugins
     /// \brief Pointer to private data.
     private: std::unique_ptr<CameraTrackingPrivate> dataPtr;
   };
-}
-}
-}
-#endif
+}  // namespace gz::gui::plugins
+
+#endif  // GZ_GUI_PLUGINS_CAMERATRACKING_HH_

src/plugins/grid_config/GridConfig.cc

@@ -81,10 +81,6 @@ namespace gz::gui
     /// \brief Visible state
     bool visible{true};
   };
-}
-
-using namespace gz;
-using namespace gui;
 
 /////////////////////////////////////////////////
 GridConfig::GridConfig()
@@ -409,7 +405,8 @@ void GridConfig::RefreshList()
     this->OnName(this->dataPtr->nameList.at(0));
   this->NameListChanged();
 }
+}  // namespace gz::gui
 
 // Register this plugin
-GZ_ADD_PLUGIN(GridConfig,
-              gui::Plugin)
+GZ_ADD_PLUGIN(gz::gui::GridConfig,
+              gz::gui::Plugin)

src/plugins/grid_config/GridConfig.hh

@@ -22,9 +22,7 @@
 
 #include <gz/gui/Plugin.hh>
 
-namespace gz
-{
-namespace gui
+namespace gz::gui
 {
   class GridConfigPrivate;
 
@@ -143,7 +141,6 @@ namespace gui
     /// \brief Pointer to private data.
     private: std::unique_ptr<GridConfigPrivate> dataPtr;
   };
-}
-}
+}  // namespace gz::gui
 
-#endif
+#endif  // GZ_GUI_GRIDCONFIG_HH_

src/plugins/image_display/ImageDisplay.cc

@@ -33,11 +33,7 @@
 #include "gz/gui/Application.hh"
 #include "gz/gui/MainWindow.hh"
 
-namespace gz
-{
-namespace gui
-{
-namespace plugins
+namespace gz::gui::plugins
 {
   class ImageDisplayPrivate
   {
@@ -56,13 +52,6 @@ namespace plugins
     /// \brief To provide images for QML.
     public: ImageProvider *provider{nullptr};
   };
-}
-}
-}
-
-using namespace gz;
-using namespace gui;
-using namespace plugins;
 
 /////////////////////////////////////////////////
 ImageDisplay::ImageDisplay()
@@ -273,7 +262,8 @@ void ImageDisplay::SetTopicList(const QStringList &_topicList)
   this->dataPtr->topicList = _topicList;
   this->TopicListChanged();
 }
+}  // namespace gz::gui::plugins
 
 // Register this plugin
-GZ_ADD_PLUGIN(ImageDisplay,
-              gui::Plugin)
+GZ_ADD_PLUGIN(gz::gui::plugins::ImageDisplay,
+              gz::gui::Plugin)

src/plugins/image_display/ImageDisplay.hh

@@ -36,11 +36,7 @@
 
 #include "gz/gui/Plugin.hh"
 
-namespace gz
-{
-namespace gui
-{
-namespace plugins
+namespace gz::gui::plugins
 {
   class ImageDisplayPrivate;
 
@@ -136,8 +132,6 @@ namespace plugins
     /// \brief Pointer to private data.
     private: std::unique_ptr<ImageDisplayPrivate> dataPtr;
   };
-}
-}
-}
+}  // namespace gz::gui::plugins
 
-#endif
+#endif  // GZ_GUI_PLUGINS_IMAGEDISPLAY_HH_

src/plugins/interactive_view_control/InteractiveViewControl.cc

@@ -43,8 +43,10 @@
 
 #include "InteractiveViewControl.hh"
 
+namespace gz::gui::plugins
+{
 /// \brief Private data class for InteractiveViewControl
-class gz::gui::plugins::InteractiveViewControlPrivate
+class InteractiveViewControlPrivate
 {
   /// \brief Perform rendering calls in the rendering thread.
   public: void OnRender();
@@ -144,10 +146,6 @@ class gz::gui::plugins::InteractiveViewControlPrivate
   public: double viewControlSensitivity = 1.0;
 };
 
-using namespace gz;
-using namespace gui;
-using namespace plugins;
-
 /////////////////////////////////////////////////
 void InteractiveViewControlPrivate::OnRender()
 {
@@ -502,6 +500,7 @@ bool InteractiveViewControl::eventFilter(QObject *_obj, QEvent *_event)
   // Standard event processing
   return QObject::eventFilter(_obj, _event);
 }
+}  // namespace gz::gui::plugins
 
 // Register this plugin
 GZ_ADD_PLUGIN(gz::gui::plugins::InteractiveViewControl,

src/plugins/interactive_view_control/InteractiveViewControl.hh

@@ -22,11 +22,7 @@
 
 #include "gz/gui/Plugin.hh"
 
-namespace gz
-{
-namespace gui
-{
-namespace plugins
+namespace gz::gui::plugins
 {
   class InteractiveViewControlPrivate;
 
@@ -70,8 +66,6 @@ namespace plugins
     /// \brief Pointer to private data.
     private: std::unique_ptr<InteractiveViewControlPrivate> dataPtr;
   };
-}
-}
-}
+}  // namespace gz::gui::plugins
 
-#endif
+#endif  // GZ_GUI_PLUGINS_INTERACTIVEVIEWCONTROL_HH_

src/plugins/key_publisher/KeyPublisher.cc

@@ -25,9 +25,7 @@
 
 #include "KeyPublisher.hh"
 
-namespace gz
-{
-namespace gui
+namespace gz::gui
 {
   class KeyPublisherPrivate
   {
@@ -49,11 +47,6 @@ namespace gui
       pub.Publish(Msg);
     }
   };
-}
-}
-
-using namespace gz;
-using namespace gui;
 
 /////////////////////////////////////////////////
 KeyPublisher::KeyPublisher(): Plugin(), dataPtr(new KeyPublisherPrivate)
@@ -88,7 +81,8 @@ bool KeyPublisher::eventFilter(QObject *_obj, QEvent *_event)
   }
   return QObject::eventFilter(_obj, _event);
 }
+}  // namespace gz::gui
 
 // Register this plugin
-GZ_ADD_PLUGIN(KeyPublisher,
-              gui::Plugin)
+GZ_ADD_PLUGIN(gz::gui::KeyPublisher,
+              gz::gui::Plugin)

src/plugins/key_publisher/KeyPublisher.hh

@@ -35,9 +35,7 @@
 #include <gz/gui/Plugin.hh>
 #include <gz/transport/Node.hh>
 
-namespace gz
-{
-namespace gui
+namespace gz::gui
 {
   class KeyPublisherPrivate;
 
@@ -68,7 +66,6 @@ namespace gui
     /// \brief Pointer to private data.
     private: std::unique_ptr<KeyPublisherPrivate> dataPtr;
   };
-}
-}
+}  // namespace gz::gui
 
-#endif
+#endif  // GZ_GUI_PLUGINS_KEYPUBLISHER_HH_

src/plugins/marker_manager/MarkerManager.cc

@@ -49,8 +49,10 @@
 
 #include "MarkerManager.hh"
 
+namespace gz::gui::plugins
+{
 /// \brief Private data class for MarkerManager
-class gz::gui::plugins::MarkerManagerPrivate
+class MarkerManagerPrivate
 {
   /// \brief Update markers based on msgs received
   public: void OnRender();
@@ -140,10 +142,6 @@ class gz::gui::plugins::MarkerManagerPrivate
   public: bool warnOnActionFailure{true};
 };
 
-using namespace gz;
-using namespace gui;
-using namespace plugins;
-
 /////////////////////////////////////////////////
 void MarkerManagerPrivate::Initialize()
 {
@@ -777,6 +775,7 @@ bool MarkerManager::eventFilter(QObject *_obj, QEvent *_event)
   // Standard event processing
   return QObject::eventFilter(_obj, _event);
 }
+}  // namespace gz::gui::plugins
 
 // Register this plugin
 GZ_ADD_PLUGIN(gz::gui::plugins::MarkerManager,

src/plugins/marker_manager/MarkerManager.hh

@@ -22,11 +22,7 @@
 
 #include "gz/gui/Plugin.hh"
 
-namespace gz
-{
-namespace gui
-{
-namespace plugins
+namespace gz::gui::plugins
 {
   class MarkerManagerPrivate;
 
@@ -62,7 +58,6 @@ namespace plugins
     /// \brief Pointer to private data.
     private: std::unique_ptr<MarkerManagerPrivate> dataPtr;
   };
-}
-}
-}
-#endif
+}  // namespace gz::gui::plugins
+
+#endif  // GZ_GUI_PLUGINS_MARKERMANAGER_HH_