From db89dfa18113459e7b6d9422ad78207d4fb67779 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Tue, 27 Oct 2009 17:54:40 +0100
Subject: [PATCH] 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 1633cf2593fa6142893940f809b7d1fab0f7d3f5)
---
 plugins/flp_import/FlpImport.cpp   | 3 ++-
 plugins/midi_import/MidiImport.cpp | 6 ++----
 plugins/patman/patman.cpp          | 2 +-
 src/gui/embed.cpp                  | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugins/flp_import/FlpImport.cpp b/plugins/flp_import/FlpImport.cpp
index db69edf78..c2dbde468 100644
--- a/plugins/flp_import/FlpImport.cpp
+++ b/plugins/flp_import/FlpImport.cpp
@@ -1874,7 +1874,8 @@ extern "C"
 // neccessary for getting instance out of shared lib
 Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
 {
-	return new FlpImport( static_cast<const char *>( _data ) );
+	return new FlpImport( QString::fromUtf8(
+									static_cast<const char *>( _data ) ) );
 }
 
 }
diff --git a/plugins/midi_import/MidiImport.cpp b/plugins/midi_import/MidiImport.cpp
index 7caba07ae..980bc1d80 100644
--- a/plugins/midi_import/MidiImport.cpp
+++ b/plugins/midi_import/MidiImport.cpp
@@ -563,12 +563,10 @@ extern "C"
 // neccessary for getting instance out of shared lib
 Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
 {
-	return new MidiImport( static_cast<const char *>( _data ) );
+	return new MidiImport( QString::fromUtf8(
+									static_cast<const char *>( _data ) ) );
 }
 
 
 }
 
-
-#undef pos
-#undef setValue
diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp
index 2d628a326..e0a990347 100644
--- a/plugins/patman/patman.cpp
+++ b/plugins/patman/patman.cpp
@@ -210,7 +210,7 @@ patmanInstrument::LoadErrors patmanInstrument::loadPatch(
 {
 	unloadCurrentPatch();
 
-	FILE * fd = fopen( _filename.toAscii().constData() , "rb" );
+	FILE * fd = fopen( _filename.toUtf8().constData() , "rb" );
 	if( !fd )
 	{
 		perror( "fopen" );
diff --git a/src/gui/embed.cpp b/src/gui/embed.cpp
index 3b87b0c62..d95be2fef 100644
--- a/src/gui/embed.cpp
+++ b/src/gui/embed.cpp
@@ -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 );
 }