[Plugins] Fix compilation regarding qt code now activated (#5623)

* Fix compilation, changing namespace by removing GUI

* Fix namespaces in image

Author: bakpaul

applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.cpp

@@ -76,4 +76,4 @@ Creator<DataWidgetFactory, TableDataWidget< sofa::gpu::cuda::CudaVector<Vec3d> >
 Creator<DataWidgetFactory, TableDataWidget< sofa::gpu::cuda::CudaVector<Vec4d> > > DWClass_cudaVectorVec4d("default", true);
 
 
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

applications/plugins/SofaCUDA/sofa/gpu/gui/CudaDataWidget.h

@@ -59,4 +59,4 @@ class vector_data_trait < sofa::gpu::cuda::CudaVector<T> >
 };
 
 
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

applications/plugins/SofaMatrix/extensions/Qt/src/SofaMatrix/Qt/BaseMatrixImageViewerWidget.cpp

@@ -21,7 +21,7 @@
 ******************************************************************************/
 #include <SofaMatrix/Qt/BaseMatrixImageViewerWidget.h>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 // Add the widget in the DataWidgetFactory with the key 'matrixbitmap', so that a Data< type::BaseMatrixProxy > can call setWidget("matrixbitmap")
@@ -172,4 +172,4 @@ void BaseMatrixImageViewerWidget::readFromData()
     dirty = false;
     counter = baseData->getCounter();
 }
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

applications/plugins/SofaMatrix/extensions/Qt/src/SofaMatrix/Qt/BaseMatrixImageViewerWidget.h

@@ -23,11 +23,11 @@
 #include <SofaMatrix/Qt/config.h>
 
 #include <QGraphicsView>
-#include <sofa/gui/qt/SimpleDataWidget.h>
+#include <sofa/qt/SimpleDataWidget.h>
 
 #include <SofaMatrix/Qt/BaseMatrixImageProxy.h>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 /// A QGraphicsScene showing a QImage
@@ -106,4 +106,4 @@ class BaseMatrixImageViewerWidget : public SimpleDataWidget<type::BaseMatrixImag
     void readFromData() override;
 };
 
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

applications/plugins/image/image_gui/src/image_gui/HistogramWidget.cpp

@@ -29,9 +29,6 @@
 namespace sofa
 {
 
-namespace gui
-{
-
 namespace qt
 {
 
@@ -66,7 +63,6 @@ helper::Creator<DataWidgetFactory, HistogramDataWidget< Histogram<bool> > >				D
 #endif
 
 } // qt
-} // gui
 } // sofa
 
 

applications/plugins/image/image_gui/src/image_gui/HistogramWidget.h

@@ -23,8 +23,8 @@
 #define SOFA_IMAGE_HISTOGRAMWIDGET_H
 
 #include <image_gui/config.h>
-#include <sofa/gui/qt/DataWidget.h>
-#include <sofa/gui/qt/SimpleDataWidget.h>
+#include <sofa/qt/DataWidget.h>
+#include <sofa/qt/SimpleDataWidget.h>
 
 #include <QLabel>
 #include <QImage>
@@ -42,8 +42,6 @@
 
 namespace sofa
 {
-namespace gui
-{
 namespace qt
 {
 
@@ -386,6 +384,4 @@ class SOFA_IMAGE_GUI_API HistogramDataWidget : public SimpleDataWidget<T, histog
 
 }
 
-}
-
 #endif // SOFA_IMAGE_HISTOGRAMWIDGET_H

applications/plugins/image/image_gui/src/image_gui/ImagePlaneWidget.cpp

@@ -29,9 +29,6 @@
 namespace sofa
 {
 
-namespace gui
-{
-
 namespace qt
 {
 
@@ -80,7 +77,6 @@ helper::Creator<DataWidgetFactory, ImagePlaneDataWidget< ImagePlane<bool> > >		D
 #endif
 
 } // qt
-} // gui
 } // sofa
 
 

applications/plugins/image/image_gui/src/image_gui/ImagePlaneWidget.h

@@ -23,8 +23,8 @@
 #define SOFA_IMAGE_IMAGEPLANEWIDGET_H
 
 #include <image_gui/config.h>
-#include <sofa/gui/qt/DataWidget.h>
-#include <sofa/gui/qt/SimpleDataWidget.h>
+#include <sofa/qt/DataWidget.h>
+#include <sofa/qt/SimpleDataWidget.h>
 
 #include <image/ImageTypes.h>
 #include <image/ImageViewer.h>
@@ -54,8 +54,6 @@
 
 namespace sofa
 {
-namespace gui
-{
 namespace qt
 {
 
@@ -807,6 +805,4 @@ class SOFA_IMAGE_GUI_API ImagePlaneDataWidget : public SimpleDataWidget<T, Timag
 
 }
 
-}
-
 #endif // SOFA_IMAGE_IMAGEPLANEWIDGET_H

applications/plugins/image/image_gui/src/image_gui/ImageTransformWidget.cpp

@@ -29,9 +29,6 @@
 namespace sofa
 {
 
-namespace gui
-{
-
 namespace qt
 {
 
@@ -202,7 +199,6 @@ void ImageLPTransformWidget<TransformType>::writeToData()
 }
 
 } // qt
-} // gui
 } // sofa
 
 

applications/plugins/image/image_gui/src/image_gui/ImageTransformWidget.h

@@ -23,9 +23,9 @@
 #define SOFA_IMAGE_IMAGETRANSFORMWIDGET_H
 
 #include <image_gui/config.h>
-#include <sofa/gui/qt/DataWidget.h>
-#include <sofa/gui/qt/SimpleDataWidget.h>
-#include <sofa/gui/qt/WDoubleLineEdit.h>
+#include <sofa/qt/DataWidget.h>
+#include <sofa/qt/SimpleDataWidget.h>
+#include <sofa/qt/WDoubleLineEdit.h>
 
 #include <QTextEdit>
 #include <QGroupBox>
@@ -46,8 +46,6 @@
 
 namespace sofa
 {
-namespace gui
-{
 namespace qt
 {
 
@@ -92,6 +90,4 @@ public :
 
 }
 
-}
-
 #endif // SOFA_IMAGE_IMAGETRANSFORMWIDGET_H