mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-17 00:04:02 -04:00
Wrap field name in quotes when added to expression string
This commit is contained in:
parent
9b93f9b8fa
commit
d7b14999a0
@ -162,7 +162,7 @@ void QgsExpressionBuilderWidget::loadFieldNames( QgsFieldMap fields )
|
||||
{
|
||||
QString fieldName = field.name();
|
||||
fieldNames << fieldName;
|
||||
registerItem( tr( "Fields" ), fieldName, " " + fieldName + " ", "", QgsExpressionItem::Field );
|
||||
registerItem( tr( "Fields" ), fieldName, " \"" + fieldName + "\" ", "", QgsExpressionItem::Field );
|
||||
}
|
||||
highlighter->addFields( fieldNames );
|
||||
}
|
||||
|
@ -20,25 +20,6 @@ QgsExpressionHighlighter::QgsExpressionHighlighter( QTextDocument *parent)
|
||||
{
|
||||
HighlightingRule rule;
|
||||
|
||||
// keywordFormat.setForeground(Qt::darkBlue);
|
||||
// keywordFormat.setFontWeight(QFont::Bold);
|
||||
// QStringList keywordPatterns;
|
||||
// keywordPatterns << "\\bchar\\b" << "\\bclass\\b" << "\\bconst\\b"
|
||||
// << "\\bdouble\\b" << "\\benum\\b" << "\\bexplicit\\b"
|
||||
// << "\\bfriend\\b" << "\\binline\\b" << "\\bint\\b"
|
||||
// << "\\blong\\b" << "\\bnamespace\\b" << "\\boperator\\b"
|
||||
// << "\\bprivate\\b" << "\\bprotected\\b" << "\\bpublic\\b"
|
||||
// << "\\bshort\\b" << "\\bsignals\\b" << "\\bsigned\\b"
|
||||
// << "\\bslots\\b" << "\\bstatic\\b" << "\\bstruct\\b"
|
||||
// << "\\btemplate\\b" << "\\btypedef\\b" << "\\btypename\\b"
|
||||
// << "\\bunion\\b" << "\\bunsigned\\b" << "\\bvirtual\\b"
|
||||
// << "\\bvoid\\b" << "\\bvolatile\\b";
|
||||
// foreach (const QString &pattern, keywordPatterns) {
|
||||
// rule.pattern = QRegExp(pattern);
|
||||
// rule.format = keywordFormat;
|
||||
// highlightingRules.append(rule);
|
||||
// }
|
||||
|
||||
quotationFormat.setForeground( Qt::darkGreen );
|
||||
rule.pattern = QRegExp( "\'.*\'" );
|
||||
rule.format = quotationFormat;
|
||||
|
Loading…
x
Reference in New Issue
Block a user