[vlc-commits] [Git][videolan/vlc][3.0.x] 29 commits: gui/qt: Fix invalid widget in buddy

Tue Feb 4 13:36:12 UTC 2025

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC

Commits:
812fdf10 by Marvin Scholz at 2025-02-04T13:07:54+00:00
gui/qt: Fix invalid widget in buddy

This fixes the warning: "Buddy assignment is not a valid widget" caused
by referencing an invalid widget as buddy for the mmdevice label.

(cherry picked from commit a7f623dd3225b2a07532142660184a046d1fa920)

- - - - -
86eff076 by Alexandre Janniaux at 2025-02-04T13:07:54+00:00
qt: EPGChannels: use std::sort instead of qSort

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit c49140dcff3a2ba2729cec8756c7f78b198d50c9)

- - - - -
cdf0eaad by Alexandre Janniaux at 2025-02-04T13:07:54+00:00
qt: EPGChannels: replace deprecated QFontMetrics::width

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 9a11d6198baf46f4a42ab33f87b6688532815a0f) (edited)
edited:
- the API is only available since Qt 5.11

- - - - -
d7b0eeb1 by Alexandre Janniaux at 2025-02-04T13:07:54+00:00
qt: extended_panels: replace deprecated QFontMetrics::width

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 5a62d2aa2fdfd76ce9aa96dc17975f1ec90b0a07) (edited)
edited:
- horizontalAdvance() was added in 5.11 https://doc.qt.io/qt-5/qfontmetrics.html#horizontalAdvance

- - - - -
de46ad7e by Alexandre Janniaux at 2025-02-04T13:07:54+00:00
qt: replace deprecated qVariantFromValue by QVariant::fromValue

They are warned as obsolete in Qt 5.14, and were historic workaround
for MSVC builds.

Signed-off-by: Thomas Guillem <thomas at gllm.fr>
(cherry picked from commit f8aa7058fab0452024a0b769f549d9e663a9cde8) (edited)
edited:
- the file was moved in 4.0

- - - - -
6f0a9ec6 by Alexandre Janniaux at 2025-02-04T13:07:54+00:00
qt: info_panels: replace deprecated QString::sprintf

QString::sprintf is deprecated in Qt 5.14, so use QString::setNum
instead. As we always use the same precision, width and format, enforce
it in the macro itself too.

Signed-off-by: Thomas Guillem <thomas at gllm.fr>
(cherry picked from commit 50d57469219f82981856a18a2698cf349e9b951c) (edited)
edited:
- on 4.0 the stats come from a local variable

- - - - -
f537d0e1 by Alexandre Janniaux at 2025-02-04T13:07:54+00:00
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 <epirat07 at gmail.com>
(cherry picked from commit c5e302585ee0e02080400fde79a9aa27de01e2a9) (edited)
edited:
- the file was moved on 4.0

- - - - -
5a48655d by Pierre Lamot at 2025-02-04T13:07:54+00:00
qt: QLinkedList is deprecated in Qt 5.15

(cherry picked from commit 28bc7efdabd040b8d66eb17ffbbacaefcb1a8d4f) (edited)
edited:
- the files were moved on 4.0

- - - - -
952f7990 by Pierre Lamot at 2025-02-04T13:07:54+00:00
qt: QGraphicsView::setMatrix is deprecated since Qt 5.15

(cherry picked from commit be856f33c6798067816a4e224786cc7d5d84c99f) (edited)
edited:
- the file was moved on 4.0

- - - - -
880ae34d by Pierre Lamot at 2025-02-04T13:07:54+00:00
qt: constructing QFlags from int is deprecated since Qt 5.15

  Zero initializing can be done with default constructor. here the default
  value of the parameter.

(cherry picked from commit f2d32344cfe9638f48981e067d0d94bfe95bf4d7) (edited)
edited:
- the files were moved on 4.0

- - - - -
9072173b by Pierre Lamot at 2025-02-04T13:07:54+00:00
qt: using QMap as multimap is deprecated in Qt5.15

(cherry picked from commit 78708b273d07c5387c30772de365674dc690b5dc) (edited)
edited:
- 3.0 doesn't have navigation_history.cpp
- the const iterator was using the wrong type

- - - - -
20435308 by Fatih Uzunoglu at 2025-02-04T13:07:54+00:00
qt: use Qt::SkipEmptyParts in newer Qt version

It's gone in recent versions of Qt.

