@@ -903,9 +903,7 @@ void QgsDwgImporter::addLayer( const DRW_Layer &data )
903
903
if ( OGR_L_CreateFeature ( layer, f.get () ) != OGRERR_NONE )
904
904
{
905
905
LOG ( QObject::tr ( " Could not add %3 %1 [%2]" )
906
- .arg ( data.name .c_str () )
907
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
908
- .arg ( QObject::tr ( " layer" ) )
906
+ .arg ( data.name .c_str (), QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " layer" ) )
909
907
);
910
908
}
911
909
}
@@ -1105,9 +1103,7 @@ void QgsDwgImporter::addDimStyle( const DRW_Dimstyle &data )
1105
1103
if ( OGR_L_CreateFeature ( layer, f.get () ) != OGRERR_NONE )
1106
1104
{
1107
1105
LOG ( QObject::tr ( " Could not add %3 %1 [%2]" )
1108
- .arg ( data.name .c_str () )
1109
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
1110
- .arg ( QObject::tr ( " dimension style" ) )
1106
+ .arg ( data.name .c_str (), QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " dimension style" ) )
1111
1107
);
1112
1108
}
1113
1109
}
@@ -1139,9 +1135,7 @@ void QgsDwgImporter::addTextStyle( const DRW_Textstyle &data )
1139
1135
if ( OGR_L_CreateFeature ( layer, f.get () ) != OGRERR_NONE )
1140
1136
{
1141
1137
LOG ( QObject::tr ( " Could not add %3 %1 [%2]" )
1142
- .arg ( data.name .c_str () )
1143
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
1144
- .arg ( QObject::tr ( " text style" ) )
1138
+ .arg ( data.name .c_str (), QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " text style" ) )
1145
1139
);
1146
1140
}
1147
1141
}
@@ -1202,8 +1196,7 @@ void QgsDwgImporter::addBlock( const DRW_Block &data )
1202
1196
if ( !createFeature ( layer, f.get (), p ) )
1203
1197
{
1204
1198
LOG ( QObject::tr ( " Could not add %2 [%1]" )
1205
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
1206
- .arg ( QObject::tr ( " block" ) )
1199
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " block" ) )
1207
1200
);
1208
1201
}
1209
1202
}
@@ -1263,8 +1256,7 @@ void QgsDwgImporter::addPoint( const DRW_Point &data )
1263
1256
if ( !createFeature ( layer, f, p ) )
1264
1257
{
1265
1258
LOG ( QObject::tr ( " Could not add %2 [%1]" )
1266
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
1267
- .arg ( QObject::tr ( " point" ) )
1259
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " point" ) )
1268
1260
);
1269
1261
}
1270
1262
}
@@ -1317,8 +1309,7 @@ void QgsDwgImporter::addArc( const DRW_Arc &data )
1317
1309
if ( !createFeature ( layer, f, c ) )
1318
1310
{
1319
1311
LOG ( QObject::tr ( " Could not add %2 [%1]" )
1320
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
1321
- .arg ( QObject::tr ( " arc" ) )
1312
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " arc" ) )
1322
1313
);
1323
1314
}
1324
1315
}
@@ -1348,8 +1339,7 @@ void QgsDwgImporter::addCircle( const DRW_Circle &data )
1348
1339
if ( !createFeature ( layer, f, c ) )
1349
1340
{
1350
1341
LOG ( QObject::tr ( " Could not add %2 [%1]" )
1351
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
1352
- .arg ( QObject::tr ( " circle" ) )
1342
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " circle" ) )
1353
1343
);
1354
1344
}
1355
1345
}
@@ -1500,8 +1490,7 @@ void QgsDwgImporter::addLWPolyline( const DRW_LWPolyline &data )
1500
1490
if ( !createFeature ( layer, f, cc ) )
1501
1491
{
1502
1492
LOG ( QObject::tr ( " Could not add %2 [%1]" )
1503
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
1504
- .arg ( QObject::tr ( " line string" ) )
1493
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " line string" ) )
1505
1494
);
1506
1495
}
1507
1496
@@ -1572,8 +1561,7 @@ void QgsDwgImporter::addLWPolyline( const DRW_LWPolyline &data )
1572
1561
if ( !createFeature ( layer, f, poly ) )
1573
1562
{
1574
1563
LOG ( QObject::tr ( " Could not add %2 [%1]" )
1575
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
1576
- .arg ( QObject::tr ( " polygon" ) )
1564
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " polygon" ) )
1577
1565
);
1578
1566
}
1579
1567
}
@@ -1619,8 +1607,7 @@ void QgsDwgImporter::addLWPolyline( const DRW_LWPolyline &data )
1619
1607
if ( !createFeature ( layer, f, cc ) )
1620
1608
{
1621
1609
LOG ( QObject::tr ( " Could not add %2 [%1]" )
1622
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
1623
- .arg ( QObject::tr ( " line string" ) )
1610
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " line string" ) )
1624
1611
);
1625
1612
}
1626
1613
}
@@ -1701,8 +1688,7 @@ void QgsDwgImporter::addPolyline( const DRW_Polyline &data )
1701
1688
if ( !createFeature ( layer, f, cc ) )
1702
1689
{
1703
1690
LOG ( QObject::tr ( " Could not add %2 [%1]" )
1704
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
1705
- .arg ( QObject::tr ( " line string" ) )
1691
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " line string" ) )
1706
1692
);
1707
1693
}
1708
1694
@@ -1778,8 +1764,7 @@ void QgsDwgImporter::addPolyline( const DRW_Polyline &data )
1778
1764
if ( !createFeature ( layer, f, poly ) )
1779
1765
{
1780
1766
LOG ( QObject::tr ( " Could not add %2 [%1]" )
1781
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
1782
- .arg ( QObject::tr ( " polygon" ) )
1767
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " polygon" ) )
1783
1768
);
1784
1769
}
1785
1770
}
@@ -1825,8 +1810,7 @@ void QgsDwgImporter::addPolyline( const DRW_Polyline &data )
1825
1810
if ( !createFeature ( layer, f, cc ) )
1826
1811
{
1827
1812
LOG ( QObject::tr ( " Could not add %2 [%1]" )
1828
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
1829
- .arg ( QObject::tr ( " line string" ) )
1813
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " line string" ) )
1830
1814
);
1831
1815
}
1832
1816
}
@@ -2067,8 +2051,7 @@ void QgsDwgImporter::addSpline( const DRW_Spline *data )
2067
2051
if ( !createFeature ( layer, f, l ) )
2068
2052
{
2069
2053
LOG ( QObject::tr ( " Could not add %2 [%1]" )
2070
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
2071
- .arg ( QObject::tr ( " spline" ) )
2054
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " spline" ) )
2072
2055
);
2073
2056
}
2074
2057
}
@@ -2109,8 +2092,7 @@ void QgsDwgImporter::addInsert( const DRW_Insert &data )
2109
2092
if ( !createFeature ( layer, f, p ) )
2110
2093
{
2111
2094
LOG ( QObject::tr ( " Could not add %2 [%1]" )
2112
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
2113
- .arg ( QObject::tr ( " point" ) )
2095
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " point" ) )
2114
2096
);
2115
2097
}
2116
2098
}
@@ -2161,8 +2143,7 @@ void QgsDwgImporter::addSolid( const DRW_Solid &data )
2161
2143
if ( !createFeature ( layer, f, poly ) )
2162
2144
{
2163
2145
LOG ( QObject::tr ( " Could not add %2 [%1]" )
2164
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
2165
- .arg ( QObject::tr ( " polygon" ) )
2146
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " polygon" ) )
2166
2147
);
2167
2148
}
2168
2149
}
@@ -2197,8 +2178,7 @@ void QgsDwgImporter::addMText( const DRW_MText &data )
2197
2178
if ( !createFeature ( layer, f, p ) )
2198
2179
{
2199
2180
LOG ( QObject::tr ( " Could not add %2 [%1]" )
2200
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
2201
- .arg ( QObject::tr ( " point" ) )
2181
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " point" ) )
2202
2182
);
2203
2183
}
2204
2184
}
@@ -2236,8 +2216,7 @@ void QgsDwgImporter::addText( const DRW_Text &data )
2236
2216
if ( !createFeature ( layer, f, p ) )
2237
2217
{
2238
2218
LOG ( QObject::tr ( " Could not add %2 [%1]" )
2239
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
2240
- .arg ( QObject::tr ( " point" ) )
2219
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " point" ) )
2241
2220
);
2242
2221
}
2243
2222
}
@@ -2369,8 +2348,7 @@ void QgsDwgImporter::addHatch( const DRW_Hatch *pdata )
2369
2348
if ( !createFeature ( layer, f, p ) )
2370
2349
{
2371
2350
LOG ( QObject::tr ( " Could not add %2 [%1]" )
2372
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
2373
- .arg ( QObject::tr ( " polygon" ) )
2351
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " polygon" ) )
2374
2352
);
2375
2353
}
2376
2354
}
@@ -2399,8 +2377,7 @@ void QgsDwgImporter::addLine( const DRW_Line &data )
2399
2377
if ( !createFeature ( layer, f, l ) )
2400
2378
{
2401
2379
LOG ( QObject::tr ( " Could not add %2 [%1]" )
2402
- .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ) )
2403
- .arg ( QObject::tr ( " line string" ) )
2380
+ .arg ( QString::fromUtf8 ( CPLGetLastErrorMsg () ), QObject::tr ( " line string" ) )
2404
2381
);
2405
2382
}
2406
2383
}
0 commit comments