From d0a07f19f03c94e6addc57e2d65a52787c491498 Mon Sep 17 00:00:00 2001
From: lm <pixhawk@pixhawk02.(none)>
Date: Thu, 8 Apr 2010 18:02:37 +0200
Subject: [PATCH] Stability changes

---
 src/GAudioOutput.cc          | 2 +-
 src/comm/MAVLinkXMLParser.cc | 7 +++++--
 src/ui/MainWindow.cc         | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc
index 6f17bfc..9ebd104 100644
--- a/src/GAudioOutput.cc
+++ b/src/GAudioOutput.cc
@@ -83,7 +83,7 @@ voice(NULL),
 voiceIndex(0),
 emergency(false)
 {
-#if Q_OS_LINUX
+#ifdef Q_OS_LINUX
     flite_init();
 #endif
     m_media = new Phonon::MediaObject(this);
diff --git a/src/comm/MAVLinkXMLParser.cc b/src/comm/MAVLinkXMLParser.cc
index 4b65778..314ded9 100644
--- a/src/comm/MAVLinkXMLParser.cc
+++ b/src/comm/MAVLinkXMLParser.cc
@@ -180,9 +180,10 @@ bool MAVLinkXMLParser::generate()
     QDateTime now = QDateTime::currentDateTime().toUTC();
     QString dateFormat = "dddd, MMMM d yyyy, hh:mm UTC";
     QString date = now.toString(dateFormat);
-    QString mainHeader = QString("/** @file\n *\t@brief MAVLink comm protocol.\n *\t@see http://pixhawk.ethz.ch/software/mavlink\n *\t Generated on %1\n */\n#ifndef MAVLINK_H\n#define MAVLINK_H\n\n#include \"protocol.h\"\n\n\n").arg(date); // The main header includes all messages
+    QString mainHeader = QString("/** @file\n *\t@brief MAVLink comm protocol.\n *\t@see http://pixhawk.ethz.ch/software/mavlink\n *\t Generated on %1\n */\n#ifndef MAVLINK_H\n#define MAVLINK_H\n\n").arg(date); // The main header includes all messages
     // Mark all code as C code
-    mainHeader += "#ifdef __cplusplus\nextern \"C\" {\n#endif\n";
+    mainHeader += "#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n";
+    mainHeader += "\n#include \"protocol.h\"\n";
     QString includeLine = "#include \"%1\"\n";
     QString mainHeaderName = "mavlink.h";
     QString messagesDirName = "generated";
@@ -200,6 +201,8 @@ bool MAVLinkXMLParser::generate()
 
     mainHeader += "#ifdef __cplusplus\n}\n#endif\n";
     mainHeader += "#endif";
+    // Newline to make compiler happy
+    mainHeader += "\n";
 
     // Write main header
     QFile rawHeader(outputDirName + "/" + mainHeaderName);
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 4da7172..e52d42f 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -172,7 +172,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     LinkManager::instance()->addProtocol(simulationLink, mavlink);
     //CommConfigurationWindow* simulationWidget = new CommConfigurationWindow(simulationLink, mavlink, this);
     //ui.menuNetwork->addAction(commWidget->getAction());
-    simulationLink->connect();
+    //simulationLink->connect();
 }
 
 MainWindow::~MainWindow()