From bb533171ca1f2ced30196276b9f36a6c3dc4a6e0 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Wed, 19 Dec 2018 12:05:31 -0800 Subject: [PATCH 1/3] Fix errors from uncrustify v0.68 --- .../src/rviz_common/panel_dock_widget.cpp | 4 ++-- .../display_group_visibility_property.cpp | 8 ++++---- .../properties/property_tree_widget.cpp | 8 ++++---- .../properties/property_tree_with_help.cpp | 4 ++-- .../properties/ros_topic_property.cpp | 2 +- .../properties/tf_frame_property.cpp | 2 +- .../src/rviz_common/screenshot_dialog.cpp | 4 ++-- rviz_common/src/rviz_common/time_panel.cpp | 8 ++++---- rviz_common/src/rviz_common/tool_manager.cpp | 4 ++-- rviz_common/src/rviz_common/view_manager.cpp | 4 ++-- .../src/rviz_common/visualization_frame.cpp | 18 +++++++++--------- .../src/rviz_common/visualization_manager.cpp | 2 +- 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/rviz_common/src/rviz_common/panel_dock_widget.cpp b/rviz_common/src/rviz_common/panel_dock_widget.cpp index 42364626d..8255dee62 100644 --- a/rviz_common/src/rviz_common/panel_dock_widget.cpp +++ b/rviz_common/src/rviz_common/panel_dock_widget.cpp @@ -109,11 +109,11 @@ void PanelDockWidget::setCollapsed(bool collapse) void PanelDockWidget::setContentWidget(QWidget * child) { if (widget()) { - disconnect(widget(), SIGNAL(destroyed(QObject *)), this, SLOT(onChildDestroyed(QObject *))); + disconnect(widget(), SIGNAL(destroyed(QObject*)), this, SLOT(onChildDestroyed(QObject*))); } setWidget(child); if (child) { - connect(child, SIGNAL(destroyed(QObject *)), this, SLOT(onChildDestroyed(QObject *))); + connect(child, SIGNAL(destroyed(QObject*)), this, SLOT(onChildDestroyed(QObject*))); } } diff --git a/rviz_common/src/rviz_common/properties/display_group_visibility_property.cpp b/rviz_common/src/rviz_common/properties/display_group_visibility_property.cpp index b5508e976..2d8026240 100644 --- a/rviz_common/src/rviz_common/properties/display_group_visibility_property.cpp +++ b/rviz_common/src/rviz_common/properties/display_group_visibility_property.cpp @@ -65,11 +65,11 @@ DisplayGroupVisibilityProperty::DisplayGroupVisibilityProperty( parent_display_(parent_display) { connect( - display_group, SIGNAL(displayAdded(Display *)), - this, SLOT(onDisplayAdded(Display *))); + display_group, SIGNAL(displayAdded(Display*)), + this, SLOT(onDisplayAdded(Display*))); connect( - display_group, SIGNAL(displayRemoved(Display *)), - this, SLOT(onDisplayRemoved(Display *))); + display_group, SIGNAL(displayRemoved(Display*)), + this, SLOT(onDisplayRemoved(Display*))); for (int i = 0; i < display_group->numDisplays(); i++) { rviz_common::Display * display = display_group->getDisplayAt(i); diff --git a/rviz_common/src/rviz_common/properties/property_tree_widget.cpp b/rviz_common/src/rviz_common/properties/property_tree_widget.cpp index cfcbb5e65..fd45f8436 100644 --- a/rviz_common/src/rviz_common/properties/property_tree_widget.cpp +++ b/rviz_common/src/rviz_common/properties/property_tree_widget.cpp @@ -85,8 +85,8 @@ void PropertyTreeWidget::selectionChanged( void PropertyTreeWidget::setModel(PropertyTreeModel * model) { if (model_) { - disconnect(model_, SIGNAL(propertyHiddenChanged(const Property *)), - this, SLOT(propertyHiddenChanged(const Property *))); + disconnect(model_, SIGNAL(propertyHiddenChanged(const Property*)), + this, SLOT(propertyHiddenChanged(const Property*))); disconnect(model_, SIGNAL(expand(const QModelIndex&)), this, SLOT(expand(const QModelIndex&))); disconnect(model_, SIGNAL(collapse(const QModelIndex&)), @@ -95,8 +95,8 @@ void PropertyTreeWidget::setModel(PropertyTreeModel * model) model_ = model; QTreeView::setModel(model_); if (model_) { - connect(model_, SIGNAL(propertyHiddenChanged(const Property *)), - this, SLOT(propertyHiddenChanged(const Property *)), Qt::QueuedConnection); + connect(model_, SIGNAL(propertyHiddenChanged(const Property*)), + this, SLOT(propertyHiddenChanged(const Property*)), Qt::QueuedConnection); connect(model_, SIGNAL(expand(const QModelIndex&)), this, SLOT(expand(const QModelIndex&))); connect(model_, SIGNAL(collapse(const QModelIndex&)), diff --git a/rviz_common/src/rviz_common/properties/property_tree_with_help.cpp b/rviz_common/src/rviz_common/properties/property_tree_with_help.cpp index f151f5dfa..1574d6b22 100644 --- a/rviz_common/src/rviz_common/properties/property_tree_with_help.cpp +++ b/rviz_common/src/rviz_common/properties/property_tree_with_help.cpp @@ -61,8 +61,8 @@ PropertyTreeWithHelp::PropertyTreeWithHelp(QWidget * parent) _sizes.push_back(1); setSizes(_sizes); - connect(property_tree_, SIGNAL(currentPropertyChanged(const Property *)), - this, SLOT(showHelpForProperty(const Property *))); + connect(property_tree_, SIGNAL(currentPropertyChanged(const Property*)), + this, SLOT(showHelpForProperty(const Property*))); } void PropertyTreeWithHelp::showHelpForProperty(const Property * property) diff --git a/rviz_common/src/rviz_common/properties/ros_topic_property.cpp b/rviz_common/src/rviz_common/properties/ros_topic_property.cpp index 925b84fc5..27d9dfef8 100644 --- a/rviz_common/src/rviz_common/properties/ros_topic_property.cpp +++ b/rviz_common/src/rviz_common/properties/ros_topic_property.cpp @@ -53,7 +53,7 @@ RosTopicProperty::RosTopicProperty( rviz_ros_node_(), message_type_(message_type) { - connect(this, SIGNAL(requestOptions(EditableEnumProperty *)), + connect(this, SIGNAL(requestOptions(EditableEnumProperty*)), this, SLOT(fillTopicList())); } diff --git a/rviz_common/src/rviz_common/properties/tf_frame_property.cpp b/rviz_common/src/rviz_common/properties/tf_frame_property.cpp index 68bd210fb..a2116eb66 100644 --- a/rviz_common/src/rviz_common/properties/tf_frame_property.cpp +++ b/rviz_common/src/rviz_common/properties/tf_frame_property.cpp @@ -59,7 +59,7 @@ TfFrameProperty::TfFrameProperty( include_fixed_frame_string_(include_fixed_frame_string) { // Parent class EditableEnumProperty has requestOptions() signal. - connect(this, SIGNAL(requestOptions(EditableEnumProperty *)), + connect(this, SIGNAL(requestOptions(EditableEnumProperty*)), this, SLOT(fillFrameList())); setFrameManager(frame_manager); } diff --git a/rviz_common/src/rviz_common/screenshot_dialog.cpp b/rviz_common/src/rviz_common/screenshot_dialog.cpp index 2e812a651..2320943bb 100644 --- a/rviz_common/src/rviz_common/screenshot_dialog.cpp +++ b/rviz_common/src/rviz_common/screenshot_dialog.cpp @@ -79,8 +79,8 @@ ScreenshotDialog::ScreenshotDialog( setLayout(main_layout); - connect(button_box_, SIGNAL(clicked(QAbstractButton *)), this, - SLOT(onButtonClicked(QAbstractButton *))); + connect(button_box_, SIGNAL(clicked(QAbstractButton*)), this, + SLOT(onButtonClicked(QAbstractButton*))); connect(full_window_checkbox, SIGNAL(toggled(bool)), this, SLOT(setSaveFullWindow(bool))); connect(delay_timer_, SIGNAL(timeout()), this, SLOT(onTimeout())); } diff --git a/rviz_common/src/rviz_common/time_panel.cpp b/rviz_common/src/rviz_common/time_panel.cpp index 470f2d958..5cfd4629a 100644 --- a/rviz_common/src/rviz_common/time_panel.cpp +++ b/rviz_common/src/rviz_common/time_panel.cpp @@ -152,10 +152,10 @@ void TimePanel::onDisplayAdded(Display * display) { DisplayGroup * display_group = qobject_cast(display); if (display_group) { - connect(display_group, SIGNAL(displayAdded(rviz::Display *)), this, - SLOT(onDisplayAdded(rviz::Display *))); - connect(display_group, SIGNAL(displayRemoved(rviz::Display *)), this, - SLOT(onDisplayRemoved(rviz::Display *))); + connect(display_group, SIGNAL(displayAdded(rviz::Display*)), this, + SLOT(onDisplayAdded(rviz::Display*))); + connect(display_group, SIGNAL(displayRemoved(rviz::Display*)), this, + SLOT(onDisplayRemoved(rviz::Display*))); for (int i = 0; i < display_group->numDisplays(); i++) { rviz::Display * display = display_group->getDisplayAt(i); diff --git a/rviz_common/src/rviz_common/tool_manager.cpp b/rviz_common/src/rviz_common/tool_manager.cpp index ccb4f7b64..ffa46fd6b 100644 --- a/rviz_common/src/rviz_common/tool_manager.cpp +++ b/rviz_common/src/rviz_common/tool_manager.cpp @@ -256,9 +256,9 @@ Tool * ToolManager::addTool(const PluginInfo & tool_plugin) rviz_common::properties::Property * container = tool->getPropertyContainer(); connect( container, - SIGNAL(childListChanged(rviz_common::properties::Property *)), + SIGNAL(childListChanged(rviz_common::properties::Property*)), this, - SLOT(updatePropertyVisibility(rviz_common::properties::Property *))); + SLOT(updatePropertyVisibility(rviz_common::properties::Property*))); updatePropertyVisibility(container); Q_EMIT toolAdded(tool); diff --git a/rviz_common/src/rviz_common/view_manager.cpp b/rviz_common/src/rviz_common/view_manager.cpp index 20265c316..c63256a03 100644 --- a/rviz_common/src/rviz_common/view_manager.cpp +++ b/rviz_common/src/rviz_common/view_manager.cpp @@ -148,10 +148,10 @@ void ViewManager::setCurrent(ViewController * new_current, bool mimic_view) } else { new_current->transitionFrom(previous); } - disconnect(previous, SIGNAL(destroyed(QObject *)), this, SLOT(onCurrentDestroyed(QObject *))); + disconnect(previous, SIGNAL(destroyed(QObject *)), this, SLOT(onCurrentDestroyed(QObject*))); } new_current->setName("Current View"); - connect(new_current, SIGNAL(destroyed(QObject *)), this, SLOT(onCurrentDestroyed(QObject *))); + connect(new_current, SIGNAL(destroyed(QObject *)), this, SLOT(onCurrentDestroyed(QObject*))); impl_->current = new_current; impl_->root_property->addChildToFront(new_current); delete previous; diff --git a/rviz_common/src/rviz_common/visualization_frame.cpp b/rviz_common/src/rviz_common/visualization_frame.cpp index 36188db63..70d53143e 100644 --- a/rviz_common/src/rviz_common/visualization_frame.cpp +++ b/rviz_common/src/rviz_common/visualization_frame.cpp @@ -341,10 +341,10 @@ void VisualizationFrame::initialize( ToolManager * tool_man = manager_->getToolManager(); connect(manager_, SIGNAL(configChanged()), this, SLOT(setDisplayConfigModified())); - connect(tool_man, SIGNAL(toolAdded(Tool *)), this, SLOT(addTool(Tool *))); - connect(tool_man, SIGNAL(toolRemoved(Tool *)), this, SLOT(removeTool(Tool *))); - connect(tool_man, SIGNAL(toolRefreshed(Tool *)), this, SLOT(refreshTool(Tool *))); - connect(tool_man, SIGNAL(toolChanged(Tool *)), this, SLOT(indicateToolIsCurrent(Tool *))); + connect(tool_man, SIGNAL(toolAdded(Tool*)), this, SLOT(addTool(Tool*))); + connect(tool_man, SIGNAL(toolRemoved(Tool*)), this, SLOT(removeTool(Tool*))); + connect(tool_man, SIGNAL(toolRefreshed(Tool*)), this, SLOT(refreshTool(Tool*))); + connect(tool_man, SIGNAL(toolChanged(Tool*)), this, SLOT(indicateToolIsCurrent(Tool*))); manager_->initialize(); @@ -513,8 +513,8 @@ void VisualizationFrame::initToolbars() toolbar_->setObjectName("Tools"); toolbar_->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); toolbar_actions_ = new QActionGroup(this); - connect(toolbar_actions_, SIGNAL(triggered(QAction *)), this, - SLOT(onToolbarActionTriggered(QAction *))); + connect(toolbar_actions_, SIGNAL(triggered(QAction*)), this, + SLOT(onToolbarActionTriggered(QAction*))); view_menu_->addAction(toolbar_->toggleViewAction()); add_tool_action_ = new QAction("", toolbar_actions_); @@ -530,8 +530,8 @@ void VisualizationFrame::initToolbars() remove_tool_button->setToolTip("Remove a tool from the toolbar"); remove_tool_button->setIcon(loadPixmap("package://rviz_common/icons/minus.png")); toolbar_->addWidget(remove_tool_button); - connect(remove_tool_menu_, SIGNAL(triggered(QAction *)), this, SLOT(onToolbarRemoveTool( - QAction *))); + connect(remove_tool_menu_, SIGNAL(triggered(QAction*)), this, SLOT(onToolbarRemoveTool( + QAction*))); } void VisualizationFrame::hideDockImpl(Qt::DockWidgetArea area, bool hide) @@ -1121,7 +1121,7 @@ void VisualizationFrame::showHelpPanel() if (!show_help_action_) { QDockWidget * dock = addPanelByName("Help", "rviz_common/Help"); show_help_action_ = dock->toggleViewAction(); - connect(dock, SIGNAL(destroyed(QObject *)), this, SLOT(onHelpDestroyed())); + connect(dock, SIGNAL(destroyed(QObject*)), this, SLOT(onHelpDestroyed())); } else { show_help_action_->trigger(); } diff --git a/rviz_common/src/rviz_common/visualization_manager.cpp b/rviz_common/src/rviz_common/visualization_manager.cpp index 222446ff0..a1a8ff00c 100644 --- a/rviz_common/src/rviz_common/visualization_manager.cpp +++ b/rviz_common/src/rviz_common/visualization_manager.cpp @@ -199,7 +199,7 @@ VisualizationManager::VisualizationManager( tool_manager_ = new ToolManager(this); connect(tool_manager_, SIGNAL(configChanged()), this, SIGNAL(configChanged())); - connect(tool_manager_, SIGNAL(toolChanged(Tool *)), this, SLOT(onToolChanged(Tool *))); + connect(tool_manager_, SIGNAL(toolChanged(Tool*)), this, SLOT(onToolChanged(Tool*))); view_manager_ = new ViewManager(this); view_manager_->setRenderPanel(render_panel_); From f041c57ece586f9bf10dec9fcf2ae9fa91d3c28d Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Wed, 19 Dec 2018 12:08:22 -0800 Subject: [PATCH 2/3] Fix uncrustify errors in rviz_default_plugins --- .../displays/pointcloud/point_cloud_common.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rviz_default_plugins/src/rviz_default_plugins/displays/pointcloud/point_cloud_common.cpp b/rviz_default_plugins/src/rviz_default_plugins/displays/pointcloud/point_cloud_common.cpp index 7fc62b2fa..b00c9b07a 100644 --- a/rviz_default_plugins/src/rviz_default_plugins/displays/pointcloud/point_cloud_common.cpp +++ b/rviz_default_plugins/src/rviz_default_plugins/displays/pointcloud/point_cloud_common.cpp @@ -136,14 +136,14 @@ PointCloudCommon::PointCloudCommon(rviz_common::Display * display) "Set the transformer to use to set the position of the points.", display_, SLOT(updateXyzTransformer()), this); connect(xyz_transformer_property_, SIGNAL(requestOptions( - rviz_common::properties::EnumProperty *)), - this, SLOT(setXyzTransformerOptions(rviz_common::properties::EnumProperty *))); + rviz_common::properties::EnumProperty*)), + this, SLOT(setXyzTransformerOptions(rviz_common::properties::EnumProperty*))); color_transformer_property_ = new rviz_common::properties::EnumProperty("Color Transformer", "", "Set the transformer to use to set the color of the points.", display_, SLOT(updateColorTransformer()), this); connect(color_transformer_property_, - SIGNAL(requestOptions(rviz_common::properties::EnumProperty *)), + SIGNAL(requestOptions(rviz_common::properties::EnumProperty*)), this, SLOT(setColorTransformerOptions(rviz_common::properties::EnumProperty *))); } From cbd163e58b616fbb614ead954671cd6215acb15e Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Wed, 19 Dec 2018 12:18:48 -0800 Subject: [PATCH 3/3] Missed a couple uncrustify bugs --- rviz_common/src/rviz_common/view_manager.cpp | 4 ++-- .../displays/pointcloud/point_cloud_common.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rviz_common/src/rviz_common/view_manager.cpp b/rviz_common/src/rviz_common/view_manager.cpp index c63256a03..4a83baa27 100644 --- a/rviz_common/src/rviz_common/view_manager.cpp +++ b/rviz_common/src/rviz_common/view_manager.cpp @@ -148,10 +148,10 @@ void ViewManager::setCurrent(ViewController * new_current, bool mimic_view) } else { new_current->transitionFrom(previous); } - disconnect(previous, SIGNAL(destroyed(QObject *)), this, SLOT(onCurrentDestroyed(QObject*))); + disconnect(previous, SIGNAL(destroyed(QObject*)), this, SLOT(onCurrentDestroyed(QObject*))); } new_current->setName("Current View"); - connect(new_current, SIGNAL(destroyed(QObject *)), this, SLOT(onCurrentDestroyed(QObject*))); + connect(new_current, SIGNAL(destroyed(QObject*)), this, SLOT(onCurrentDestroyed(QObject*))); impl_->current = new_current; impl_->root_property->addChildToFront(new_current); delete previous; diff --git a/rviz_default_plugins/src/rviz_default_plugins/displays/pointcloud/point_cloud_common.cpp b/rviz_default_plugins/src/rviz_default_plugins/displays/pointcloud/point_cloud_common.cpp index b00c9b07a..5e8e9cba8 100644 --- a/rviz_default_plugins/src/rviz_default_plugins/displays/pointcloud/point_cloud_common.cpp +++ b/rviz_default_plugins/src/rviz_default_plugins/displays/pointcloud/point_cloud_common.cpp @@ -144,7 +144,7 @@ PointCloudCommon::PointCloudCommon(rviz_common::Display * display) display_, SLOT(updateColorTransformer()), this); connect(color_transformer_property_, SIGNAL(requestOptions(rviz_common::properties::EnumProperty*)), - this, SLOT(setColorTransformerOptions(rviz_common::properties::EnumProperty *))); + this, SLOT(setColorTransformerOptions(rviz_common::properties::EnumProperty*))); } void PointCloudCommon::initialize(