diff --git a/DDEve/include/DDEve/DD4hepMenu.h b/DDEve/include/DDEve/DD4hepMenu.h index ed6e19f1efd734ad550ffb3ca7b78922bc537169..1edb2f4015d3e883d5619fa18da00ef8e4de1fb2 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 dc3eb505eccbcc8f31e156b297671f9cee398298..29b2a350b8d78cebe6081f36712d3ef190dd0c08 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 10ca18689ca096c49c8dbf98e6edf0f8749bf0bd..af1e8a189821456ba3aa553225786c0be56ec13e 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 6f52a9ce833cf986143654616ddfaa069319d23c..cb1c3fb9f0a93b30e3ab1440deb98b13427494f9 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;