Browse Source

Merge pull request #3505 from dogmaphobic/restoreSignal

Restoring link change signal.
QGC4.4
Gus Grubba 9 years ago
parent
commit
7b8f0a1468
  1. 3
      src/comm/LinkConfiguration.cc
  2. 3
      src/comm/LinkConfiguration.h

3
src/comm/LinkConfiguration.cc

@ -158,5 +158,8 @@ void LinkConfiguration::setName(const QString name)
void LinkConfiguration::setLink(LinkInterface* link) void LinkConfiguration::setLink(LinkInterface* link)
{ {
if(_link != link) {
_link = link; _link = link;
emit linkChanged(link);
}
} }

3
src/comm/LinkConfiguration.h

@ -28,7 +28,7 @@ public:
virtual ~LinkConfiguration() {} virtual ~LinkConfiguration() {}
Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
Q_PROPERTY(LinkInterface* link READ link WRITE setLink) Q_PROPERTY(LinkInterface* link READ link WRITE setLink NOTIFY linkChanged)
Q_PROPERTY(LinkType linkType READ type CONSTANT) Q_PROPERTY(LinkType linkType READ type CONSTANT)
Q_PROPERTY(bool dynamic READ isDynamic WRITE setDynamic NOTIFY dynamicChanged) Q_PROPERTY(bool dynamic READ isDynamic WRITE setDynamic NOTIFY dynamicChanged)
Q_PROPERTY(bool autoConnect READ isAutoConnect WRITE setAutoConnect NOTIFY autoConnectChanged) Q_PROPERTY(bool autoConnect READ isAutoConnect WRITE setAutoConnect NOTIFY autoConnectChanged)
@ -180,6 +180,7 @@ signals:
void nameChanged (const QString& name); void nameChanged (const QString& name);
void dynamicChanged (); void dynamicChanged ();
void autoConnectChanged (); void autoConnectChanged ();
void linkChanged (LinkInterface* link);
protected: protected:
LinkInterface* _link; ///< Link currently using this configuration (if any) LinkInterface* _link; ///< Link currently using this configuration (if any)

Loading…
Cancel
Save