[vlc-devel] [PATCH] qt: messages: use C++ atomic instead of Qt's

Alexandre Janniaux ajanni at videolabs.io
Tue Mar 10 22:08:43 CET 2020


Hi,

Ping for merge,

Regards,
--
Alexandre Janniaux
Videolabs

On Sun, Feb 23, 2020 at 08:34:24PM +0100, Alexandre Janniaux wrote:
> It removes a deprecation warning on QBasicAtomicInteger<T>::load which
> is not solvable with Qt 5.12 version at the same time.
> ---
>  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 );
>
> --
> 2.25.1
>


More information about the vlc-devel mailing list