(cherry picked from commit ecebe9fc1db5c9952e64a1d8b31ac5026a096ac0) (edited)
edited:
- the change was also needed in controller.cpp and bookmarks.cpp
- 3.0 doesn't have playercontrolbarmodel.cpp

- - - - -
928c8e9f by Fatih Uzunoglu at 2025-02-04T13:07:54+00:00
qt: fix QDateTime warning when Qt 5.14 is used

Signed-off-by: Pierre Lamot <pierre at videolabs.io>
(cherry picked from commit 9da7c8c4f9d2f90c151decc0ec61a6db474f850d) (edited)
edited:
- the file was moved in 4.0

- - - - -
674f3b58 by Marvin Scholz at 2025-02-04T13:07:54+00:00
gui/qt: do not use deprecated SystemLocaleLongDate

(cherry picked from commit dcb97734fd4597a6b648f3b55ba7af6c5b7ce269) (edited)
edited:
- the file was moved in 4.0

- - - - -
0d53ece6 by Lyndon Brown at 2025-02-04T13:07:54+00:00
qt: purge more redundant includes

Note that in some cases they have been changed to forward declarations, and
in some they have been moved, for instance inclusion of `<QUrl>` was moved
from `qt.hpp` to where it was needed.

(cherry picked from commit b86a9ce6833c17f37d87b30be0b5181a06d6ac6b) (edited)
edited:
- 4.0 has more files
- some files were moved in 4.0

- - - - -
ec16474c by Steve Lhomme at 2025-02-04T13:07:54+00:00
qt: add missing includes

- - - - -
9399cc21 by Alexandre Janniaux at 2025-02-04T13:07:54+00:00
qt: preferences_widgets: use override

... instead of Q_DECL_OVERRIDE, since it always expand to override for
>=C++11 configuration, and the module uses C++11 anyway.

(cherry picked from commit 8d838e7ea2abe99dbb4a51d5e3212524767c0689) (edited)
edited:
- only a few select methods were updated and they are different in 3.0 but on
  the same classes

- - - - -
8e8a41ac by Johannes Kauffmann at 2025-02-04T13:07:54+00:00
qt: open_panels: add missing override

(cherry picked from commit 64f86598c61f5666379c180a311626b89eff0979) (edited)
edited:
- the file was moved in 4.0

- - - - -
732b92b6 by Pierre Lamot at 2025-02-04T13:07:54+00:00
qt: fix ambiguous string construction

(cherry picked from commit a8d3ae63820ade765c1e21c1d8d44ab37c396e81) (edited)
edited:
- the file was moved in 4.0

- - - - -
d2d42290 by Steve Lhomme at 2025-02-04T13:07:54+00:00
qt: fix UTF-8 string usage

(cherry picked from commit bbb9f6a07adfd20c544d29198ea2fec601bf3e62) (edited)
edited:
- 3.0 doesn't have expert_model.cpp
- files were moved in 4.0

- - - - -
29e931a9 by Ilkka Ollakka at 2025-02-04T13:07:54+00:00
qt: convert fromTime_t to fromSecsSinceEpoch

fromTime_t has been deprecated and fromSecsSinceEpoch looks like drop-in replacement in our use

(cherry picked from commit 8a5bcc93c08d714f82e25a60461dd7fa88e443b5) (edited)
edited:
- 3.0 doesn't have mlrecentsmodel.cpp and mlurlmodel.cpp
- the files were moved in 4.0
- the API is only available since Qt 5.8

- - - - -
66f095c3 by Ilkka Ollakka at 2025-02-04T13:07:54+00:00
qt: replace setMargin with setContentsMargins

setMargin has been deprecated and shouldn't be used

(cherry picked from commit ed986711c159499b873157d4e5d4a53026d94719) (edited)
edited:
- files were moved in 4.0

- - - - -
3293e98a by Ilkka Ollakka at 2025-02-04T13:07:54+00:00
qt: remove QDirModel include

It has been deprecated since qt4.7 and only use seemed to be in commented out code

(cherry picked from commit 9d4e884c7452f1919dfc1d264c683778cc60d630) (edited)
edited:
- the file was moved in 4.0

- - - - -
a22fe6c9 by Fatih Uzunoglu at 2025-02-04T13:07:54+00:00
qt: use different overload for QDateTime::fromSecsSinceEpoch()

Before Qt 6.5, it is necessary to provide the timezone explicitly.

