Remove GUI from target name

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.22)
-project(Sofa.GUI.Qt LANGUAGES CXX)
+project(Sofa.Qt LANGUAGES CXX)
 
 # Detect if component is compiled outside SOFA
 if ("${CMAKE_PROJECT_NAME}" STREQUAL "${PROJECT_NAME}")
@@ -132,7 +132,7 @@ endif()
 
 
 
-set(SRC_ROOT src/sofa/gui/qt)
+set(SRC_ROOT src/sofa/qt)
 
 set(MOC_HEADER_FILES
     ${SRC_ROOT}/AboutSOFADialog.h

src/sofa/gui/qt/AboutSOFADialog.cpp → src/sofa/qt/AboutSOFADialog.cpp

@@ -29,7 +29,7 @@
 #include <sofa/helper/system/FileRepository.h>
 using sofa::helper::system::DataRepository;
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 AboutSOFADialog::AboutSOFADialog(QWidget *parent)
@@ -52,4 +52,4 @@ void AboutSOFADialog::clickSupportUs()
 }
 
 
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

src/sofa/gui/qt/AboutSOFADialog.h → src/sofa/qt/AboutSOFADialog.h

@@ -21,10 +21,10 @@
 ******************************************************************************/
 #pragma once
 #include <ui_AboutDialog.h>
-#include <sofa/gui/qt/config.h>
+#include <sofa/qt/config.h>
 
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 class SOFA_GUI_QT_API AboutSOFADialog: public QDialog, public Ui_AboutDialog
@@ -38,4 +38,4 @@ public slots:
 };
 
 
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

src/sofa/gui/qt/DataFilenameWidget.cpp → src/sofa/qt/DataFilenameWidget.cpp

@@ -29,7 +29,7 @@
 
 #include <algorithm>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 helper::Creator<DataWidgetFactory,DataFileNameWidget> DW_Datafilename("widget_filename",false);
@@ -96,4 +96,4 @@ void DataFileNameWidget::raiseDialog()
 }
 
 
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

src/sofa/gui/qt/DataFilenameWidget.h → src/sofa/qt/DataFilenameWidget.h

@@ -27,7 +27,7 @@
 #include "DataWidget.h"
 
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 class DataFileNameWidget : public TDataWidget<std::string>
@@ -56,4 +56,4 @@ protected slots :
     virtual void raiseDialog();
 };
 
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

src/sofa/gui/qt/DataWidget.cpp → src/sofa/qt/DataWidget.cpp

@@ -35,10 +35,10 @@
 
 namespace sofa::helper
 {
-template class SOFA_GUI_QT_API Factory<std::string, sofa::gui::qt::DataWidget, sofa::gui::qt::DataWidget::CreatorArgument>;
+template class SOFA_GUI_QT_API Factory<std::string, sofa::qt::DataWidget, sofa::qt::DataWidget::CreatorArgument>;
 } // namespace sofa::helper
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 using namespace core::objectmodel;
@@ -305,4 +305,4 @@ void QPushButtonUpdater::setDisplayed(bool b)
 
 }
 
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

src/sofa/gui/qt/DataWidget.h → src/sofa/qt/DataWidget.h

@@ -21,7 +21,7 @@
 ******************************************************************************/
 
 #pragma once
-#include <sofa/gui/qt/config.h>
+#include <sofa/qt/config.h>
 #include "ModifyObject.h"
 #include <sofa/core/objectmodel/Data.h>
 #include <sofa/helper/Factory.h>
@@ -41,7 +41,7 @@
 #define MAX_NUM_ELEM 100
 
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 /**
@@ -297,14 +297,14 @@ public Q_SLOTS:
 
 typedef sofa::helper::Factory<std::string, DataWidget, DataWidget::CreatorArgument> DataWidgetFactory;
 
-} //namespace sofa::gui::qt
+} //namespace sofa::qt
 
 //MOC_SKIP_BEGIN
 #if !defined(SOFA_BUILD_SOFA_GUI_QT)
 namespace sofa::helper
 {
 //delay load of the specialized Factory class. unique definition reside in the cpp file
-extern template class SOFA_GUI_QT_API Factory<std::string, gui::qt::DataWidget, gui::qt::DataWidget::CreatorArgument>;
+extern template class SOFA_GUI_QT_API Factory<std::string, qt::DataWidget, qt::DataWidget::CreatorArgument>;
 } // namespace sofa::helper
 
 #endif

src/sofa/gui/qt/DisplayFlagsDataWidget.cpp → src/sofa/qt/DisplayFlagsDataWidget.cpp

@@ -19,13 +19,13 @@
 *                                                                             *
 * Contact information: [email protected]                             *
 ******************************************************************************/
