Wrap field name in quotes when added to expression string

NathanW2 · NathanW2 · commit d7b14999a03d · 2011-12-30T23:08:36.000+10:00
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -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 );
 }
diff --git a/src/gui/qgsexpressionhighlighter.cpp b/src/gui/qgsexpressionhighlighter.cpp
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ void QgsExpressionBuilderWidget::loadFieldNames( QgsFieldMap fields )`
`162`	`162`	`{`
`163`	`163`	`QString fieldName = field.name();`
`164`	`164`	`fieldNames << fieldName;`
`165`		`- registerItem( tr( "Fields" ), fieldName, " " + fieldName + " ", "", QgsExpressionItem::Field );`
	`165`	`+ registerItem( tr( "Fields" ), fieldName, " \"" + fieldName + "\" ", "", QgsExpressionItem::Field );`
`166`	`166`	`}`
`167`	`167`	`highlighter->addFields( fieldNames );`
`168`	`168`	`}`