@@ -924,9 +924,9 @@ std::string MainWindow::addToolbarButton(const std::string& name,
924924 // default to "buttonX" naming
925925 key = " button" + std::to_string (key_idx);
926926 key_idx++;
927- } while (buttons_.count (key) != 0 );
927+ } while (buttons_.contains (key));
928928 } else {
929- if (buttons_.count (name) != 0 ) {
929+ if (buttons_.contains (name)) {
930930 logger_->error (utl::GUI, 22 , " Button {} already defined." , name);
931931 }
932932 key = name;
@@ -951,7 +951,7 @@ std::string MainWindow::addToolbarButton(const std::string& name,
951951
952952void MainWindow::removeToolbarButton (const std::string& name)
953953{
954- if (buttons_.count (name) == 0 ) {
954+ if (! buttons_.contains (name)b ) {
955955 return ;
956956 }
957957
@@ -1020,9 +1020,9 @@ std::string MainWindow::addMenuItem(const std::string& name,
10201020 // default to "actionX" naming
10211021 key = " action" + std::to_string (key_idx);
10221022 key_idx++;
1023- } while (menu_actions_.count (key) != 0 );
1023+ } while (menu_actions_.contains (key));
10241024 } else {
1025- if (menu_actions_.count (name) != 0 ) {
1025+ if (menu_actions_.contains (name)) {
10261026 logger_->error (utl::GUI, 25 , " Menu action {} already defined." , name);
10271027 }
10281028 key = name;
@@ -1081,7 +1081,7 @@ void MainWindow::removeMenu(QMenu* menu)
10811081
10821082void MainWindow::removeMenuItem (const std::string& name)
10831083{
1084- if (menu_actions_.count (name) == 0 ) {
1084+ if (! menu_actions_.contains (name)) {
10851085 return ;
10861086 }
10871087
0 commit comments