Skip to content

Replace QRegExp with QRegularExpression to support Qt6 #1592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahcorde merged 1 commit into from
Oct 2, 2025
Merged

Replace QRegExp with QRegularExpression to support Qt6 #1592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions rviz_common/include/rviz_common/properties/ros_action_property.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define RVIZ_COMMON__PROPERTIES__ROS_ACTION_PROPERTY_HPP_

#include <QObject>
#include <QRegExp>
#include <QRegularExpression>
#include <QString>

#include <memory>
Expand Down Expand Up @@ -90,20 +90,20 @@ class RVIZ_COMMON_PUBLIC RosFilteredActionProperty
const QString & default_value = QString(),
const QString & action_type = QString(),
const QString & description = QString(),
const QRegExp & filter = QRegExp(),
const QRegularExpression & filter = QRegularExpression(),
Property * parent = 0,
const char * changed_slot = 0,
QObject * receiver = 0);

void enableFilter(bool enabled);

QRegExp filter() const;
QRegularExpression filter() const;

protected Q_SLOTS:
void fillActionList() override;

private:
QRegExp filter_;
QRegularExpression filter_;
bool filter_enabled_;
};

Expand Down
8 changes: 4 additions & 4 deletions rviz_common/include/rviz_common/properties/ros_service_property.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define RVIZ_COMMON__PROPERTIES__ROS_SERVICE_PROPERTY_HPP_

#include <QObject>
#include <QRegExp>
#include <QRegularExpression>
#include <QString>

#include <memory>
Expand Down Expand Up @@ -90,20 +90,20 @@ class RVIZ_COMMON_PUBLIC RosFilteredServiceProperty
const QString & default_value = QString(),
const QString & service_type = QString(),
const QString & description = QString(),
const QRegExp & filter = QRegExp(),
const QRegularExpression & filter = QRegularExpression(),
Property * parent = 0,
const char * changed_slot = 0,
QObject * receiver = 0);

void enableFilter(bool enabled);

QRegExp filter() const;
QRegularExpression filter() const;

protected Q_SLOTS:
void fillServiceList() override;

private:
QRegExp filter_;
QRegularExpression filter_;
bool filter_enabled_;
};

Expand Down
6 changes: 3 additions & 3 deletions rviz_common/src/rviz_common/properties/ros_action_property.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#include <QApplication> // NOLINT: cpplint can't handle Qt imports
#include <QObject> // NOLINT: cpplint can't handle Qt imports
#include <QRegExp> // NOLINT: cpplint can't handle Qt imports
#include <QRegularExpression> // NOLINT: cpplint can't handle Qt imports
#include <QString> // NOLINT: cpplint can't handle Qt imports
#include <QStringList> // NOLINT: cpplint can't handle Qt imports

Expand Down Expand Up @@ -121,7 +121,7 @@ RosFilteredActionProperty::RosFilteredActionProperty(
const QString & default_value,
const QString & action_type,
const QString & description,
const QRegExp & filter,
const QRegularExpression & filter,
Property * parent,
const char * changed_slot,
QObject * receiver)
Expand All @@ -137,7 +137,7 @@ void RosFilteredActionProperty::enableFilter(bool enabled)
fillActionList();
}

QRegExp RosFilteredActionProperty::filter() const
QRegularExpression RosFilteredActionProperty::filter() const
{
return filter_;
}
Expand Down
6 changes: 3 additions & 3 deletions rviz_common/src/rviz_common/properties/ros_service_property.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#include <QApplication> // NOLINT: cpplint can't handle Qt imports
#include <QObject> // NOLINT: cpplint can't handle Qt imports
#include <QRegExp> // NOLINT: cpplint can't handle Qt imports
#include <QRegularExpression> // NOLINT: cpplint can't handle Qt imports
#include <QString> // NOLINT: cpplint can't handle Qt imports
#include <QStringList> // NOLINT: cpplint can't handle Qt imports

Expand Down Expand Up @@ -119,7 +119,7 @@ RosFilteredServiceProperty::RosFilteredServiceProperty(
const QString & default_value,
const QString & service_type,
const QString & description,
const QRegExp & filter,
const QRegularExpression & filter,
Property * parent,
const char * changed_slot,
QObject * receiver)
Expand All @@ -135,7 +135,7 @@ void RosFilteredServiceProperty::enableFilter(bool enabled)
fillServiceList();
}

QRegExp RosFilteredServiceProperty::filter() const
QRegularExpression RosFilteredServiceProperty::filter() const
{
return filter_;
}
Expand Down