Skip to content

drop redundant instance_ member #360

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 5 commits into from
Jul 13, 2026
Merged

drop redundant instance_ member #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5ba087
modernize to cpp20
ahcorde Jun 26, 2026
78d0f75
Move implementation from hpp to cpp
ahcorde Jun 26, 2026
6e8fab9
drp redundant instance_ member
ahcorde Jun 26, 2026
bea8f65
Review feedback
ahcorde Jul 10, 2026
e14b604
Merge branch 'rolling' into ahcorde/rolling/redundant_instance
ahcorde Jul 13, 2026
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
9 changes: 3 additions & 6 deletions rqt_gui_cpp/src/rqt_gui_cpp/nodelet_plugin_provider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,12 @@ std::shared_ptr<Plugin> NodeletPluginProvider::create_plugin(
init_loader();

std::string nodelet_name = std::format("{}_{}", lookup_name, plugin_context->serialNumber());
instance_.reset();

instance_ =
std::shared_ptr<rqt_gui_cpp::Plugin> instance =
qt_gui_cpp::RosPluginlibPluginProvider<rqt_gui_cpp::Plugin>::create_plugin(lookup_name);
instance_->passInNode(node_);
instances_[&*instance_] = nodelet_name.c_str();
instance->passInNode(node_);
instances_[instance.get()] = nodelet_name.c_str();

std::shared_ptr<rqt_gui_cpp::Plugin> instance = instance_;
instance_.reset();
return instance;
}

Expand Down
2 changes: 0 additions & 2 deletions rqt_gui_cpp/src/rqt_gui_cpp/nodelet_plugin_provider.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ class NodeletPluginProvider
const QString & plugin_id, qt_gui_cpp::PluginContext * plugin_context,
qt_gui_cpp::Plugin * plugin) override;

std::shared_ptr<rqt_gui_cpp::Plugin> instance_;

QMap<void *, QString> instances_;

bool loader_initialized_;
Expand Down
2 changes: 2 additions & 0 deletions rqt_gui_cpp/src/rqt_gui_cpp/roscpp_plugin_provider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@

#include "roscpp_plugin_provider.hpp"

#include <string>

#include "nodelet_plugin_provider.hpp"

#include <qt_gui_cpp/plugin_provider.hpp>
Expand Down
2 changes: 0 additions & 2 deletions rqt_gui_cpp/src/rqt_gui_cpp/roscpp_plugin_provider.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
#ifndef RQT_GUI_CPP__ROSCPP_PLUGIN_PROVIDER_HPP_
#define RQT_GUI_CPP__ROSCPP_PLUGIN_PROVIDER_HPP_

#include <string>

#include <qt_gui_cpp/composite_plugin_provider.hpp>

namespace rqt_gui_cpp
Expand Down