Browse Source

Merge pull request #2783 from DonLakeFlyer/ConnectSlot

Fix bad connection
QGC4.4
Don Gagne 9 years ago
parent
commit
29c9afb3a4
  1. 4
      src/ui/uas/UASQuickView.cc
  2. 2
      src/ui/uas/UASQuickView.h

4
src/ui/uas/UASQuickView.cc

@ -41,7 +41,7 @@ UASQuickView::UASQuickView(QWidget *parent) : QWidget(parent),
QAction *action = new QAction("Add/Remove Items",this); QAction *action = new QAction("Add/Remove Items",this);
action->setCheckable(false); action->setCheckable(false);
connect(action,&QAction::triggered,this, static_cast<void (UASQuickView::*)(bool)>(&UASQuickView::actionTriggered)); connect(action,&QAction::triggered,this, &UASQuickView::addActionTriggered);
this->addAction(action); this->addAction(action);
QAction *columnaction = new QAction("Set Column Count",this); QAction *columnaction = new QAction("Set Column Count",this);
@ -75,7 +75,7 @@ void UASQuickView::columnActionTriggered()
saveSettings(); saveSettings();
} }
void UASQuickView::actionTriggered() void UASQuickView::addActionTriggered()
{ {
if (quickViewSelectDialog) if (quickViewSelectDialog)
{ {

2
src/ui/uas/UASQuickView.h

@ -61,7 +61,7 @@ signals:
public slots: public slots:
void valueChanged(const int uasid, const QString& name, const QString& unit, const QVariant& value,const quint64 msecs); void valueChanged(const int uasid, const QString& name, const QString& unit, const QVariant& value,const quint64 msecs);
void actionTriggered(bool checked); void actionTriggered(bool checked);
void actionTriggered(); void addActionTriggered();
void updateTimerTick(); void updateTimerTick();
void selectDialogClosed(); void selectDialogClosed();
void valueEnabled(QString value); void valueEnabled(QString value);

Loading…
Cancel
Save