QStringLiteral

nyalldawson · nyalldawson · commit fe3e494d613c · 2018-09-06T06:51:17.000+10:00
diff --git a/src/gui/symbology/qgsstylemanagerdialog.cpp b/src/gui/symbology/qgsstylemanagerdialog.cpp
@@ -545,7 +545,7 @@ QString QgsStyleManagerDialog::addColorRampStatic( QWidget *parent, QgsStyle *st
   {
     // Q_ASSERT( 0 && "invalid ramp type" );
     // bailing out is rather harsh!
-    QgsDebugMsg( "invalid ramp type " + rampType );
+    QgsDebugMsg( QStringLiteral( "invalid ramp type %1" ).arg( rampType ) );
     return QString();
   }
 
@@ -958,7 +958,7 @@ void QgsStyleManagerDialog::groupChanged( const QModelIndex &index )
   QgsStyle::StyleEntity type = currentItemType() < 3 ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity;
   if ( currentItemType() > 3 )
   {
-    QgsDebugMsg( "Entity not implemented" );
+    QgsDebugMsg( QStringLiteral( "Entity not implemented" ) );
     return;
   }
 
@@ -1156,7 +1156,7 @@ void QgsStyleManagerDialog::removeGroup()
 
 void QgsStyleManagerDialog::groupRenamed( QStandardItem *item )
 {
-  QgsDebugMsg( "Symbol group edited: data=" + item->data( Qt::UserRole + 1 ).toString() + " text=" + item->text() );
+  QgsDebugMsg( QStringLiteral( "Symbol group edited: data=%1 text=%2" ).arg( item->data( Qt::UserRole + 1 ).toString(), item->text() ) );
   int id = item->data( Qt::UserRole + 1 ).toInt();
   QString name = item->text();
   if ( item->parent()->data( Qt::UserRole + 1 ) == "smartgroups" )
@@ -1243,7 +1243,7 @@ void QgsStyleManagerDialog::regrouped( QStandardItem *item )
   QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity;
   if ( currentItemType() > 3 )
   {
-    QgsDebugMsg( "Unknown style entity" );
+    QgsDebugMsg( QStringLiteral( "Unknown style entity" ) );
     return;
   }
 
@@ -1365,7 +1365,7 @@ void QgsStyleManagerDialog::grouptreeContextMenu( QPoint point )
   QPoint globalPos = groupTree->viewport()->mapToGlobal( point );
 
   QModelIndex index = groupTree->indexAt( point );
-  QgsDebugMsg( "Now you clicked: " + index.data().toString() );
+  QgsDebugMsg( QStringLiteral( "Now you clicked: %1" ).arg( index.data().toString() ) );
 
   if ( index.isValid() && !mGrouppingMode )
     mGroupTreeContextMenu->popup( globalPos );
@@ -1407,7 +1407,7 @@ void QgsStyleManagerDialog::addFavoriteSelectedSymbols()
   QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity;
   if ( currentItemType() > 3 )
   {
-    QgsDebugMsg( "unknown entity type" );
+    QgsDebugMsg( QStringLiteral( "unknown entity type" ) );
     return;
   }
 
@@ -1424,7 +1424,7 @@ void QgsStyleManagerDialog::removeFavoriteSelectedSymbols()
   QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity;
   if ( currentItemType() > 3 )
   {
-    QgsDebugMsg( "unknown entity type" );
+    QgsDebugMsg( QStringLiteral( "unknown entity type" ) );
     return;
   }
 
@@ -1444,7 +1444,7 @@ void QgsStyleManagerDialog::tagSelectedSymbols( bool newTag )
     QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity;
     if ( currentItemType() > 3 )
     {
-      QgsDebugMsg( "unknown entity type" );
+      QgsDebugMsg( QStringLiteral( "unknown entity type" ) );
       return;
     }
 
@@ -1471,7 +1471,7 @@ void QgsStyleManagerDialog::tagSelectedSymbols( bool newTag )
     }
     populateList();
 
-    QgsDebugMsg( "Selected Action: " + selectedItem->text() );
+    QgsDebugMsg( QStringLiteral( "Selected Action: %1" ).arg( selectedItem->text() ) );
   }
 }
 
