Follow up 88b8039

borysiasty · nyalldawson · commit 221df8e65e21 · 2018-10-25T18:11:36.000+10:00
diff --git a/src/gui/processing/qgsprocessingalgorithmdialogbase.cpp b/src/gui/processing/qgsprocessingalgorithmdialogbase.cpp
@@ -123,7 +123,7 @@ void QgsProcessingAlgorithmDialogBase::setAlgorithm( QgsProcessingAlgorithm *alg
 {
   mAlgorithm = algorithm;
   QString title;
-  if ( ( QgsGui::higFlags() & QgsGui::HigDialogTitleIsTitleCase ) and !( algorithm->flags() & QgsProcessingAlgorithm::FlagDisplayNameIsLiteral ) )
+  if ( ( QgsGui::higFlags() & QgsGui::HigDialogTitleIsTitleCase ) && !( algorithm->flags() & QgsProcessingAlgorithm::FlagDisplayNameIsLiteral ) )
   {
     title = QgsStringUtils::capitalize( mAlgorithm->displayName(), QgsStringUtils::TitleCase );
   }
diff --git a/src/gui/qgsgui.cpp b/src/gui/qgsgui.cpp
@@ -123,7 +123,7 @@ QgsGui::HigFlags QgsGui::higFlags()
   }
   else
   {
-    return NULL;
+    return nullptr;
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ void QgsProcessingAlgorithmDialogBase::setAlgorithm( QgsProcessingAlgorithm *alg`
`123`	`123`	`{`
`124`	`124`	`mAlgorithm = algorithm;`
`125`	`125`	`QString title;`
`126`		`- if ( ( QgsGui::higFlags() & QgsGui::HigDialogTitleIsTitleCase ) and !( algorithm->flags() & QgsProcessingAlgorithm::FlagDisplayNameIsLiteral ) )`
	`126`	`+ if ( ( QgsGui::higFlags() & QgsGui::HigDialogTitleIsTitleCase ) && !( algorithm->flags() & QgsProcessingAlgorithm::FlagDisplayNameIsLiteral ) )`
`127`	`127`	`{`
`128`	`128`	`title = QgsStringUtils::capitalize( mAlgorithm->displayName(), QgsStringUtils::TitleCase );`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ QgsGui::HigFlags QgsGui::higFlags()`
`123`	`123`	`}`
`124`	`124`	`else`
`125`	`125`	`{`
`126`		`- return NULL;`
	`126`	`+ return nullptr;`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`