diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-11-11 08:48:33 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-11-11 17:36:52 +0000 |
| commit | 94344cd49158b67ea21ce8e1578cf21c7107adba (patch) | |
| tree | a99aee50bda0d766a4af9c143c71778e39af5e18 /ui | |
| parent | 55fbb6387ad478363e524f35d3ce06a6c670553e (diff) | |
Qt: Fix a "No such slot" warning.
Make sure on_actionCaptureOptions_triggered always exists so that we
don't get a "No such slot" warning when building without libpcap.
Change-Id: Ib7c82df6c72bf080ff080e0a650216b345a97e9c
Reviewed-on: https://code.wireshark.org/review/18747
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/main_window.h | 2 | ||||
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index 5c2a77a28c..5320fc7f13 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -465,8 +465,8 @@ private slots: void on_actionGoAutoScroll_toggled(bool checked); void resetPreviousFocus(); -#ifdef HAVE_LIBPCAP void on_actionCaptureOptions_triggered(); +#ifdef HAVE_LIBPCAP void on_actionCaptureRefreshInterfaces_triggered(); #endif void on_actionCaptureCaptureFilters_triggered(); diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index c42a8b4d59..1b2ac37c11 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -3642,9 +3642,9 @@ void MainWindow::on_actionStatisticsProtocolHierarchy_triggered() phd->show(); } -#ifdef HAVE_LIBPCAP void MainWindow::on_actionCaptureOptions_triggered() { +#ifdef HAVE_LIBPCAP if (!capture_interfaces_dialog_) { capture_interfaces_dialog_ = new CaptureInterfacesDialog(this); @@ -3676,8 +3676,10 @@ void MainWindow::on_actionCaptureOptions_triggered() capture_interfaces_dialog_->raise(); capture_interfaces_dialog_->activateWindow(); +#endif } +#ifdef HAVE_LIBPCAP void MainWindow::on_actionCaptureRefreshInterfaces_triggered() { main_ui_->actionCaptureRefreshInterfaces->setEnabled(false); |