Add ServiceResponseTimeDialog.

[metze/wireshark/wip.git] / ui / qt / qt_ui_utils.cpp

diff --git a/ui/qt/qt_ui_utils.cpp b/ui/qt/qt_ui_utils.cpp
index 7e34706536e64e8968d412dde3c2a1c2806e1f61..c1841c9f8014620ced1dc65d4d96d72ee68f0270 100644 (file)
--- a/ui/qt/qt_ui_utils.cpp
+++ b/ui/qt/qt_ui_utils.cpp
@@ -19,19 +19,23 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <string.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "qt_ui_utils.h"
 
-#include <ui/recent.h>
-#include <ui/ui_util.h>
-
 #include <epan/addr_resolv.h>
+#include <epan/range.h>
 #include <epan/to_str.h>
+#include <epan/value_string.h>
+
+#include <ui/recent.h>
+#include <ui/ui_util.h>
 
 #include <wsutil/str_util.h>
 
+#include <QAction>
 #include <QFontDatabase>
 
 /* Make the format_size_flags_e enum usable in C++ */
@@ -50,9 +54,16 @@ gchar *qstring_strdup(QString q_string) {
 }
 
 QString gchar_free_to_qstring(gchar *glib_string) {
-    QString *qt_string = new QString(glib_string);
+    QString qt_string(glib_string);
     g_free(glib_string);
-    return *qt_string;
+    return qt_string;
+}
+
+QByteArray gstring_free_to_qbytearray(GString *glib_gstring)
+{
+    QByteArray qt_ba(glib_gstring->str);
+    g_string_free(glib_gstring, TRUE);
+    return qt_ba;
 }
 
 const QString address_to_qstring(const _address *address)
@@ -97,6 +108,29 @@ const QString val_ext_to_qstring(const guint32 val, value_string_ext *vse, const
     return val_qstr;
 }
 
+const QString range_to_qstring(const epan_range *range)
+{
+    QString range_qstr = QString();
+    if (range) {
+        const gchar *range_gchar_p = range_convert_range(NULL, range);
+        range_qstr = range_gchar_p;
+        wmem_free(NULL, (void *) range_gchar_p);
+    }
+    return range_qstr;
+}
+
+const QString bits_s_to_qstring(const double bits_s)
+{
+    return gchar_free_to_qstring(
+                format_size(bits_s, format_size_unit_none|format_size_prefix_si));
+}
+
+const QString file_size_to_qstring(const gint64 size)
+{
+    return gchar_free_to_qstring(
+                format_size(size, format_size_unit_bytes|format_size_prefix_si));
+}
+
 void smooth_font_size(QFont &font) {
     QFontDatabase fdb;
 #if QT_VERSION < QT_VERSION_CHECK(4, 8, 0)
@@ -117,6 +151,10 @@ void smooth_font_size(QFont &font) {
     }
 }
 
+bool qActionLessThan(const QAction * a1, const QAction * a2) {
+    return a1->text().compare(a2->text()) < 0;
+}
+
 /*
  * Editor modelines
  *