QRegExp was deprecated in Qt5, gone in Qt6

ros-visualization · Jan 15, 2024 · cd6ecea · cd6ecea
1 parent ab24014
commit cd6ecea
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/rviz/default_plugin/depth_cloud_display.cpp b/src/rviz/default_plugin/depth_cloud_display.cpp
@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <QObject>
+#include <QRegularExpression>
 
 #include "depth_cloud_display.h"
 #include <rviz/visualization_manager.h>
@@ -78,8 +79,7 @@ DepthCloudDisplay::DepthCloudDisplay()
 
 {
   // Depth map properties
-  QRegExp depth_filter("depth");
-  depth_filter.setCaseSensitivity(Qt::CaseInsensitive);
+  QRegularExpression depth_filter("depth", QRegularExpression::CaseInsensitiveOption);
 
   topic_filter_property_ =
       new Property("Topic Filter", true,
@@ -100,8 +100,7 @@ DepthCloudDisplay::DepthCloudDisplay()
   depth_transport_property_->setStdString("raw");
 
   // color image properties
-  QRegExp color_filter("color|rgb|bgr|gray|mono");
-  color_filter.setCaseSensitivity(Qt::CaseInsensitive);
+  QRegularExpression color_filter("color|rgb|bgr|gray|mono", QRegularExpression::CaseInsensitiveOption);
 
   color_topic_property_ = new RosFilteredTopicProperty(
       "Color Image Topic", "",

diff --git a/src/rviz/default_plugin/depth_cloud_display.h b/src/rviz/default_plugin/depth_cloud_display.h
@@ -54,6 +54,7 @@
 #endif
 
 #include <QMap>
+#include <QtCore/QRegularExpression>
 
 using namespace message_filters::sync_policies;
 
@@ -81,7 +82,7 @@ class RosFilteredTopicProperty : public RosTopicProperty
                            const QString& default_value = QString(),
                            const QString& message_type = QString(),
                            const QString& description = QString(),
-                           const QRegExp& filter = QRegExp(),
+                           const QRegularExpression& filter = QRegularExpression(),
                            Property* parent = nullptr)
     : RosTopicProperty(name, default_value, message_type, description, parent)
     , filter_(filter)
@@ -94,7 +95,7 @@ class RosFilteredTopicProperty : public RosTopicProperty
                            const QString& default_value,
                            const QString& message_type,
                            const QString& description,
-                           const QRegExp& filter,
+                           const QRegularExpression& filter,
                            Property* parent,
                            Func&& changed_slot,
                            const R* receiver)
@@ -109,7 +110,7 @@ class RosFilteredTopicProperty : public RosTopicProperty
                            const QString& default_value,
                            const QString& message_type,
                            const QString& description,
-                           const QRegExp& filter,
+                           const QRegularExpression& filter,
                            P* parent,
                            Func&& changed_slot)
     : RosFilteredTopicProperty(name, default_value, message_type, description, filter, parent)
@@ -124,7 +125,7 @@ class RosFilteredTopicProperty : public RosTopicProperty
     fillTopicList();
   }
 
-  QRegExp filter() const
+  QRegularExpression filter() const
   {
     return filter_;
   }
@@ -142,7 +143,7 @@ protected Q_SLOTS:
   }
 
 private:
-  QRegExp filter_;
+  QRegularExpression filter_;
   bool filter_enabled_;
 };
 

diff --git a/src/rviz/tool_manager.cpp b/src/rviz/tool_manager.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <QKeyEvent>
-#include <QRegExp>
+#include <QRegularExpression>
 
 #include <ros/assert.h>
 
@@ -42,7 +42,7 @@ namespace rviz
 {
 QString addSpaceToCamelCase(QString input)
 {
-  QRegExp re = QRegExp("([A-Z])([a-z]*)");
+  QRegularExpression re = QRegularExpression("([A-Z])([a-z]*)");
   input.replace(re, " \\1\\2");
   return input.trimmed();
 }