Mercurial > ldforge / file diff

--- a/src/crashcatcher.cc	Tue Jan 07 12:06:12 2014 +0200
+++ b/src/crashcatcher.cc	Tue Jan 07 12:21:46 2014 +0200
@@ -33,7 +33,7 @@
 static bool g_crashCatcherActive = false;
 
 // If an assertion failed, what was it?
-static str g_assertionFailure;
+static QString g_assertionFailure;
 
 // List of signals to catch and crash on
 static QList<int> g_signalsToCatch ({
@@ -64,9 +64,9 @@
 	if (commandsFile.open())
 	{
 		commandsFile.write (fmt ("attach %1\n", pid).toLocal8Bit());
-		commandsFile.write (str ("backtrace full\n").toLocal8Bit());
-		commandsFile.write (str ("detach\n").toLocal8Bit());
-		commandsFile.write (str ("quit").toLocal8Bit());
+		commandsFile.write (QString ("backtrace full\n").toLocal8Bit());
+		commandsFile.write (QString ("detach\n").toLocal8Bit());
+		commandsFile.write (QString ("quit").toLocal8Bit());
 		commandsFile.flush();
 		commandsFile.close();
 	}
@@ -81,8 +81,8 @@
 	prctl (PR_SET_PTRACER, proc.pid(), 0, 0, 0);
 
 	proc.waitForFinished (1000);
-	str output = QString (proc.readAllStandardOutput());
-	str err = QString (proc.readAllStandardError());
+	QString output = QString (proc.readAllStandardOutput());
+	QString err = QString (proc.readAllStandardError());
 
 	bombBox (fmt ("<h3>Program crashed with signal %1</h3>\n\n"
 		"%2"
@@ -115,7 +115,7 @@
 // -----------------------------------------------------------------------------
 void assertionFailure (const char* file, int line, const char* funcname, const char* expr)
 {
-	str errmsg = fmt (
+	QString errmsg = fmt (
 		"<p><b>File</b>: <tt>%1</tt><br />"
 		"<b>Line</b>: <tt>%2</tt><br />"
 		"<b>Function:</b> <tt>%3</tt></p>"