-#include <sofa/gui/qt/DisplayFlagsDataWidget.h>
+#include <sofa/qt/DisplayFlagsDataWidget.h>
 
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QLayout>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 using namespace sofa::core::objectmodel;
 using namespace sofa::core::visual;
@@ -217,4 +217,4 @@ void DisplayFlagsDataWidget::writeToData()
 
 }
 
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

src/sofa/gui/qt/DisplayFlagsDataWidget.h → src/sofa/qt/DisplayFlagsDataWidget.h

@@ -20,7 +20,7 @@
 * Contact information: [email protected]                             *
 ******************************************************************************/
 #pragma once
-#include <sofa/gui/qt/DataWidget.h>
+#include <sofa/qt/DataWidget.h>
 #include <sofa/core/visual/DisplayFlags.h>
 
 #include <QTreeWidget>
@@ -30,7 +30,7 @@
 #include <QFrame>
 #include <QGroupBox>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 
@@ -109,4 +109,4 @@ class SOFA_GUI_QT_API DisplayFlagsDataWidget : public TDataWidget< sofa::core::v
 
 };
 
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

src/sofa/gui/qt/FileManagement.cpp → src/sofa/qt/FileManagement.cpp

@@ -23,7 +23,7 @@
 #include "FileManagement.h"
 #include <iostream>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 #include <QDir>
@@ -117,4 +117,4 @@ void getFilesInDirectory( const QString &p, std::vector< QString > &files, bool
     }
 }
 
-} //namespace sofa::gui::qt
+} //namespace sofa::qt

src/sofa/gui/qt/FileManagement.h → src/sofa/qt/FileManagement.h

@@ -20,13 +20,13 @@
 * Contact information: [email protected]                             *
 ******************************************************************************/
 #pragma once
-#include <sofa/gui/qt/config.h>
+#include <sofa/qt/config.h>
 #include <vector>
 
 #include <QFileDialog>
 
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 
@@ -39,4 +39,4 @@ QString SOFA_GUI_QT_API getSaveFileName ( QWidget* parent, const QString & start
 
 void SOFA_GUI_QT_API getFilesInDirectory( const QString &path, std::vector< QString > &files, bool recursive=true, const std::vector< QString > &filter=std::vector< QString >() );
 
-} //namespace sofa::gui::qt
+} //namespace sofa::qt

src/sofa/gui/qt/GLPickHandler.cpp → src/sofa/qt/GLPickHandler.cpp

@@ -19,7 +19,7 @@
 *                                                                             *
 * Contact information: [email protected]                             *
 ******************************************************************************/
-#include <sofa/gui/qt/GLPickHandler.h>
+#include <sofa/qt/GLPickHandler.h>
 
 
 #include <sofa/simulation/InitVisitor.h>
@@ -37,7 +37,7 @@
 #include <limits>
 
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 using namespace sofa::component::collision::geometry;
@@ -135,4 +135,4 @@ BodyPicked GLPickHandler::findCollisionUsingColourCoding(const type::Vec3& origi
     return result;
 }
 
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

src/sofa/gui/qt/GLPickHandler.h → src/sofa/qt/GLPickHandler.h

@@ -20,7 +20,7 @@
 * Contact information: [email protected]                             *
 ******************************************************************************/
 #pragma once
-#include <sofa/gui/qt/config.h>
+#include <sofa/qt/config.h>
 #include <sofa/gui/common/OperationFactory.h>
 
 #include <sofa/gui/common/PickHandler.h>
@@ -34,10 +34,10 @@ namespace sofa::component::collision::model
     class RayCollisionModel;
 } // namespace sofa::component::collision::model
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
-class SOFA_GUI_QT_API GLPickHandler : public common::PickHandler
+class SOFA_GUI_QT_API GLPickHandler : public gui::common::PickHandler
 {
     typedef PickHandler Inherit;
     typedef sofa::component::collision::model::RayCollisionModel MouseCollisionModel;
@@ -56,7 +56,7 @@ class SOFA_GUI_QT_API GLPickHandler : public common::PickHandler
     void allocateSelectionBuffer(int width, int height) override;
     void destroySelectionBuffer() override;
 
-    common::BodyPicked findCollisionUsingColourCoding(const type::Vec3& origin, const type::Vec3& direction) override;
+    gui::common::BodyPicked findCollisionUsingColourCoding(const type::Vec3& origin, const type::Vec3& direction) override;
 
 protected:
     bool _fboAllocated;
@@ -65,4 +65,4 @@ class SOFA_GUI_QT_API GLPickHandler : public common::PickHandler
 
 };
 
