diff options
author | Joerg Mayer <jmayer@loplof.de> | 2015-07-07 08:24:50 +0200 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2015-07-07 06:29:31 +0000 |
commit | 21754f43e1e7139bcd3d673714c2a191681a63e9 (patch) | |
tree | a0b54f5031191f77cff5baa51d7c74ed0a9a4414 /ui/qt/preferences_dialog.cpp | |
parent | aca5f4ee2dc5121b822ed87859740b260eeaf759 (diff) | |
download | wireshark-21754f43e1e7139bcd3d673714c2a191681a63e9.tar.gz |
Starting to get rid of Q_UNUSED declarations for unused function parameters.
The official C++ way is to leave out the variable name instead. This has the
advantage to be reliable: In one case a variable declared unused was later
used.
Change-Id: I1c96636f7fa7a621d1594d1e9cacaec75c561faa
Reviewed-on: https://code.wireshark.org/review/9532
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'ui/qt/preferences_dialog.cpp')
-rw-r--r-- | ui/qt/preferences_dialog.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp index 75705e5222..58e7a8cbc5 100644 --- a/ui/qt/preferences_dialog.cpp +++ b/ui/qt/preferences_dialog.cpp @@ -123,10 +123,8 @@ extern "C" { // Callbacks prefs routines static guint -pref_exists(pref_t *pref, gpointer user_data) +pref_exists(pref_t *, gpointer) { - Q_UNUSED(pref) - Q_UNUSED(user_data) return 1; } @@ -231,10 +229,8 @@ module_prefs_unstash(module_t *module, gpointer data) } static guint -module_prefs_clean_stash(module_t *module, gpointer unused) +module_prefs_clean_stash(module_t *module, gpointer) { - Q_UNUSED(unused); - for (GList *pref_l = module->prefs; pref_l && pref_l->data; pref_l = g_list_next(pref_l)) { pref_t *pref = (pref_t *) pref_l->data; @@ -354,9 +350,8 @@ void PreferencesDialog::setPane(const QString module_name) } } -void PreferencesDialog::showEvent(QShowEvent *evt) +void PreferencesDialog::showEvent(QShowEvent *) { - Q_UNUSED(evt); QStyleOption style_opt; int new_prefs_tree_width = pd_ui_->prefsTree->style()->subElementRect(QStyle::SE_TreeViewDisclosureItem, &style_opt).left(); QList<int> sizes = pd_ui_->splitter->sizes(); @@ -511,10 +506,8 @@ void PreferencesDialog::updateItem(QTreeWidgetItem &item) item.setText(3, cur_value); } -void PreferencesDialog::on_prefsTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) +void PreferencesDialog::on_prefsTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *) { - Q_UNUSED(previous) - if (!current) return; QWidget *new_item = current->data(0, Qt::UserRole).value<QWidget *>(); if (new_item) { @@ -566,10 +559,8 @@ void PreferencesDialog::on_advancedSearchLineEdit_textEdited(const QString &sear } } -void PreferencesDialog::on_advancedTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) +void PreferencesDialog::on_advancedTree_currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *previous) { - Q_UNUSED(current); - if (previous && pd_ui_->advancedTree->itemWidget(previous, 3)) { pd_ui_->advancedTree->removeItemWidget(previous, 3); } |