vlc | branch: master | Alexandre Janniaux <[email protected]> | Sun Feb 23 20:34:24 2020 +0100| [c5e302585ee0e02080400fde79a9aa27de01e2a9] | committer: Marvin Scholz
qt: messages: use C++ atomic instead of Qt's It removes a deprecation warning on QBasicAtomicInteger<T>::load which is not solvable with Qt 5.12 version at the same time. Signed-off-by: Marvin Scholz <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c5e302585ee0e02080400fde79a9aa27de01e2a9 --- modules/gui/qt/dialogs/messages/messages.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt/dialogs/messages/messages.hpp b/modules/gui/qt/dialogs/messages/messages.hpp index c2fd2850d1..91571f2d35 100644 --- a/modules/gui/qt/dialogs/messages/messages.hpp +++ b/modules/gui/qt/dialogs/messages/messages.hpp @@ -28,7 +28,7 @@ #include "dialogs/messages/ui_messages_panel.h" #include <stdarg.h> #include <QMutex> -#include <QAtomicInt> +#include <atomic> class QPushButton; class QTreeWidget; @@ -48,7 +48,7 @@ private: void sinkMessage( const MsgEvent * ); bool matchFilter( const QString& ); - QAtomicInt verbosity; + std::atomic<int> verbosity; static void MsgCallback( void *, int, const vlc_log_t *, const char *, va_list ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
