Removed usage of ASCII C strings in several places

Still QString::toAscii() & friends were used in several places causing
problems such as failed access to files with non-ASCII characters in
name.

Closes #2884115.
(cherry picked from commit 1633cf2593)
This commit is contained in:
Tobias Doerffel
2009-10-27 17:54:40 +01:00
parent 89fc626533
commit db89dfa181
4 changed files with 9 additions and 10 deletions

View File

@@ -79,10 +79,10 @@ QPixmap getIconPixmap( const char * _name, int _w, int _h )
p = QPixmap( 1, 1 );
}
}
return( p );
return p;
}
return( getIconPixmap( _name ).scaled( _w, _h, Qt::IgnoreAspectRatio,
Qt::SmoothTransformation ) );
return getIconPixmap( _name ).
scaled( _w, _h, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
}
@@ -91,7 +91,7 @@ QPixmap getIconPixmap( const char * _name, int _w, int _h )
QString getText( const char * _name )
{
const embed::descriptor & e = findEmbeddedData( _name );
return( QString::fromLatin1( (const char *) e.data, e.size ) );
return QString::fromUtf8( (const char *) e.data, e.size );
}