From 4c4606f41e663703860e8d65a4aba3f079c24be9 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Fri, 22 Apr 2022 11:24:01 +0200
Subject: [PATCH] DDEve: fix (menu)bar shadow warnings
---
DDEve/include/DDEve/DD4hepMenu.h | 2 +-
DDEve/include/DDEve/Display.h | 4 ++--
DDEve/include/DDEve/PopupMenu.h | 2 +-
DDEve/include/DDEve/ViewMenu.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/DDEve/include/DDEve/DD4hepMenu.h b/DDEve/include/DDEve/DD4hepMenu.h
index ed6e19f1e..1edb2f401 100644
--- a/DDEve/include/DDEve/DD4hepMenu.h
+++ b/DDEve/include/DDEve/DD4hepMenu.h
@@ -48,7 +48,7 @@ namespace dd4hep {
virtual ~DD4hepMenu();
/// Add the menu to the menu bar
- virtual void Build(TGMenuBar* bar, int hints=kLHintsNormal) override;
+ virtual void Build(TGMenuBar* menuBar, int hints=kLHintsNormal) override;
/// Callback when loading the configuration
void OnLoadXML(TGMenuEntry* entry, void* ptr);
/// Callback when loading the configuration
diff --git a/DDEve/include/DDEve/Display.h b/DDEve/include/DDEve/Display.h
index dc3eb505e..29b2a350b 100644
--- a/DDEve/include/DDEve/Display.h
+++ b/DDEve/include/DDEve/Display.h
@@ -212,9 +212,9 @@ namespace dd4hep {
virtual void OnNewEvent(EventHandler& handler) override;
/// Build the DDEve specific menues. Default bar is the ROOT browser's bar
- virtual void BuildMenus(TGMenuBar* bar=0);
+ virtual void BuildMenus(TGMenuBar* menuBar=0);
/// Add new menu to the main menu bar
- virtual void AddMenu(TGMenuBar* bar, PopupMenu* menu, int hints=kLHintsNormal);
+ virtual void AddMenu(TGMenuBar* menuBar, PopupMenu* menu, int hints=kLHintsNormal);
ClassDefOverride(Display,0);
};
diff --git a/DDEve/include/DDEve/PopupMenu.h b/DDEve/include/DDEve/PopupMenu.h
index 10ca18689..af1e8a189 100644
--- a/DDEve/include/DDEve/PopupMenu.h
+++ b/DDEve/include/DDEve/PopupMenu.h
@@ -53,7 +53,7 @@ namespace dd4hep {
TGPopupMenu& menu() { return m_popup; }
/// Add the menu to the menu bar
- virtual void Build(TGMenuBar* bar, int hints=kLHintsNormal);
+ virtual void Build(TGMenuBar* menuBar, int hints=kLHintsNormal);
/// Add a menu separator to the menu.
virtual void AddSeparator(TGMenuEntry* before = 0);
diff --git a/DDEve/include/DDEve/ViewMenu.h b/DDEve/include/DDEve/ViewMenu.h
index 6f52a9ce8..cb1c3fb9f 100644
--- a/DDEve/include/DDEve/ViewMenu.h
+++ b/DDEve/include/DDEve/ViewMenu.h
@@ -48,7 +48,7 @@ namespace dd4hep {
virtual ~ViewMenu();
/// Add the menu to the menu bar
- virtual void Build(TGMenuBar* bar, int hints=kLHintsNormal) override;
+ virtual void Build(TGMenuBar* menuBar, int hints=kLHintsNormal) override;
/// Import Geometry data and build the view
void BuildView(View *view) const;
--
GitLab