hmatuschek / qdmr

A GUI application for configuring and programming cheap DMR radios under Linux and MacOS X.
https://dm3mat.darc.de/qdmr/
GNU General Public License v3.0
223 stars 46 forks source link

"takerAliasSource" in anytone_extension.hh should be "talkerAliasSource"? #350

Closed allesand closed 1 year ago

allesand commented 1 year ago

Is that a typo? B/c in the yaml it ends up as a config entry:

[...]
      sendTalkerAlias: false
      takerAliasSource: UserDB
      talkerAliasEncoding: ISO7
      encryption: DMR
      talkerAliasSource: UserDB
[...]
** anytone_extension.hh~    2023-06-01 21:50:26.000000000 +0200
--- anytone_extension.hh    2023-06-20 10:17:41.066453950 +0200
***************
*** 1513,1517 ****
    /** If @c true, the talker alias (name) is send. */
    Q_PROPERTY(bool sendTalkerAlias READ sendTalkerAlias WRITE enableSendTalkerAlias)
!   Q_PROPERTY(TalkerAliasSource takerAliasSource READ talkerAliasSource WRITE setTalkerAliasSource)
    Q_PROPERTY(TalkerAliasEncoding talkerAliasEncoding READ talkerAliasEncoding WRITE setTalkerAliasEncoding)

--- 1513,1517 ----
    /** If @c true, the talker alias (name) is send. */
    Q_PROPERTY(bool sendTalkerAlias READ sendTalkerAlias WRITE enableSendTalkerAlias)
!   Q_PROPERTY(TalkerAliasSource talkerAliasSource READ talkerAliasSource WRITE setTalkerAliasSource)
    Q_PROPERTY(TalkerAliasEncoding talkerAliasEncoding READ talkerAliasEncoding WRITE setTalkerAliasEncoding)
hmatuschek commented 1 year ago

Yes, it is.

allesand commented 1 year ago

Oh, and it is defined correctly a few lines below anyway?

$ make [ 0%] Generating moc_anytone_extension.cpp ../qdmr/lib/anytone_extension.hh:1653: Warning: The property 'talkerAliasSource' is defined multiple times in class AnytoneDMRSettingsExtension. ../qdmr/lib/anytone_extension.hh:1653: Warning: The property 'talkerAliasEncoding' is defined multiple times in class AnytoneDMRSettingsExtension.

So

*** anytone_extension.hh~   2023-06-20 10:27:23.000000000 +0200
--- anytone_extension.hh    2023-06-20 10:28:01.112134569 +0200
***************
*** 1513,1518 ****
    /** If @c true, the talker alias (name) is send. */
    Q_PROPERTY(bool sendTalkerAlias READ sendTalkerAlias WRITE enableSendTalkerAlias)
-   Q_PROPERTY(TalkerAliasSource talkerAliasSource READ talkerAliasSource WRITE setTalkerAliasSource)
-   Q_PROPERTY(TalkerAliasEncoding talkerAliasEncoding READ talkerAliasEncoding WRITE setTalkerAliasEncoding)

    /** The encryption type to be used. */
--- 1513,1516 ----

since line 1519 ff.:

 /** Specifies the talker alias source. */
  Q_PROPERTY(TalkerAliasSource talkerAliasSource READ talkerAliasSource WRITE setTalkerAliasSource)
  /** Specifies the talker alias encoding. */
  Q_PROPERTY(TalkerAliasEncoding talkerAliasEncoding READ talkerAliasEncoding WRITE setTalkerAliasEncoding)

Sorry, have to remember: compile first, then report :-)

hmatuschek commented 1 year ago

Oh, boy. Should be OK now. Thanks for spotting this.

allesand commented 1 year ago

You are welcome, thanks for your effort! Great progress with the Anytone extensions, very cool.