osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Interface View/Model: Fix pcap-less build 

Change-Id: I88bc6c939b7ce6986299e4ebf99358437b758bd2
Reviewed-on: https://code.wireshark.org/review/18045
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
Roland Knall 2016-10-03 19:57:44 +02:00 committed by Peter Wu
parent a59e64c906
commit fc234708a7
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/qt/interface_tree_model.cpp
View File

@ -341,7 +341,7 @@ void InterfaceTreeModel::getPoints(int idx, PointList *pts)
QItemSelection InterfaceTreeModel::selectedDevices()
{
QItemSelection mySelection;
#ifdef HAVE_LIBPCAP
for( int idx = 0; idx < rowCount(); idx++ )
{
interface_t device = g_array_index(global_capture_opts.all_ifaces, interface_t, idx);
@ -349,23 +349,20 @@ QItemSelection InterfaceTreeModel::selectedDevices()
if ( device.selected )
{
QModelIndex selectIndex = index(idx, 0);
/* Proxy model has masked out the interface */
if ( !selectIndex.isValid() )
continue;
mySelection.merge(
QItemSelection( selectIndex, index(selectIndex.row(), columnCount() - 1) ),
QItemSelectionModel::SelectCurrent
);
}
}
#endif
return mySelection;
}
bool InterfaceTreeModel::updateSelectedDevices(QItemSelection sourceSelection)
{
bool selectionHasChanged = false;
#ifdef HAVE_LIBPCAP
QList<int> selectedIndices;
foreach(QItemSelectionRange selection, sourceSelection)
@ -406,7 +403,9 @@ bool InterfaceTreeModel::updateSelectedDevices(QItemSelection sourceSelection)
g_array_insert_val(global_capture_opts.all_ifaces, idx, device);
}
}
#else
Q_UNUSED(sourceSelection);
#endif
return selectionHasChanged;
}