dwg import: handle filenames with utf8 characters

jef-n · jef-n · commit 4945e97f248f · 2018-08-02T17:54:05.000+02:00
diff --git a/src/app/dwg/qgsdwgimporter.cpp b/src/app/dwg/qgsdwgimporter.cpp
@@ -623,7 +623,7 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa
   if ( fi.suffix().toLower() == "dxf" )
   {
     //loads dxf
-    QScopedPointer<dxfRW> dxf( new dxfRW( drawing.toUtf8() ) );
+    QScopedPointer<dxfRW> dxf( new dxfRW( drawing.toLocal8Bit() ) );
     if ( !dxf->read( this, false ) )
     {
       result = DRW::BAD_UNKNOWN;
@@ -632,7 +632,7 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa
   else if ( fi.suffix().toLower() == "dwg" )
   {
     //loads dwg
-    QScopedPointer<dwgR> dwg( new dwgR( drawing.toUtf8() ) );
+    QScopedPointer<dwgR> dwg( new dwgR( drawing.toLocal8Bit() ) );
     if ( !dwg->read( this, false ) )
     {
       result = dwg->getError();

Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,7 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa`
`623`	`623`	`if ( fi.suffix().toLower() == "dxf" )`
`624`	`624`	`{`
`625`	`625`	`//loads dxf`
`626`		`- QScopedPointer<dxfRW> dxf( new dxfRW( drawing.toUtf8() ) );`
	`626`	`+ QScopedPointer<dxfRW> dxf( new dxfRW( drawing.toLocal8Bit() ) );`
`627`	`627`	`if ( !dxf->read( this, false ) )`
`628`	`628`	`{`
`629`	`629`	`result = DRW::BAD_UNKNOWN;`
`@@ -632,7 +632,7 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa`
`632`	`632`	`else if ( fi.suffix().toLower() == "dwg" )`
`633`	`633`	`{`
`634`	`634`	`//loads dwg`
`635`		`- QScopedPointer<dwgR> dwg( new dwgR( drawing.toUtf8() ) );`
	`635`	`+ QScopedPointer<dwgR> dwg( new dwgR( drawing.toLocal8Bit() ) );`
`636`	`636`	`if ( !dwg->read( this, false ) )`
`637`	`637`	`{`
`638`	`638`	`result = dwg->getError();`