[vlc-commits] qt: soutchain: make soutchain copyable

Steve Lhomme git at videolan.org
Mon Nov 4 16:53:17 CET 2019


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Nov  4 13:47:32 2019 +0100| [1857d6508938087cde8f2113bb36ae0ed03bbfe9] | committer: Steve Lhomme

qt: soutchain: make soutchain copyable

Qt requires container elements to be copyable, https://bugreports.qt.io/browse/QTBUG-54685
but class with const members can't be copy-assignable. Remove the const values
so that we can copy SoutChain.

This patch fix the compilation with Clang 9.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1857d6508938087cde8f2113bb36ae0ed03bbfe9
---

 modules/gui/qt/util/soutchain.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt/util/soutchain.hpp b/modules/gui/qt/util/soutchain.hpp
index 2bfac37764..c593738e0d 100644
--- a/modules/gui/qt/util/soutchain.hpp
+++ b/modules/gui/qt/util/soutchain.hpp
@@ -45,7 +45,7 @@ public:
 private:
     typedef QPair<QString, SoutOption> OptionPairType;
     typedef QList<OptionPairType> OptionsType;
-    const QString moduleName;
+    QString moduleName;
     OptionsType options;
 };
 
@@ -81,9 +81,9 @@ public:
 
 private:
     enum Kind{ String, Nested };
-    const Kind kind;
-    const QString stringValue;
-    const SoutModule nestedModule;
+    Kind kind;
+    QString stringValue;
+    SoutModule nestedModule;
 };
 
 



More information about the vlc-commits mailing list