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: I0dbf8d0236b163da568a173ccedc3072bd039caa
Reviewed-on: https://code.wireshark.org/review/20739
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-27 09:40:56 -04:00
parent 9e9917bdbe
commit f5ed8a4306
5 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/qt/extcap_argument.cpp
View File

@ -61,7 +61,6 @@ ExtArgTimestamp::ExtArgTimestamp(extcap_arg * argument) :
QWidget * ExtArgTimestamp::createEditor(QWidget * parent)
{
QDateTimeEdit * tsBox;
QString storeValue;
QString text = defaultValue();
if ( _argument->pref_valptr && *_argument->pref_valptr)
@ -364,7 +363,6 @@ ExtArgText::ExtArgText(extcap_arg * argument) :
QWidget * ExtArgText::createEditor(QWidget * parent)
{
QString storeValue;
QString text = defaultValue();
if ( _argument->pref_valptr && *_argument->pref_valptr)
@ -431,7 +429,6 @@ ExtArgNumber::ExtArgNumber(extcap_arg * argument) :
QWidget * ExtArgNumber::createEditor(QWidget * parent)
{
QString storeValue;
QString text = defaultValue();
if ( _argument->pref_valptr && *_argument->pref_valptr)

8
ui/qt/io_graph_dialog.cpp
View File

@ -1337,12 +1337,12 @@ void IOGraphDialog::on_graphTreeWidget_itemActivated(QTreeWidgetItem *item, int
sma_combo_box_;
int cur_col = name_col_;
QWidget *prev_widget = ui->graphTreeWidget;
foreach (QWidget *editor, editors) {
foreach (QWidget *editorItem, editors) {
QFrame *edit_frame = new QFrame();
QHBoxLayout *hb = new QHBoxLayout();
QSpacerItem *spacer = new QSpacerItem(5, 10);
hb->addWidget(editor, 0);
hb->addWidget(editorItem, 0);
hb->addSpacerItem(spacer);
hb->setStretch(1, 1);
hb->setContentsMargins(0, 0, 0, 0);
@ -1351,8 +1351,8 @@ void IOGraphDialog::on_graphTreeWidget_itemActivated(QTreeWidgetItem *item, int
edit_frame->setFrameStyle(QFrame::NoFrame);
edit_frame->setLayout(hb);
ui->graphTreeWidget->setItemWidget(item, cur_col, edit_frame);
setTabOrder(prev_widget, editor);
prev_widget = editor;
setTabOrder(prev_widget, editorItem);
prev_widget = editorItem;
cur_col++;
}

18
ui/qt/sctp_chunk_statistics_dialog.cpp
View File

@ -114,9 +114,9 @@ void SCTPChunkStatisticsDialog::fillTable(bool all)
g_free (fname);
if (init || all) {
int j = 0;
int i, j = 0;
for (int i = 0; i < chunks.size(); i++) {
for (i = 0; i < chunks.size(); i++) {
if (!chunks.value(i).hide) {
ui->tableWidget->setRowCount(ui->tableWidget->rowCount()+1);
ui->tableWidget->setVerticalHeaderItem(j, new QTableWidgetItem(QString("%1").arg(chunks.value(i).name)));
@ -126,7 +126,7 @@ void SCTPChunkStatisticsDialog::fillTable(bool all)
j++;
}
}
for (int i = 0; i < chunks.size(); i++) {
for (i = 0; i < chunks.size(); i++) {
if (chunks.value(i).hide) {
ui->tableWidget->setRowCount(ui->tableWidget->rowCount()+1);
ui->tableWidget->setVerticalHeaderItem(j, new QTableWidgetItem(QString("%1").arg(chunks.value(i).name)));
@ -162,8 +162,8 @@ void SCTPChunkStatisticsDialog::fillTable(bool all)
} else if ((strstr(token, "Show"))) {
temp.hide = 0;
} else {
QString ch = QString(token).mid(1, (int)strlen(token)-2);
g_strlcpy(temp.name, qPrintable(ch), sizeof temp.name);
QString ch2 = QString(token).mid(1, (int)strlen(token)-2);
g_strlcpy(temp.name, qPrintable(ch2), sizeof temp.name);
}
}
}
@ -179,7 +179,7 @@ void SCTPChunkStatisticsDialog::fillTable(bool all)
i++;
}
j = ui->tableWidget->rowCount();
for (int i = 0; i < chunks.size(); i++) {
for (i = 0; i < chunks.size(); i++) {
if (chunks.value(i).hide) {
ui->tableWidget->setRowCount(ui->tableWidget->rowCount()+1);
ui->tableWidget->setVerticalHeaderItem(j, new QTableWidgetItem(QString("%1").arg(chunks.value(i).name)));
@ -263,9 +263,9 @@ void SCTPChunkStatisticsDialog::on_actionHideChunkType_triggered()
{
int row;
QTableWidgetItem *item = ui->tableWidget->itemAt(selected_point.x(), selected_point.y()-60);
if (item) {
row = item->row();
QTableWidgetItem *itemPoint = ui->tableWidget->itemAt(selected_point.x(), selected_point.y()-60);
if (itemPoint) {
row = itemPoint->row();
ui->tableWidget->hideRow(row);
QTableWidgetItem *item = ui->tableWidget->verticalHeaderItem(row);
QMap<int, struct chunkTypes>::iterator iter;

1
ui/qt/sequence_diagram.cpp
View File

@ -256,7 +256,6 @@ void SequenceDiagram::draw(QCPPainter *painter)
for (it = data_->constBegin(); it != data_->constEnd(); ++it) {
double cur_key = it.key();
seq_analysis_item_t *sai = it.value().value;
QPen fg_pen(mainPen());
QColor bg_color;
if (sai->frame_number == selected_packet_) {

4
ui/qt/wireless_frame.cpp
View File

@ -209,8 +209,8 @@ void WirelessFrame::getInterfaceInfo()
ws80211_get_iface_info(iface->ifname, &iface_info);
for (guint i = 0; i < iface->frequencies->len; i++) {
guint32 frequency = g_array_index(iface->frequencies, guint32, i);
for (guint j = 0; j < iface->frequencies->len; j++) {
guint32 frequency = g_array_index(iface->frequencies, guint32, j);
double ghz = frequency / 1000.0;
QString chan_str = QString("%1 " UTF8_MIDDLE_DOT " %2%3")
.arg(ieee80211_mhz_to_chan(frequency))