-} // namespace sofa::gui::qt
+} // namespace sofa::qt

src/sofa/gui/qt/GUI.ui → src/sofa/qt/GUI.ui

@@ -826,7 +826,7 @@ State 2: dirty, in that state the button reflect the fact that the scene graph v
  </widget>
  <layoutdefault spacing="2" margin="5"/>
  <includes>
-  <include location="global">sofa/gui/qt/config.h</include>
+  <include location="global">sofa/qt/config.h</include>
  </includes>
  <resources/>
  <connections>

src/sofa/gui/qt/GenGraphForm.cpp → src/sofa/qt/GenGraphForm.cpp

@@ -38,7 +38,7 @@
 #include <QRadioButton>
 #include <sofa/simulation/ExportDotVisitor.h>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 GenGraphForm::GenGraphForm(QWidget *parent)
@@ -523,4 +523,4 @@ std::set<std::string> GenGraphForm::getCurrentFilter()
     return filt;
 }
 
-} //namespace sofa::gui::qt
+} //namespace sofa::qt

src/sofa/gui/qt/GenGraphForm.h → src/sofa/qt/GenGraphForm.h

@@ -30,7 +30,7 @@
 #include <map>
 #include <set>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 class GenGraphForm : public QDialog, public Ui_BaseGenGraphForm
@@ -67,4 +67,4 @@ public slots:
     std::set<std::string> getCurrentFilter();
 };
 
-} //namespace sofa::gui::qt
+} //namespace sofa::qt

src/sofa/gui/qt/GenericWidget.h → src/sofa/qt/GenericWidget.h

@@ -21,18 +21,18 @@
  ******************************************************************************/
 #pragma once
 
-#include <sofa/gui/qt/DataWidget.h>
+#include <sofa/qt/DataWidget.h>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 template <class DATA, class WIDGET>
-class GenericDataWidget : public sofa::gui::qt::DataWidget
+class GenericDataWidget : public sofa::qt::DataWidget
 {
 public:
     typedef DATA MyData;
     typedef WIDGET MyWidget;
 
-    GenericDataWidget(QWidget* parent, const char* name, MyData* d) : sofa::gui::qt::DataWidget(parent, name, d), m_data(d) {}
+    GenericDataWidget(QWidget* parent, const char* name, MyData* d) : sofa::qt::DataWidget(parent, name, d), m_data(d) {}
 
     virtual bool createWidgets()
     {
@@ -78,7 +78,7 @@ class GenericDataWidget : public sofa::gui::qt::DataWidget
     MyWidget* m_widget;
 };
 
-}  // namespace sofa::gui::qt
+}  // namespace sofa::qt
 
 template <class DATA, class WIDGET>
-using GenericDataWidget = sofa::gui::qt::GenericDataWidget<DATA, WIDGET>;
+using GenericDataWidget = sofa::qt::GenericDataWidget<DATA, WIDGET>;

src/sofa/gui/qt/GraphDataWidget.cpp → src/sofa/qt/GraphDataWidget.cpp

@@ -20,13 +20,13 @@
 * Contact information: [email protected]                             *
 ******************************************************************************/
 
-#include <sofa/gui/qt/GraphDataWidget.h>
-#include <sofa/gui/qt/DataWidget.h>
+#include <sofa/qt/GraphDataWidget.h>
+#include <sofa/qt/DataWidget.h>
 #include <sofa/helper/Factory.inl>
 #include <sofa/helper/map.h>
 #include <iostream>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 using sofa::helper::Creator;
@@ -148,4 +148,4 @@ void GraphOptionWidget::exportImage()
     graph->exportImage(filename);
 }
 
-} //namespace sofa::gui::qt
+} //namespace sofa::qt

src/sofa/gui/qt/GraphDataWidget.h → src/sofa/qt/GraphDataWidget.h

@@ -41,7 +41,7 @@
 using namespace QtCharts;
 #endif
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 
 template<class T>
@@ -382,4 +382,4 @@ class GraphDataWidget_Linear : public GraphDataWidget< T >
     }
 };
 
-} //namespace sofa::gui::qt
+} //namespace sofa::qt