From cb6e40f065f4f223a524ef5ff3797287ec68f0ab Mon Sep 17 00:00:00 2001
From: pixhawk <tv@.(none)>
Date: Thu, 20 Jan 2011 21:05:33 +0100
Subject: [PATCH] Fixed minor compile errors
---
src/ui/HSIDisplay.cc | 2 +-
src/ui/uas/UASView.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ui/HSIDisplay.cc b/src/ui/HSIDisplay.cc
index d7a203ccc0..2b7da31cd9 100644
--- a/src/ui/HSIDisplay.cc
+++ b/src/ui/HSIDisplay.cc
@@ -678,7 +678,7 @@ void HSIDisplay::drawWaypoints(QPainter& painter)
{
if (uas)
{
- const QVector<Waypoint*>& list = uas->getWaypointManager().getWaypointList();
+ const QVector<Waypoint*>& list = uas->getWaypointManager()->getWaypointList();
// for (int i = 0; i < list.size(); i++)
// {
// QPointF in(list.at(i)->getX(), list.at(i)->getY());
diff --git a/src/ui/uas/UASView.cc b/src/ui/uas/UASView.cc
index c387583c0b..3a3f0d7d8c 100644
--- a/src/ui/uas/UASView.cc
+++ b/src/ui/uas/UASView.cc
@@ -83,7 +83,7 @@ UASView::UASView(UASInterface* uas, QWidget *parent) :
connect(uas, SIGNAL(loadChanged(UASInterface*, double)), this, SLOT(updateLoad(UASInterface*, double)));
connect(uas, SIGNAL(heartbeatTimeout()), this, SLOT(heartbeatTimeout()));
connect(uas, SIGNAL(waypointSelected(int,int)), this, SLOT(selectWaypoint(int,int)));
- connect(&(uas->getWaypointManager()), SIGNAL(currentWaypointChanged(quint16)), this, SLOT(currentWaypointUpdated(quint16)));
+ connect(uas->getWaypointManager(), SIGNAL(currentWaypointChanged(quint16)), this, SLOT(currentWaypointUpdated(quint16)));
connect(uas, SIGNAL(systemTypeSet(UASInterface*,uint)), this, SLOT(setSystemType(UASInterface*,uint)));
connect(UASManager::instance(), SIGNAL(activeUASStatusChanged(UASInterface*,bool)), this, SLOT(updateActiveUAS(UASInterface*,bool)));
--
GitLab