From 30e9ca4a839a550cfc80e6cbc5130bebddf067e4 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Sun, 6 Jul 2014 17:10:11 +0200
Subject: [PATCH] Build fixes for Mac OS

---
 src/GAudioOutput.cc | 2 +-
 src/GAudioOutput.h  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc
index f9e36d93e..57f47bc6d 100644
--- a/src/GAudioOutput.cc
+++ b/src/GAudioOutput.cc
@@ -221,7 +221,7 @@ bool GAudioOutput::say(QString text, int severity)
             // Slashes necessary to have the right start to the sentence
             // copying data prevents SpeakString from reading additional chars
             text = "\\" + text;
-            QStdWString str = text.toStdWString();
+            std::wstring str = text.toStdWString();
             unsigned char str2[1024] = {};
             memcpy(str2, text.toLatin1().data(), str.length());
             SpeakString(str2);
diff --git a/src/GAudioOutput.h b/src/GAudioOutput.h
index ca8c2247d..dbf3b60be 100644
--- a/src/GAudioOutput.h
+++ b/src/GAudioOutput.h
@@ -36,8 +36,8 @@ This file is part of the PIXHAWK project
 #include <QTimer>
 #include <QStringList>
 #ifdef Q_OS_MAC
-#include <MediaObject>
-#include <AudioOutput>
+//#include <MediaObject>
+//#include <AudioOutput>
 #endif
 #ifdef Q_OS_LINUX
 //#include <phonon/MediaObject>
-- 
2.22.0