aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/qt_ui_utils.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-03-18 10:34:41 -0700
committerGerald Combs <gerald@wireshark.org>2016-03-28 16:27:41 +0000
commit6931f581f90d272474b47d4a4606bb93183f449a (patch)
tree08ff02c43d1896ea1d5e14bf28cd9288156e91c8 /ui/qt/qt_ui_utils.cpp
parent7e5dae90d65ed062f2d01c63174cc1c94850a19a (diff)
Qt: Make conversation menu items static.
Add a ConversationAction and ColorizeAction classes which respectively handle conversation filtering and colorization. Move conversation menu initialization to initConversationMenus and call it once at startup. This keeps us from leaking quite a bit of memory each time we select a packet or proto tree item. Bug: 12044 Change-Id: I32e8cedaba08a419d5da6a7a9db31c910909f450 Reviewed-on: https://code.wireshark.org/review/14516 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/qt_ui_utils.cpp')
-rw-r--r--ui/qt/qt_ui_utils.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/ui/qt/qt_ui_utils.cpp b/ui/qt/qt_ui_utils.cpp
index 76beca1451..70d0834218 100644
--- a/ui/qt/qt_ui_utils.cpp
+++ b/ui/qt/qt_ui_utils.cpp
@@ -63,9 +63,14 @@ gchar *qstring_strdup(QString q_string) {
}
QString gchar_free_to_qstring(gchar *glib_string) {
- QString qt_string(glib_string);
+ return QString(gchar_free_to_qbytearray(glib_string));
+}
+
+QByteArray gchar_free_to_qbytearray(gchar *glib_string)
+{
+ QByteArray qt_bytearray(glib_string);
g_free(glib_string);
- return qt_string;
+ return qt_bytearray;
}
QByteArray gstring_free_to_qbytearray(GString *glib_gstring)