From 9c91f4795fa4130f74bdc9b809bfe40942488be8 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Wed, 13 Sep 2023 15:57:08 -0400 Subject: [PATCH 1/2] VP1TestSystems: slots -> Q_SLOTS Rename the Qt slots 'keyword' to Q_SLOTS. Having this in the source confuses cppcheck, which reports syntax errors. We can define slots as a macro expanding to nothing in the cppcheck configuration, but if we do that globally, there are other packages that break because they use slots as an identifier. Using Q_SLOTS instead prevents this name collision. --- .../VP1TestSystems/VP1TestSystems/Example3DSystem4.h | 4 ++-- .../VP1TestSystems/VP1TestSystems/Example3DSystem5.h | 4 ++-- .../VP1TestSystems/VP1TestSystems/TrackingSurfacesSystem.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/graphics/VP1/VP1Systems/VP1TestSystems/VP1TestSystems/Example3DSystem4.h b/graphics/VP1/VP1Systems/VP1TestSystems/VP1TestSystems/Example3DSystem4.h index cab48294f62d..84a34d0aff3a 100755 --- a/graphics/VP1/VP1Systems/VP1TestSystems/VP1TestSystems/Example3DSystem4.h +++ b/graphics/VP1/VP1Systems/VP1TestSystems/VP1TestSystems/Example3DSystem4.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration */ #ifndef EXAMPLE3DSYSTEM4_H @@ -36,7 +36,7 @@ public: void userPickedNode(SoNode* pickedNode, SoPath * pickedPath); QWidget * buildController(); -private slots: +private Q_SLOTS: void ptCutChanged(double); private: diff --git a/graphics/VP1/VP1Systems/VP1TestSystems/VP1TestSystems/Example3DSystem5.h b/graphics/VP1/VP1Systems/VP1TestSystems/VP1TestSystems/Example3DSystem5.h index 837238aed7a4..2300bae6093d 100755 --- a/graphics/VP1/VP1Systems/VP1TestSystems/VP1TestSystems/Example3DSystem5.h +++ b/graphics/VP1/VP1Systems/VP1TestSystems/VP1TestSystems/Example3DSystem5.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration */ #ifndef EXAMPLE3DSYSTEM5_H @@ -38,7 +38,7 @@ public: void userChangedSelection(SoCooperativeSelection*, QSet<SoNode*>, QSet<SoPath*>); QWidget * buildController(); -private slots: +private Q_SLOTS: void ptCutChanged(double); void updateSelectionMode( bool single ); diff --git a/graphics/VP1/VP1Systems/VP1TestSystems/VP1TestSystems/TrackingSurfacesSystem.h b/graphics/VP1/VP1Systems/VP1TestSystems/VP1TestSystems/TrackingSurfacesSystem.h index 929a439d83da..fea2ccb3b53e 100644 --- a/graphics/VP1/VP1Systems/VP1TestSystems/VP1TestSystems/TrackingSurfacesSystem.h +++ b/graphics/VP1/VP1Systems/VP1TestSystems/VP1TestSystems/TrackingSurfacesSystem.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration */ #ifndef TRACKINGSURFACESSYSTEM_H @@ -28,7 +28,7 @@ public: void userChangedSelection(SoCooperativeSelection*, QSet<SoNode*>, QSet<SoPath*>); QWidget * buildController(); -private slots: +private Q_SLOTS: void updateSelectionMode( bool single ); private: -- GitLab From c618872cdf61a3dc5cd03267e429eb29c64d4c76 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Wed, 13 Sep 2023 16:03:31 -0400 Subject: [PATCH 2/2] VP1CaloReadoutSystems: slots -> Q_SLOTS Rename the Qt slots 'keyword' to Q_SLOTS. Having this in the source confuses cppcheck, which reports syntax errors. We can define slots as a macro expanding to nothing in the cppcheck configuration, but if we do that globally, there are other packages that break because they use slots as an identifier. Using Q_SLOTS instead prevents this name collision. --- .../VP1CaloReadoutSystems/VP1CaloReadoutSystem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/VP1CaloReadoutSystems/VP1CaloReadoutSystem.h b/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/VP1CaloReadoutSystems/VP1CaloReadoutSystem.h index f615d81dac14..774480d79248 100755 --- a/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/VP1CaloReadoutSystems/VP1CaloReadoutSystem.h +++ b/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/VP1CaloReadoutSystems/VP1CaloReadoutSystem.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration */ #ifndef VP1CALOREADOUTSYSTEM_H @@ -39,7 +39,7 @@ class VP1CaloReadoutSystem: public IVP13DSystemSimple QByteArray saveState(); void restoreFromState(QByteArray ba); - protected slots: + protected Q_SLOTS: void checkboxChanged(); void checkboxChanged(QCheckBox*cb); void phiSectorTurnon(int); -- GitLab