From c69db1efd72793b034c06e655cf09b763f0e425d Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 24 Apr 2016 17:27:04 -0400
Subject: [PATCH] Use QByteArray instead of QString for buffers.

---
 glabels/LabelModel.cpp      |  6 +++---
 glabels/XmlLabelCreator.cpp | 12 ++++++------
 glabels/XmlLabelCreator.h   |  4 ++--
 glabels/XmlLabelParser.cpp  |  4 ++--
 glabels/XmlLabelParser.h    |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/glabels/LabelModel.cpp b/glabels/LabelModel.cpp
index 21fe185..72e9917 100644
--- a/glabels/LabelModel.cpp
+++ b/glabels/LabelModel.cpp
@@ -1101,11 +1101,11 @@ void LabelModel::copySelection()
 	{
 		QClipboard *clipboard = QApplication::clipboard();
 		
-		QString buffer;
+		QByteArray buffer;
 		XmlLabelCreator::serializeObjects( getSelection(), buffer );
 
 		QMimeData *mimeData = new QMimeData;
-		mimeData->setData( MIME_TYPE, buffer.toUtf8() );
+		mimeData->setData( MIME_TYPE, buffer );
 
 		clipboard->setMimeData( mimeData );
 	}
@@ -1157,7 +1157,7 @@ void LabelModel::paste()
 	if ( mimeData->hasFormat( MIME_TYPE ) )
 	{
 		QByteArray buffer = mimeData->data( MIME_TYPE );
-		QList <LabelModelObject*> objects = XmlLabelParser::deserializeObjects( QString(buffer) );
+		QList <LabelModelObject*> objects = XmlLabelParser::deserializeObjects( buffer );
 
 		unselectAll();
 		foreach ( LabelModelObject* object, objects )
diff --git a/glabels/XmlLabelCreator.cpp b/glabels/XmlLabelCreator.cpp
index 74f2754..6e8d773 100644
--- a/glabels/XmlLabelCreator.cpp
+++ b/glabels/XmlLabelCreator.cpp
@@ -41,7 +41,7 @@ XmlLabelCreator::writeFile( const LabelModel* label, const QString& fileName )
 	QDomDocument doc;
 
 	createDoc( doc, label );
-	QString buffer = doc.toString( 2 );
+	QByteArray buffer = doc.toByteArray( 2 );
 
 	QFile file( fileName );
 
@@ -51,23 +51,23 @@ XmlLabelCreator::writeFile( const LabelModel* label, const QString& fileName )
 			   << ": " << file.errorString();
 	}
 
-	file.write( buffer.toStdString().c_str(), buffer.size() );
+	file.write( buffer.data(), buffer.size() );
 }
 
 
 void
-XmlLabelCreator::writeBuffer( const LabelModel* label, QString& buffer )
+XmlLabelCreator::writeBuffer( const LabelModel* label, QByteArray& buffer )
 {
 	QDomDocument doc;
 
 	createDoc( doc, label );
-	buffer = doc.toString( 2 );
+	buffer = doc.toByteArray( 2 );
 }
 
 
 void
 XmlLabelCreator::serializeObjects( const QList<LabelModelObject*>& objects,
-				   QString&                        buffer )
+				   QByteArray&                     buffer )
 {
 	QDomDocument doc;
 
@@ -79,7 +79,7 @@ XmlLabelCreator::serializeObjects( const QList<LabelModelObject*>& objects,
 
 	addObjectsToNode( root, objects );
 
-	buffer = doc.toString( 2 );
+	buffer = doc.toByteArray( 2 );
 }
 
 
diff --git a/glabels/XmlLabelCreator.h b/glabels/XmlLabelCreator.h
index 1447c96..d1428f0 100644
--- a/glabels/XmlLabelCreator.h
+++ b/glabels/XmlLabelCreator.h
@@ -45,8 +45,8 @@ class XmlLabelCreator : public QObject
 
 public:
 	static void writeFile( const LabelModel* label, const QString& fileName );
-	static void writeBuffer( const LabelModel* label, QString& buffer );
-	static void serializeObjects( const QList<LabelModelObject*>& objects, QString& buffer );
+	static void writeBuffer( const LabelModel* label, QByteArray& buffer );
+	static void serializeObjects( const QList<LabelModelObject*>& objects, QByteArray& buffer );
 
 private:
 	static void createDoc( QDomDocument& doc, const LabelModel* label );
diff --git a/glabels/XmlLabelParser.cpp b/glabels/XmlLabelParser.cpp
index 843f39e..b18bbd9 100644
--- a/glabels/XmlLabelParser.cpp
+++ b/glabels/XmlLabelParser.cpp
@@ -89,7 +89,7 @@ XmlLabelParser::readFile( const QString& fileName )
 
 
 LabelModel*
-XmlLabelParser::readBuffer( const QString& buffer )
+XmlLabelParser::readBuffer( const QByteArray& buffer )
 {
 	QDomDocument doc;
 	QString      errorString;
@@ -116,7 +116,7 @@ XmlLabelParser::readBuffer( const QString& buffer )
 
 
 QList<LabelModelObject*>
-XmlLabelParser::deserializeObjects( const QString& buffer )
+XmlLabelParser::deserializeObjects( const QByteArray& buffer )
 {
 	QList<LabelModelObject*> list;
 	
diff --git a/glabels/XmlLabelParser.h b/glabels/XmlLabelParser.h
index 80c53d9..f12f9ec 100644
--- a/glabels/XmlLabelParser.h
+++ b/glabels/XmlLabelParser.h
@@ -45,8 +45,8 @@ class XmlLabelParser : public QObject
 
 public:
 	static LabelModel* readFile( const QString& fileName );
-	static LabelModel* readBuffer( const QString& buffer );
-	static QList<LabelModelObject*> deserializeObjects( const QString& buffer );
+	static LabelModel* readBuffer( const QByteArray& buffer );
+	static QList<LabelModelObject*> deserializeObjects( const QByteArray& buffer );
 
 private:
 	static void gunzip( const QByteArray& gzippedData, QByteArray& data );