diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-03-28 19:36:50 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-03-29 02:38:29 +0000 |
| commit | b56bbb493afe6717d2e26c6e795205d7ae10254a (patch) | |
| tree | 0dd6b8f432c72b7a4457b9e901dad4dea2212093 /ui | |
| parent | 6b0f846ac35a9775090f85a02f58064b4b0117e6 (diff) | |
Fix "warning C6246: Local declaration hides declaration of the same name in outer scope" warnings
Change-Id: I98edc076fdab40ef1fd05313168011f58e13a4d6
Reviewed-on: https://code.wireshark.org/review/20773
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/about_dialog.cpp | 1 | ||||
| -rw-r--r-- | ui/qt/additional_toolbar.cpp | 8 | ||||
| -rw-r--r-- | ui/qt/bluetooth_hci_summary_dialog.cpp | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 19faee4255..aa3c657b9b 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -122,7 +122,6 @@ const QString AboutDialog::plugins_scan() #ifdef HAVE_EXTCAP GHashTable * tools = extcap_loaded_interfaces(); if (tools && g_hash_table_size(tools) > 0) { - QString short_file; GList * walker = g_list_first(g_hash_table_get_keys(tools)); while (walker && walker->data) { extcap_info * tool = (extcap_info *)g_hash_table_lookup(tools, walker->data); diff --git a/ui/qt/additional_toolbar.cpp b/ui/qt/additional_toolbar.cpp index 5a91b90bd3..6a76651a0a 100644 --- a/ui/qt/additional_toolbar.cpp +++ b/ui/qt/additional_toolbar.cpp @@ -406,14 +406,14 @@ toolbar_selector_cb(gpointer item, gpointer item_data, gpointer user_data) { for ( int i = 0; i < sourceModel->rowCount(); i++ ) { - QStandardItem * item = sourceModel->item(i, 0); - ext_toolbar_value_t * entry = VariantPointer<ext_toolbar_value_t>::asPtr(item->data(Qt::UserRole)); + QStandardItem * dataValue = sourceModel->item(i, 0); + ext_toolbar_value_t * entry = VariantPointer<ext_toolbar_value_t>::asPtr(dataValue->data(Qt::UserRole)); if ( entry && g_strcmp0( entry->value, idx) == 0 ) { g_free(entry->display); entry->display = g_strdup(display); - item->setData(VariantPointer<ext_toolbar_value_t>::asQVariant(entry), Qt::UserRole); - item->setText(display); + dataValue->setData(VariantPointer<ext_toolbar_value_t>::asQVariant(entry), Qt::UserRole); + dataValue->setText(display); break; } } diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp index 04aa81738d..cd05e3d745 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.cpp +++ b/ui/qt/bluetooth_hci_summary_dialog.cpp @@ -493,8 +493,6 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi } if (!item) { - QString name; - item = new QTreeWidgetItem(); if (tap_hci->name) name = tap_hci->name; |