Skip to content

Clean project #306

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

Open
wants to merge 1 commit into
base: rolling
Choose a base branch
from
Open

Clean project #306

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
13 changes: 0 additions & 13 deletions qt_gui_cpp/include/qt_gui_cpp/ros_pluginlib_plugin_provider.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,6 @@ class RosPluginlibPluginProvider
attributes["class_base_class_type"] = class_loader_->getBaseClassType().c_str();
attributes["package_name"] = class_loader_->getClassPackage(lookup_name).c_str();
attributes["plugin_path"] = plugin_path.c_str();

// check if plugin is available
// std::string library_path = class_loader_->getClassLibraryPath(lookup_name);
// attributes["not_available"] =
// !std::ifstream(library_path.c_str()) ?
// QString("library ").append(lookup_name.c_str()).append(
// " not found (may be it must be built?)") : "";
attributes["not_available"] = "";

PluginDescriptor * plugin_descriptor = new PluginDescriptor(lookup_name.c_str(), attributes);
Expand Down Expand Up @@ -230,8 +223,6 @@ class RosPluginlibPluginProvider
return 0;
}
}

// qDebug("RosPluginlibPluginProvider::load_explicit_type(%s) succeeded", lookup_name.c_str());
instances_[&*instance] = instance;

return &*instance;
Expand Down Expand Up @@ -314,11 +305,7 @@ class RosPluginlibPluginProvider
QString & label, QString & statustip, QString & icon, QString & icontype,
PluginDescriptor * plugin_descriptor)
{
// qDebug("RosPluginlibPluginProvider::parseManifest()");

std::string manifest_path = class_loader_->getPluginManifestPath(lookup_name);
// qDebug("RosPluginlibPluginProvider::parseManifest() manifest_path \"%s\"",
// manifest_path.c_str());
tinyxml2::XMLDocument doc;
tinyxml2::XMLError result = doc.LoadFile(manifest_path.c_str());
if (result != tinyxml2::XML_SUCCESS) {
Expand Down
8 changes: 0 additions & 8 deletions qt_gui_cpp/include/qt_gui_cpp/settings.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,14 @@ class Settings

QStringList allKeys() const;

// int beginReadArray(const QString& prefix);

// void beginWriteArray(const QString& prefix, int size = -1);

QStringList childGroups() const;

QStringList childKeys() const;

bool contains(const QString & key) const;

// void endArray();

void remove(const QString & key);

// void setArrayIndex(int i);

void setValue(const QString & key, const QVariant & value);

QVariant value(const QString & key, const QVariant & defaultValue = QVariant()) const;
Expand Down
6 changes: 2 additions & 4 deletions qt_gui_cpp/src/qt_gui_cpp/generic_proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ bool GenericProxy::invokeMethod(
QGenericArgument val6, QGenericArgument val7, QGenericArgument val8, QGenericArgument val9)
{
if (!object_) {return false;}
// qDebug("GenericProxy::invokeMethod(%s, %s)",
// object_->objectName().toStdString().c_str(), member);

return QMetaObject::invokeMethod(object_, member, Qt::DirectConnection, val0, val1, val2, val3,
val4, val5, val6, val7, val8, val9);
}
Expand All @@ -70,8 +69,7 @@ bool GenericProxy::invokeMethodWithReturn(
QGenericArgument val8, QGenericArgument val9)
{
if (!object_) {return false;}
// qDebug("GenericProxy::invokeMethodWithReturn(%s, %s)",
// object_->objectName().toStdString().c_str(), member);

return QMetaObject::invokeMethod(object_, member, Qt::DirectConnection, ret, val0, val1, val2,
val3, val4, val5, val6, val7, val8, val9);
}
Expand Down
2 changes: 1 addition & 1 deletion qt_gui_py_common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.20)
project(qt_gui_py_common)

find_package(ament_cmake REQUIRED)
Expand Down