diff options
| author | Roland Knall <roland.knall@br-automation.com> | 2017-01-11 13:55:23 +0100 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2017-01-12 16:04:00 +0000 |
| commit | 3df81a055064e2e2c8c9548f1c6837ddef5e5034 (patch) | |
| tree | 484d3a1e56679668e657ddb29fe6aa6a9d964cdf /ui/qt/decode_as_dialog.cpp | |
| parent | d6d516888122a26d477dcaa39a52fc9cd8b24479 (diff) | |
| download | wireshark-3df81a055064e2e2c8c9548f1c6837ddef5e5034.tar.gz | |
Qt: Remove unneccessary Q_DECLARE_METATYPE
Remove unnecessary Q_DECLARE_METATYPE macros and replace calls
to QVariant conversions with VariantPointer where necessary
Change-Id: Ia4690590095f930bf94644197de7fa30b00ee7ec
Reviewed-on: https://code.wireshark.org/review/19611
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui/qt/decode_as_dialog.cpp')
| -rw-r--r-- | ui/qt/decode_as_dialog.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/qt/decode_as_dialog.cpp b/ui/qt/decode_as_dialog.cpp index f371b97aff..67e9cbb1c2 100644 --- a/ui/qt/decode_as_dialog.cpp +++ b/ui/qt/decode_as_dialog.cpp @@ -35,6 +35,8 @@ #include "qt_ui_utils.h" #include "wireshark_application.h" +#include <ui/qt/variant_pointer.h> + #include <QComboBox> #include <QFont> #include <QFontMetrics> @@ -335,7 +337,7 @@ void DecodeAsDialog::buildChangedList(const gchar *table_name, ftenum_t, gpointe dissector_info_t *dissector_info = new dissector_info_t(); dissector_info->proto_name = current_proto_name; dissector_info->dissector_handle = current_dh; - item->setData(proto_col_, Qt::UserRole, QVariant::fromValue<dissector_info_t *>(dissector_info)); + item->setData(proto_col_, Qt::UserRole, VariantPointer<dissector_info_t>::asQVariant(dissector_info)); da_dlg->ui->decodeAsTreeWidget->addTopLevelItem(item); } @@ -496,7 +498,7 @@ void DecodeAsDialog::tableNamesCurrentIndexChanged(const QString &text) while (i.hasNext()) { dissector_info_t *dissector_info = i.next(); - cur_proto_combo_box_->addItem(dissector_info->proto_name, QVariant::fromValue<dissector_info_t *>(dissector_info)); + cur_proto_combo_box_->addItem(dissector_info->proto_name, VariantPointer<dissector_info_t>::asQVariant(dissector_info)); } cur_proto_combo_box_->model()->sort(0); @@ -595,7 +597,7 @@ void DecodeAsDialog::applyChanges() continue; } - dissector_info = variant.value<dissector_info_t *>(); + dissector_info = VariantPointer<dissector_info_t>::asPtr(variant); for (GList *cur = decode_as_list; cur; cur = cur->next) { decode_as_entry = (decode_as_t *) cur->data; |