From e993561f05d3c0eb89e6ae41a662ec40c2322f15 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Fri, 22 Aug 2014 18:35:49 -0700
Subject: [PATCH] Fix override of QWidget update signal

---
 src/ui/map3D/Pixhawk3DWidget.cc | 4 ++--
 src/ui/map3D/Pixhawk3DWidget.h  | 2 +-
 src/ui/map3D/Q3DWidget.h        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ui/map3D/Pixhawk3DWidget.cc b/src/ui/map3D/Pixhawk3DWidget.cc
index 543834c90..474b445be 100644
--- a/src/ui/map3D/Pixhawk3DWidget.cc
+++ b/src/ui/map3D/Pixhawk3DWidget.cc
@@ -66,7 +66,7 @@ Pixhawk3DWidget::Pixhawk3DWidget(QWidget* parent)
  , mViewParamWidget(new ViewParamWidget(mGlobalViewParams, mSystemViewParamMap, this, parent))
 {
     connect(m3DWidget, SIGNAL(sizeChanged(int,int)), this, SLOT(sizeChanged(int,int)));
-    connect(m3DWidget, SIGNAL(update()), this, SLOT(update()));
+    connect(m3DWidget, SIGNAL(updateWidget()), this, SLOT(updateWidget()));
 
     m3DWidget->setCameraParams(2.0f, 30.0f, 0.01f, 10000.0f);
     m3DWidget->init(15.0f);
@@ -1078,7 +1078,7 @@ Pixhawk3DWidget::sizeChanged(int width, int height)
 }
 
 void
-Pixhawk3DWidget::update(void)
+Pixhawk3DWidget::updateWidget(void)
 {
     MAV_FRAME frame = mGlobalViewParams->frame();
 
diff --git a/src/ui/map3D/Pixhawk3DWidget.h b/src/ui/map3D/Pixhawk3DWidget.h
index 3dbc64992..913875f7c 100644
--- a/src/ui/map3D/Pixhawk3DWidget.h
+++ b/src/ui/map3D/Pixhawk3DWidget.h
@@ -97,7 +97,7 @@ private slots:
     void rotateTerrain(void);
 
     void sizeChanged(int width, int height);
-    void update(void);
+    void updateWidget(void);
 
 protected:
     void addModels(QVector< osg::ref_ptr<osg::Node> >& models,
diff --git a/src/ui/map3D/Q3DWidget.h b/src/ui/map3D/Q3DWidget.h
index 037de8aa9..245559e11 100644
--- a/src/ui/map3D/Q3DWidget.h
+++ b/src/ui/map3D/Q3DWidget.h
@@ -176,7 +176,7 @@ protected slots:
 
 signals:
     void sizeChanged(int width, int height);
-    void update(void);
+    void updateWidget(void);
 
 protected:
     /**
-- 
2.22.0