diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /ui/qt/simple_dialog.cpp | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ui/qt/simple_dialog.cpp')
| -rw-r--r-- | ui/qt/simple_dialog.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/qt/simple_dialog.cpp b/ui/qt/simple_dialog.cpp index b45c7a19..c5a57d4d 100644 --- a/ui/qt/simple_dialog.cpp +++ b/ui/qt/simple_dialog.cpp @@ -90,8 +90,8 @@ simple_dialog_format_message(const char *msg) return g_strdup(msg); } -gpointer -simple_dialog(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, ...) +void * +simple_dialog(ESD_TYPE_E type, int btn_mask, const char *msg_format, ...) { va_list ap; @@ -103,8 +103,8 @@ simple_dialog(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, ...) return NULL; } -gpointer -simple_dialog_async(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, ...) +void * +simple_dialog_async(ESD_TYPE_E type, int btn_mask, const char *msg_format, ...) { va_list ap; @@ -121,7 +121,7 @@ simple_dialog_async(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, ... * and checkbox, and optional secondary text. */ void -simple_message_box(ESD_TYPE_E type, gboolean *notagain, +simple_message_box(ESD_TYPE_E type, bool *notagain, const char *secondary_msg, const char *msg_format, ...) { if (notagain && *notagain) { @@ -202,7 +202,7 @@ SimpleDialog::SimpleDialog(QWidget *parent, ESD_TYPE_E type, int btn_mask, const check_box_(0), message_box_(0) { - gchar *vmessage; + char *vmessage; QString message; vmessage = ws_strdup_vprintf(msg_format, ap); |