diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp index ffcdbfe403..1c89e97a29 100644 --- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp +++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp @@ -368,9 +368,8 @@ void BluetoothAttServerAttributesDialog::on_actionSave_as_image_triggered() image.save(fileName, "PNG"); } -void BluetoothAttServerAttributesDialog::on_buttonBox_clicked(QAbstractButton *button) +void BluetoothAttServerAttributesDialog::on_buttonBox_clicked(QAbstractButton *) { - Q_UNUSED(button); /* if (button == foo_button_) */ } diff --git a/ui/qt/bluetooth_devices_dialog.cpp b/ui/qt/bluetooth_devices_dialog.cpp index 06c5d882d7..38ade7e889 100644 --- a/ui/qt/bluetooth_devices_dialog.cpp +++ b/ui/qt/bluetooth_devices_dialog.cpp @@ -393,9 +393,8 @@ void BluetoothDevicesDialog::on_actionSave_as_image_triggered() image.save(fileName, "PNG"); } -void BluetoothDevicesDialog::on_buttonBox_clicked(QAbstractButton *button) +void BluetoothDevicesDialog::on_buttonBox_clicked(QAbstractButton *) { - Q_UNUSED(button); /* if (button == foo_button_) */ } diff --git a/ui/qt/byte_view_text.cpp b/ui/qt/byte_view_text.cpp index e8b11e017e..c2090701a9 100644 --- a/ui/qt/byte_view_text.cpp +++ b/ui/qt/byte_view_text.cpp @@ -99,10 +99,8 @@ void ByteViewText::setProtocolHighlight(int start, int end) viewport()->update(); } -void ByteViewText::setFieldHighlight(int start, int end, guint32 mask, int mask_le) +void ByteViewText::setFieldHighlight(int start, int end, guint32, int) { - Q_UNUSED(mask); - Q_UNUSED(mask_le); f_bound_ = QPair(qMax(0, start), qMax(0, end)); f_bound_save_ = f_bound_; scrollToByte(start); diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp index 2f473b9fe6..6803ec5615 100644 --- a/ui/qt/capture_file_dialog.cpp +++ b/ui/qt/capture_file_dialog.cpp @@ -67,17 +67,13 @@ extern void capture_start_confirmed(void) { /** Open a new file coming from drag and drop. * @param cf_names_freeme the selection data reported from GTK */ -extern void dnd_open_file_cmd(gchar *cf_names_freeme) { - Q_UNUSED(cf_names_freeme); -} - +extern void dnd_open_file_cmd(gchar *) { // From gtk/menus.h & main_menubar.c /** User pushed a recent file submenu item. * * @param widget parent widget */ -extern void menu_open_recent_file_cmd(gpointer action){ - Q_UNUSED(action) +extern void menu_open_recent_file_cmd(gpointer){ } /** One of the name resolution menu items changed. */ diff --git a/ui/qt/capture_file_progress_frame.cpp b/ui/qt/capture_file_progress_frame.cpp index 329510f715..8d3d0b82f4 100644 --- a/ui/qt/capture_file_progress_frame.cpp +++ b/ui/qt/capture_file_progress_frame.cpp @@ -38,11 +38,8 @@ // - Start adding the progress bar to dialogs. // - Don't complain so loudly when the user stops a capture. -progdlg_t *create_progress_dlg(const gpointer top_level_window, const gchar *task_title, const gchar *item_title, +progdlg_t *create_progress_dlg(const gpointer top_level_window, const gchar *, const gchar *, gboolean terminate_is_stop, gboolean *stop_flag) { - Q_UNUSED(task_title); - Q_UNUSED(item_title); - CaptureFileProgressFrame *cfpf; QWidget *main_window; @@ -67,9 +64,8 @@ progdlg_t *create_progress_dlg(const gpointer top_level_window, const gchar *tas progdlg_t * delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_title, const gchar *item_title, gboolean terminate_is_stop, gboolean *stop_flag, - const GTimeVal *start_time, gfloat progress) + const GTimeVal *, gfloat progress) { - Q_UNUSED(start_time); progdlg_t *progress_dialog = create_progress_dlg(top_level_window, task_title, item_title, terminate_is_stop, stop_flag); update_progress_dlg(progress_dialog, progress, item_title); return progress_dialog; @@ -79,9 +75,8 @@ delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_t * Update the progress information of the progress bar box. */ void -update_progress_dlg(progdlg_t *dlg, gfloat percentage, const gchar *status) +update_progress_dlg(progdlg_t *dlg, gfloat percentage, const gchar *) { - Q_UNUSED(status); if (!dlg) return; dlg->progress_frame->setValue(percentage * 100); diff --git a/ui/qt/capture_info_dialog.cpp b/ui/qt/capture_info_dialog.cpp index 107d493773..01debd8009 100644 --- a/ui/qt/capture_info_dialog.cpp +++ b/ui/qt/capture_info_dialog.cpp @@ -31,11 +31,9 @@ /* create the capture info dialog */ /* will keep pointers to the fields in the counts parameter */ void capture_info_ui_create( -capture_info *cinfo, -capture_session *cap_session) +capture_info *, +capture_session *) { - Q_UNUSED(cinfo); - Q_UNUSED(cap_session); g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: capture_info_ui_create"); } @@ -43,17 +41,15 @@ capture_session *cap_session) /* As this function is a bit time critical while capturing, */ /* prepare everything possible in the capture_info_ui_create() function above! */ void capture_info_ui_update( -capture_info *cinfo) +capture_info *) { - Q_UNUSED(cinfo); g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: capture_info_ui_update"); } /* destroy the capture info dialog again */ void capture_info_ui_destroy( -capture_info *cinfo) +capture_info *) { - Q_UNUSED(cinfo); g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: capture_info_ui_destroy"); } diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp index 13c035b799..03613860c6 100644 --- a/ui/qt/capture_interfaces_dialog.cpp +++ b/ui/qt/capture_interfaces_dialog.cpp @@ -202,10 +202,8 @@ void CaptureInterfacesDialog::updateWidgets() start_bt_->setEnabled(can_capture); } -void CaptureInterfacesDialog::interfaceClicked(QTreeWidgetItem *item, int column) +void CaptureInterfacesDialog::interfaceClicked(QTreeWidgetItem *, int) { - Q_UNUSED(item) - Q_UNUSED(column) guint i; QString filter = ui->allFilterComboBox->currentText(); @@ -916,9 +914,8 @@ InterfaceTreeDelegate::~InterfaceTreeDelegate() } -QWidget* InterfaceTreeDelegate::createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const +QWidget* InterfaceTreeDelegate::createEditor( QWidget *parent, const QStyleOptionViewItem &, const QModelIndex &index ) const { - Q_UNUSED(option); QWidget *w = NULL; #ifdef SHOW_BUFFER_COLUMN gint buffer = DEFAULT_CAPTURE_BUFFER_SIZE; diff --git a/ui/qt/capture_preferences_frame.cpp b/ui/qt/capture_preferences_frame.cpp index e1185a680f..4bb8192111 100644 --- a/ui/qt/capture_preferences_frame.cpp +++ b/ui/qt/capture_preferences_frame.cpp @@ -65,9 +65,8 @@ CapturePreferencesFrame::~CapturePreferencesFrame() delete ui; } -void CapturePreferencesFrame::showEvent(QShowEvent *evt) +void CapturePreferencesFrame::showEvent(QShowEvent *) { - Q_UNUSED(evt); updateWidgets(); } diff --git a/ui/qt/coloring_rules_dialog.cpp b/ui/qt/coloring_rules_dialog.cpp index 94fa926f35..0170a2a257 100644 --- a/ui/qt/coloring_rules_dialog.cpp +++ b/ui/qt/coloring_rules_dialog.cpp @@ -374,9 +374,8 @@ void ColoringRulesDialog::on_buttonBox_helpRequested() // Delegate for editing coloring rule names and filters. // -QWidget *ColoringRulesTreeDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const +QWidget *ColoringRulesTreeDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &, const QModelIndex &index) const { - Q_UNUSED(option); QWidget *w = NULL; QTreeWidgetItem *ti = tree_->topLevelItem(index.row()); diff --git a/ui/qt/compiled_filter_output.cpp b/ui/qt/compiled_filter_output.cpp index c3d117b92a..00c5179cb1 100644 --- a/ui/qt/compiled_filter_output.cpp +++ b/ui/qt/compiled_filter_output.cpp @@ -109,10 +109,8 @@ void CompiledFilterOutput::compileFilter() } } -void CompiledFilterOutput::on_interfaceList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous) +void CompiledFilterOutput::on_interfaceList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *) { - Q_UNUSED(previous); - QString interface = current->text(); QHash::const_iterator iter = compile_results.find(interface); ui->filterList->clear(); diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp index f9604ee5e6..545973f77b 100644 --- a/ui/qt/conversation_dialog.cpp +++ b/ui/qt/conversation_dialog.cpp @@ -279,9 +279,8 @@ void ConversationDialog::itemSelectionChanged() graph_bt_->setEnabled(graph_enable); } -void ConversationDialog::on_nameResolutionCheckBox_toggled(bool checked) +void ConversationDialog::on_nameResolutionCheckBox_toggled(bool) { - Q_UNUSED(checked); updateWidgets(); } @@ -314,7 +313,6 @@ void ConversationDialog::on_buttonBox_helpRequested() void init_conversation_table(struct register_ct* ct, const char *filter) { - Q_UNUSED(ct) wsApp->emitStatCommandSignal("Conversations", filter, GINT_TO_POINTER(get_conversation_proto_id(ct))); } diff --git a/ui/qt/decode_as_dialog.cpp b/ui/qt/decode_as_dialog.cpp index 5afb1efedb..f2854d8163 100644 --- a/ui/qt/decode_as_dialog.cpp +++ b/ui/qt/decode_as_dialog.cpp @@ -195,9 +195,8 @@ void DecodeAsDialog::on_decodeAsTreeWidget_currentItemChanged(QTreeWidgetItem *c } } -void DecodeAsDialog::on_decodeAsTreeWidget_itemActivated(QTreeWidgetItem *item, int column) +void DecodeAsDialog::on_decodeAsTreeWidget_itemActivated(QTreeWidgetItem *item, int) { - Q_UNUSED(column); GList *cur; table_names_combo_box_ = new QComboBox(); @@ -286,10 +285,8 @@ void DecodeAsDialog::on_decodeAsTreeWidget_itemSelectionChanged() } } -void DecodeAsDialog::buildChangedList(const gchar *table_name, ftenum_t selector_type, gpointer key, gpointer value, gpointer user_data) +void DecodeAsDialog::buildChangedList(const gchar *table_name, ftenum_t, gpointer key, gpointer value, gpointer user_data) { - Q_UNUSED(selector_type); - DecodeAsDialog *da_dlg = (DecodeAsDialog *)user_data; if (!da_dlg) return; @@ -321,10 +318,8 @@ void DecodeAsDialog::buildChangedList(const gchar *table_name, ftenum_t selector da_dlg->ui->decodeAsTreeWidget->addTopLevelItem(item); } -void DecodeAsDialog::buildDceRpcChangedList(gpointer data, gpointer user_data) +void DecodeAsDialog::buildDceRpcChangedList(gpointer, gpointer) { - Q_UNUSED(data); - Q_UNUSED(user_data); // decode_dcerpc_bind_values_t *binding = (decode_dcerpc_bind_values_t *)data; } @@ -401,11 +396,8 @@ void DecodeAsDialog::tableNamesDestroyed() table_names_combo_box_ = NULL; } -void DecodeAsDialog::decodeAddProtocol(const gchar *table_name, const gchar *proto_name, gpointer value, gpointer user_data) +void DecodeAsDialog::decodeAddProtocol(const gchar *, const gchar *proto_name, gpointer value, gpointer user_data) { - Q_UNUSED(table_name); - Q_UNUSED(value); - QSet *dissector_info_set = (QSet *)user_data; if (!dissector_info_set) return; diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp index 62023ec935..db3cce634f 100644 --- a/ui/qt/endpoint_dialog.cpp +++ b/ui/qt/endpoint_dialog.cpp @@ -207,7 +207,6 @@ void EndpointDialog::on_buttonBox_helpRequested() void init_endpoint_table(struct register_ct* ct, const char *filter) { - Q_UNUSED(ct) wsApp->emitStatCommandSignal("Endpoints", filter, GINT_TO_POINTER(get_conversation_proto_id(ct))); } diff --git a/ui/qt/export_object_dialog.cpp b/ui/qt/export_object_dialog.cpp index 84ce31fe82..4812486669 100644 --- a/ui/qt/export_object_dialog.cpp +++ b/ui/qt/export_object_dialog.cpp @@ -214,10 +214,8 @@ void ExportObjectDialog::on_buttonBox_helpRequested() wsApp->helpTopicAction(HELP_EXPORT_OBJECT_LIST); } -void ExportObjectDialog::on_objectTree_currentItemChanged(QTreeWidgetItem *item, QTreeWidgetItem *previous) +void ExportObjectDialog::on_objectTree_currentItemChanged(QTreeWidgetItem *item, QTreeWidgetItem *) { - Q_UNUSED(previous); - if (!item) { if (save_bt_) save_bt_->setEnabled(false); return; diff --git a/ui/qt/extcap_argument.cpp b/ui/qt/extcap_argument.cpp index f8c2d7a50d..ab1916db8d 100644 --- a/ui/qt/extcap_argument.cpp +++ b/ui/qt/extcap_argument.cpp @@ -567,9 +567,8 @@ QWidget * ExtcapArgument::createLabel(QWidget * parent) return label; } -QWidget * ExtcapArgument::createEditor(QWidget * parent) +QWidget * ExtcapArgument::createEditor(QWidget *) { - Q_UNUSED(parent); return 0; } diff --git a/ui/qt/file_set_dialog.cpp b/ui/qt/file_set_dialog.cpp index 09e34a7c31..506b58fa10 100644 --- a/ui/qt/file_set_dialog.cpp +++ b/ui/qt/file_set_dialog.cpp @@ -167,10 +167,8 @@ void FileSetDialog::on_buttonBox_helpRequested() wsApp->helpTopicAction(HELP_FILESET_DIALOG); } -void FileSetDialog::on_fileSetTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) +void FileSetDialog::on_fileSetTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *) { - Q_UNUSED(previous); - fileset_entry *entry; if (!current) diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp index c29ebe9d78..84a8e1983a 100644 --- a/ui/qt/follow_stream_dialog.cpp +++ b/ui/qt/follow_stream_dialog.cpp @@ -368,10 +368,8 @@ FollowStreamDialog::readStream() //Copy from ui/gtk/follow_udp.c static int udp_queue_packet_data(void *tapdata, packet_info *pinfo, - epan_dissect_t *edt, const void *data) + epan_dissect_t *, const void *data) { - Q_UNUSED(edt); - follow_record_t *follow_record; follow_info_t *follow_info = (follow_info_t *)tapdata; tvbuff_t *next_tvb = (tvbuff_t *)data; @@ -403,10 +401,8 @@ udp_queue_packet_data(void *tapdata, packet_info *pinfo, //Copy from ui/gtk/follow_ssl.c static int -ssl_queue_packet_data(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *ssl) +ssl_queue_packet_data(void *tapdata, packet_info *pinfo, epan_dissect_t *, const void *ssl) { - Q_UNUSED(edt); - follow_info_t * follow_info = (follow_info_t*) tapdata; SslDecryptedRecord * rec = NULL; SslDataInfo * appl_data = NULL; @@ -597,9 +593,8 @@ void FollowStreamDialog::addText(QString text, gboolean is_from_server, guint32 // / (slash), Ctrl-F - Focus and highlight the search box // Ctrl-G, Ctrl-N, F3 - Find next // Should we make it so that typing any text starts searching? -bool FollowStreamDialog::eventFilter(QObject *obj, QEvent *event) +bool FollowStreamDialog::eventFilter(QObject *, QEvent *event) { - Q_UNUSED(obj); if (ui->teStreamContent->hasFocus() && event->type() == QEvent::KeyPress) { QKeyEvent *keyEvent = static_cast(event); if (keyEvent->matches(QKeySequence::SelectAll) || keyEvent->matches(QKeySequence::Copy) diff --git a/ui/qt/font_color_preferences_frame.cpp b/ui/qt/font_color_preferences_frame.cpp index ce677139da..ca9686a91a 100644 --- a/ui/qt/font_color_preferences_frame.cpp +++ b/ui/qt/font_color_preferences_frame.cpp @@ -65,10 +65,8 @@ FontColorPreferencesFrame::~FontColorPreferencesFrame() delete ui; } -void FontColorPreferencesFrame::showEvent(QShowEvent *evt) +void FontColorPreferencesFrame::showEvent(QShowEvent *) { - Q_UNUSED(evt) - GRand *rand_state = g_rand_new(); QString pangram = QString(font_pangrams_[g_rand_int_range(rand_state, 0, num_font_pangrams_)]) + " 0123456789"; ui->fontSampleLineEdit->setText(pangram); diff --git a/ui/qt/interface_tree.cpp b/ui/qt/interface_tree.cpp index b4678d8d1e..7e1c91a74a 100644 --- a/ui/qt/interface_tree.cpp +++ b/ui/qt/interface_tree.cpp @@ -107,9 +107,7 @@ void InterfaceTree::resetColumnCount() setColumnCount(IFTREE_COL_MAX); } -void InterfaceTree::hideEvent(QHideEvent *evt) { - Q_UNUSED(evt); - +void InterfaceTree::hideEvent(QHideEvent *) { #ifdef HAVE_LIBPCAP if (stat_timer_) stat_timer_->stop(); if (stat_cache_) { @@ -119,17 +117,15 @@ void InterfaceTree::hideEvent(QHideEvent *evt) { #endif // HAVE_LIBPCAP } -void InterfaceTree::showEvent(QShowEvent *evt) { - Q_UNUSED(evt); - +void InterfaceTree::showEvent(QShowEvent *) { #ifdef HAVE_LIBPCAP if (stat_timer_) stat_timer_->start(stat_update_interval_); #endif // HAVE_LIBPCAP } + #include -void InterfaceTree::resizeEvent(QResizeEvent *evt) +void InterfaceTree::resizeEvent(QResizeEvent *) { - Q_UNUSED(evt); int max_if_width = width() * 2 / 3; // Arbitrary setUpdatesEnabled(false); diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp index 1d6a2f916d..c25cc846dd 100644 --- a/ui/qt/io_graph_dialog.cpp +++ b/ui/qt/io_graph_dialog.cpp @@ -155,8 +155,7 @@ static uat_field_t io_graph_fields[] = { UAT_END_FIELDS }; -static void* io_graph_copy_cb(void* dst_ptr, const void* src_ptr, size_t len) { - Q_UNUSED(len); +static void* io_graph_copy_cb(void* dst_ptr, const void* src_ptr, size_t) { io_graph_settings_t* dst = (io_graph_settings_t *)dst_ptr; const io_graph_settings_t* src = (const io_graph_settings_t *)src_ptr; @@ -884,9 +883,8 @@ void IOGraphDialog::mouseReleased(QMouseEvent *event) } } -void IOGraphDialog::focusChanged(QWidget *previous, QWidget *current) +void IOGraphDialog::focusChanged(QWidget *, QWidget *current) { - Q_UNUSED(previous); QTreeWidgetItem *item = ui->graphTreeWidget->currentItem(); if (!item) { return; @@ -1119,10 +1117,8 @@ void IOGraphDialog::comboDestroyed() } } -void IOGraphDialog::on_intervalComboBox_currentIndexChanged(int index) +void IOGraphDialog::on_intervalComboBox_currentIndexChanged(int) { - Q_UNUSED(index); - int interval = ui->intervalComboBox->itemData(ui->intervalComboBox->currentIndex()).toInt(); bool need_retap = false; @@ -1158,10 +1154,8 @@ void IOGraphDialog::on_todCheckBox_toggled(bool checked) ui->ioPlot->xAxis->moveRange(start_time_ - orig_start); } -void IOGraphDialog::on_graphTreeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) +void IOGraphDialog::on_graphTreeWidget_currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *previous) { - Q_UNUSED(current); - if (previous && ui->graphTreeWidget->itemWidget(previous, name_col_)) { itemEditingFinished(previous); } @@ -2106,9 +2100,8 @@ void IOGraph::tapReset(void *iog_ptr) } // "tap_packet" callback for register_tap_listener -gboolean IOGraph::tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *data) +gboolean IOGraph::tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *) { - Q_UNUSED(data); IOGraph *iog = static_cast(iog_ptr); if (!pinfo || !iog) { return FALSE;