Wireshark-commits: [Wireshark-commits] master-2.0 1bdef75: Create a FieldFilterEdit class and apply
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 1 Jun 2016 23:20:44 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1bdef7560a6179384adc27110a6c6ec28135c9aa
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

1bdef75 by Michael Mann (mmann78@xxxxxxxxxxxx):

    Create a FieldFilterEdit class and apply it to custom column preference field.
    
    DisplayFilterEdit deals with entire filters and some edit boxes just need a
    single protocol field.  This control will do the trick.
    
    # Conflicts:
    #	ui/qt/Makefile.common
    #	ui/qt/column_preferences_frame.cpp
    
    Bug: 12321
    Change-Id: I8e5837ea9a6955ada29b7e516ea022ab1dd46f0d
    Reviewed-on: https://code.wireshark.org/review/15691
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  8421ca2   Fix a compile error occurring on RedHat Enterprise Linux Workstation release 7.0 (Maipo).
    adds  1bdef75   Create a FieldFilterEdit class and apply it to custom column preference field.


Summary of changes:
 ui/qt/CMakeLists.txt                               |    2 +
 ui/qt/Makefile.common                              |    2 +
 ui/qt/Wireshark.pro                                |    2 +
 ui/qt/column_preferences_frame.cpp                 |   11 +-
 ui/qt/field_filter_edit.cpp                        |  287 ++++++++++++++++++++
 .../{display_filter_edit.h => field_filter_edit.h} |   28 +-
 6 files changed, 304 insertions(+), 28 deletions(-)
 create mode 100644 ui/qt/field_filter_edit.cpp
 copy ui/qt/{display_filter_edit.h => field_filter_edit.h} (71%)