Browse Source

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

QGC4.4
John Tapsell 12 years ago
parent
commit
311a82aea1
  1. 5
      src/ui/designer/QGCToolWidget.cc
  2. 5
      src/ui/designer/QGCToolWidget.h

5
src/ui/designer/QGCToolWidget.cc

@ -578,6 +578,11 @@ void QGCToolWidget::addLabel() @@ -578,6 +578,11 @@ void QGCToolWidget::addLabel()
{
QGCTextLabel* label= new QGCTextLabel(this);
connect(label, SIGNAL(destroyed()), this, SLOT(storeSettings()));
if (ui->hintLabel)
{
ui->hintLabel->deleteLater();
ui->hintLabel = NULL;
}
toolLayout->addWidget(label);
label->startEditMode();
}

5
src/ui/designer/QGCToolWidget.h

@ -95,7 +95,7 @@ protected: @@ -95,7 +95,7 @@ protected:
void hideEvent(QHideEvent* event);
public slots:
void setTitle(QString title);
void setTitle(const QString &title);
void addParam(int uas,int component,QString paramname,QVariant value);
protected slots:
void addParam();
@ -103,9 +103,6 @@ protected slots: @@ -103,9 +103,6 @@ protected slots:
void addLabel();
void setTitle();
void setWindowTitle(const QString& title);
private:
Ui::QGCToolWidget *ui;
};

Loading…
Cancel
Save