merge master

1 files changed, 18 insertions, 17 deletions

diff --git a/src/printutils.cc b/src/printutils.cc
index a315ab3..ec41765 100644
--- a/src/printutils.cc
+++ b/src/printutils.cc
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <QDate>
 
-QList<QString> print_messages_stack;
+std::list<std::string> print_messages_stack;
 OutputHandlerFunc *outputhandler = NULL;
 void *outputhandler_data = NULL;
 
@@ -14,37 +14,38 @@ void set_output_handler(OutputHandlerFunc *newhandler, void *userdata)
 
 void print_messages_push()
 {
-	print_messages_stack.append(QString());
+	print_messages_stack.push_back(std::string());
 }
 
 void print_messages_pop()
 {
-	QString msg = print_messages_stack.takeLast();
-	if (print_messages_stack.size() > 0 && !msg.isNull()) {
-		if (!print_messages_stack.last().isEmpty())
-			print_messages_stack.last() += "\n";
-		print_messages_stack.last() += msg;
+	std::string msg = print_messages_stack.back();
+	print_messages_stack.pop_back();
+	if (print_messages_stack.size() > 0 && !msg.empty()) {
+		if (!print_messages_stack.back().empty()) {
+			print_messages_stack.back() += "\n";
+		}
+		print_messages_stack.back() += msg;
 	}
 }
 
-void PRINT(const QString &msg)
+void PRINT(const std::string &msg)
 {
-	if (msg.isNull())
-		return;
+	if (msg.empty()) return;
 	if (print_messages_stack.size() > 0) {
-		if (!print_messages_stack.last().isEmpty())
-			print_messages_stack.last() += "\n";
-		print_messages_stack.last() += msg;
+		if (!print_messages_stack.back().empty()) {
+			print_messages_stack.back() += "\n";
+		}
+		print_messages_stack.back() += msg;
 	}
 	PRINT_NOCACHE(msg);
 }
 
-void PRINT_NOCACHE(const QString &msg)
+void PRINT_NOCACHE(const std::string &msg)
 {
-	if (msg.isNull())
-		return;
+	if (msg.empty()) return;
 	if (!outputhandler) {
-		fprintf(stderr, "%s\n", msg.toUtf8().data());
+		fprintf(stderr, "%s\n", msg.c_str());
 	} else {
 		outputhandler(msg, outputhandler_data);
 	}