diff options
| author | Dario Lombardo <lomato@gmail.com> | 2016-08-01 23:01:13 +0200 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2016-08-02 21:08:59 +0000 |
| commit | 64ec47e8261e3623d464cd69db12dcac0fa31332 (patch) | |
| tree | e247089f2769a6b590e85e2c0e7728d8a15282d9 /ui | |
| parent | 3c1db69189b18d486176bc0ecd93a5466027a027 (diff) | |
| download | wireshark-64ec47e8261e3623d464cd69db12dcac0fa31332.tar.gz | |
Qt: remove dead code.
Fix CID: 1362828, 1362829, 1362889.
Change-Id: I15045c32e96896323ae4d788b7891b2608a0c102
Reviewed-on: https://code.wireshark.org/review/16833
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/conversation_dialog.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp index 2abc5924c2..bf6dce50eb 100644 --- a/ui/qt/conversation_dialog.cpp +++ b/ui/qt/conversation_dialog.cpp @@ -335,7 +335,6 @@ public: if (role == Qt::DisplayRole) { // Column text cooked representation. conv_item_t *conv_item = &g_array_index(conv_array_, conv_item_t, conv_idx_); - if (!conv_item) return QVariant(); bool resolve_names = false; if (resolve_names_ptr_ && *resolve_names_ptr_) resolve_names = true; @@ -381,10 +380,6 @@ public: QVariant colData(int col, bool resolve_names) const { conv_item_t *conv_item = &g_array_index(conv_array_, conv_item_t, conv_idx_); - if (!conv_item) { - return QVariant(); - } - double duration = nstime_to_sec(&conv_item->stop_time) - nstime_to_sec(&conv_item->start_time); double bps_ab = 0, bps_ba = 0; if (duration > min_bw_calc_duration_) { @@ -456,10 +451,6 @@ public: conv_item_t *conv_item = &g_array_index(conv_array_, conv_item_t, conv_idx_); conv_item_t *other_item = &g_array_index(other_row->conv_array_, conv_item_t, other_row->conv_idx_); - if (!conv_item || !other_item) { - return false; - } - int sort_col = treeWidget()->sortColumn(); double conv_duration = nstime_to_sec(&conv_item->stop_time) - nstime_to_sec(&conv_item->start_time); double other_duration = nstime_to_sec(&other_item->stop_time) - nstime_to_sec(&other_item->start_time); |