Merge pull request #34727 from smuzaffar/fireworks-header-cleanup

[Firework] Cleanup for public headers
cms-sw · Aug 5, 2021 · bca8dac · bca8dac
2 parents eabbb10 + 888fa7c
commit bca8dac
Show file tree

Hide file tree

Showing 33 changed files with 28 additions and 29 deletions.
diff --git a/Fireworks/Core/bin/cmsShow.cc b/Fireworks/Core/bin/cmsShow.cc
@@ -11,7 +11,7 @@
 #include <memory>
 #include <csignal>
 
-#include "Fireworks/Core/src/CmsShowMain.h"
+#include "Fireworks/Core/interface/CmsShowMain.h"
 #include "Fireworks/Core/interface/fwPaths.h"
 /* NOTE: This is a short term work around until FWLite can properly handle the MessageLogger
  */

diff --git a/Fireworks/Core/src/CmsShowMain.h → Fireworks/Core/interface/CmsShowMain.h b/Fireworks/Core/src/CmsShowMain.h → Fireworks/Core/interface/CmsShowMain.h
diff --git a/Fireworks/Core/interface/CmsShowMainBase.h b/Fireworks/Core/interface/CmsShowMainBase.h
@@ -34,7 +34,7 @@ class FWConfigurationManager;
 #include "Fireworks/Core/interface/FWEventItemsManager.h"
 #include "Fireworks/Core/interface/FWSelectionManager.h"
 #include "Fireworks/Core/interface/FWViewManagerManager.h"
