From 951cf710e8c8f85fb248887d9545c939cc03d7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= <stig@bjorlykke.org>
Date: Tue, 18 Apr 2017 10:03:00 +0200
Subject: [PATCH] Qt: AdditionalToolbars is a menu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rename actionViewAdditionalToolbars to menuAdditionalToolbars
because this is a menu, not an action.

Change-Id: I85e45c065f415ffa008792f04127d81283e54b7e
Reviewed-on: https://code.wireshark.org/review/21181
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
---
 ui/qt/main_window.cpp       | 14 +++++++-------
 ui/qt/main_window.ui        |  4 ++--
 ui/qt/main_window_slots.cpp |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index d910b73e3c..1570b4f4cc 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -779,9 +779,9 @@ QMenu *MainWindow::createPopupMenu()
     menu->addAction(main_ui_->actionViewFilterToolbar);
     menu->addAction(main_ui_->actionViewWirelessToolbar);
 
-    if (!main_ui_->actionViewAdditionalToolbars->actions().isEmpty()) {
-        QMenu *subMenu = menu->addMenu(main_ui_->actionViewAdditionalToolbars->title());
-        foreach (QAction *action, main_ui_->actionViewAdditionalToolbars->actions()) {
+    if (!main_ui_->menuAdditionalToolbars->actions().isEmpty()) {
+        QMenu *subMenu = menu->addMenu(main_ui_->menuAdditionalToolbars->title());
+        foreach (QAction *action, main_ui_->menuAdditionalToolbars->actions()) {
             subMenu->addAction(action);
         }
     }
@@ -1896,7 +1896,7 @@ void MainWindow::initShowHideMainWidgets()
     }
 
     /* Initially hide the additional toolbars menus */
-    main_ui_->actionViewAdditionalToolbars->menuAction()->setVisible(false);
+    main_ui_->menuAdditionalToolbars->menuAction()->setVisible(false);
 
     connect(show_hide_actions_, SIGNAL(triggered(QAction*)), this, SLOT(showHideMainWidgets(QAction*)));
 }
@@ -2642,7 +2642,7 @@ void MainWindow::addPluginIFStructures()
 
     int cntToolbars = 0;
 
-    QMenu *tbMenu = main_ui_->actionViewAdditionalToolbars;
+    QMenu *tbMenu = main_ui_->menuAdditionalToolbars;
     GList *if_toolbars = ext_toolbar_get_entries();
     while (if_toolbars && if_toolbars->data) {
         ext_toolbar_t *toolbar = (ext_toolbar_t*) if_toolbars->data;
@@ -2709,13 +2709,13 @@ void MainWindow::removeAdditionalToolbar(QString toolbarName)
             if (entry) {
                 recent.gui_additional_toolbars = g_list_remove(recent.gui_additional_toolbars, entry->data);
             }
-            QList<QAction *> actions = main_ui_->actionViewAdditionalToolbars->actions();
+            QList<QAction *> actions = main_ui_->menuAdditionalToolbars->actions();
             foreach(QAction *action, actions) {
                 ext_toolbar_t *item = VariantPointer<ext_toolbar_t>::asPtr(action->data());
                 if (item && ifToolBar->menuName().compare(item->name)) {
                     if (show_hide_actions_)
                         show_hide_actions_->removeAction(action);
-                    main_ui_->actionViewAdditionalToolbars->removeAction(action);
+                    main_ui_->menuAdditionalToolbars->removeAction(action);
                 }
             }
             break;
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index b6fb96dd62..39bfc55cb1 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -337,7 +337,7 @@
      <addaction name="actionViewInternalsDissectorTables"/>
      <addaction name="actionViewInternalsSupportedProtocols"/>
     </widget>
-    <widget class="QMenu" name="actionViewAdditionalToolbars">
+    <widget class="QMenu" name="menuAdditionalToolbars">
      <property name="title">
       <string>Additional Toolbars</string>
      </property>
@@ -345,7 +345,7 @@
     <addaction name="actionViewMainToolbar"/>
     <addaction name="actionViewFilterToolbar"/>
     <addaction name="actionViewWirelessToolbar"/>
-    <addaction name="actionViewAdditionalToolbars" />
+    <addaction name="menuAdditionalToolbars" />
     <addaction name="actionViewStatusBar"/>
     <addaction name="separator"/>
     <addaction name="actionViewFullScreen"/>
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index adec39897b..4103da00b8 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -523,7 +523,7 @@ void MainWindow::updateRecentActions()
     main_ui_->actionViewPacketDetails->setChecked(recent.tree_view_show && prefs_has_layout_pane_content(layout_pane_content_pdetails));
     main_ui_->actionViewPacketBytes->setChecked(recent.byte_view_show && prefs_has_layout_pane_content(layout_pane_content_pbytes));
 
-    foreach (QAction * action, main_ui_->actionViewAdditionalToolbars->actions()) {
+    foreach (QAction * action, main_ui_->menuAdditionalToolbars->actions()) {
         ext_toolbar_t * toolbar = VariantPointer<ext_toolbar_t>::asPtr(action->data());
         bool checked = false;
         if (toolbar && g_list_find_custom(recent.gui_additional_toolbars, toolbar->name, (GCompareFunc) strcmp))