diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-02-06 18:22:54 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-02-06 18:22:54 +0000 |
commit | 1c0deb0fc818252904878fe5419c75df3873a901 (patch) | |
tree | b44a3986fa473e3c6872c21c1036abe9d573b225 /ui/qt/qt_ui_utils.h | |
parent | ae527cbf109a054ba10e3e313fb42e0b2ec0f342 (diff) | |
download | wireshark-1c0deb0fc818252904878fe5419c75df3873a901.tar.gz |
Add Filter Expressions^WButton^WShortcut^WBookmark preferences.
Add comments noting that
- We might want to do something different when the bookmark button is
pressed.
- The display filters (dfilters file) and gui.filter_expressions
preferences should be merged.
- Many buttons on Qt4 + OS X + unifiedTitleAndToolBarOnMac makes the
main window really wide.
Add a qstring_strdup convenience routine. Add "disabled" display filter
edit icons. Fix up whitespace and descriptions in a couple of places.
svn path=/trunk/; revision=47522
Diffstat (limited to 'ui/qt/qt_ui_utils.h')
-rw-r--r-- | ui/qt/qt_ui_utils.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ui/qt/qt_ui_utils.h b/ui/qt/qt_ui_utils.h index 6d995fb9b2..454312b4a1 100644 --- a/ui/qt/qt_ui_utils.h +++ b/ui/qt/qt_ui_utils.h @@ -75,12 +75,20 @@ extern gboolean main_do_quit(void); } #endif /* __cplusplus */ +/** Create a glib-compatible copy of a QString. + * + * @param q_string A QString. + * + * @return A copy of the QString. UTF-8 allocated with g_malloc(). + */ +gchar *qstring_strdup(QString q_string); + /** Transfer ownership of a GLib character string to a newly constructed QString * * @param glib_string A string allocated with g_malloc() or NULL. Will be * freed. * - * @return a QString instance created from the input string. + * @return A QString instance created from the input string. */ QString gchar_free_to_qstring(gchar *glib_string); |