diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-12-07 09:58:28 -0800 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-12-07 19:48:54 +0000 |
| commit | 0af0532ccd9e39372f13238c63519fb04977974f (patch) | |
| tree | d4cdb2c5575951496b99ac61cf23d23585998a69 | |
| parent | fa47c368c6ea29c71e7a0d80aa42f8632f335fb8 (diff) | |
| download | wireshark-0af0532ccd9e39372f13238c63519fb04977974f.tar.gz wireshark-0af0532ccd9e39372f13238c63519fb04977974f.tar.bz2 wireshark-0af0532ccd9e39372f13238c63519fb04977974f.zip | |
Qt: Fixup the currentOutputDeviceName Q_PROPERTY.
The CONSTANT attribute indicates that the same value will be returned
every time. That isn't the case here so remove it.
Change-Id: Ie7451e6aabcb4fa1a6960762d96ad190f32b3d7a
Reviewed-on: https://code.wireshark.org/review/19130
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | ui/qt/rtp_player_dialog.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/rtp_player_dialog.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp index 35274cb3f0..22ab5d0897 100644 --- a/ui/qt/rtp_player_dialog.cpp +++ b/ui/qt/rtp_player_dialog.cpp @@ -733,7 +733,7 @@ int RtpPlayerDialog::getHoveredPacket() // Used by RtpAudioStreams to initialize QAudioOutput. We could alternatively // pass the corresponding QAudioDeviceInfo directly. -const QString RtpPlayerDialog::currentOutputDeviceName() +QString RtpPlayerDialog::currentOutputDeviceName() { return ui->outputDeviceComboBox->currentText(); } diff --git a/ui/qt/rtp_player_dialog.h b/ui/qt/rtp_player_dialog.h index 0067c6f3e9..0c0bfd9dda 100644 --- a/ui/qt/rtp_player_dialog.h +++ b/ui/qt/rtp_player_dialog.h @@ -46,7 +46,7 @@ class RtpAudioStream; class RtpPlayerDialog : public WiresharkDialog { Q_OBJECT - Q_PROPERTY(QString currentOutputDeviceName READ currentOutputDeviceName CONSTANT) + Q_PROPERTY(QString currentOutputDeviceName READ currentOutputDeviceName) public: explicit RtpPlayerDialog(QWidget &parent, CaptureFile &cf); @@ -135,7 +135,7 @@ private: double getLowestTimestamp(); const QString getHoveredTime(); int getHoveredPacket(); - const QString currentOutputDeviceName(); + QString currentOutputDeviceName(); #else // QT_MULTIMEDIA_LIB private: |