@@ -1484,7 +1484,7 @@ void QgsStyleManagerDialog::detagSelectedSymbols()
     QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity;
     if ( currentItemType() > 3 )
     {
-      QgsDebugMsg( "unknown entity type" );
+      QgsDebugMsg( QStringLiteral( "unknown entity type" ) );
       return;
     }
     QModelIndexList indexes = listItems->selectionModel()->selectedIndexes();
@@ -1494,7 +1494,7 @@ void QgsStyleManagerDialog::detagSelectedSymbols()
     }
     populateList();
 
-    QgsDebugMsg( "Selected Action: " + selectedItem->text() );
+    QgsDebugMsg( QStringLiteral( "Selected Action: %1" ).arg( selectedItem->text() ) );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ QString QgsStyleManagerDialog::addColorRampStatic( QWidget parent, QgsStyle st`
`545`	`545`	`{`
`546`	`546`	`// Q_ASSERT( 0 && "invalid ramp type" );`
`547`	`547`	`// bailing out is rather harsh!`
`548`		`- QgsDebugMsg( "invalid ramp type " + rampType );`
	`548`	`+ QgsDebugMsg( QStringLiteral( "invalid ramp type %1" ).arg( rampType ) );`
`549`	`549`	`return QString();`
`550`	`550`	`}`
`551`	`551`
`@@ -958,7 +958,7 @@ void QgsStyleManagerDialog::groupChanged( const QModelIndex &index )`
`958`	`958`	`QgsStyle::StyleEntity type = currentItemType() < 3 ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity;`
`959`	`959`	`if ( currentItemType() > 3 )`
`960`	`960`	`{`
`961`		`- QgsDebugMsg( "Entity not implemented" );`
	`961`	`+ QgsDebugMsg( QStringLiteral( "Entity not implemented" ) );`
`962`	`962`	`return;`
`963`	`963`	`}`
`964`	`964`
`@@ -1156,7 +1156,7 @@ void QgsStyleManagerDialog::removeGroup()`
`1156`	`1156`
`1157`	`1157`	`void QgsStyleManagerDialog::groupRenamed( QStandardItem *item )`
`1158`	`1158`	`{`
`1159`		`- QgsDebugMsg( "Symbol group edited: data=" + item->data( Qt::UserRole + 1 ).toString() + " text=" + item->text() );`
	`1159`	`+ QgsDebugMsg( QStringLiteral( "Symbol group edited: data=%1 text=%2" ).arg( item->data( Qt::UserRole + 1 ).toString(), item->text() ) );`
`1160`	`1160`	`int id = item->data( Qt::UserRole + 1 ).toInt();`
`1161`	`1161`	`QString name = item->text();`
`1162`	`1162`	`if ( item->parent()->data( Qt::UserRole + 1 ) == "smartgroups" )`
`@@ -1243,7 +1243,7 @@ void QgsStyleManagerDialog::regrouped( QStandardItem *item )`
`1243`	`1243`	`QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity;`
`1244`	`1244`	`if ( currentItemType() > 3 )`
`1245`	`1245`	`{`
`1246`		`- QgsDebugMsg( "Unknown style entity" );`
	`1246`	`+ QgsDebugMsg( QStringLiteral( "Unknown style entity" ) );`
`1247`	`1247`	`return;`
`1248`	`1248`	`}`
`1249`	`1249`
`@@ -1365,7 +1365,7 @@ void QgsStyleManagerDialog::grouptreeContextMenu( QPoint point )`
`1365`	`1365`	`QPoint globalPos = groupTree->viewport()->mapToGlobal( point );`
`1366`	`1366`
`1367`	`1367`	`QModelIndex index = groupTree->indexAt( point );`
`1368`		`- QgsDebugMsg( "Now you clicked: " + index.data().toString() );`
	`1368`	`+ QgsDebugMsg( QStringLiteral( "Now you clicked: %1" ).arg( index.data().toString() ) );`
`1369`	`1369`
`1370`	`1370`	`if ( index.isValid() && !mGrouppingMode )`
`1371`	`1371`	`mGroupTreeContextMenu->popup( globalPos );`
`@@ -1407,7 +1407,7 @@ void QgsStyleManagerDialog::addFavoriteSelectedSymbols()`
`1407`	`1407`	`QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity;`
`1408`	`1408`	`if ( currentItemType() > 3 )`
`1409`	`1409`	`{`
`1410`		`- QgsDebugMsg( "unknown entity type" );`
	`1410`	`+ QgsDebugMsg( QStringLiteral( "unknown entity type" ) );`
`1411`	`1411`	`return;`
`1412`	`1412`	`}`
`1413`	`1413`
`@@ -1424,7 +1424,7 @@ void QgsStyleManagerDialog::removeFavoriteSelectedSymbols()`
`1424`	`1424`	`QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity;`
`1425`	`1425`	`if ( currentItemType() > 3 )`
`1426`	`1426`	`{`
`1427`		`- QgsDebugMsg( "unknown entity type" );`
	`1427`	`+ QgsDebugMsg( QStringLiteral( "unknown entity type" ) );`
`1428`	`1428`	`return;`
`1429`	`1429`	`}`
`1430`	`1430`
`@@ -1444,7 +1444,7 @@ void QgsStyleManagerDialog::tagSelectedSymbols( bool newTag )`
`1444`	`1444`	`QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity;`
`1445`	`1445`	`if ( currentItemType() > 3 )`
`1446`	`1446`	`{`
`1447`		`- QgsDebugMsg( "unknown entity type" );`
	`1447`	`+ QgsDebugMsg( QStringLiteral( "unknown entity type" ) );`
`1448`	`1448`	`return;`
`1449`	`1449`	`}`
`1450`	`1450`
`@@ -1471,7 +1471,7 @@ void QgsStyleManagerDialog::tagSelectedSymbols( bool newTag )`
`1471`	`1471`	`}`
`1472`	`1472`	`populateList();`
`1473`	`1473`
`1474`		`- QgsDebugMsg( "Selected Action: " + selectedItem->text() );`
	`1474`	`+ QgsDebugMsg( QStringLiteral( "Selected Action: %1" ).arg( selectedItem->text() ) );`
`1475`	`1475`	`}`
`1476`	`1476`	`}`
`1477`	`1477`
`@@ -1484,7 +1484,7 @@ void QgsStyleManagerDialog::detagSelectedSymbols()`
`1484`	`1484`	`QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity;`
`1485`	`1485`	`if ( currentItemType() > 3 )`
`1486`	`1486`	`{`
`1487`		`- QgsDebugMsg( "unknown entity type" );`
	`1487`	`+ QgsDebugMsg( QStringLiteral( "unknown entity type" ) );`
`1488`	`1488`	`return;`
`1489`	`1489`	`}`
`1490`	`1490`	`QModelIndexList indexes = listItems->selectionModel()->selectedIndexes();`
`@@ -1494,7 +1494,7 @@ void QgsStyleManagerDialog::detagSelectedSymbols()`
`1494`	`1494`	`}`
`1495`	`1495`	`populateList();`
`1496`	`1496`
`1497`		`- QgsDebugMsg( "Selected Action: " + selectedItem->text() );`
	`1497`	`+ QgsDebugMsg( QStringLiteral( "Selected Action: %1" ).arg( selectedItem->text() ) );`
`1498`	`1498`	`}`
`1499`	`1499`	`}`
`1500`	`1500`