(cherry picked from commit cfef77dd5da1ae259e2bf7937e6e05846f39dd15) (edited)
edited:
- the code in 3.0 has a check for Qt 5.8
- 3.0 doesn't have mlrecentsmodel.cpp, mlurlmodel.cpp and networkmediamodel.cpp
- files were moved in 4.0

- - - - -
6cf18cc5 by Fatih Uzunoglu at 2025-02-04T13:07:54+00:00
qt: use QRegularExpression instead of QRegex

Co-authored-by: Pierre Lamot <pierre at videolabs.io>
(cherry picked from commit d32667992e3fca21f49d35e6294b581d4443d3ad) (edited)
edited:
- the files were moved in 4.0
- 3.0 doesn't have sortfilterproxymodel.cpp
- 3.0 already backport 37480bc2294f58881f4dfa49b5e0204a64bc7cba

- - - - -
4e553110 by Fatih Uzunoglu at 2025-02-04T13:07:54+00:00
qt: use QTimeZone::systemTimeZone() instead of QTimeZone::utc()

(cherry picked from commit a1b6ba86ca054298425e93d8dc669e9e811a3f40) (edited)
edited:
- the code in 3.0 has a check for Qt 5.8
- 3.0 doesn't have mlrecentsmodel.cpp, mlurlmodel.cpp and networkmediamodel.cpp
- the files were moved in 4.0

- - - - -
a572d691 by Steve Lhomme at 2025-02-04T13:07:54+00:00
qt: use override+virtual

from 2abc4460ce175e812670b551e12412ee427786f2

- - - - -
1b50b8af by Johannes Kauffmann at 2025-02-04T13:07:54+00:00
qt: egp: use override

(cherry picked from commit 5d9b04653b939a8f7e93c50f49248515633b4455) (edited)
edited:
- the files moved in 4.0

- - - - -
3e646442 by Steve Lhomme at 2025-02-04T13:07:54+00:00
qt: remove virtual on override methods

It's implied.

(cherry picked from commit 324b9f5a730318b9206f5061db7825d738e3e63b) (edited)
- the files moved in 4.0
- a lot of 4.0 files are not in 3.0

- - - - -

30 changed files:

- modules/gui/qt/adapters/chromaprint.cpp
- modules/gui/qt/components/complete_preferences.cpp
- modules/gui/qt/components/controller.cpp
- modules/gui/qt/components/epg/EPGChannels.cpp
- modules/gui/qt/components/epg/EPGChannels.hpp
- modules/gui/qt/components/epg/EPGItem.cpp
- modules/gui/qt/components/epg/EPGItem.hpp
- modules/gui/qt/components/epg/EPGProgram.cpp
- modules/gui/qt/components/epg/EPGRuler.hpp
- modules/gui/qt/components/epg/EPGView.cpp
- modules/gui/qt/components/epg/EPGView.hpp
- modules/gui/qt/components/epg/EPGWidget.cpp
- modules/gui/qt/components/epg/EPGWidget.hpp
- modules/gui/qt/components/extended_panels.cpp
- modules/gui/qt/components/extended_panels.hpp
- modules/gui/qt/components/info_panels.cpp
- modules/gui/qt/components/info_widgets.cpp
- modules/gui/qt/components/info_widgets.hpp
- modules/gui/qt/components/interface_widgets.cpp
- modules/gui/qt/components/interface_widgets.hpp
- modules/gui/qt/components/open_panels.cpp
- modules/gui/qt/components/open_panels.hpp
- modules/gui/qt/components/playlist/playlist_model.cpp
- modules/gui/qt/components/playlist/playlist_model.hpp
- modules/gui/qt/components/playlist/standardpanel.cpp
- modules/gui/qt/components/preferences_widgets.cpp
- modules/gui/qt/components/preferences_widgets.hpp
- modules/gui/qt/components/simple_preferences.cpp
- modules/gui/qt/components/sout/profile_selector.cpp
- modules/gui/qt/components/sout/sout_widgets.cpp

The diff was not included because it is too large.

View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/71ad405fde6a00fa0b139d57cd152a9b78a8b9b8...3e64644242783c68892262b11c178a1c668ab14a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/71ad405fde6a00fa0b139d57cd152a9b78a8b9b8...3e64644242783c68892262b11c178a1c668ab14a
You're receiving this email because of your account on code.videolan.org.

VideoLAN code repository instance