diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-18 17:31:09 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-03-21 17:10:21 +0000 |
| commit | 52dd4fb6330a10ed37b8e221c502b5a98de4f581 (patch) | |
| tree | 9d3ea5b26003115f61ac5af0d9dd7997cbe7cfb2 /ui/qt/main_welcome.cpp | |
| parent | 69d348c12a2d86e5fa75189cd2dd5f4f3784dcfc (diff) | |
Fix building without extcap enabled
Using cmake -DENABLE_EXTCAP=no or ./configure --without-extcap.
Some documentation fixes too.
Change-Id: Iebf9c843d67e10a32de1a62904de8f88b872ec99
Reviewed-on: https://code.wireshark.org/review/14522
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'ui/qt/main_welcome.cpp')
| -rw-r--r-- | ui/qt/main_welcome.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp index 263fde5f49..696f681204 100644 --- a/ui/qt/main_welcome.cpp +++ b/ui/qt/main_welcome.cpp @@ -53,7 +53,7 @@ #define VERSION_FLAVOR "" #endif -#if HAVE_EXTCAP +#ifdef HAVE_EXTCAP #include <extcap.h> #endif @@ -165,7 +165,7 @@ MainWelcome::MainWelcome(QWidget *parent) : connect(wsApp, SIGNAL(appInitialized()), this, SLOT(appInitialized())); connect(welcome_ui_->interfaceTree, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(interfaceDoubleClicked(QTreeWidgetItem*,int))); -#if HAVE_EXTCAP +#ifdef HAVE_EXTCAP connect(welcome_ui_->interfaceTree, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(interfaceClicked(QTreeWidgetItem*,int))); #endif @@ -306,7 +306,7 @@ void MainWelcome::interfaceSelected() void MainWelcome::interfaceDoubleClicked(QTreeWidgetItem *item, int) { if (item) { -#if HAVE_EXTCAP +#ifdef HAVE_EXTCAP QString extcap_string = QVariant(item->data(IFTREE_COL_EXTCAP, Qt::UserRole)).toString(); /* We trust the string here. If this interface is really extcap, the string is * being checked immediatly before the dialog is being generated */ @@ -323,9 +323,9 @@ void MainWelcome::interfaceDoubleClicked(QTreeWidgetItem *item, int) } } +#ifdef HAVE_EXTCAP void MainWelcome::interfaceClicked(QTreeWidgetItem *item, int column) { -#if HAVE_EXTCAP if (column == IFTREE_COL_EXTCAP) { QString extcap_string = QVariant(item->data(IFTREE_COL_EXTCAP, Qt::UserRole)).toString(); /* We trust the string here. If this interface is really extcap, the string is @@ -335,8 +335,8 @@ void MainWelcome::interfaceClicked(QTreeWidgetItem *item, int column) emit showExtcapOptions(device_name); } } -#endif } +#endif void MainWelcome::updateRecentFiles() { QString itemLabel; |