dwg import: handle filenames with utf8 characters

jef-n · jef-n · commit dd5ed6881838 · 2018-08-02T18:01:30.000+02:00
(cherry picked from commit 4945e97)
diff --git a/src/app/dwg/qgsdwgimporter.cpp b/src/app/dwg/qgsdwgimporter.cpp
@@ -596,7 +596,7 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa
   if ( fi.suffix().toLower() == QLatin1String( "dxf" ) )
   {
     //loads dxf
-    std::unique_ptr<dxfRW> dxf( new dxfRW( drawing.toUtf8() ) );
+    std::unique_ptr<dxfRW> dxf( new dxfRW( drawing.toLocal8Bit() ) );
     if ( !dxf->read( this, false ) )
     {
       result = DRW::BAD_UNKNOWN;
@@ -605,7 +605,7 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa
   else if ( fi.suffix().toLower() == QLatin1String( "dwg" ) )
   {
     //loads dwg
-    std::unique_ptr<dwgR> dwg( new dwgR( drawing.toUtf8() ) );
+    std::unique_ptr<dwgR> dwg( new dwgR( drawing.toLocal8Bit() ) );
     if ( !dwg->read( this, false ) )
     {
       result = dwg->getError();

Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,7 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa`
`596`	`596`	`if ( fi.suffix().toLower() == QLatin1String( "dxf" ) )`
`597`	`597`	`{`
`598`	`598`	`//loads dxf`
`599`		`- std::unique_ptr<dxfRW> dxf( new dxfRW( drawing.toUtf8() ) );`
	`599`	`+ std::unique_ptr<dxfRW> dxf( new dxfRW( drawing.toLocal8Bit() ) );`
`600`	`600`	`if ( !dxf->read( this, false ) )`
`601`	`601`	`{`
`602`	`602`	`result = DRW::BAD_UNKNOWN;`
`@@ -605,7 +605,7 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa`
`605`	`605`	`else if ( fi.suffix().toLower() == QLatin1String( "dwg" ) )`
`606`	`606`	`{`
`607`	`607`	`//loads dwg`
`608`		`- std::unique_ptr<dwgR> dwg( new dwgR( drawing.toUtf8() ) );`
	`608`	`+ std::unique_ptr<dwgR> dwg( new dwgR( drawing.toLocal8Bit() ) );`
`609`	`609`	`if ( !dwg->read( this, false ) )`
`610`	`610`	`{`
`611`	`611`	`result = dwg->getError();`