summaryrefslogtreecommitdiffstats
path: root/ui/qt/sequence_diagram.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:33 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:33 +0000
commit9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch)
tree2784370cda9bbf2da9114d70f05399c0b229d28c /ui/qt/sequence_diagram.h
parentAdding debian version 4.2.6-1. (diff)
downloadwireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz
wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ui/qt/sequence_diagram.h')
-rw-r--r--ui/qt/sequence_diagram.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/sequence_diagram.h b/ui/qt/sequence_diagram.h
index aa9a377a..a3c1327d 100644
--- a/ui/qt/sequence_diagram.h
+++ b/ui/qt/sequence_diagram.h
@@ -12,8 +12,6 @@
#include <config.h>
-#include <glib.h>
-
#include <epan/address.h>
#include <QObject>
@@ -53,6 +51,8 @@ public:
// non-property methods:
struct _seq_analysis_item *itemForPosY(int ypos);
+ bool inComment(QPoint pos) const;
+ QString elidedComment(const QString &text) const;
// reimplemented virtual methods:
virtual void clearData() { data_->clear(); }
@@ -73,7 +73,7 @@ private:
QCPAxis *comment_axis_;
WSCPSeqDataMap *data_;
struct _seq_analysis_info *sainfo_;
- guint32 selected_packet_;
+ uint32_t selected_packet_;
double selected_key_;
};