summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2015-07-07 23:47:20 +0200
committerJörg Mayer <jmayer@loplof.de>2015-07-07 21:50:17 +0000
commit51a37b666a18f8d85e4a43ec2d9676d24d15c360 (patch)
treea133dc084dade0670a7be77c22cfe3ae53ec628c
parente91ca72a445d51b71f958f140e2eb89747f499ff (diff)
downloadwireshark-51a37b666a18f8d85e4a43ec2d9676d24d15c360.tar.gz
Continuing to remove Q_UNUSED
Change-Id: I54bc4a1b7d39abd1bb88ee361b0de5fcbca1efe8 Reviewed-on: https://code.wireshark.org/review/9546 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-rw-r--r--ui/qt/label_stack.cpp9
-rw-r--r--ui/qt/layout_preferences_frame.cpp6
-rw-r--r--ui/qt/lbm_lbtrm_transport_dialog.cpp23
-rw-r--r--ui/qt/lbm_lbtru_transport_dialog.cpp23
-rw-r--r--ui/qt/lbm_stream_dialog.cpp7
-rw-r--r--ui/qt/lbm_uimflow_dialog.cpp13
-rw-r--r--ui/qt/main_welcome.cpp4
-rw-r--r--ui/qt/main_window_preferences_frame.cpp3
-rw-r--r--ui/qt/manage_interfaces_dialog.cpp19
9 files changed, 30 insertions, 77 deletions
diff --git a/ui/qt/label_stack.cpp b/ui/qt/label_stack.cpp
index 5db56945e0..1f0507f396 100644
--- a/ui/qt/label_stack.cpp
+++ b/ui/qt/label_stack.cpp
@@ -117,19 +117,16 @@ void LabelStack::mousePressEvent(QMouseEvent *event)
emit mousePressedAt(QPoint(event->globalPos()), Qt::LeftButton);
}
-void LabelStack::mouseReleaseEvent(QMouseEvent *event)
+void LabelStack::mouseReleaseEvent(QMouseEvent *)
{
- Q_UNUSED(event);
}
-void LabelStack::mouseDoubleClickEvent(QMouseEvent *event)
+void LabelStack::mouseDoubleClickEvent(QMouseEvent *)
{
- Q_UNUSED(event);
}
-void LabelStack::mouseMoveEvent(QMouseEvent *event)
+void LabelStack::mouseMoveEvent(QMouseEvent *)
{
- Q_UNUSED(event);
}
void LabelStack::contextMenuEvent(QContextMenuEvent *event)
diff --git a/ui/qt/layout_preferences_frame.cpp b/ui/qt/layout_preferences_frame.cpp
index f88f06ec55..12c220d69c 100644
--- a/ui/qt/layout_preferences_frame.cpp
+++ b/ui/qt/layout_preferences_frame.cpp
@@ -54,9 +54,8 @@ LayoutPreferencesFrame::~LayoutPreferencesFrame()
delete ui;
}
-void LayoutPreferencesFrame::showEvent(QShowEvent *evt)
+void LayoutPreferencesFrame::showEvent(QShowEvent *)
{
- Q_UNUSED(evt);
updateWidgets();
}
@@ -274,9 +273,8 @@ void LayoutPreferencesFrame::on_pane3NoneRadioButton_toggled(bool checked)
}
-void LayoutPreferencesFrame::on_restoreButtonBox_clicked(QAbstractButton *button)
+void LayoutPreferencesFrame::on_restoreButtonBox_clicked(QAbstractButton *)
{
- Q_UNUSED(button);
pref_layout_type_->stashed_val.uint = pref_layout_type_->default_val.uint;
pref_layout_content_1_->stashed_val.enumval = pref_layout_content_1_->default_val.enumval;
updateWidgets();
diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp
index aaa1cc2e5a..4c44c5ee20 100644
--- a/ui/qt/lbm_lbtrm_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp
@@ -1338,10 +1338,8 @@ void LBMLBTRMTransportDialog::resetTap(void * tap_data)
info->clearMaps();
}
-gboolean LBMLBTRMTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * tap_info)
+gboolean LBMLBTRMTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info)
{
- Q_UNUSED(edt)
-
if (pinfo->fd->flags.passed_dfilter == 1)
{
const lbm_lbtrm_tap_info_t * tapinfo = (const lbm_lbtrm_tap_info_t *)tap_info;
@@ -1352,9 +1350,8 @@ gboolean LBMLBTRMTransportDialog::tapPacket(void * tap_data, packet_info * pinfo
return (TRUE);
}
-void LBMLBTRMTransportDialog::drawTreeItems(void * tap_data)
+void LBMLBTRMTransportDialog::drawTreeItems(void *)
{
- Q_UNUSED(tap_data)
}
void LBMLBTRMTransportDialog::on_applyFilterButton_clicked(void)
@@ -1389,10 +1386,8 @@ void LBMLBTRMTransportDialog::sourcesDetailCurrentChanged(int index)
sourcesItemClicked(m_current_source_transport, 0);
}
-void LBMLBTRMTransportDialog::sourcesItemClicked(QTreeWidgetItem * item, int column)
+void LBMLBTRMTransportDialog::sourcesItemClicked(QTreeWidgetItem * item, int)
{
- Q_UNUSED(column)
-
LBMLBTRMSourceTransportEntry * transport = dynamic_cast<LBMLBTRMSourceTransportEntry *>(item);
resetSourcesDetail();
@@ -1459,10 +1454,8 @@ void LBMLBTRMTransportDialog::loadSourceSMDetails(LBMLBTRMSourceTransportEntry *
}
}
-void LBMLBTRMTransportDialog::receiversItemClicked(QTreeWidgetItem * item, int column)
+void LBMLBTRMTransportDialog::receiversItemClicked(QTreeWidgetItem * item, int)
{
- Q_UNUSED(column)
-
LBMLBTRMReceiverTransportEntry * transport = dynamic_cast<LBMLBTRMReceiverTransportEntry *>(item);
resetReceiversDetail();
@@ -1485,10 +1478,8 @@ void LBMLBTRMTransportDialog::loadReceiverNAKDetails(LBMLBTRMReceiverTransportEn
}
}
-void LBMLBTRMTransportDialog::sourcesDetailItemDoubleClicked(QTreeWidgetItem * item, int column)
+void LBMLBTRMTransportDialog::sourcesDetailItemDoubleClicked(QTreeWidgetItem * item, int)
{
- Q_UNUSED(column)
-
LBMLBTRMFrameEntry * frame = dynamic_cast<LBMLBTRMFrameEntry *>(item);
if (frame == NULL)
{
@@ -1498,10 +1489,8 @@ void LBMLBTRMTransportDialog::sourcesDetailItemDoubleClicked(QTreeWidgetItem * i
emit goToPacket((int)frame->getFrame());
}
-void LBMLBTRMTransportDialog::receiversDetailItemDoubleClicked(QTreeWidgetItem * item, int column)
+void LBMLBTRMTransportDialog::receiversDetailItemDoubleClicked(QTreeWidgetItem * item, int)
{
- Q_UNUSED(column)
-
LBMLBTRMFrameEntry * frame = dynamic_cast<LBMLBTRMFrameEntry *>(item);
if (frame == NULL)
{
diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp
index e31a523ebd..807df9580a 100644
--- a/ui/qt/lbm_lbtru_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtru_transport_dialog.cpp
@@ -1758,10 +1758,8 @@ void LBMLBTRUTransportDialog::resetTap(void * tap_data)
info->clearMaps();
}
-gboolean LBMLBTRUTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * tap_info)
+gboolean LBMLBTRUTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info)
{
- Q_UNUSED(edt)
-
if (pinfo->fd->flags.passed_dfilter == 1)
{
const lbm_lbtru_tap_info_t * tapinfo = (const lbm_lbtru_tap_info_t *)tap_info;
@@ -1772,9 +1770,8 @@ gboolean LBMLBTRUTransportDialog::tapPacket(void * tap_data, packet_info * pinfo
return (TRUE);
}
-void LBMLBTRUTransportDialog::drawTreeItems(void * tap_data)
+void LBMLBTRUTransportDialog::drawTreeItems(void *)
{
- Q_UNUSED(tap_data)
}
void LBMLBTRUTransportDialog::on_applyFilterButton_clicked(void)
@@ -1813,10 +1810,8 @@ void LBMLBTRUTransportDialog::sourcesDetailCurrentChanged(int index)
sourcesItemClicked(m_current_source_transport, 0);
}
-void LBMLBTRUTransportDialog::sourcesItemClicked(QTreeWidgetItem * item, int column)
+void LBMLBTRUTransportDialog::sourcesItemClicked(QTreeWidgetItem * item, int)
{
- Q_UNUSED(column)
-
LBMLBTRUSourceTransportEntry * transport = dynamic_cast<LBMLBTRUSourceTransportEntry *>(item);
resetSourcesDetail();
@@ -1895,10 +1890,8 @@ void LBMLBTRUTransportDialog::loadSourceRSTDetails(LBMLBTRUSourceTransportEntry
}
}
-void LBMLBTRUTransportDialog::sourcesDetailItemDoubleClicked(QTreeWidgetItem * item, int column)
+void LBMLBTRUTransportDialog::sourcesDetailItemDoubleClicked(QTreeWidgetItem * item, int)
{
- Q_UNUSED(column)
-
LBMLBTRUFrameEntry * frame = dynamic_cast<LBMLBTRUFrameEntry *>(item);
if (frame == NULL)
{
@@ -1928,10 +1921,8 @@ void LBMLBTRUTransportDialog::receiversDetailCurrentChanged(int index)
receiversItemClicked(m_current_receiver_transport, 0);
}
-void LBMLBTRUTransportDialog::receiversItemClicked(QTreeWidgetItem * item, int column)
+void LBMLBTRUTransportDialog::receiversItemClicked(QTreeWidgetItem * item, int)
{
- Q_UNUSED(column)
-
LBMLBTRUReceiverTransportEntry * transport = dynamic_cast<LBMLBTRUReceiverTransportEntry *>(item);
resetReceiversDetail();
@@ -1986,10 +1977,8 @@ void LBMLBTRUTransportDialog::loadReceiverCREQDetails(LBMLBTRUReceiverTransportE
}
}
-void LBMLBTRUTransportDialog::receiversDetailItemDoubleClicked(QTreeWidgetItem * item, int column)
+void LBMLBTRUTransportDialog::receiversDetailItemDoubleClicked(QTreeWidgetItem * item, int)
{
- Q_UNUSED(column)
-
LBMLBTRUFrameEntry * frame = dynamic_cast<LBMLBTRUFrameEntry *>(item);
if (frame == NULL)
{
diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp
index b78533a5df..cc0341acac 100644
--- a/ui/qt/lbm_stream_dialog.cpp
+++ b/ui/qt/lbm_stream_dialog.cpp
@@ -412,10 +412,8 @@ void LBMStreamDialog::resetTap(void * tap_data)
dialog->m_ui->lbm_stream_TreeWidget->clear();
}
-gboolean LBMStreamDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info)
+gboolean LBMStreamDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * stream_info)
{
- Q_UNUSED(edt)
-
if (pinfo->fd->flags.passed_dfilter == 1)
{
const lbm_uim_stream_tap_info_t * tapinfo = (const lbm_uim_stream_tap_info_t *)stream_info;
@@ -426,9 +424,8 @@ gboolean LBMStreamDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_d
return (TRUE);
}
-void LBMStreamDialog::drawTreeItems(void * tap_data)
+void LBMStreamDialog::drawTreeItems(void *)
{
- Q_UNUSED(tap_data)
}
void LBMStreamDialog::on_applyFilterButton_clicked(void)
diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp
index b0dd5e53a8..c35946904c 100644
--- a/ui/qt/lbm_uimflow_dialog.cpp
+++ b/ui/qt/lbm_uimflow_dialog.cpp
@@ -163,10 +163,8 @@ static gboolean lbm_uimflow_add_to_graph(seq_analysis_info_t * seq_info, packet_
return (TRUE);
}
-static gboolean lbm_uimflow_tap_packet(void * tap_data, packet_info * pinfo, epan_dissect_t * edt _U_, const void * stream_info)
+static gboolean lbm_uimflow_tap_packet(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * stream_info)
{
- Q_UNUSED(edt)
-
seq_analysis_info_t * sainfo = (seq_analysis_info_t *)tap_data;
const lbm_uim_stream_info_t * info = (const lbm_uim_stream_info_t *)stream_info;
@@ -297,15 +295,13 @@ void LBMUIMFlowDialog::setCaptureFile(capture_file * cfile)
}
}
-void LBMUIMFlowDialog::showEvent(QShowEvent * event)
+void LBMUIMFlowDialog::showEvent(QShowEvent *)
{
- Q_UNUSED(event);
resetAxes();
}
-void LBMUIMFlowDialog::resizeEvent(QResizeEvent * event)
+void LBMUIMFlowDialog::resizeEvent(QResizeEvent *)
{
- Q_UNUSED(event);
resetAxes(true);
}
@@ -441,9 +437,8 @@ void LBMUIMFlowDialog::mouseMoved(QMouseEvent * event)
m_ui->hintLabel->setText(hint);
}
-void LBMUIMFlowDialog::mouseReleased(QMouseEvent * event)
+void LBMUIMFlowDialog::mouseReleased(QMouseEvent *)
{
- Q_UNUSED(event);
if (m_ui->sequencePlot->cursor().shape() == Qt::ClosedHandCursor)
{
m_ui->sequencePlot->setCursor(QCursor(Qt::OpenHandCursor));
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp
index c29791d5e4..27f6aaeb7b 100644
--- a/ui/qt/main_welcome.cpp
+++ b/ui/qt/main_welcome.cpp
@@ -208,10 +208,8 @@ void MainWelcome::appInitialized()
splash_overlay_ = NULL;
}
-void MainWelcome::interfaceDoubleClicked(QTreeWidgetItem *item, int column)
+void MainWelcome::interfaceDoubleClicked(QTreeWidgetItem *item, int)
{
- Q_UNUSED(column);
-
if (item) {
emit startCapture();
}
diff --git a/ui/qt/main_window_preferences_frame.cpp b/ui/qt/main_window_preferences_frame.cpp
index bbc011ab92..a2b0d72eff 100644
--- a/ui/qt/main_window_preferences_frame.cpp
+++ b/ui/qt/main_window_preferences_frame.cpp
@@ -113,9 +113,8 @@ MainWindowPreferencesFrame::~MainWindowPreferencesFrame()
delete ui;
}
-void MainWindowPreferencesFrame::showEvent(QShowEvent *evt)
+void MainWindowPreferencesFrame::showEvent(QShowEvent *)
{
- Q_UNUSED(evt);
updateWidgets();
}
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
index 20a32f4412..c0746f8409 100644
--- a/ui/qt/manage_interfaces_dialog.cpp
+++ b/ui/qt/manage_interfaces_dialog.cpp
@@ -298,10 +298,8 @@ void ManageInterfacesDialog::on_delPipe_clicked()
delete ui->pipeList->currentItem();
}
-void ManageInterfacesDialog::on_pipeList_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
+void ManageInterfacesDialog::on_pipeList_currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)
{
- Q_UNUSED(current)
- Q_UNUSED(previous)
updateWidgets();
}
@@ -467,10 +465,8 @@ void ManageInterfacesDialog::on_buttonBox_helpRequested()
}
#ifdef HAVE_PCAP_REMOTE
-void ManageInterfacesDialog::remoteSelectionChanged(QTreeWidgetItem* item, int col)
+void ManageInterfacesDialog::remoteSelectionChanged(QTreeWidgetItem*, int)
{
- Q_UNUSED(item)
- Q_UNUSED(col)
updateWidgets();
}
@@ -660,10 +656,8 @@ void ManageInterfacesDialog::remoteAccepted()
}
}
-void ManageInterfacesDialog::on_remoteList_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
+void ManageInterfacesDialog::on_remoteList_currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)
{
- Q_UNUSED(current)
- Q_UNUSED(previous)
updateWidgets();
}
@@ -782,10 +776,8 @@ PathChooserDelegate::~PathChooserDelegate()
{
}
-QWidget* PathChooserDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
+QWidget* PathChooserDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &) const
{
- Q_UNUSED(index)
-
QTreeWidgetItem *item = tree_->currentItem();
if (!item) {
return NULL;
@@ -821,9 +813,8 @@ QWidget* PathChooserDelegate::createEditor(QWidget *parent, const QStyleOptionVi
return path_editor_;
}
-void PathChooserDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
+void PathChooserDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &) const
{
- Q_UNUSED(index)
QRect rect = option.rect;
// Make sure the editor doesn't get squashed.