From cfcbb286712ae392689e7cd1a640b57b611dd277 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 18 Jan 2015 02:22:19 -0800 Subject: Clean up ftype-conversion and dfilter error message string handling. Have dfilter_compile() take an additional gchar ** argument, pointing to a gchar * item that, on error, gets set to point to a g_malloc()ed error string. That removes one bit of global state from the display filter parser, and doesn't impose a fixed limit on the error message strings. Have fvalue_from_string() and fvalue_from_unparsed() take a gchar ** argument, pointer to a gchar * item, rather than an error-reporting function, and set the gchar * item to point to a g_malloc()ed error string on an error. Allow either gchar ** argument to be null; if the argument is null, no error message is allocated or provided. Change-Id: Ibd36b8aaa9bf4234aa6efa1e7fb95f7037493b4c Reviewed-on: https://code.wireshark.org/review/6608 Reviewed-by: Guy Harris --- ui/qt/syntax_line_edit.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ui/qt/syntax_line_edit.h') diff --git a/ui/qt/syntax_line_edit.h b/ui/qt/syntax_line_edit.h index f6872c31f8..77edf92e84 100644 --- a/ui/qt/syntax_line_edit.h +++ b/ui/qt/syntax_line_edit.h @@ -35,6 +35,7 @@ public: SyntaxState syntaxState() const { return syntax_state_; } void setSyntaxState(SyntaxState state = Empty); + QString syntaxErrorMessage(); QString styleSheet() const; QString deprecatedToken(); @@ -51,6 +52,7 @@ private: QString style_sheet_; QString state_style_sheet_; QString deprecated_token_; + QString syntax_error_message_; signals: -- cgit v1.2.3