diff --git a/src/ui/map3D/Pixhawk3DWidget.cc b/src/ui/map3D/Pixhawk3DWidget.cc index 543834c900dbb40d88ef58b38a6d17e357915b32..474b445be1e5440c2ae70e7048474664fc57e37b 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 3dbc64992fd41c1e4d8d22cbcd2841f47626eb3f..913875f7c1847dab2bb7e6f7380620c4e7b42282 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 >& models, diff --git a/src/ui/map3D/Q3DWidget.h b/src/ui/map3D/Q3DWidget.h index 037de8aa9b01916fe5bb3cdd10510602d25e3c43..245559e11bf880628572fb6ff729a72933cc4b8d 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: /**