From de16ab819b88dfd084a862a0c06c83a733bb5aa9 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 5 Sep 2024 16:14:29 +0200 Subject: [PATCH] [VISUALIZATION] Changes suggested by new llvm18 clang-format --- Fireworks/Calo/interface/scaleMarker.h | 2 +- Fireworks/Calo/plugins/FWTracksterHitsProxyBuilder.cc | 2 +- Fireworks/Core/interface/FWJobMetadataUpdateRequest.h | 2 +- Fireworks/Core/interface/FWProxyBuilderBase.h | 2 +- Fireworks/Core/interface/FWViewManagerBase.h | 4 ++-- Fireworks/Core/src/CSGConnector.h | 2 +- Fireworks/Core/src/FW3DViewDistanceMeasureTool.h | 2 +- Fireworks/Core/src/FWGeometryTableViewBase.cc | 2 +- Fireworks/Core/src/fwPaletteExtra.cc | 2 +- Fireworks/FWInterface/src/FWPSetCellEditor.h | 4 ++-- Fireworks/Tracks/plugins/FWItemTrackAccessors.cc | 2 +- Fireworks/Tracks/plugins/FWSiPixelDigiProxyBuilder.cc | 2 +- Fireworks/Tracks/plugins/FWSiStripDigiProxyBuilder.cc | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Fireworks/Calo/interface/scaleMarker.h b/Fireworks/Calo/interface/scaleMarker.h index 81cf9c343d315..b690db26afc20 100644 --- a/Fireworks/Calo/interface/scaleMarker.h +++ b/Fireworks/Calo/interface/scaleMarker.h @@ -24,7 +24,7 @@ class FWViewContext; namespace fireworks { struct scaleMarker { scaleMarker(TEveScalableStraightLineSet* ls, float et, float e, const FWViewContext* vc) - : m_ls(ls), m_et(et), m_energy(e), m_vc(vc){}; + : m_ls(ls), m_et(et), m_energy(e), m_vc(vc) {} virtual ~scaleMarker() {} diff --git a/Fireworks/Calo/plugins/FWTracksterHitsProxyBuilder.cc b/Fireworks/Calo/plugins/FWTracksterHitsProxyBuilder.cc index bebd5949b1519..4e109c20b0714 100644 --- a/Fireworks/Calo/plugins/FWTracksterHitsProxyBuilder.cc +++ b/Fireworks/Calo/plugins/FWTracksterHitsProxyBuilder.cc @@ -262,7 +262,7 @@ void FWTracksterHitsProxyBuilder::build(const ticl::Trackster &iData, } } } // End of loop over rechits of a single layercluster - } // End loop over the layerclusters of the trackster + } // End loop over the layerclusters of the trackster hex_boxset->RefitPlex(); boxset->RefitPlex(); diff --git a/Fireworks/Core/interface/FWJobMetadataUpdateRequest.h b/Fireworks/Core/interface/FWJobMetadataUpdateRequest.h index 13c75c91f9a22..bae54f87f327a 100644 --- a/Fireworks/Core/interface/FWJobMetadataUpdateRequest.h +++ b/Fireworks/Core/interface/FWJobMetadataUpdateRequest.h @@ -3,7 +3,7 @@ class FWJobMetadataUpdateRequest { public: - virtual ~FWJobMetadataUpdateRequest(){}; + virtual ~FWJobMetadataUpdateRequest() {} }; #endif diff --git a/Fireworks/Core/interface/FWProxyBuilderBase.h b/Fireworks/Core/interface/FWProxyBuilderBase.h index 0d057772eea92..87655b9b6cece 100644 --- a/Fireworks/Core/interface/FWProxyBuilderBase.h +++ b/Fireworks/Core/interface/FWProxyBuilderBase.h @@ -110,7 +110,7 @@ class FWProxyBuilderBase { virtual void modelChanges(const FWModelIds&, Product*); - virtual void scaleProduct(TEveElementList* parent, FWViewType::EType, const FWViewContext* vc){}; + virtual void scaleProduct(TEveElementList* parent, FWViewType::EType, const FWViewContext* vc) {} FWProxyBuilderBase(const FWProxyBuilderBase&); // stop default const FWProxyBuilderBase& operator=(const FWProxyBuilderBase&); // stop default diff --git a/Fireworks/Core/interface/FWViewManagerBase.h b/Fireworks/Core/interface/FWViewManagerBase.h index 41d3d3708b78d..d21de53c16278 100644 --- a/Fireworks/Core/interface/FWViewManagerBase.h +++ b/Fireworks/Core/interface/FWViewManagerBase.h @@ -61,8 +61,8 @@ class FWViewManagerBase { void modelChangesComingSlot(); void modelChangesDoneSlot(); void colorsChangedSlot(); - virtual void eventBegin(){}; - virtual void eventEnd(){}; + virtual void eventBegin() {} + virtual void eventEnd() {} // ---------- const member functions --------------------- diff --git a/Fireworks/Core/src/CSGConnector.h b/Fireworks/Core/src/CSGConnector.h index 2d37156eb73cf..f4f0761b11c29 100644 --- a/Fireworks/Core/src/CSGConnector.h +++ b/Fireworks/Core/src/CSGConnector.h @@ -29,7 +29,7 @@ class CSGActionSupervisor; class CSGConnector : public TQObject { public: - CSGConnector(CSGAction *action, CSGActionSupervisor *supervisor) : m_action(action), m_supervisor(supervisor){}; + CSGConnector(CSGAction *action, CSGActionSupervisor *supervisor) : m_action(action), m_supervisor(supervisor) {} //virtual ~CSGConnector(); // ---------- member functions --------------------------- diff --git a/Fireworks/Core/src/FW3DViewDistanceMeasureTool.h b/Fireworks/Core/src/FW3DViewDistanceMeasureTool.h index 5de34ce644c11..a7ff9f8aa1eb9 100644 --- a/Fireworks/Core/src/FW3DViewDistanceMeasureTool.h +++ b/Fireworks/Core/src/FW3DViewDistanceMeasureTool.h @@ -14,7 +14,7 @@ class FW3DViewDistanceMeasureTool { enum EPickAction { kPnt1, kPnt2, kNone }; FW3DViewDistanceMeasureTool(); - virtual ~FW3DViewDistanceMeasureTool(){}; + virtual ~FW3DViewDistanceMeasureTool() {} void resetAction(); diff --git a/Fireworks/Core/src/FWGeometryTableViewBase.cc b/Fireworks/Core/src/FWGeometryTableViewBase.cc index cb36af9be0688..1c876bbc9d171 100644 --- a/Fireworks/Core/src/FWGeometryTableViewBase.cc +++ b/Fireworks/Core/src/FWGeometryTableViewBase.cc @@ -114,7 +114,7 @@ namespace { kStructureNotifyMask | kFocusChangeMask | kEnterWindowMask | kLeaveWindowMask); } - ~FWGeometryVF() override{}; + ~FWGeometryVF() override {} Bool_t HandleKey(Event_t* event) override { if (event->fCode == (UInt_t)gVirtualX->KeysymToKeycode(kKey_Escape)) { diff --git a/Fireworks/Core/src/fwPaletteExtra.cc b/Fireworks/Core/src/fwPaletteExtra.cc index 7132e69ce21b5..3c6317df2d610 100644 --- a/Fireworks/Core/src/fwPaletteExtra.cc +++ b/Fireworks/Core/src/fwPaletteExtra.cc @@ -13,7 +13,7 @@ namespace fireworks { bool whiteBg; FWColorManager::EPalette id; PaletteExtraTopBottomIndices(float (*iColors)[3], bool iIsWhiteBg, FWColorManager::EPalette iId) - : colVals(iColors), whiteBg(iIsWhiteBg), id(iId){}; + : colVals(iColors), whiteBg(iIsWhiteBg), id(iId) {} void set(int i, Color_t cidx) { if (whiteBg) { diff --git a/Fireworks/FWInterface/src/FWPSetCellEditor.h b/Fireworks/FWInterface/src/FWPSetCellEditor.h index 5f76fefe8b819..02e2ae66654e4 100644 --- a/Fireworks/FWInterface/src/FWPSetCellEditor.h +++ b/Fireworks/FWInterface/src/FWPSetCellEditor.h @@ -23,8 +23,8 @@ class FWPSetCellEditor : public TGTextEntry { public: - FWPSetCellEditor(const TGWindow* w, const char* txt) : TGTextEntry(w, txt){}; - ~FWPSetCellEditor() override{}; + FWPSetCellEditor(const TGWindow* w, const char* txt) : TGTextEntry(w, txt) {} + ~FWPSetCellEditor() override {} bool HandleKey(Event_t* event) override; bool apply(FWPSetTableManager::PSetData& data, FWPSetTableManager::PSetData& parent); }; diff --git a/Fireworks/Tracks/plugins/FWItemTrackAccessors.cc b/Fireworks/Tracks/plugins/FWItemTrackAccessors.cc index 3d2e1564341a6..cecb755d750a2 100644 --- a/Fireworks/Tracks/plugins/FWItemTrackAccessors.cc +++ b/Fireworks/Tracks/plugins/FWItemTrackAccessors.cc @@ -29,7 +29,7 @@ class BeamSpotSingleAccessor : public FWItemSingleAccessor { public: BeamSpotSingleAccessor(const TClass* x) : FWItemSingleAccessor(x) {} - ~BeamSpotSingleAccessor() override{}; + ~BeamSpotSingleAccessor() override {} REGISTER_FWITEMACCESSOR_METHODS(); }; diff --git a/Fireworks/Tracks/plugins/FWSiPixelDigiProxyBuilder.cc b/Fireworks/Tracks/plugins/FWSiPixelDigiProxyBuilder.cc index 0a6e8e692c193..481e49d152382 100644 --- a/Fireworks/Tracks/plugins/FWSiPixelDigiProxyBuilder.cc +++ b/Fireworks/Tracks/plugins/FWSiPixelDigiProxyBuilder.cc @@ -71,7 +71,7 @@ void FWSiPixelDigiProxyBuilder::build(const FWEventItem* iItem, TEveElementList* pointSet->SetNextPoint(globalPoint[0], globalPoint[1], globalPoint[2]); } } // end of iteration over digis in range - } // end of iteration over the DetSetVector + } // end of iteration over the DetSetVector } REGISTER_FWPROXYBUILDER(FWSiPixelDigiProxyBuilder, diff --git a/Fireworks/Tracks/plugins/FWSiStripDigiProxyBuilder.cc b/Fireworks/Tracks/plugins/FWSiStripDigiProxyBuilder.cc index 102ca078a0786..bcf9bfb42fca4 100644 --- a/Fireworks/Tracks/plugins/FWSiStripDigiProxyBuilder.cc +++ b/Fireworks/Tracks/plugins/FWSiStripDigiProxyBuilder.cc @@ -72,7 +72,7 @@ void FWSiStripDigiProxyBuilder::build(const FWEventItem* iItem, TEveElementList* lineSet->AddLine(globalTop[0], globalTop[1], globalTop[2], globalBottom[0], globalBottom[1], globalBottom[2]); } // end of iteration over digis - } // end of iteration over the DetSetVector + } // end of iteration over the DetSetVector } REGISTER_FWPROXYBUILDER(FWSiStripDigiProxyBuilder,