summaryrefslogtreecommitdiff
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2015-07-20Try to minimize sorting overhead.Gerald Combs1-1/+3
Process application events as little as possible while sorting. Change-Id: I9d779aebf6edaafc1e6af3a99b4a0dac682ea6b6 Reviewed-on: https://code.wireshark.org/review/9722 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-20Add general a busy progress indicator.Gerald Combs20-83/+166
Rename CaptureFileProgressFrame to ProgressFrame. It's not limited to capture files. Add "busy" routines there and in MainStatusBar. Show a busy indicator while sorting columns. Use toByteArray().constData instead of .data. I'm not sure if it matters in our case but it's more correct. Change-Id: Ibe35fee9b9dd3fabb5ff8ddcc21f6bf59dec4af6 Reviewed-on: https://code.wireshark.org/review/9720 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-19[Automatic update for 2015-07-19]Gerald Combs13-3707/+8203
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I43c44e68e802ed2ab595714ecaf072d941c852ad Reviewed-on: https://code.wireshark.org/review/9701 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-17Qt/Bluetooth: Add HCI Summary dialogueMichal Labedzki10-0/+1542
HCI Summary dialogue collect HCI Opcodes, HCI Events, Hardware Errors, Statuses and Reasons. Also show occurrence of them. The top level item is group of items (by OGF or types), the second level item is in real command, event, hardware error, status or reason. The third level items are direct link to packet that contains second level item type. Change-Id: I6b6bd02533c4605a2dd2c1f5dfee46f72a0f3fdc Reviewed-on: https://code.wireshark.org/review/9676 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-07-17Add new long options to GUIs to allow arbitrary protocols and heuristics to ↵Jim Young1-0/+42
be disabled via command-line Future: Allow multiple protocols to be disabled in one option statement (perhaps using a comma or colon delmited set of names in <proto_name>) instead of having to specify --disable-protocol <proto_name> multiple times. Change-Id: I9b8f960acf75298ebb098d9b667fca49dca52306 Reviewed-on: https://code.wireshark.org/review/9631 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-17Qt: Fix DecodeAs for String tablesMichal Labedzki1-1/+3
It seems that string object die to early. Add space when it can live. Change-Id: I4e776134ce6782bd6e854ab2bc3c188e80530839 Reviewed-on: https://code.wireshark.org/review/9677 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-07-16Draw packet colors in the packet list scrollbar.Gerald Combs12-15/+483
Inspired by (but not as fancy as) Packet Fence, an enhancement written for Ethereal a loooong time ago by Martin Visser: https://www.wireshark.org/lists/ethereal-dev/200011/msg00122.html Several text editors call this a "minimap". Color each scrollbar raster line to match the color of up to 7 packets. Note in the comments why this number was chosen. If we have any flagged frames (marked, ignored, time ref) indicate them on either side of the scrolbar. Handle HiDPI (retina) displays. This means that your window size depends on the height of your scrollbar *and* your monitor resolution. Qt's idea of the slider rect doesn't match up with the slider on OS X. This might be local to my build -- I can replicate it Qt Creator. Change-Id: Ia089d2d766ce37bab11e22d1a5721b4908935304 Reviewed-on: https://code.wireshark.org/review/8982 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2015-07-16Get rid of _U_, which was (mis)used in some places:Joerg Mayer2-5/+9
- It was used even though the variable actually *was* in use for some compile settings. - It's not the c++ way. 2do: In case the definition of _U_ in Wireshark.pro is only used for the ui/qt directory, it should be removed to avoid further (ab)use. Change-Id: I22d6269a66d6ed558035aad3e6702c4a9c8af1fa Reviewed-on: https://code.wireshark.org/review/9665 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-16Qt: remove unused parametersPascal Quantin1-3/+3
Change-Id: I45fcf87f99dc15eb49343119fa134fb5698b15cf Reviewed-on: https://code.wireshark.org/review/9664 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-16Qt: Frame flag updates.Gerald Combs5-126/+137
Move frame flag (mark, ignore, ref_time) member functions from PacketList to PacketListModel. They arguably belong there and we can emit dataChanged to signal updates. Rename some variables named "index" since they shadow a function name. Change-Id: I9a731a76e4e63e562b561c29d13915278d5a7dbb Reviewed-on: https://code.wireshark.org/review/9663 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-16Add display_is_remote.Gerald Combs4-3/+19
Add a display_is_remote function and use it instead of get_conn_cfilter to check for remoteness. Change-Id: Ia93d113afec36ede55daf7dc8394b2dc0d8c9abf Reviewed-on: https://code.wireshark.org/review/9659 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-16Add the RTP Stream Analysis dialog.Gerald Combs26-58/+2177
Combine the GTK+ RTP Stream Analysis and RTP Graph Analysis dialogs into one. Yell at the user less. Disable the Analyze RTP Stream menu item if we don't have an RTP stream selected. There are a *lot* of moving parts in this dialog. I've tested with the few RTP captures I have but it's by no means complete. "To do" items are listed at the top of rtp_analysis.cpp. Change-Id: Id503977f069bebc46cc68bc749f0c9cbf4d37bf6 Reviewed-on: https://code.wireshark.org/review/9650 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-15Check for a valid pointer when ignoring a frame.Gerald Combs1-0/+1
Change-Id: I1a4a6b3f729c818a68bee1b6b8de3778130252a4 Reviewed-on: https://code.wireshark.org/review/9652 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-15Filter UDP packets on port 3389 when capturing from a Remote Desktop sessionPascal Quantin1-1/+1
As reported in https://www.wireshark.org/lists/wireshark-dev/201507/msg00069.html Change-Id: I171b934fd97748f17586ffcee8012fd4c0d156b1 Reviewed-on: https://code.wireshark.org/review/9642 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-15Resize the name column every time we re-display the interface tree.Guy Harris1-0/+1
Interfaces can appear and disappear, changing the maximum length of the interface name column; resize it each time we reconstruct the tree. Change-Id: I38b40f6c3ce51272e8bbb0c7f7fbaa7255886e0e Reviewed-on: https://code.wireshark.org/review/9641 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-14Add a "heuristic dissectors" tab to the Enable Protocols dialog.Michael Mann5-425/+486
This allows for a global place to enable/disable all heuristic dissectors. This removes the need for individual dissector preferences, but those will be removed at a later date. The more important part is the epan code to save/restore the enabled state of the heuristic dissector. The GTK dialog was more for quickly testing the feature (there was already some GTK code in place that started the heuristic dialog tab) Change-Id: Ie10687505c27a4456c49d5c4c69a5fc5f6394275 Ping-Bug:11152 Reviewed-on: https://code.wireshark.org/review/9508 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-13RTP updates.Gerald Combs4-29/+19
Merge rtp_sample_header_t into rtp_sample_t. That's the only place it was used. Note that rtp_sample_t is used for writing rtpdump files. Move the rtp_sample_t definition to tap-rtp-common.c. Rename it to rtpdump_info_t. Make rtp_write_sample static. Change-Id: I04e7428f634efa87a98e5d6c82a354f94ab1765d Reviewed-on: https://code.wireshark.org/review/9629 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-13GTK: Don't crash when we click on an RTP sample.Gerald Combs1-2/+2
This doesn't fix any of the underlying problems discussed in bug 10613 but it does keep us from dereferencing a NULL pointer. Change-Id: I9317366a6ae6e563dcadb32bccee87e8803c37e3 Ping-Bug: 10613. Reviewed-on: https://code.wireshark.org/review/9626 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-13PacketList column fixes.Gerald Combs6-25/+92
Add a columnsChanged slot to PacketList and move the column update code from redrawVisiblePackets there. Make sure we call packet_list_model_->recreateVisibleRows, which should fix the behavior described in bug 11324. Call columnsChanged when we, uh, change columns. Add a sectionMoved slot to handle column reordering. Don't rebuild the column list when we update the widgets in the column preferences frame. Do enable and disable the "remove" button as needed. Try to keep the user from removing all of the columns in both the packet list and column preferences. Left as an exercise for the reader: The GTK+ UI also fails when you remove all of the columns via the preferences: packet_list.c:377:packet_list_sort_column: assertion failed: (col) Bug: 11324 Change-Id: Id58cf98e42cbda9aa2fc370ea06b8bcc6098c8ca Reviewed-on: https://code.wireshark.org/review/9591 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-12Fixup packet list selection.Gerald Combs3-8/+7
Be less aggressive about resetting the packet list model so that we retain our selection when (un)coloring packets or rebuilding columns. Correctly enable a colorization menu item while we're here. Change-Id: I8d1c8f26dbb8a814b8344b609695b77632006e4b Reviewed-on: https://code.wireshark.org/review/9608 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-12[Automatic update for 2015-07-12]Gerald Combs13-4906/+7468
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Icf621f6bcde5736653771c3789772b692d5cdd43 Reviewed-on: https://code.wireshark.org/review/9605 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-11simple_statistics_dialog(.h): fix parameter 'rtd_table/user_table' not found ↵Alexis La Goutte1-3/+1
in the function declaration [-Wdocumentation] Change-Id: Ie82d8528953169f1a95f985b36848176a45f8187 Reviewed-on: https://code.wireshark.org/review/9571 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-11Set the font.Gerald Combs1-1/+2
Change-Id: I97abd504727ef71bb29969f0a7555e17eaa70561 Reviewed-on: https://code.wireshark.org/review/9596 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-11Qt: Add Colorize Conversation menu items.Gerald Combs7-16/+263
Add the "View→Colorize Conversation" menu similar to the GTK+ UI. Add the "Reset" item under the "Colorize Conversation" menu instead of the top-level "View" menu. Make sure the "Reset" shortcut is Ctrl+Space even on OS X. Normally Qt would convert it to Cmd+Space, but that's used by Spotlight. Add StockIcon::colorIcon and use it to create filled square icons. Change-Id: I2af9e26d025cdaf97482422bbb9440e28e18d1ac Reviewed-on: https://code.wireshark.org/review/9595 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-10Make .o files, not .cpp and .h files, depend on the ui_*.h files.Guy Harris1-67/+77
That's one of the mechanisms the autotools documentation suggests using to handle generated header files. Using it means that "make dist" will no longer try to build those files (they're not part of the distribution - and they can't be, as the files would be different for Qt 4 and Qt 5, and need to be generated by the uic from the same version of Qt as the one against which Wireshark is being built). This means we don't need to try to find uic, moc, or rcc if we're not building with Qt, so don't do so. Change-Id: Id2aadb8289598b82e14e4ed402ff8cdc15fdef74 Reviewed-on: https://code.wireshark.org/review/9583 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-10Fix a typoJoerg Mayer1-1/+1
Change-Id: If608ef78526c1876cba7650b42eca1d9c9b4e817 Reviewed-on: https://code.wireshark.org/review/9586 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-10IEEE 802.11: tap all packetsPascal Quantin1-0/+7
And only take into account management, non null data and or extension frames in WLAN traffic statistics, as previously Bug: 11318 Change-Id: I32c059a2594331c4e317380b9de43fb582f7f8cb Reviewed-on: https://code.wireshark.org/review/9566 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-10Bugfix GTK RPC SRT dialog use of direct hashing.Michael Mann1-4/+4
Change-Id: I3db6ee3e6c5cb79b9cc31068930c9fe9c9d8aa7a Reviewed-on: https://code.wireshark.org/review/9581 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-07-10Add the "Resolved Addresses" dialog.Gerald Combs11-0/+757
The GTK+ equivalent is named "Address Resolution" but "Resolved Addresses" seemed (to me at least) to be more clear. Change-Id: I1806354d91bb5ce8af11d20568b92a04c78d4d73 Reviewed-on: https://code.wireshark.org/review/9580 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-09Make sure we uncheck the "Find Packet" action.Gerald Combs4-1/+14
Make sure we uncheck the "Find Packet" action when we're done finding packets. Make the "Go To Packet" action checkable and ensure that it's properly checked an unchecked as well. Change-Id: I979cabfd950ec4807ebcd40664b44b600557cf48 Reviewed-on: https://code.wireshark.org/review/9577 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-09service_response_time_dialog/response_time_delay_dialog(.h): fix '@return' ↵Alexis La Goutte2-2/+0
command used in a comment that is attached to a function returning void [-Wdocumentation] Change-Id: I84682651f40ab9e8f54a6ae656d0670096b5a3bc Reviewed-on: https://code.wireshark.org/review/9559 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-09main_window(.h): fix parameter 'menu_path' not found in the function ↵Alexis La Goutte1-1/+1
declaration [-Wdocumentation] Change-Id: I98a9388f44fe38261fde5422ac821fbb6c1d993c Reviewed-on: https://code.wireshark.org/review/9553 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-09qt_ui_utils.h: fix empty paragraph passed to '@return' command [-Wdocumentation]Alexis La Goutte1-1/+1
Change-Id: I120ed85ee88253084646db4817ae77a8c90492f2 Reviewed-on: https://code.wireshark.org/review/9557 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-09Qt: Add dynamic menu support.Gerald Combs9-98/+121
Generalize the dynamic menu code and make it possible to connect multiple types of actions to their corresponding slots. Change-Id: Ib915ad5a666310e2a6e366fada006336820d1653 Reviewed-on: https://code.wireshark.org/review/9568 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-08Handle setModule(NULL) more safely.Guy Harris1-6/+3
If module_name is null, we can't do much of anything - we don't have a protocol ID, so we don't have a protocol. Change-Id: I42c2fa4b47e39d7ac122c60be91b5d408bf30a1d Reviewed-on: https://code.wireshark.org/review/9569 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-08GTK+: Add a Telephony/ANSI menu placeholder.Gerald Combs2-4/+21
Add REGISTER_STAT_GROUP_TELEPHONY_ANSI as well, and use it to add recently updated stats. Make sure we properly escape our path separators. Change-Id: I979d5c29a82acddec1a9bcae7e3cb9c5ea3f9d33 Reviewed-on: https://code.wireshark.org/review/9564 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-08Add SimpleStatisticsDialog.Gerald Combs7-2/+372
To do: - Refactor dynamic menu item placement. Change-Id: I087de9f2fa3c2ff7dc08e5d54bc9c1b984fdd7b1 Reviewed-on: https://code.wireshark.org/review/9561 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-08Put back closing } accidentally removed in previous commit.Guy Harris1-0/+2
Change-Id: Ic02b0c86e55751a27d5d0417f4f5314def69e794 Reviewed-on: https://code.wireshark.org/review/9550 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-07Add ResponseTimeDelayDialog.Gerald Combs11-31/+377
Change-Id: Ie1ea316643a3465763aec71f4a3ef4bf1a5ae639 Reviewed-on: https://code.wireshark.org/review/9548 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-07qt_ui_utils.h: fix @param command used in a comment that is not attached to ↵Alexis La Goutte1-1/+1
a function declaration [-Wdocumentation] Move class declaration on the top Change-Id: I4ced45f2c677a41cc8f5180d2eb5d211f4c6e6c1 Reviewed-on: https://code.wireshark.org/review/9518 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-07Finish removal of Q_UNUSED.Joerg Mayer20-96/+38
Todo: qcustomplot via upstream Change-Id: I19cf98f1281ecb1f6efbb7d36c997d5aa43f5baf Reviewed-on: https://code.wireshark.org/review/9547 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-07Continuing to remove Q_UNUSEDJoerg Mayer9-77/+30
Change-Id: I54bc4a1b7d39abd1bb88ee361b0de5fcbca1efe8 Reviewed-on: https://code.wireshark.org/review/9546 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-07Qt: Add initial Lua support.Gerald Combs22-27/+1212
Add a FunnelStatistics class, which is the main interface between the Qt UI and the Funnel API. Add FunnelTextDialog, which implements the text_window, ProgDlg, menu, and other routines. Add FunnelStringDialog, which implements dlg_new. We currently only support "Tools" menu items (MENU_TOOLS_UNSORTED, aka REGISTER_TOOLS_GROUP_UNSORTED). Add a disabled placeholder to the "Tools" menu in case we don't load any scripts. Use "struct progdlg" instead of needlessly casting to funnel_progress_window_t. To do: - Add support for MENU_STAT_UNSORTED, MENU_STAT_GENERIC, etc. - Make the firewall config generator a Lua script? - Add FunnelGraphDialog? It seems like it would be useful to make QCustomPlot accessible to Lua scripts. Ping-Bug: 9845 Change-Id: Iefff02e9032ed1853666f7902509ed08b431e7a7 Reviewed-on: https://code.wireshark.org/review/9523 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-07Actually, user_data *is* used there.Guy Harris1-1/+1
Change-Id: Ic22741e6551b5ec2eb76408ff8521067d9d40a88 Reviewed-on: https://code.wireshark.org/review/9534 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-07Starting to get rid of Q_UNUSED declarations for unused function parameters.Joerg Mayer19-101/+39
The official C++ way is to leave out the variable name instead. This has the advantage to be reliable: In one case a variable declared unused was later used. Change-Id: I1c96636f7fa7a621d1594d1e9cacaec75c561faa Reviewed-on: https://code.wireshark.org/review/9532 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-05[Automatic update for 2015-07-05]Gerald Combs10-3342/+3503
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I7c644cb36af2a5c81efc4c22f1355b1a5e599b49 Reviewed-on: https://code.wireshark.org/review/9500 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-04Add "custom" dissector table tab to Internals->Dissector Tables dialogMichael Mann1-0/+26
Bug: 11334 Change-Id: I2af3e41643e4e92593ed0cfe070c4f7bcb450a06 Reviewed-on: https://code.wireshark.org/review/9493 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-07-04Add missing C++ headerMichal Labedzki1-0/+1
This fixes: ui/qt/wireshark_application.cpp:588:5: error: 'sort' is not a member of 'std' std::sort(sgi_list.begin(), sgi_list.end(), qActionLessThan); Change-Id: I70058f0fcbabb0279bed5c62d09d55d88bda0fd4 Reviewed-on: https://code.wireshark.org/review/9492 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-07-04Do error checking on simple_error_message_box() calls and fix errors.Guy Harris1-1/+1
It's a printf-like routine, so give it the right declaration. Fix errors that this finds. Change-Id: I7e8c100ff9e16ba89743ce744cbf548aae705b77 Reviewed-on: https://code.wireshark.org/review/9487 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-04Squelch a compiler warning.Guy Harris1-3/+3
Some systems still offer the old V7 index()/rindex() routines, in addition to the standard strchr()/strrchr() routines, so don't use "index" as a variable. (Maybe the folks at Center 127 were thinking of the PL/I index() function, but that's more like strstr(), so it wasn't a good choice of name.) Change-Id: I6193a93684c0684c83357def3d76e0dbd808e29b Reviewed-on: https://code.wireshark.org/review/9485 Reviewed-by: Guy Harris <guy@alum.mit.edu>