From 1df9723a89d8bda85e1f15460322b275dc142188 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Wed, 13 Sep 2023 15:53:27 -0400 Subject: [PATCH 1/2] VP1BanksPlugin: 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. --- .../VP1BanksPlugin/VP1BanksPlugin/VP1BanksChannel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/VP1/VP1Plugins/VP1BanksPlugin/VP1BanksPlugin/VP1BanksChannel.h b/graphics/VP1/VP1Plugins/VP1BanksPlugin/VP1BanksPlugin/VP1BanksChannel.h index 27901d66e64a..9b3dd3f33335 100755 --- a/graphics/VP1/VP1Plugins/VP1BanksPlugin/VP1BanksPlugin/VP1BanksChannel.h +++ b/graphics/VP1/VP1Plugins/VP1BanksPlugin/VP1BanksPlugin/VP1BanksChannel.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 */ ///////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ public: Type type() const { return NUMBERS; };//Fixme: Need better type for this kind of system. Maybe an OTHER type? void create(); -protected slots: +protected Q_SLOTS: void entriesChanged(const QStringList& entry_key,const QStringList& entry_type,const QStringList& entry_id); private: -- GitLab From f0f2e3c66590c56ae61250519b1ab81e5c0558b0 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Wed, 13 Sep 2023 16:01:04 -0400 Subject: [PATCH 2/2] VP1TriggerDecisionPlugin: 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. --- .../VP1TriggerDecisionPlugin/VP1TriggerDecisionChannel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/VP1/VP1Plugins/VP1TriggerDecisionPlugin/VP1TriggerDecisionPlugin/VP1TriggerDecisionChannel.h b/graphics/VP1/VP1Plugins/VP1TriggerDecisionPlugin/VP1TriggerDecisionPlugin/VP1TriggerDecisionChannel.h index c36b86ba08b9..739f49ad5fc0 100644 --- a/graphics/VP1/VP1Plugins/VP1TriggerDecisionPlugin/VP1TriggerDecisionPlugin/VP1TriggerDecisionChannel.h +++ b/graphics/VP1/VP1Plugins/VP1TriggerDecisionPlugin/VP1TriggerDecisionPlugin/VP1TriggerDecisionChannel.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration */ ///////////////////////////////////////////////////////////// @@ -36,7 +36,7 @@ public: void systemErased(IVP1System*); void systemRefreshed(IVP1System*); -protected slots: +protected Q_SLOTS: void entriesChanged(const QStringList& entry_key,const QStringList& entry_type); void cellActivated( int row, int column ); -- GitLab