Wireshark-commits: [Wireshark-commits] master 0921c82: extcap: Add Required and cleanup
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 30 Dec 2015 08:11:05 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0921c8214ef225fe2b84c5ace0113ea1e931c70c
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

0921c82 by Roland Knall (roland.knall@xxxxxxxxxxxxxxxxx):

    extcap: Add Required and cleanup
    
     An option may now use the "required=true" argument (see sshdump.c)
     which will ensure, that the capture can only be started via the
     dialog, if the option has been provided. To ensure, that this is
     working properly, multiselect has been moved to a separate source
     file.
    
     Renamed one method so it may not interfere with a future save
     functionality, and cleaned up the interface to use only default
     buttons and roles
    
     ONLY the Qt interface is being supported.
    
    Change-Id: Ie1c9a63c1bba2e557d55b1de6f4775d8b9fce515
    Reviewed-on: https://code.wireshark.org/review/12912
    Reviewed-by: Roland Knall <rknall@xxxxxxxxx>
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  b123985   Zbee (ZCL Closures): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
    adds  0921c82   extcap: Add Required and cleanup


Summary of changes:
 extcap/sshdump.c                                   |    2 +-
 extcap_parser.c                                    |    8 +
 extcap_parser.h                                    |    5 +-
 ui/qt/CMakeLists.txt                               |    2 +
 ui/qt/Makefile.common                              |    2 +
 ui/qt/extcap_argument.cpp                          |  208 ++++++--------------
 ui/qt/extcap_argument.h                            |   14 ++
 ui/qt/extcap_argument_file.cpp                     |   13 ++
 ui/qt/extcap_argument_file.h                       |    5 +-
 ui/qt/extcap_argument_multiselect.cpp              |  202 +++++++++++++++++++
 ...gument_file.h => extcap_argument_multiselect.h} |   37 ++--
 ui/qt/extcap_options_dialog.cpp                    |   50 +++--
 ui/qt/extcap_options_dialog.h                      |    8 +-
 ui/qt/extcap_options_dialog.ui                     |    8 +-
 14 files changed, 385 insertions(+), 179 deletions(-)
 create mode 100644 ui/qt/extcap_argument_multiselect.cpp
 copy ui/qt/{extcap_argument_file.h => extcap_argument_multiselect.h} (61%)