Skip to content
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

Fix errors from uncrustify v0.68 #366

Merged
merged 3 commits into from
Dec 21, 2018
Merged

Fix errors from uncrustify v0.68 #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb53317
Fix errors from uncrustify v0.68
jacobperron Dec 19, 2018
f041c57
Fix uncrustify errors in rviz_default_plugins
jacobperron Dec 19, 2018
cbd163e
Missed a couple uncrustify bugs
jacobperron Dec 19, 2018
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
4 changes: 2 additions & 2 deletions rviz_common/src/rviz_common/panel_dock_widget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*)));
}
}

Expand Down
8 changes: 4 additions & 4 deletions rviz_common/src/rviz_common/properties/display_group_visibility_property.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions rviz_common/src/rviz_common/properties/property_tree_widget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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&)),
Expand All @@ -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&)),
Expand Down
4 changes: 2 additions & 2 deletions rviz_common/src/rviz_common/properties/property_tree_with_help.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/properties/ros_topic_property.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}

Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/properties/tf_frame_property.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions rviz_common/src/rviz_common/screenshot_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
Expand Down
8 changes: 4 additions & 4 deletions rviz_common/src/rviz_common/time_panel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ void TimePanel::onDisplayAdded(Display * display)
{
DisplayGroup * display_group = qobject_cast<DisplayGroup *>(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);
Expand Down
4 changes: 2 additions & 2 deletions rviz_common/src/rviz_common/tool_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions rviz_common/src/rviz_common/view_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions rviz_common/src/rviz_common/visualization_frame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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_);
Expand All @@ -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)
Expand Down Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/visualization_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_);
Expand Down
8 changes: 4 additions & 4 deletions rviz_default_plugins/src/rviz_default_plugins/displays/pointcloud/point_cloud_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,15 @@ 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 *)),
this, SLOT(setColorTransformerOptions(rviz_common::properties::EnumProperty *)));
SIGNAL(requestOptions(rviz_common::properties::EnumProperty*)),
this, SLOT(setColorTransformerOptions(rviz_common::properties::EnumProperty*)));
}

void PointCloudCommon::initialize(
Expand Down