osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Michael Mann 2017-03-28 19:36:50 -04:00
parent 6b0f846ac3
commit b56bbb493a
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/qt/about_dialog.cpp
View File

@ -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);

8
ui/qt/additional_toolbar.cpp
View File

@ -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;
}
}

2
ui/qt/bluetooth_hci_summary_dialog.cpp
View File

@ -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;