From f5b849fd309c76d8a2de70bc1cc1407a543c528a Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Mon, 28 Jul 2008 06:45:16 +0000
Subject: [PATCH] * use QTextStream to save uncompressed XML-files * when
 encountering problems while parsing XML-file, print line and column of
 problem

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1387 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog        | 7 +++++++
 src/core/mmp.cpp | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 18f6b45b3..3ebcd4fd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-28	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/core/mmp.cpp:
+	- use QTextStream to save uncompressed XML-files
+	- when encountering problems while parsing XML-file, print line and
+	  column of problem
+
 2008-07-27	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* src/gui/automation_editor.cpp:
diff --git a/src/core/mmp.cpp b/src/core/mmp.cpp
index 770ae497d..3261f3eac 100644
--- a/src/core/mmp.cpp
+++ b/src/core/mmp.cpp
@@ -125,6 +125,8 @@ multimediaProject::multimediaProject( const QString & _in_file_name,
 		}
 		if( error )
 		{
+			printf( "at line %d column %d: %s\n", line, col,
+					error_msg.toAscii().constData() );
 			QMessageBox::critical( NULL, songEditor::tr( "Error in "
 							"multimedia-project" ),
 					songEditor::tr( "The multimedia-"
@@ -236,14 +238,14 @@ bool multimediaProject::writeFile( const QString & _fn )
 						).arg( fn ) );
 		return( FALSE );
 	}
-	QString xml = "<?xml version=\"1.0\"?>\n" + toString( 1 );
+	QString xml = "<?xml version=\"1.0\"?>\n" + toString( 2 );
 	if( fn.section( '.', -1 ) == "mmpz" )
 	{
 		outfile.write( qCompress( xml.toAscii() ) );
 	}
 	else
 	{
-		outfile.write( xml.toUtf8().constData(), xml.length() );
+		QTextStream( &outfile ) << xml;
 	}
 	outfile.close();