Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fireworks] Move public headers in to interface directory #34896

Merged
merged 1 commit into from
Aug 17, 2021
Merged

[Fireworks] Move public headers in to interface directory #34896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Fireworks/Calo/interface/FWCaloDataHistProxyBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define Fireworks_Calo_FWCaloHistDataProxyBuilder_h

#include "Fireworks/Calo/interface/FWCaloDataProxyBuilderBase.h"
#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
#include "Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h"

class TH2F;
class FWHistSliceSelector;
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/interface/FWECALDetailViewBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ class FWECALDetailViewBase : public FWDetailViewGL<T> {
void setTextInfo(const FWModelId &id, const T *) override;
};

#include "Fireworks/Calo/src/FWECALDetailViewBase.icc"
#include "Fireworks/Calo/interface/FWECALDetailViewBase.icc"

#endif
0 Fireworks/Calo/src/FWECALDetailViewBase.icc → ...s/Calo/interface/FWECALDetailViewBase.icc
View file
Open in desktop
File renamed without changes.
0 Fireworks/Calo/src/FWFromSliceSelector.h → ...orks/Calo/interface/FWFromSliceSelector.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rks/Calo/src/FWFromTEveCaloDataSelector.h → ...lo/interface/FWFromTEveCaloDataSelector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

// user include files
#include "Fireworks/Core/interface/FWFromEveSelectorBase.h"
#include "Fireworks/Calo/src/FWFromSliceSelector.h"
#include "Fireworks/Calo/interface/FWFromSliceSelector.h"

// forward declarations
class FWEventItem;
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/interface/FWHistSliceSelector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef Fireworks_Calo_FWHistSliceSelector_h
#define Fireworks_Calo_FWHistSliceSelector_h

#include "Fireworks/Calo/src/FWFromSliceSelector.h"
#include "Fireworks/Calo/interface/FWFromSliceSelector.h"
class TH2F;

