Commit e993561f authored by Don Gagne's avatar Don Gagne

Fix override of QWidget update signal

parent d18e0394
...@@ -66,7 +66,7 @@ Pixhawk3DWidget::Pixhawk3DWidget(QWidget* parent) ...@@ -66,7 +66,7 @@ Pixhawk3DWidget::Pixhawk3DWidget(QWidget* parent)
, mViewParamWidget(new ViewParamWidget(mGlobalViewParams, mSystemViewParamMap, this, parent)) , mViewParamWidget(new ViewParamWidget(mGlobalViewParams, mSystemViewParamMap, this, parent))
{ {
connect(m3DWidget, SIGNAL(sizeChanged(int,int)), this, SLOT(sizeChanged(int,int))); 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->setCameraParams(2.0f, 30.0f, 0.01f, 10000.0f);
m3DWidget->init(15.0f); m3DWidget->init(15.0f);
...@@ -1078,7 +1078,7 @@ Pixhawk3DWidget::sizeChanged(int width, int height) ...@@ -1078,7 +1078,7 @@ Pixhawk3DWidget::sizeChanged(int width, int height)
} }
void void
Pixhawk3DWidget::update(void) Pixhawk3DWidget::updateWidget(void)
{ {
MAV_FRAME frame = mGlobalViewParams->frame(); MAV_FRAME frame = mGlobalViewParams->frame();
......
...@@ -97,7 +97,7 @@ private slots: ...@@ -97,7 +97,7 @@ private slots:
void rotateTerrain(void); void rotateTerrain(void);
void sizeChanged(int width, int height); void sizeChanged(int width, int height);
void update(void); void updateWidget(void);
protected: protected:
void addModels(QVector< osg::ref_ptr<osg::Node> >& models, void addModels(QVector< osg::ref_ptr<osg::Node> >& models,
......
...@@ -176,7 +176,7 @@ protected slots: ...@@ -176,7 +176,7 @@ protected slots:
signals: signals:
void sizeChanged(int width, int height); void sizeChanged(int width, int height);
void update(void); void updateWidget(void);
protected: protected:
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment