Rename a variable that clashes with GLib
This commit is contained in:
parent
0e50979b3f
commit
145ba2e071
|
@ -154,12 +154,12 @@ bool SearchFrame::regexCompile()
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
GError *g_error = nullptr;
|
GError *error = nullptr;
|
||||||
regex_ = g_regex_new(sf_ui_->searchLineEdit->text().toUtf8().constData(),
|
regex_ = g_regex_new(sf_ui_->searchLineEdit->text().toUtf8().constData(),
|
||||||
(GRegexCompileFlags)flags, (GRegexMatchFlags) 0, &g_error);
|
(GRegexCompileFlags)flags, (GRegexMatchFlags) 0, &error);
|
||||||
if (g_error) {
|
if (error) {
|
||||||
regex_error_ = g_error->message;
|
regex_error_ = error->message;
|
||||||
g_error_free(g_error);
|
g_error_free(error);
|
||||||
}
|
}
|
||||||
|
|
||||||
return regex_ ? true : false;
|
return regex_ ? true : false;
|
||||||
|
|
Loading…
Reference in New Issue