Commit 311a82ae authored by John Tapsell's avatar John Tapsell

Fix stupid small compilation mistakes that I made in the last merge

parent d403e613
...@@ -578,6 +578,11 @@ void QGCToolWidget::addLabel() ...@@ -578,6 +578,11 @@ void QGCToolWidget::addLabel()
{ {
QGCTextLabel* label= new QGCTextLabel(this); QGCTextLabel* label= new QGCTextLabel(this);
connect(label, SIGNAL(destroyed()), this, SLOT(storeSettings())); connect(label, SIGNAL(destroyed()), this, SLOT(storeSettings()));
if (ui->hintLabel)
{
ui->hintLabel->deleteLater();
ui->hintLabel = NULL;
}
toolLayout->addWidget(label); toolLayout->addWidget(label);
label->startEditMode(); label->startEditMode();
} }
......
...@@ -95,7 +95,7 @@ protected: ...@@ -95,7 +95,7 @@ protected:
void hideEvent(QHideEvent* event); void hideEvent(QHideEvent* event);
public slots: public slots:
void setTitle(QString title); void setTitle(const QString &title);
void addParam(int uas,int component,QString paramname,QVariant value); void addParam(int uas,int component,QString paramname,QVariant value);
protected slots: protected slots:
void addParam(); void addParam();
...@@ -103,9 +103,6 @@ protected slots: ...@@ -103,9 +103,6 @@ protected slots:
void addLabel(); void addLabel();
void setTitle(); void setTitle();
void setWindowTitle(const QString& title);
private: private:
Ui::QGCToolWidget *ui; Ui::QGCToolWidget *ui;
}; };
......
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