Sort some include lines in XGUI and ModuleBase.

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index a15c841c52523368acb91153c0ac45bf25dfb921..ebb3760725740ded73553811696a5e0e75f79acb 100644 (file)
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -5,96 +5,96 @@ SET(CMAKE_AUTOMOC ON)
 
 SET(PROJECT_HEADERS
        ModuleBase.h
-       ModuleBase_Filter.h
-       ModuleBase_FilterFactory.h
-       ModuleBase_FilterValidated.h
-       ModuleBase_Tools.h
-       ModuleBase_IModule.h
-       ModuleBase_Operation.h
-       ModuleBase_OperationDescription.h       
-       ModuleBase_ModelWidget.h
-       ModuleBase_WidgetBoolValue.h
-       ModuleBase_WidgetDoubleValue.h
-       ModuleBase_WidgetEditor.h
-       ModuleBase_WidgetFactory.h
-       ModuleBase_IWorkshop.h
-       ModuleBase_Definitions.h
-       ModuleBase_SelectionValidator.h
-       ModuleBase_ViewerPrs.h
-       ModuleBase_WidgetChoice.h
-       ModuleBase_WidgetFileSelector.h
-       ModuleBase_DoubleSpinBox.h
-       ModuleBase_IPropertyPanel.h
-       ModuleBase_ISelection.h
-       ModuleBase_IViewer.h
-       ModuleBase_WidgetLineEdit.h
-       ModuleBase_WidgetMultiSelector.h
-       ModuleBase_ViewerFilters.h
-       ModuleBase_ResultPrs.h
-       ModuleBase_IViewWindow.h
-       ModuleBase_WidgetLabel.h
-       ModuleBase_IPrefMgr.h
-       ModuleBase_Preferences.h
-       ModuleBase_ActionInfo.h
-       ModuleBase_PageBase.h
-       ModuleBase_PageWidget.h 
-       ModuleBase_PageGroupBox.h
-       ModuleBase_PagedContainer.h
-       ModuleBase_WidgetSelector.h
-       ModuleBase_WidgetShapeSelector.h
-       ModuleBase_WidgetSwitch.h
-       ModuleBase_WidgetToolbox.h
-       ModuleBase_WidgetValidated.h
-       ModuleBase_WidgetExprEditor.h
-       ModuleBase_ParamSpinBox.h
-       ModuleBase_WidgetIntValue.h
+  ModuleBase_ActionInfo.h
+  ModuleBase_Definitions.h
+  ModuleBase_DoubleSpinBox.h
+  ModuleBase_Filter.h
+  ModuleBase_FilterFactory.h
+  ModuleBase_FilterValidated.h
   ModuleBase_IDocumentDataModel.h
+  ModuleBase_IModule.h
+  ModuleBase_IPrefMgr.h
+  ModuleBase_IPropertyPanel.h
+  ModuleBase_ISelection.h
+  ModuleBase_IViewWindow.h
+  ModuleBase_IViewer.h
+  ModuleBase_IWorkshop.h
+  ModuleBase_ModelWidget.h
+  ModuleBase_Operation.h
+  ModuleBase_OperationDescription.h    
+  ModuleBase_PageBase.h
+  ModuleBase_PageGroupBox.h
+  ModuleBase_PageWidget.h      
+  ModuleBase_PagedContainer.h
+  ModuleBase_ParamSpinBox.h
+  ModuleBase_Preferences.h
+  ModuleBase_ResultPrs.h
+  ModuleBase_SelectionValidator.h
+  ModuleBase_Tools.h
+  ModuleBase_ViewerFilters.h
+  ModuleBase_ViewerPrs.h
+  ModuleBase_WidgetBoolValue.h
+  ModuleBase_WidgetChoice.h
+  ModuleBase_WidgetDoubleValue.h
+  ModuleBase_WidgetEditor.h
+  ModuleBase_WidgetExprEditor.h
+  ModuleBase_WidgetFactory.h
+  ModuleBase_WidgetFileSelector.h
+  ModuleBase_WidgetIntValue.h
+  ModuleBase_WidgetLabel.h
+  ModuleBase_WidgetLineEdit.h
+  ModuleBase_WidgetMultiSelector.h
+  ModuleBase_WidgetSelector.h
+  ModuleBase_WidgetShapeSelector.h
+  ModuleBase_WidgetSwitch.h
+  ModuleBase_WidgetToolbox.h
+  ModuleBase_WidgetValidated.h
 )
 
 SET(PROJECT_SOURCES
-       ModuleBase_Filter.cpp
-       ModuleBase_FilterFactory.cpp
-       ModuleBase_FilterValidated.cpp
-       ModuleBase_Tools.cpp
-       ModuleBase_IModule.cpp
-       ModuleBase_ISelection.cpp
-       ModuleBase_IViewer.cpp
-       ModuleBase_IWorkshop.cpp
-       ModuleBase_Operation.cpp
-       ModuleBase_OperationDescription.cpp
-       ModuleBase_ModelWidget.cpp
-       ModuleBase_WidgetBoolValue.cpp
-       ModuleBase_WidgetDoubleValue.cpp
-       ModuleBase_WidgetEditor.cpp
-       ModuleBase_WidgetFactory.cpp
-       ModuleBase_WidgetChoice.cpp
-       ModuleBase_WidgetFileSelector.cpp
-       ModuleBase_DoubleSpinBox.cpp
-       ModuleBase_IPropertyPanel.cpp
-       ModuleBase_WidgetLineEdit.cpp
-       ModuleBase_WidgetMultiSelector.cpp
-       ModuleBase_ViewerFilters.cpp
-       ModuleBase_ResultPrs.cpp
-       ModuleBase_IViewWindow.cpp
-       ModuleBase_WidgetLabel.cpp
-       ModuleBase_IPrefMgr.cpp
-       ModuleBase_Preferences.cpp
-       ModuleBase_ActionInfo.cpp
-       ModuleBase_PageBase.cpp
-       ModuleBase_PageWidget.cpp
-       ModuleBase_PageGroupBox.cpp
-       ModuleBase_PagedContainer.cpp
-       ModuleBase_WidgetSelector.cpp
-       ModuleBase_WidgetShapeSelector.cpp
-       ModuleBase_WidgetSwitch.cpp
-       ModuleBase_WidgetToolbox.cpp
-       ModuleBase_WidgetValidated.cpp
-       ModuleBase_WidgetExprEditor.cpp
-       ModuleBase_ParamSpinBox.cpp
-       ModuleBase_SelectionValidator.cpp
-       ModuleBase_ViewerPrs.cpp
-       ModuleBase_WidgetIntValue.cpp
+  ModuleBase_ActionInfo.cpp
+  ModuleBase_DoubleSpinBox.cpp
+  ModuleBase_Filter.cpp
+  ModuleBase_FilterFactory.cpp
+  ModuleBase_FilterValidated.cpp
   ModuleBase_IDocumentDataModel.cpp
+  ModuleBase_IModule.cpp
+  ModuleBase_IPrefMgr.cpp
+  ModuleBase_IPropertyPanel.cpp
+  ModuleBase_ISelection.cpp
+  ModuleBase_IViewWindow.cpp
+  ModuleBase_IViewer.cpp
+  ModuleBase_IWorkshop.cpp
+  ModuleBase_ModelWidget.cpp
+  ModuleBase_Operation.cpp
+  ModuleBase_OperationDescription.cpp
+  ModuleBase_PageBase.cpp
+  ModuleBase_PageGroupBox.cpp
+  ModuleBase_PageWidget.cpp
+  ModuleBase_PagedContainer.cpp
+  ModuleBase_ParamSpinBox.cpp
+  ModuleBase_Preferences.cpp
+  ModuleBase_ResultPrs.cpp
+  ModuleBase_SelectionValidator.cpp
+  ModuleBase_Tools.cpp
+  ModuleBase_ViewerFilters.cpp
+  ModuleBase_ViewerPrs.cpp
+  ModuleBase_WidgetBoolValue.cpp
+  ModuleBase_WidgetChoice.cpp
+  ModuleBase_WidgetDoubleValue.cpp
+  ModuleBase_WidgetEditor.cpp
+  ModuleBase_WidgetExprEditor.cpp
+  ModuleBase_WidgetFactory.cpp
+  ModuleBase_WidgetFileSelector.cpp
+  ModuleBase_WidgetIntValue.cpp
+  ModuleBase_WidgetLabel.cpp
+  ModuleBase_WidgetLineEdit.cpp
+  ModuleBase_WidgetMultiSelector.cpp
+  ModuleBase_WidgetSelector.cpp
+  ModuleBase_WidgetShapeSelector.cpp
+  ModuleBase_WidgetSwitch.cpp
+  ModuleBase_WidgetToolbox.cpp
+  ModuleBase_WidgetValidated.cpp
 )
 
 SET(PROJECT_LIBRARIES

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index a5b6b0c2e74f58cf639af421fabdd645a65f440e..1cc72f76c5c777dfa905e0049c522fd7836893fb 100644 (file)
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -9,8 +9,10 @@ SET(PROJECT_HEADERS
        XGUI_ColorDialog.h
        XGUI_ContextMenuMgr.h
        XGUI_CustomPrs.h
+       XGUI_DataModel.h
        XGUI_Displayer.h
        XGUI_ErrorDialog.h
+       XGUI_HistoryMenu.h
        XGUI_ModuleConnector.h
        XGUI_ObjectsBrowser.h
        XGUI_OperationMgr.h
@@ -23,8 +25,6 @@ SET(PROJECT_HEADERS
        XGUI_ViewerProxy.h
        XGUI_Workshop.h
        XGUI_WorkshopListener.h
-       XGUI_HistoryMenu.h
-       XGUI_DataModel.h
 )
 
 SET(PROJECT_AUTOMOC 
@@ -36,8 +36,10 @@ SET(PROJECT_SOURCES
        XGUI_ColorDialog.cpp
        XGUI_ContextMenuMgr.cpp
        XGUI_CustomPrs.cpp
+       XGUI_DataModel.cpp
        XGUI_Displayer.cpp
        XGUI_ErrorDialog.cpp
+       XGUI_HistoryMenu.cpp
        XGUI_ModuleConnector.cpp
        XGUI_ObjectsBrowser.cpp
        XGUI_OperationMgr.cpp
@@ -50,8 +52,6 @@ SET(PROJECT_SOURCES
        XGUI_ViewerProxy.cpp
        XGUI_Workshop.cpp
        XGUI_WorkshopListener.cpp
-       XGUI_HistoryMenu.cpp
-       XGUI_DataModel.cpp
 )
 
 SET(PROJECT_RESOURCES 

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index 27ef45623acef008b35523d72895c2f86583bf35..0ce4e96c455a225dfb4c9360a424ab462d081cae 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -1,50 +1,47 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
 
 //#include "XGUI_Constants.h"
-#include "XGUI_Tools.h"
 #include "XGUI_Workshop.h"
-#include "XGUI_SelectionMgr.h"
-#include "XGUI_Selection.h"
-#include "XGUI_ObjectsBrowser.h"
-#include "XGUI_Displayer.h"
-#include "XGUI_OperationMgr.h"
-#include "XGUI_SalomeConnector.h"
+
 #include "XGUI_ActionsMgr.h"
-#include "XGUI_ErrorDialog.h"
 #include "XGUI_ColorDialog.h"
-#include "XGUI_ViewerProxy.h"
-#include "XGUI_PropertyPanel.h"
 #include "XGUI_ContextMenuMgr.h"
+#include "XGUI_Displayer.h"
+#include "XGUI_ErrorDialog.h"
 #include "XGUI_ModuleConnector.h"
+#include "XGUI_ObjectsBrowser.h"
+#include "XGUI_OperationMgr.h"
+#include "XGUI_PropertyPanel.h"
+#include "XGUI_SalomeConnector.h"
+#include "XGUI_Selection.h"
+#include "XGUI_SelectionMgr.h"
+#include "XGUI_Tools.h"
+#include "XGUI_ViewerProxy.h"
 #include "XGUI_WorkshopListener.h"
-
-#include <XGUI_QtEvents.h>
-#include <XGUI_HistoryMenu.h>
 #include <XGUI_CustomPrs.h>
+#include <XGUI_HistoryMenu.h>
+#include <XGUI_QtEvents.h>
 
-#include <AppElements_Workbench.h>
-#include <AppElements_Viewer.h>
+#include <AppElements_Button.h>
 #include <AppElements_Command.h>
 #include <AppElements_MainMenu.h>
 #include <AppElements_MainWindow.h>
 #include <AppElements_MenuGroupPanel.h>
-#include <AppElements_Button.h>
-
-#include <ModuleBase_IModule.h>
-#include <ModuleBase_Preferences.h>
+#include <AppElements_Viewer.h>
+#include <AppElements_Workbench.h>
 
+#include <ModelAPI_AttributeDocRef.h>
+#include <ModelAPI_AttributeIntArray.h>
+#include <ModelAPI_Data.h>
 #include <ModelAPI_Events.h>
-#include <ModelAPI_Session.h>
 #include <ModelAPI_Feature.h>
-#include <ModelAPI_Data.h>
-#include <ModelAPI_AttributeDocRef.h>
 #include <ModelAPI_Object.h>
-#include <ModelAPI_Validator.h>
-#include <ModelAPI_ResultGroup.h>
-#include <ModelAPI_ResultConstruction.h>
 #include <ModelAPI_ResultBody.h>
-#include <ModelAPI_AttributeIntArray.h>
+#include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_ResultGroup.h>
 #include <ModelAPI_ResultParameter.h>
+#include <ModelAPI_Session.h>
+#include <ModelAPI_Validator.h>
 
 //#include <PartSetPlugin_Part.h>
 
@@ -52,20 +49,21 @@
 #include <Events_Error.h>
 #include <Events_LongOp.h>
 
+#include <ModuleBase_FilterFactory.h>
+#include <ModuleBase_IModule.h>
+#include <ModuleBase_IViewer.h>
 #include <ModuleBase_Operation.h>
 #include <ModuleBase_OperationDescription.h>
-#include <ModuleBase_SelectionValidator.h>
-#include <ModuleBase_WidgetFactory.h>
-#include <ModuleBase_Tools.h>
-#include <ModuleBase_IViewer.h>
-#include <ModuleBase_FilterFactory.h>
 #include <ModuleBase_PageBase.h>
+#include <ModuleBase_Preferences.h>
+#include <ModuleBase_SelectionValidator.h>
 #include <ModuleBase_Tools.h>
+#include <ModuleBase_WidgetFactory.h>
 
 #include <Config_Common.h>
 #include <Config_FeatureMessage.h>
-#include <Config_PointerMessage.h>
 #include <Config_ModuleReader.h>
+#include <Config_PointerMessage.h>
 #include <Config_PropManager.h>
 #include <Config_SelectionFilterMessage.h>
 

diff --git a/src/XGUI/XGUI_Workshop.h b/src/XGUI/XGUI_Workshop.h
index eda29c115794bb86a3c44e329817bad647b6da35..c0ecf8d730bfcf06c163589dc055795764b37563 100644 (file)
--- a/src/XGUI/XGUI_Workshop.h
+++ b/src/XGUI/XGUI_Workshop.h
@@ -20,23 +20,23 @@ class AppElements_MainWindow;
 class AppElements_Command;
 class AppElements_Workbench;
 
-class XGUI_SelectionMgr;
+class XGUI_ActionsMgr;
+class XGUI_ContextMenuMgr;
 class XGUI_Displayer;
+class XGUI_ErrorDialog;
+class XGUI_ModuleConnector;
+class XGUI_ObjectsBrowser;
 class XGUI_OperationMgr;
+class XGUI_PropertyPanel;
 class XGUI_SalomeConnector;
-class XGUI_ObjectsBrowser;
-class XGUI_ActionsMgr;
-class XGUI_ErrorDialog;
 class XGUI_SalomeViewer;
+class XGUI_SelectionMgr;
 class XGUI_ViewerProxy;
-class XGUI_PropertyPanel;
-class XGUI_ContextMenuMgr;
-class XGUI_ModuleConnector;
 class XGUI_WorkshopListener;
 
-class ModuleBase_Operation;
 class ModuleBase_IModule;
 class ModuleBase_IViewer;
+class ModuleBase_Operation;
 
 class QWidget;
 class QDockWidget;