class FWHistSliceSelector : public FWFromSliceSelector {
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/plugins/FWCaloTowerProxyBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <string>

#include "Fireworks/Calo/interface/FWCaloDataHistProxyBuilder.h"
#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
#include "Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h"
#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"

Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/plugins/FWHFTowerProxyBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

// user include files
#include "Fireworks/Calo/interface/FWCaloDataProxyBuilderBase.h"
#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
#include "Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h"
#include "DataFormats/HcalRecHit/interface/HFRecHit.h"
#include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"

Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/plugins/FWHFTowerSliceSelector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
class HcalDetId;
class TEveCaloDataVec;

#include "Fireworks/Calo/src/FWFromSliceSelector.h"
#include "Fireworks/Calo/interface/FWFromSliceSelector.h"

// forward declarations

Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/plugins/FWHGTowerProxyBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

// user include files
#include "Fireworks/Calo/interface/FWCaloDataProxyBuilderBase.h"
#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
#include "Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h"
// #include "DataFormats/HGCRecHit/interface/HGRecHit.h"
#include "DataFormats/HGCRecHit/interface/HGCRecHitCollections.h"

Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/plugins/FWHGTowerSliceSelector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
class DetId;
class TEveCaloDataVec;

#include "Fireworks/Calo/src/FWFromSliceSelector.h"
#include "Fireworks/Calo/interface/FWFromSliceSelector.h"

// forward declarations

Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/src/FWCaloDataProxyBuilderBase.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "Fireworks/Core/interface/FWEventItem.h"

#include "Fireworks/Calo/interface/FWCaloDataProxyBuilderBase.h"
#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
#include "Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h"

#include "DataFormats/CaloTowers/interface/CaloTower.h"

Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/src/FWFromSliceSelector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// system include files

// user include files
#include "Fireworks/Calo/src/FWFromSliceSelector.h"
#include "Fireworks/Calo/interface/FWFromSliceSelector.h"
#include "Fireworks/Core/interface/FWEventItem.h"

//
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/src/FWFromTEveCaloDataSelector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <functional>

// user include files
#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
#include "Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h"
#include "Fireworks/Core/interface/FWModelChangeManager.h"
#include "Fireworks/Core/interface/FWEventItem.h"

Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Core/interface/CmsShowTaskExecutor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <functional>

// user include files
#include "Fireworks/Core/src/CmsShowTaskExecutorBase.h"
#include "Fireworks/Core/interface/CmsShowTaskExecutorBase.h"

// forward declarations

Expand Down
0 Fireworks/Core/src/CmsShowTaskExecutorBase.h → .../Core/interface/CmsShowTaskExecutorBase.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Fireworks/Core/interface/FWDetailViewCanvas.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ class FWDetailViewCanvas : public FWDetailView<T> {
TCanvas* m_viewCanvas;
};

#include "Fireworks/Core/src/FWDetailViewCanvas.icc"
#include "Fireworks/Core/interface/FWDetailViewCanvas.icc"
#endif
0 Fireworks/Core/src/FWDetailViewCanvas.icc → ...rks/Core/interface/FWDetailViewCanvas.icc
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Fireworks/Core/interface/FWDetailViewGL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ class FWDetailViewGL : public FWDetailView<T> {
TEveScene *m_eveScene;
};

#include "Fireworks/Core/src/FWDetailViewGL.icc"
#include "Fireworks/Core/interface/FWDetailViewGL.icc"

#endif
0 Fireworks/Core/src/FWDetailViewGL.icc → Fireworks/Core/interface/FWDetailViewGL.icc
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Fireworks/Core/interface/FWHLTValidator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Class : FWHLTValidator
//

#include "Fireworks/Core/src/FWValidatorBase.h"
#include "Fireworks/Core/interface/FWValidatorBase.h"

namespace edm {
class TriggerNames;
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Core/interface/FWItemAccessorRegistry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Package: Core
// Class : FWItemAccessorRegistry
//
/**\class FWItemAccessorRegistry FWItemAccessorRegistry.h Fireworks/Core/src/FWItemAccessorRegistry.h
/**\class FWItemAccessorRegistry FWItemAccessorRegistry.h Fireworks/Core/interface/FWItemAccessorRegistry.h

Description: Registry for all th FWItemAccessorBase derived classes that can be loaded via the
plugin manager. Those classes are to be used to have specialized versions of
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Core/interface/FWTEventList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define Fireworks_Core_FWTEventList_h

// There was a bug in ROOT ... fixed on Dec 9 2009:
// http://root.cern.ch/viewcvs/trunk/tree/tree/src/TEventList.cxx?view=log
// http://root.cern.ch/viewcvs/trunk/tree/tree/interface/TEventList.cxx?view=log
//
// We need to keep this intermediate class until we switch to
// root-5.26 or later.
Expand Down
0 Fireworks/Core/src/FWValidatorBase.h → Fireworks/Core/interface/FWValidatorBase.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Fireworks/Core/interface/FWXMLConfigParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define Fireworks_Core_FWXMLConfigParser
#include <istream>
#include <iostream>
#include "Fireworks/Core/src/SimpleSAXParser.h"
#include "Fireworks/Core/interface/SimpleSAXParser.h"

#include "Fireworks/Core/interface/FWConfiguration.h"

Expand Down
0 Fireworks/Core/src/SimpleSAXParser.h → Fireworks/Core/interface/SimpleSAXParser.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Fireworks/Core/src/CmsShowMainBase.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include "Fireworks/Core/interface/FWViewManagerManager.h"
#include "Fireworks/Core/interface/CmsShowTaskExecutor.h"
#include "Fireworks/Core/src/FWColorSelect.h"
#include "Fireworks/Core/src/SimpleSAXParser.h"
#include "Fireworks/Core/interface/SimpleSAXParser.h"
#include "Fireworks/Core/interface/CmsShowCommon.h"
#include "Fireworks/Core/interface/fwLog.h"
#include "Fireworks/Core/interface/fwPaths.h"
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Core/src/CmsShowTaskExecutorBase.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <TTimer.h>

// user include files
#include "Fireworks/Core/src/CmsShowTaskExecutorBase.h"
#include "Fireworks/Core/interface/CmsShowTaskExecutorBase.h"
#include "Fireworks/Core/src/CmsShowTaskTimer.h"

//
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Core/src/CmsShowTaskTimer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

// user include files
#include "Fireworks/Core/src/CmsShowTaskTimer.h"
#include "Fireworks/Core/src/CmsShowTaskExecutorBase.h"
#include "Fireworks/Core/interface/CmsShowTaskExecutorBase.h"

//
// constants, enums and typedefs
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Core/src/FWConfigurationManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "Fireworks/Core/interface/FWConfiguration.h"
#include "Fireworks/Core/interface/FWConfigurable.h"
#include "Fireworks/Core/interface/fwLog.h"
#include "Fireworks/Core/src/SimpleSAXParser.h"
#include "Fireworks/Core/interface/SimpleSAXParser.h"
#include "Fireworks/Core/interface/FWJobMetadataManager.h"
#include "Fireworks/Core/interface/fwLog.h"
#include "Fireworks/Core/interface/FWXMLConfigParser.h"
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Core/src/FWExpressionValidator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "FWCore/Reflection/interface/TypeWithDict.h"

// user include files
#include "Fireworks/Core/src/FWValidatorBase.h"
#include "Fireworks/Core/interface/FWValidatorBase.h"

// forward declarations
namespace fireworks {
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Core/src/FWGeometryTableView.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "Fireworks/Core/src/FWGUIValidatingTextEntry.h"
#include "Fireworks/Core/interface/FWGUIManager.h"
#include "Fireworks/Core/src/FWValidatorBase.h"
#include "Fireworks/Core/interface/FWValidatorBase.h"
#include "Fireworks/Core/src/FWEveDetectorGeo.h"

#include "KeySymbols.h"
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Core/src/FWOverlapTableView.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "Fireworks/Core/interface/fwLog.h"

#include "Fireworks/Core/src/FWGUIValidatingTextEntry.h"
#include "Fireworks/Core/src/FWValidatorBase.h"
#include "Fireworks/Core/interface/FWValidatorBase.h"
#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h"

#include "TEveScene.h"
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Core/src/FWPartialConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "TSystem.h"
#include "TROOT.h"

#include "Fireworks/Core/src/SimpleSAXParser.h"
#include "Fireworks/Core/interface/SimpleSAXParser.h"
#include "Fireworks/Core/interface/FWXMLConfigParser.h"
#include "Fireworks/Core/interface/FWEventItemsManager.h"
#include "Fireworks/Core/interface/FWGUIManager.h"
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Core/src/SimpleSAXParser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Fireworks/Core/src/SimpleSAXParser.h"
#include "Fireworks/Core/interface/SimpleSAXParser.h"

/** Helper function to handle entities, i.e. characters specified with
the "&label;" syntax.
Expand Down