@@ -1415,7 +1415,7 @@ void QgsExpressionBuilderWidget::exportUserExpressions_pressed()
1415
1415
QString lastSaveDir = settings.value ( QStringLiteral ( " lastExportExpressionsDir" ), QDir::homePath (), QgsSettings::App ).toString ();
1416
1416
QString saveFileName = QFileDialog::getSaveFileName (
1417
1417
this ,
1418
- tr ( " Save user expressions " ),
1418
+ tr ( " Export User Expressions " ),
1419
1419
lastSaveDir,
1420
1420
tr ( " User expressions" ) + " (*.json)" );
1421
1421
@@ -1432,7 +1432,7 @@ void QgsExpressionBuilderWidget::exportUserExpressions_pressed()
1432
1432
1433
1433
settings.setValue ( QStringLiteral ( " lastExportExpressionsDir" ), saveFileInfo.absolutePath (), QgsSettings::App );
1434
1434
1435
- QJsonDocument * exportJson = exportUserExpressions ();
1435
+ std::unique_ptr< QJsonDocument > exportJson = exportUserExpressions ();
1436
1436
QFile jsonFile ( saveFileName );
1437
1437
1438
1438
if ( !jsonFile.open ( QFile::WriteOnly | QIODevice::Truncate ) )
@@ -1442,12 +1442,10 @@ void QgsExpressionBuilderWidget::exportUserExpressions_pressed()
1442
1442
QMessageBox::warning ( this , tr ( " Export user expressions" ), tr ( " Error while creating the expressions file." ) );
1443
1443
else
1444
1444
jsonFile.close ();
1445
-
1446
- delete exportJson;
1447
1445
}
1448
1446
1449
1447
1450
- QJsonDocument * QgsExpressionBuilderWidget::exportUserExpressions ()
1448
+ std::unique_ptr< QJsonDocument > QgsExpressionBuilderWidget::exportUserExpressions ()
1451
1449
{
1452
1450
const QString group = QStringLiteral ( " user" );
1453
1451
QgsSettings settings;
@@ -1484,7 +1482,7 @@ QJsonDocument *QgsExpressionBuilderWidget::exportUserExpressions()
1484
1482
}
1485
1483
1486
1484
exportObject[" expressions" ] = exportList;
1487
- QJsonDocument * exportJson = new QJsonDocument ( exportObject );
1485
+ std::unique_ptr< QJsonDocument > exportJson = qgis::make_unique< QJsonDocument > ( exportObject );
1488
1486
1489
1487
return exportJson;
1490
1488
}
@@ -1495,21 +1493,21 @@ void QgsExpressionBuilderWidget::importUserExpressions_pressed()
1495
1493
QString lastSaveDir = settings.value ( QStringLiteral ( " lastImportExpressionsDir" ), QDir::homePath (), QgsSettings::App ).toString ();
1496
1494
QString loadFileName = QFileDialog::getOpenFileName (
1497
1495
this ,
1498
- tr ( " Save user expressions " ),
1496
+ tr ( " Import User Expressions " ),
1499
1497
lastSaveDir,
1500
1498
tr ( " User expressions" ) + " (*.json)" );
1501
1499
1502
1500
if ( loadFileName.isEmpty () )
1503
1501
return ;
1504
1502
1505
- QFileInfo saveFileInfo ( loadFileName );
1503
+ QFileInfo loadFileInfo ( loadFileName );
1506
1504
1507
- settings.setValue ( QStringLiteral ( " lastImportExpressionsDir" ), saveFileInfo .absolutePath (), QgsSettings::App );
1505
+ settings.setValue ( QStringLiteral ( " lastImportExpressionsDir" ), loadFileInfo .absolutePath (), QgsSettings::App );
1508
1506
1509
1507
QFile jsonFile ( loadFileName );
1510
1508
1511
1509
if ( !jsonFile.open ( QFile::ReadOnly ) )
1512
- QMessageBox::warning ( this , tr ( " Import user expressions " ), tr ( " Error while reading the expressions file." ) );
1510
+ QMessageBox::warning ( this , tr ( " Import User Expressions " ), tr ( " Error while reading the expressions file." ) );
1513
1511
1514
1512
QTextStream jsonStream ( &jsonFile );
1515
1513
QString jsonString = jsonFile.readAll ();
@@ -1519,7 +1517,7 @@ void QgsExpressionBuilderWidget::importUserExpressions_pressed()
1519
1517
1520
1518
if ( importJson.isNull () )
1521
1519
{
1522
- QMessageBox::warning ( this , tr ( " Import user expressions " ), tr ( " Error while reading the expressions file." ) );
1520
+ QMessageBox::warning ( this , tr ( " Import User Expressions " ), tr ( " Error while reading the expressions file." ) );
1523
1521
return ;
1524
1522
}
1525
1523
@@ -1554,7 +1552,7 @@ void QgsExpressionBuilderWidget::loadExpressionsFromJson( const QJsonDocument &e
1554
1552
tr ( " QGIS Version Mismatch" ),
1555
1553
tr ( " The imported expressions are from newer version of QGIS (%1) "
1556
1554
" and some of the expression might not work the current version (%2). "
1557
- " Do you want to continue?" ).arg ( qgisJsonVersion.toString (), qgisVersion.toString () ), buttons ) )
1555
+ " Are you sure you want to continue?" ).arg ( qgisJsonVersion.toString (), qgisVersion.toString () ), buttons ) )
1558
1556
{
1559
1557
case QMessageBox::No:
1560
1558
return ;
@@ -1655,16 +1653,14 @@ void QgsExpressionBuilderWidget::loadExpressionsFromJson( const QJsonDocument &e
1655
1653
1656
1654
loadUserExpressions ( );
1657
1655
1658
- QgsLogger::warning ( QString::number ( skippedExpressionLabels.count () ) + QStringLiteral ( __FILE__ ) + " : " + QString::number ( __LINE__ ) );
1659
-
1660
1656
if ( ! skippedExpressionLabels.isEmpty () )
1661
1657
{
1662
1658
QStringList skippedExpressionLabelsQuoted;
1663
1659
for ( const QString &skippedExpressionLabel : skippedExpressionLabels )
1664
1660
skippedExpressionLabelsQuoted.append ( QString ( " '%1'" ).arg ( skippedExpressionLabel ) );
1665
1661
1666
1662
QMessageBox::information ( this ,
1667
- tr ( " Skipped expressions " ),
1663
+ tr ( " Skipped Expression Imports " ),
1668
1664
QString ( " %1\n %2" ).arg ( tr ( " The following expressions have been skipped:" ),
1669
1665
skippedExpressionLabelsQuoted.join ( " , " ) ) );
1670
1666
}
@@ -1679,7 +1675,7 @@ void QgsExpressionBuilderWidget::showMessageBoxConfirmExpressionOverwrite(
1679
1675
{
1680
1676
QMessageBox::StandardButtons buttons = QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No | QMessageBox::NoToAll;
1681
1677
switch ( QMessageBox::question ( this ,
1682
- tr ( " Expression overwrite " ),
1678
+ tr ( " Expression Overwrite " ),
1683
1679
tr ( " The expression with label '%1' was already defined."
1684
1680
" The old expression \" %2\" will be overwritten by \" %3\" ."
1685
1681
" Are you sure you want to overwrite the expression?" ).arg ( label, oldExpression, newExpression ), buttons ) )
0 commit comments