-#include "Fireworks/Core/src/CmsShowTaskExecutor.h"
+#include "Fireworks/Core/interface/CmsShowTaskExecutor.h"
 
 namespace fireworks {
   class Context;

diff --git a/Fireworks/Core/src/CmsShowTaskExecutor.h → ...orks/Core/interface/CmsShowTaskExecutor.h b/Fireworks/Core/src/CmsShowTaskExecutor.h → ...orks/Core/interface/CmsShowTaskExecutor.h
diff --git a/Fireworks/Core/src/FWDialogBuilder.h → Fireworks/Core/interface/FWDialogBuilder.h b/Fireworks/Core/src/FWDialogBuilder.h → Fireworks/Core/interface/FWDialogBuilder.h
diff --git a/Fireworks/Core/src/FWItemSingleAccessor.h → ...rks/Core/interface/FWItemSingleAccessor.h b/Fireworks/Core/src/FWItemSingleAccessor.h → ...rks/Core/interface/FWItemSingleAccessor.h
diff --git a/Fireworks/Core/src/CmsShowCommonPopup.cc b/Fireworks/Core/src/CmsShowCommonPopup.cc
@@ -16,7 +16,7 @@
 #include "Fireworks/Core/interface/CmsShowCommonPopup.h"
 #include "Fireworks/Core/interface/CmsShowCommon.h"
 #include "Fireworks/Core/interface/FWColorManager.h"
-#include "Fireworks/Core/src/FWDialogBuilder.h"
+#include "Fireworks/Core/interface/FWDialogBuilder.h"
 #include "Fireworks/Core/src/FWColorSelect.h"
 #include "Fireworks/Core/interface/FWViewEnergyScaleEditor.h"
 #include "Fireworks/Core/interface/FWViewEnergyScale.h"

diff --git a/Fireworks/Core/src/CmsShowEDI.cc b/Fireworks/Core/src/CmsShowEDI.cc
@@ -48,7 +48,7 @@
 #include "Fireworks/Core/interface/FWExpressionException.h"
 #include "Fireworks/Core/src/FWGUIValidatingTextEntry.h"
 #include "Fireworks/Core/src/FWExpressionValidator.h"
-#include "Fireworks/Core/src/FWDialogBuilder.h"
+#include "Fireworks/Core/interface/FWDialogBuilder.h"
 
 //
 // constants, enums and typedefs

diff --git a/Fireworks/Core/src/CmsShowMain.cc b/Fireworks/Core/src/CmsShowMain.cc
@@ -33,7 +33,7 @@
 #include "TVirtualX.h"
 #include <KeySymbols.h>
 
-#include "Fireworks/Core/src/CmsShowMain.h"
+#include "Fireworks/Core/interface/CmsShowMain.h"
 
 #include "Fireworks/Core/interface/FWEveViewManager.h"
 
@@ -61,7 +61,7 @@
 #include "Fireworks/Core/interface/Context.h"
 #include "Fireworks/Core/interface/FWMagField.h"
 
-#include "Fireworks/Core/src/CmsShowTaskExecutor.h"
+#include "Fireworks/Core/interface/CmsShowTaskExecutor.h"
 #include "Fireworks/Core/interface/CmsShowMainFrame.h"
 #include "Fireworks/Core/interface/CmsShowSearchFiles.h"
 

diff --git a/Fireworks/Core/src/CmsShowMainBase.cc b/Fireworks/Core/src/CmsShowMainBase.cc
@@ -39,7 +39,7 @@
 #include "Fireworks/Core/interface/FWTriggerTableViewManager.h"
 #include "Fireworks/Core/interface/FWGeometryTableViewManager.h"
 #include "Fireworks/Core/interface/FWViewManagerManager.h"
-#include "Fireworks/Core/src/CmsShowTaskExecutor.h"
+#include "Fireworks/Core/interface/CmsShowTaskExecutor.h"
 #include "Fireworks/Core/src/FWColorSelect.h"
 #include "Fireworks/Core/src/SimpleSAXParser.h"
 #include "Fireworks/Core/interface/CmsShowCommon.h"

diff --git a/Fireworks/Core/src/CmsShowModelPopup.cc b/Fireworks/Core/src/CmsShowModelPopup.cc
@@ -32,7 +32,7 @@
 #include "Fireworks/Core/interface/CmsShowModelPopup.h"
 #include "Fireworks/Core/interface/FWDisplayProperties.h"
 #include "Fireworks/Core/src/FWColorSelect.h"
-#include "Fireworks/Core/src/FWDialogBuilder.h"
+#include "Fireworks/Core/interface/FWDialogBuilder.h"
 #include "Fireworks/Core/interface/FWModelChangeSignal.h"
 #include "Fireworks/Core/interface/FWModelChangeManager.h"
 #include "Fireworks/Core/interface/FWColorManager.h"

diff --git a/Fireworks/Core/src/CmsShowNavigator.cc b/Fireworks/Core/src/CmsShowNavigator.cc
@@ -5,7 +5,7 @@
 //
 
 #include "DataFormats/FWLite/interface/Event.h"
-#include "Fireworks/Core/src/CmsShowMain.h"
+#include "Fireworks/Core/interface/CmsShowMain.h"
 
 #include "Fireworks/Core/interface/FWEventItem.h"
 

diff --git a/Fireworks/Core/src/CmsShowTaskExecutor.cc b/Fireworks/Core/src/CmsShowTaskExecutor.cc
@@ -13,7 +13,7 @@
 // system include files
 
 // user include files
-#include "Fireworks/Core/src/CmsShowTaskExecutor.h"
+#include "Fireworks/Core/interface/CmsShowTaskExecutor.h"
 
 //
 // constants, enums and typedefs

diff --git a/Fireworks/Core/src/CmsShowViewPopup.cc b/Fireworks/Core/src/CmsShowViewPopup.cc
@@ -26,7 +26,7 @@
 #include "Fireworks/Core/interface/CmsShowViewPopup.h"
 #include "Fireworks/Core/interface/FWViewBase.h"
 #include "Fireworks/Core/interface/FWParameterSetterBase.h"
-#include "Fireworks/Core/src/FWDialogBuilder.h"
+#include "Fireworks/Core/interface/FWDialogBuilder.h"
 #include "Fireworks/Core/interface/FWColorManager.h"
 
 //

diff --git a/Fireworks/Core/src/FWDialogBuilder.cc b/Fireworks/Core/src/FWDialogBuilder.cc
@@ -1,4 +1,4 @@
-#include "Fireworks/Core/src/FWDialogBuilder.h"
+#include "Fireworks/Core/interface/FWDialogBuilder.h"
 #include "Fireworks/Core/interface/FWColorManager.h"
 #include "Fireworks/Core/src/FWGUIValidatingTextEntry.h"
 #include "Fireworks/Core/src/FWColorSelect.h"

diff --git a/Fireworks/Core/src/FWGUIEventDataAdder.cc b/Fireworks/Core/src/FWGUIEventDataAdder.cc
@@ -38,7 +38,7 @@
 #include "Fireworks/TableWidget/interface/FWTableManagerBase.h"
 #include "Fireworks/TableWidget/interface/FWTextTableCellRenderer.h"
 #include "Fireworks/Core/interface/fwLog.h"
-#include "Fireworks/Core/src/FWDialogBuilder.h"
+#include "Fireworks/Core/interface/FWDialogBuilder.h"
 //
 // constants, enums and typedefs
 //

diff --git a/Fireworks/Core/src/FWGUIManager.cc b/Fireworks/Core/src/FWGUIManager.cc
@@ -69,7 +69,7 @@
 
 #include "Fireworks/Core/interface/CmsShowHelpPopup.h"
 
-#include "Fireworks/Core/src/CmsShowTaskExecutor.h"
+#include "Fireworks/Core/interface/CmsShowTaskExecutor.h"
 
 #include "Fireworks/Core/interface/FWTypeToRepresentations.h"
 #include "Fireworks/Core/interface/FWIntValueListener.h"

diff --git a/Fireworks/Core/src/FWGeometryTableManagerBase.cc b/Fireworks/Core/src/FWGeometryTableManagerBase.cc
@@ -22,7 +22,7 @@
 #include "Fireworks/Core/interface/FWGeometryTableManagerBase.h"
 #include "Fireworks/Core/src/FWColorBoxIcon.h"
 #include "Fireworks/TableWidget/interface/GlobalContexts.h"
-#include "Fireworks/TableWidget/src/FWTabularWidget.h"
+#include "Fireworks/TableWidget/interface/FWTabularWidget.h"
 #include "Fireworks/Core/interface/fwLog.h"
 
 #include "TMath.h"

diff --git a/Fireworks/Core/src/FWItemAccessorFactory.cc b/Fireworks/Core/src/FWItemAccessorFactory.cc
@@ -21,7 +21,7 @@
 #include "Fireworks/Core/interface/FWItemAccessorFactory.h"
 #include "Fireworks/Core/interface/FWItemAccessorRegistry.h"
 #include "Fireworks/Core/src/FWItemTVirtualCollectionProxyAccessor.h"
-#include "Fireworks/Core/src/FWItemSingleAccessor.h"
+#include "Fireworks/Core/interface/FWItemSingleAccessor.h"
 #include "Fireworks/Core/interface/fwLog.h"
 
 //

diff --git a/Fireworks/Core/src/FWItemSingleAccessor.cc b/Fireworks/Core/src/FWItemSingleAccessor.cc
@@ -16,7 +16,7 @@
 #include "FWCore/Reflection/interface/TypeWithDict.h"
 
 // user include files
-#include "Fireworks/Core/src/FWItemSingleAccessor.h"
+#include "Fireworks/Core/interface/FWItemSingleAccessor.h"
 
 //
 // constants, enums and typedefs

diff --git a/Fireworks/Core/src/classes.h b/Fireworks/Core/src/classes.h
@@ -21,7 +21,7 @@
 #include "Fireworks/Core/interface/FWEnumParameter.h"
 #include "Fireworks/Core/interface/FWEnumParameterSetter.h"
 #include "Fireworks/Core/interface/CSGAction.h"
-#include "Fireworks/Core/src/CmsShowMain.h"
+#include "Fireworks/Core/interface/CmsShowMain.h"
 #include "Fireworks/Core/interface/FWTableView.h"
 #include "Fireworks/Core/interface/FWTriggerTableView.h"
 #include "Fireworks/Core/interface/FWModelId.h"

diff --git a/Fireworks/FWInterface/src/FWFFLooper.cc b/Fireworks/FWInterface/src/FWFFLooper.cc
@@ -9,7 +9,7 @@
 #include "Fireworks/Core/interface/FWConfigurationManager.h"
 #include "Fireworks/Core/interface/Context.h"
 #include "Fireworks/Core/interface/FWEventItemsManager.h"
-#include "Fireworks/Core/src/CmsShowTaskExecutor.h"
+#include "Fireworks/Core/interface/CmsShowTaskExecutor.h"
 #include "Fireworks/Core/interface/CmsShowMainFrame.h"
 #include "Fireworks/Core/interface/FWGUIManager.h"
 #include "Fireworks/Core/interface/CSGContinuousAction.h"

diff --git a/Fireworks/FWInterface/src/FWFFService.cc b/Fireworks/FWInterface/src/FWFFService.cc
@@ -8,7 +8,7 @@
 #include "Fireworks/Core/interface/FWViewManagerManager.h"
 #include "Fireworks/Core/interface/Context.h"
 #include "Fireworks/Core/interface/FWEventItemsManager.h"
-#include "Fireworks/Core/src/CmsShowTaskExecutor.h"
+#include "Fireworks/Core/interface/CmsShowTaskExecutor.h"
 #include "Fireworks/Core/interface/CmsShowMainFrame.h"
 #include "Fireworks/Core/interface/FWGUIManager.h"
 #include "Fireworks/Core/interface/CSGContinuousAction.h"

diff --git a/Fireworks/FWInterface/src/FWPSetTableManager.cc b/Fireworks/FWInterface/src/FWPSetTableManager.cc
@@ -15,7 +15,7 @@
 
 #include "Fireworks/FWInterface/src/FWPSetTableManager.h"
 #include "Fireworks/FWInterface/src/FWPSetCellEditor.h"
-#include "Fireworks/TableWidget/src/FWTabularWidget.h"
+#include "Fireworks/TableWidget/interface/FWTabularWidget.h"
 #include "Fireworks/TableWidget/interface/GlobalContexts.h"
 #include "Fireworks/Core/interface/fwLog.h"
 

diff --git a/Fireworks/FWInterface/src/FWPathsPopup.cc b/Fireworks/FWInterface/src/FWPathsPopup.cc
@@ -5,7 +5,7 @@
 #include "Fireworks/FWInterface/interface/FWFFLooper.h"
 #include "Fireworks/TableWidget/interface/FWTableWidget.h"
 
-#include "Fireworks/Core/src/FWDialogBuilder.h"
+#include "Fireworks/Core/interface/FWDialogBuilder.h"
 #include "Fireworks/Core/interface/FWGUIManager.h"
 #include "Fireworks/Core/interface/fwLog.h"
 

diff --git a/Fireworks/ParticleFlow/plugins/FWPFCandidate3DProxyBuilder.cc b/Fireworks/ParticleFlow/plugins/FWPFCandidate3DProxyBuilder.cc
@@ -19,7 +19,6 @@
 // User include files
 #include "Fireworks/Core/interface/FWSimpleProxyBuilderTemplate.h"
 #include "Fireworks/Core/interface/FWEvePtr.h"
-#include "Fireworks/Core/src/CmsShowMain.h"
 #include "Fireworks/Core/interface/FWEventItem.h"
 #include "Fireworks/ParticleFlow/interface/setTrackTypePF.h"
 

diff --git a/Fireworks/TableWidget/src/FWTabularWidget.h → ...s/TableWidget/interface/FWTabularWidget.h b/Fireworks/TableWidget/src/FWTabularWidget.h → ...s/TableWidget/interface/FWTabularWidget.h
diff --git a/Fireworks/TableWidget/interface/FWTextTreeCellRenderer.h b/Fireworks/TableWidget/interface/FWTextTreeCellRenderer.h
@@ -6,7 +6,7 @@
 
 #include "Fireworks/TableWidget/interface/FWTextTableCellRenderer.h"
 #include "Fireworks/TableWidget/interface/GlobalContexts.h"
-#include "Fireworks/TableWidget/src/FWTabularWidget.h"
+#include "Fireworks/TableWidget/interface/FWTabularWidget.h"
 
 #include "TGTextEntry.h"
 #include "TGPicture.h"

diff --git a/Fireworks/TableWidget/src/FWTableWidget.cc b/Fireworks/TableWidget/src/FWTableWidget.cc
@@ -19,7 +19,7 @@
 // user include files
 #include "Fireworks/TableWidget/interface/FWTableWidget.h"
 #include "Fireworks/TableWidget/interface/FWTableManagerBase.h"
-#include "Fireworks/TableWidget/src/FWTabularWidget.h"
+#include "Fireworks/TableWidget/interface/FWTabularWidget.h"
 #include "Fireworks/TableWidget/src/FWAdapterHeaderTableManager.h"
 #include "Fireworks/TableWidget/src/FWAdapterRowHeaderTableManager.h"
 

diff --git a/Fireworks/TableWidget/src/FWTabularWidget.cc b/Fireworks/TableWidget/src/FWTabularWidget.cc
@@ -17,7 +17,7 @@
 #include "TGResourcePool.h"
 
 // user include files
-#include "Fireworks/TableWidget/src/FWTabularWidget.h"
+#include "Fireworks/TableWidget/interface/FWTabularWidget.h"
 #include "Fireworks/TableWidget/interface/FWTableManagerBase.h"
 #include "Fireworks/TableWidget/interface/FWTableCellRendererBase.h"
 

diff --git a/Fireworks/TableWidget/src/FWTextTableCellRenderer.cc b/Fireworks/TableWidget/src/FWTextTableCellRenderer.cc
@@ -18,7 +18,7 @@
 
 // user include files
 #include "Fireworks/TableWidget/interface/FWTextTableCellRenderer.h"
-#include "Fireworks/TableWidget/src/FWTabularWidget.h"
+#include "Fireworks/TableWidget/interface/FWTabularWidget.h"
 
 //
 // constants, enums and typedefs

diff --git a/Fireworks/TableWidget/src/classes.h b/Fireworks/TableWidget/src/classes.h
@@ -1,4 +1,4 @@
 #include "Fireworks/TableWidget/interface/FWTableWidget.h"
 #include "Fireworks/TableWidget/interface/FWTableManagerBase.h"
 #include "Fireworks/TableWidget/interface/FWCheckedTextTableCellRenderer.h"
-#include "Fireworks/TableWidget/src/FWTabularWidget.h"
+#include "Fireworks/TableWidget/interface/FWTabularWidget.h"
diff --git a/Fireworks/Tracks/plugins/FWItemTrackAccessors.cc b/Fireworks/Tracks/plugins/FWItemTrackAccessors.cc
@@ -24,7 +24,7 @@
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 
 #include "Fireworks/Core/interface/FWItemRandomAccessor.h"
-#include "Fireworks/Core/src/FWItemSingleAccessor.h"
+#include "Fireworks/Core/interface/FWItemSingleAccessor.h"
 
 class BeamSpotSingleAccessor : public FWItemSingleAccessor {
 public: