1 files changed, 15 insertions, 13 deletions

diff --git a/ui/qt/wireshark_main_window.h b/ui/qt/wireshark_main_window.h
index 781a1b28..a1cc8b17 100644
--- a/ui/qt/wireshark_main_window.h
+++ b/ui/qt/wireshark_main_window.h
@@ -40,8 +40,6 @@
 
 #include <config.h>
 
-#include <glib.h>
-
 #include "file.h"
 
 #include "ui/ws_ui_util.h"
@@ -123,7 +121,7 @@ public:
     void removeAdditionalToolbar(QString toolbarName);
 
     void addInterfaceToolbar(const iface_toolbar *toolbar_entry);
-    void removeInterfaceToolbar(const gchar *menu_title);
+    void removeInterfaceToolbar(const char *menu_title);
 
     QString getMwFileName();
     void setMwFileName(QString fileName);
@@ -181,6 +179,7 @@ private:
 
     bool capture_stopping_;
     bool capture_filter_valid_;
+    bool use_capturing_title_;
 #ifdef HAVE_LIBPCAP
     capture_session cap_session_;
     CaptureOptionsDialog *capture_options_dialog_;
@@ -233,10 +232,10 @@ private:
     QString replaceWindowTitleVariables(QString title);
     void updateStyleSheet();
 
-    void externalMenuHelper(ext_menu_t * menu, QMenu  * subMenu, gint depth);
+    void externalMenuHelper(ext_menu_t * menu, QMenu  * subMenu, int depth);
 
     void setForCaptureInProgress(bool capture_in_progress = false, bool handle_toolbars = false, GArray *ifaces = NULL);
-    QMenu* findOrAddMenu(QMenu *parent_menu, QString& menu_text);
+    QMenu* findOrAddMenu(QMenu *parent_menu, const QStringList& menu_parts);
 
     void captureFileReadStarted(const QString &action);
 
@@ -269,11 +268,11 @@ public slots:
      * @param cf_path Path to the file.
      * @param display_filter Display filter to apply. May be empty.
      * @param type File type.
-     * @param is_tempfile TRUE/FALSE.
+     * @param is_tempfile true/false.
      * @return True on success, false on failure.
      */
     // XXX We might want to return a cf_read_status_t or a CaptureFile.
-    bool openCaptureFile(QString cf_path, QString display_filter, unsigned int type, gboolean is_tempfile = FALSE);
+    bool openCaptureFile(QString cf_path, QString display_filter, unsigned int type, bool is_tempfile = false);
     bool openCaptureFile(QString cf_path = QString(), QString display_filter = QString()) { return openCaptureFile(cf_path, display_filter, WTAP_TYPE_AUTO); }
     void filterPackets(QString new_filter = QString(), bool force = false);
     void updateForUnsavedChanges();
@@ -299,8 +298,8 @@ public slots:
     void captureFileClosing();
     void captureFileClosed();
 
-    void launchRLCGraph(bool channelKnown, guint16 ueid, guint8 rlcMode,
-                        guint16 channelType, guint16 channelId, guint8 direction);
+    void launchRLCGraph(bool channelKnown, uint8_t RAT, uint16_t ueid, uint8_t rlcMode,
+                        uint16_t channelType, uint16_t channelId, uint8_t direction);
 
     void rtpPlayerDialogReplaceRtpStreams(QVector<rtpstream_id_t *> stream_ids);
     void rtpPlayerDialogAddRtpStreams(QVector<rtpstream_id_t *> stream_ids);
@@ -332,6 +331,7 @@ private slots:
      */
     void startCapture(QStringList);
     void startCapture();
+    void pushLiveCaptureInProgress();
     void popLiveCaptureInProgress();
     void stopCapture();
 
@@ -363,6 +363,7 @@ private slots:
     void addPluginIFStructures();
     QMenu * searchSubMenu(QString objectName);
     void activatePluginIFToolbar(bool);
+    void updateTitlebar();
 
     void startInterfaceCapture(bool valid, const QString capture_filter);
 
@@ -398,7 +399,7 @@ private slots:
 
     // Automatically connected slots ("on_<object>_<signal>").
     //
-    // The slots below follow the naming conventaion described in
+    // The slots below follow the naming convention described in
     // https://doc.qt.io/archives/qt-4.8/qmetaobject.html#connectSlotsByName
     // and are automatically connected at initialization time via
     // main_ui_->setupUi, which in turn calls connectSlotsByName.
@@ -423,7 +424,7 @@ private slots:
     void editConfigurationProfiles();
     void editTimeShiftFinished(int);
     void addPacketCommentFinished(PacketCommentDialog* pc_dialog, int result);
-    void editPacketCommentFinished(PacketCommentDialog* pc_dialog, int result, guint nComment);
+    void editPacketCommentFinished(PacketCommentDialog* pc_dialog, int result, unsigned nComment);
     void deleteAllPacketComments();
     void deleteAllPacketCommentsFinished(int result);
     void injectSecrets();
@@ -464,7 +465,7 @@ private slots:
     void applyConversationFilter();
     void applyExportObject();
 
-    void openFollowStreamDialog(int proto_id, guint stream_num, guint sub_stream_num, bool use_stream_index = true);
+    void openFollowStreamDialog(int proto_id, unsigned stream_num, unsigned sub_stream_num, bool use_stream_index = true);
     void openFollowStreamDialog(int proto_id);
 
     void statCommandExpertInfo(const char *, void *);
@@ -494,8 +495,9 @@ private slots:
 
     void statCommandWlanStatistics(const char *arg, void *);
 
-    void openStatisticsTreeDialog(const gchar *abbr);
+    void openStatisticsTreeDialog(const char *abbr);
     void statCommandIOGraph(const char *, void *);
+    void showIOGraphDialog(io_graph_item_unit_t value_units, QString);
 
     void connectTelephonyMenuActions();