Fix build errors from deprecated QByteArray::count(), QVariant::type(), QEventPoint::pos()
#9961
+24
−19
Commits on Oct 15, 2024
-
Fix build errors from deprecated QByteArray::count()
In file included from /build/source/build/src/mozillavpn_autogen/UM7GZO45JR/../../../../src/platforms/linux/daemon/dnsutilslinux.h:12, from /build/source/build/src/mozillavpn_autogen/UM7GZO45JR/../../../../src/platforms/linux/daemon/dbusservice.h:13, from /build/source/build/src/mozillavpn_autogen/UM7GZO45JR/moc_dbusservice.cpp:9, from /build/source/build/src/mozillavpn_autogen/mocs_compilation.cpp:88: /build/source/build/src/mozillavpn_autogen/UM7GZO45JR/../../../../src/platforms/linux/daemon/dbustypeslinux.h: In function 'const QDBusArgument& operator>>(const QDBusArgument&, DnsResolver&)': /build/source/build/src/mozillavpn_autogen/UM7GZO45JR/../../../../src/platforms/linux/daemon/dbustypeslinux.h:49:26: error: 'qsizetype QByteArray::count() const' is deprecated: Use size() or length() instead. [-Werror=deprecated-declarations] 49 | } else if (data.count() >= 4) { | ~~~~~~~~~~^~ In file included from /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtCore/qstringview.h:10, from /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtCore/qchar.h:660, from /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtCore/qstring.h:14, from /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtCore/qcoreapplication.h:8, from /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtGui/qaccessible.h:17, from /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtGui/QAccessible:1, from /build/source/build/src/mozillavpn_autogen/EWIEGA46WW/../../../../src/accessiblenotification.h:8, from /build/source/build/src/mozillavpn_autogen/EWIEGA46WW/moc_accessiblenotification.cpp:9, from /build/source/build/src/mozillavpn_autogen/mocs_compilation.cpp:2: /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtCore/qbytearray.h:501:22: note: declared here 501 | inline qsizetype count() const noexcept { return size(); } | ^~~~~ Signed-off-by: Anders Kaseorg <andersk@mit.edu> -
Fix build errors from deprecated QVariant::type()
/build/source/src/platforms/linux/daemon/apptracker.cpp: In member function 'void AppTracker::userCreated(uint, const QString&)': /build/source/src/platforms/linux/daemon/apptracker.cpp:73:42: error: 'QVariant::Type QVariant::type() const' is deprecated: Use typeId() or metaType(). [-Werror=deprecated-declarations] 73 | if (!m_cgroupMount.isEmpty() && qv.type() == QVariant::String) { | ~~~~~~~^~ In file included from /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtDBus/qtdbusglobal.h:9, from /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtDBus/qdbusconnection.h:8, from /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtDBus/QDBusConnection:1, from /build/source/src/platforms/linux/daemon/apptracker.cpp:9: /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtCore/qvariant.h:433:10: note: declared here 433 | Type type() const | ^~~~ Signed-off-by: Anders Kaseorg <andersk@mit.edu> -
Fix build errors from deprecated QEventPoint::pos and friends
/build/source/src/itempicker.cpp: In member function 'QList<QQuickItem*> ItemPicker::pickItem(QMouseEvent*, QQuickItem*)': /build/source/src/itempicker.cpp:87:57: error: 'QPoint QMouseEvent::globalPos() const' is deprecated: Use globalPosition() [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wdeprecated-declarations-Werror=deprecated-declarations8;;] 87 | QPointF gpos = child->mapFromGlobal(event->globalPos()); | ~~~~~~~~~~~~~~~~^~ In file included from /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtGui/QMouseEvent:1, from /build/source/src/itempicker.cpp:9: /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtGui/qevent.h:224:19: note: declared here 224 | inline QPoint globalPos() const { return globalPosition().toPoint(); } | ^~~~~~~~~ /build/source/src/itempicker.cpp:102:59: error: 'QPoint QMouseEvent::globalPos() const' is deprecated: Use globalPosition() [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wdeprecated-declarations-Werror=deprecated-declarations8;;] 102 | QPointF gpos = child->mapFromGlobal(event->globalPos()); | ~~~~~~~~~~~~~~~~^~ /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtGui/qevent.h:224:19: note: declared here 224 | inline QPoint globalPos() const { return globalPosition().toPoint(); } | ^~~~~~~~~ /build/source/src/itempicker.cpp: In member function 'QList<QQuickItem*> ItemPicker::pickItem(QTouchEvent*, QQuickItem*)': /build/source/src/itempicker.cpp:117:25: error: 'const QList<QEventPoint>& QTouchEvent::touchPoints() const' is deprecated: Use points() [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wdeprecated-declarations-Werror=deprecated-declarations8;;] 117 | if (event->touchPoints().length() != 1) { | ~~~~~~~~~~~~~~~~~~^~ /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtGui/qevent.h:939:31: note: declared here 939 | const QList<QEventPoint> &touchPoints() const { return points(); } | ^~~~~~~~~~~ /build/source/src/itempicker.cpp:123:53: error: 'const QList<QEventPoint>& QTouchEvent::touchPoints() const' is deprecated: Use points() [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wdeprecated-declarations-Werror=deprecated-declarations8;;] 123 | QTouchEvent::TouchPoint point = event->touchPoints()[0]; | ~~~~~~~~~~~~~~~~~~^~ /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtGui/qevent.h:939:31: note: declared here 939 | const QList<QEventPoint> &touchPoints() const { return points(); } | ^~~~~~~~~~~ /build/source/src/itempicker.cpp:124:26: error: 'QPointF QEventPoint::pos() const' is deprecated: Use position() [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wdeprecated-declarations-Werror=deprecated-declarations8;;] 124 | QPointF pos = point.pos(); | ~~~~~~~~~^~ In file included from /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtGui/qevent.h:20: /nix/store/bgfalfi93kbn8j1wfwz0x0dnk1wx9wdp-qtbase-6.8.0/include/QtGui/qeventpoint.h:87:13: note: declared here 87 | QPointF pos() const { return position(); } | ^~~ Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.