Replace QRegExp with QRegularExpression to support Qt6

[mini-1235]

Description

#1548 and #1549 uses the syntax

#include <QRegExp>

which is deprecated in qt6, causing build failure

This PR replaces QRegExp with QRegularExpression, this is how it is handled in #1187

Is this user-facing behavior change?

Did you use Generative AI?

No

Additional Information

[mini-1235]

There are a lot of compile warnings when I build

Details

--- stderr: rviz_common /root/rviz_ws/src/rviz/rviz_common/include/rviz_common/ros_adapter_display.hpp:0:1: note: No relevant classes found. No output generated. /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp: In member function ‘bool rviz_common::Config::mapGetInt(const QString&, int*) const’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp:227:38: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 227 | if (mapGetValue(key, &v) && (v.type() == QVariant::Int || v.type() == QVariant::String)) { | ~~~~~~^~ In file included from /usr/include/x86_64-linux-gnu/qt6/QtCore/QVariant:1, from /root/rviz_ws/src/rviz/rviz_common/include/rviz_common/config.hpp:42, from /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp:32: /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp:227:67: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 227 | if (mapGetValue(key, &v) && (v.type() == QVariant::Int || v.type() == QVariant::String)) { | ~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp: In member function ‘bool rviz_common::Config::mapGetFloat(const QString&, float*) const’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp:243:29: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 243 | (static_cast(v.type()) == static_cast(QMetaType::Float) || | ~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp:244:11: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 244 | v.type() == QVariant::Double || | ~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp:245:11: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 245 | v.type() == QVariant::String)) | ~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp: In member function ‘bool rviz_common::Config::mapGetBool(const QString&, bool*) const’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp:272:38: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 272 | if (mapGetValue(key, &v) && (v.type() == QVariant::Bool || v.type() == QVariant::String)) { | ~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp:272:68: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 272 | if (mapGetValue(key, &v) && (v.type() == QVariant::Bool || v.type() == QVariant::String)) { | ~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp: In member function ‘bool rviz_common::Config::mapGetString(const QString&, QString*) const’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/config.cpp:282:37: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 282 | if (mapGetValue(key, &v) && v.type() == QVariant::String) { | ~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/color_property.cpp: In member function ‘virtual bool rviz_common::properties::ColorProperty::setValue(const QVariant&)’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/color_property.cpp:73:21: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 73 | if (new_value.type() == QVariant::Color) { | ~~~~~~~~~~~~~~^~ In file included from /usr/include/x86_64-linux-gnu/qt6/QtCore/qlocale.h:7, from /usr/include/x86_64-linux-gnu/qt6/QtWidgets/qstyleoption.h:8, from /usr/include/x86_64-linux-gnu/qt6/QtWidgets/QStyleOptionViewItem:1, from /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/color_property.cpp:35: /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property_tree_model.cpp: In member function ‘virtual bool rviz_common::properties::PropertyTreeModel::setData(const QModelIndex&, const QVariant&, int)’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property_tree_model.cpp:156:32: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 156 | if (property->getValue().type() == QVariant::Bool && role == Qt::CheckStateRole) { | ~~~~~~~~~~~~~~~~~~~~~~~~~^~ In file included from /usr/include/x86_64-linux-gnu/qt6/QtCore/qabstractitemmodel.h:11, from /usr/include/x86_64-linux-gnu/qt6/QtCore/QAbstractItemModel:1, from /root/rviz_ws/src/rviz/rviz_common/include/rviz_common/properties/property_tree_model.hpp:35, from /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property_tree_model.cpp:32: /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/splitter_handle.cpp: In member function ‘virtual void rviz_common::properties::SplitterHandle::mousePressEvent(QMouseEvent*)’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/splitter_handle.cpp:96:31: warning: ‘int QMouseEvent::x() const’ is deprecated: Use position() [-Wdeprecated-declarations] 96 | x_press_offset_ = event->x(); | ~~~~~~~~^~ In file included from /usr/include/x86_64-linux-gnu/qt6/QtGui/QMouseEvent:1, from /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/splitter_handle.cpp:35: /usr/include/x86_64-linux-gnu/qt6/QtGui/qevent.h:218:16: note: declared here 218 | inline int x() const { return qRound(position().x()); } | ^ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/splitter_handle.cpp: In member function ‘virtual void rviz_common::properties::SplitterHandle::mouseMoveEvent(QMouseEvent*)’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/splitter_handle.cpp:105:68: warning: ‘QPoint QMouseEvent::globalPos() const’ is deprecated: Use globalPosition() [-Wdeprecated-declarations] 105 | QPoint pos_rel_parent = parent_->mapFromGlobal(event->globalPos() ); | ~~~~~~~~~~~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtGui/qevent.h:216:19: note: declared here 216 | inline QPoint globalPos() const { return globalPosition().toPoint(); } | ^~~~~~~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/render_panel.cpp: In member function ‘void rviz_common::RenderPanel::sendMouseMoveEvent()’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/render_panel.cpp:165:40: warning: ‘QMouseEvent::QMouseEvent(QEvent::Type, const QPointF&, Qt::MouseButton, Qt::MouseButtons, Qt::KeyboardModifiers, const QPointingDevice*)’ is deprecated: Use another constructor [-Wdeprecated-declarations] 165 | QApplication::keyboardModifiers()); | ^ In file included from /usr/include/x86_64-linux-gnu/qt6/QtGui/QMouseEvent:1, from /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/render_panel.cpp:43: /usr/include/x86_64-linux-gnu/qt6/QtGui/qevent.h:193:5: note: declared here 193 | QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton button, | ^~~~~~~~~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/render_panel.cpp: In member function ‘void rviz_common::RenderPanel::onRenderWindowMouseEvents(QMouseEvent*)’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/render_panel.cpp:196:22: warning: ‘int QMouseEvent::x() const’ is deprecated: Use position() [-Wdeprecated-declarations] 196 | mouse_x_ = event->x(); | ~~~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtGui/qevent.h:218:16: note: declared here 218 | inline int x() const { return qRound(position().x()); } | ^ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/render_panel.cpp:197:22: warning: ‘int QMouseEvent::y() const’ is deprecated: Use position() [-Wdeprecated-declarations] 197 | mouse_y_ = event->y(); | ~~~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtGui/qevent.h:220:16: note: declared here 220 | inline int y() const { return qRound(position().y()); } | ^ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/render_panel.cpp: In member function ‘void rviz_common::RenderPanel::showContextMenu(std::shared_ptr)’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/render_panel.cpp:315:89: warning: ‘QContextMenuEvent::QContextMenuEvent(Reason, const QPoint&)’ is deprecated: Use the other constructor [-Wdeprecated-declarations] 315 | QApplication::postEvent(this, new QContextMenuEvent(QContextMenuEvent::Mouse, QPoint())); | ^ /usr/include/x86_64-linux-gnu/qt6/QtGui/qevent.h:595:5: note: declared here 595 | QContextMenuEvent(Reason reason, const QPoint &pos); | ^~~~~~~~~~~~~~~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property.cpp: In member function ‘virtual QVariant rviz_common::properties::Property::getViewData(int, int) const’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property.cpp:274:46: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 274 | case Qt::EditRole: return value_.type() == QVariant::Bool ? QVariant() : getValue(); | ~~~~~~~~~~~^~ In file included from /usr/include/x86_64-linux-gnu/qt6/QtCore/QVariant:1, from /root/rviz_ws/src/rviz/rviz_common/include/rviz_common/properties/property.hpp:40, from /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property.cpp:32: /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property.cpp:276:26: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 276 | if (value_.type() == QVariant::Bool) { | ~~~~~~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property.cpp: In member function ‘virtual Qt::ItemFlags rviz_common::properties::Property::getViewFlags(int) const’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property.cpp:308:20: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 308 | if (value_.type() == QVariant::Bool) { | ~~~~~~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property.cpp: In member function ‘void rviz_common::properties::Property::loadValue(const rviz_common::Config&)’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property.cpp:460:41: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 460 | switch (static_cast(value_.type() )) { | ~~~~~~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property.cpp:469:39: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 469 | static_cast(value_.type() )); | ~~~~~~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property.cpp: In member function ‘virtual QWidget* rviz_common::properties::Property::createEditor(QWidget*, const QStyleOptionViewItem&)’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/properties/property.cpp:527:39: warning: ‘QVariant::Type QVariant::type() const’ is deprecated: Use typeId() or metaType(). [-Wdeprecated-declarations] 527 | switch (static_cast(value_.type() )) { | ~~~~~~~~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtCore/qvariant.h:303:10: note: declared here 303 | Type type() const | ^~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/tool_manager.cpp: In member function ‘bool rviz_common::ToolManager::toKey(const QString&, uint&)’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/tool_manager.cpp:141:16: warning: ‘constexpr QKeyCombination::operator int() const’ is deprecated: Use QKeyCombination instead of int [-Wdeprecated-declarations] 141 | key = seq[0]; | ~~~~~^ In file included from /usr/include/x86_64-linux-gnu/qt6/QtCore/qlist.h:9, from /usr/include/x86_64-linux-gnu/qt6/QtCore/QList:1, from /root/rviz_ws/src/rviz/rviz_common/include/rviz_common/tool_manager.hpp:38, from /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/tool_manager.cpp:32: /usr/include/x86_64-linux-gnu/qt6/QtCore/qnamespace.h:1880:26: note: declared here 1880 | constexpr Q_IMPLICIT operator int() const noexcept | ^~~~~~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/viewport_mouse_event.cpp: In constructor ‘rviz_common::ViewportMouseEvent::ViewportMouseEvent(rviz_common::RenderPanel*, QMouseEvent*, int, int)’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/viewport_mouse_event.cpp:46:9: warning: ‘int QMouseEvent::x() const’ is deprecated: Use position() [-Wdeprecated-declarations] 46 | x(e->x() * device_pixel_ratio), | ~~~~^~ In file included from /usr/include/x86_64-linux-gnu/qt6/QtGui/QMouseEvent:1, from /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/viewport_mouse_event.cpp:33: /usr/include/x86_64-linux-gnu/qt6/QtGui/qevent.h:218:16: note: declared here 218 | inline int x() const { return qRound(position().x()); } | ^ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/viewport_mouse_event.cpp:47:9: warning: ‘int QMouseEvent::y() const’ is deprecated: Use position() [-Wdeprecated-declarations] 47 | y(e->y() * device_pixel_ratio), | ~~~~^~ /usr/include/x86_64-linux-gnu/qt6/QtGui/qevent.h:220:16: note: declared here 220 | inline int y() const { return qRound(position().y()); } | ^ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/visualization_frame.cpp: In member function ‘void rviz_common::VisualizationFrame::initMenus()’: /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/visualization_frame.cpp:454:58: warning: ‘QAction* QMenu::addAction(const QString&, const QObject*, const char*, const QKeySequence&)’ is deprecated: Use addAction(text, shortcut, receiver, member) instead. [-Wdeprecated-declarations] 454 | QAction * file_menu_open_action = file_menu_->addAction( | ~~~~~~~~~~~~~~~~~~~~~^ 455 | "&Open Config", this, SLOT( | ~~~~~~~~~~~~~~~~~~~~~~~~~~~ 456 | onOpen()), QKeySequence("Ctrl+O")); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /usr/include/x86_64-linux-gnu/qt6/QtWidgets/QMenu:1, from /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/visualization_frame.cpp:54: /usr/include/x86_64-linux-gnu/qt6/QtWidgets/qmenu.h:56:14: note: declared here 56 | QAction *addAction(const QString &text, const QObject *receiver, const char* member, | ^~~~~~~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/visualization_frame.cpp:458:58: warning: ‘QAction* QMenu::addAction(const QString&, const QObject*, const char*, const QKeySequence&)’ is deprecated: Use addAction(text, shortcut, receiver, member) instead. [-Wdeprecated-declarations] 458 | QAction * file_menu_save_action = file_menu_->addAction( | ~~~~~~~~~~~~~~~~~~~~~^ 459 | "&Save Config", this, SLOT( | ~~~~~~~~~~~~~~~~~~~~~~~~~~~ 460 | onSave()), QKeySequence("Ctrl+S")); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/x86_64-linux-gnu/qt6/QtWidgets/qmenu.h:56:14: note: declared here 56 | QAction *addAction(const QString &text, const QObject *receiver, const char* member, | ^~~~~~~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/visualization_frame.cpp:463:26: warning: ‘QAction* QMenu::addAction(const QString&, const QObject*, const char*, const QKeySequence&)’ is deprecated: Use addAction(text, shortcut, receiver, member) instead. [-Wdeprecated-declarations] 463 | file_menu_->addAction( | ~~~~~~~~~~~~~~~~~~~~~^ 464 | "Save Config &As", this, SLOT(onSaveAs()), | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 465 | QKeySequence("Ctrl+Shift+S")); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/x86_64-linux-gnu/qt6/QtWidgets/qmenu.h:56:14: note: declared here 56 | QAction *addAction(const QString &text, const QObject *receiver, const char* member, | ^~~~~~~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/visualization_frame.cpp:476:58: warning: ‘QAction* QMenu::addAction(const QString&, const QObject*, const char*, const QKeySequence&)’ is deprecated: Use addAction(text, shortcut, receiver, member) instead. [-Wdeprecated-declarations] 476 | QAction * file_menu_quit_action = file_menu_->addAction( | ~~~~~~~~~~~~~~~~~~~~~^ 477 | "&Quit", this, SLOT( | ~~~~~~~~~~~~~~~~~~~~ 478 | close()), QKeySequence("Ctrl+Q")); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/x86_64-linux-gnu/qt6/QtWidgets/qmenu.h:56:14: note: declared here 56 | QAction *addAction(const QString &text, const QObject *receiver, const char* member, | ^~~~~~~~~ /root/rviz_ws/src/rviz/rviz_common/src/rviz_common/visualization_frame.cpp:486:54: warning: ‘QAction* QMenu::addAction(const QString&, const QObject*, const char*, const QKeySequence&)’ is deprecated: Use addAction(text, shortcut, receiver, member) instead. [-Wdeprecated-declarations] 486 | QAction * fullscreen_action = view_menu_->addAction( | ~~~~~~~~~~~~~~~~~~~~~^ 487 | "&Fullscreen", this, SLOT( | ~~~~~~~~~~~~~~~~~~~~~~~~~~ 488 | setFullScreen(bool)), Qt::Key_F11); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/x86_64-linux-gnu/qt6/QtWidgets/qmenu.h:56:14: note: declared here 56 | QAction *addAction(const QString &text, const QObject *receiver, const char* member, | ^~~~~~~~~ ---

Is this something I should handle in this PR?

[ahcorde]

Pulls: #1592
Gist: https://gist.githubusercontent.com/ahcorde/9173baaf2fc0d2047e05779b65196179/raw/91543735c709ac7e07a18cd7bf5f9faca5fbf32e/ros2.repos
BUILD args: --packages-above-and-dependencies rviz_common
TEST args: --packages-above rviz_common
ROS Distro: rolling
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/17107

• Linux
• Linux-aarch64
• Linux-rhel
• Windows

[ahcorde]

Thank you for the PR @mini-1235 If you see more warnings feel free to open a new PR