From b4e98f6801df3f0ef6deba34e000990987276cfd Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Thu, 27 Jul 2023 05:29:34 -0700 Subject: [PATCH 1/9] Remove ignition Signed-off-by: Nate Koenig --- include/CMakeLists.txt | 1 - include/gz/gui/gz.hh | 1 - include/gz/gui/qml/qmldir_deprecated | 11 ------ include/gz/gui/resources.qrc | 9 ----- include/ignition/gui.hh | 19 ---------- include/ignition/gui/Application.hh | 19 ---------- include/ignition/gui/Conversions.hh | 19 ---------- include/ignition/gui/Dialog.hh | 19 ---------- include/ignition/gui/DragDropModel.hh | 19 ---------- include/ignition/gui/Enums.hh | 19 ---------- include/ignition/gui/Export.hh | 19 ---------- include/ignition/gui/GuiEvents.hh | 19 ---------- include/ignition/gui/Helpers.hh | 19 ---------- include/ignition/gui/MainWindow.hh | 19 ---------- include/ignition/gui/PlottingInterface.hh | 19 ---------- include/ignition/gui/Plugin.hh | 19 ---------- include/ignition/gui/SearchModel.hh | 19 ---------- include/ignition/gui/config.hh | 46 ----------------------- include/ignition/gui/ign.hh | 19 ---------- include/ignition/gui/qt.h | 19 ---------- src/Application.cc | 8 ---- src/MainWindow.cc | 11 +----- src/Plugin.cc | 12 ------ src/gz.cc | 7 +--- src/plugins/minimal_scene/MinimalScene.cc | 11 +----- test/integration/deprecated_TEST.cc | 33 ---------------- 26 files changed, 3 insertions(+), 432 deletions(-) delete mode 100644 include/gz/gui/qml/qmldir_deprecated delete mode 100644 include/ignition/gui.hh delete mode 100644 include/ignition/gui/Application.hh delete mode 100644 include/ignition/gui/Conversions.hh delete mode 100644 include/ignition/gui/Dialog.hh delete mode 100644 include/ignition/gui/DragDropModel.hh delete mode 100644 include/ignition/gui/Enums.hh delete mode 100644 include/ignition/gui/Export.hh delete mode 100644 include/ignition/gui/GuiEvents.hh delete mode 100644 include/ignition/gui/Helpers.hh delete mode 100644 include/ignition/gui/MainWindow.hh delete mode 100644 include/ignition/gui/PlottingInterface.hh delete mode 100644 include/ignition/gui/Plugin.hh delete mode 100644 include/ignition/gui/SearchModel.hh delete mode 100644 include/ignition/gui/config.hh delete mode 100644 include/ignition/gui/ign.hh delete mode 100644 include/ignition/gui/qt.h delete mode 100644 test/integration/deprecated_TEST.cc diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 992a1312e..a35a0475e 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,2 +1 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/include/gz/gui/gz.hh b/include/gz/gui/gz.hh index 58b3aa66f..59a89b274 100644 --- a/include/gz/gui/gz.hh +++ b/include/gz/gui/gz.hh @@ -23,7 +23,6 @@ /// \brief External hook to read the library version. /// \return C-string representing the version. Ex.: 0.1.2 extern "C" GZ_GUI_VISIBLE char *gzVersion(); -extern "C" GZ_GUI_VISIBLE char GZ_DEPRECATED(7) *ignitionVersion(); /// \brief External hook to execute 'gz gui -l' from the command line. extern "C" GZ_GUI_VISIBLE void cmdPluginList(); diff --git a/include/gz/gui/qml/qmldir_deprecated b/include/gz/gui/qml/qmldir_deprecated deleted file mode 100644 index c7f3007c0..000000000 --- a/include/gz/gui/qml/qmldir_deprecated +++ /dev/null @@ -1,11 +0,0 @@ -# Deprecated module, remove on tock -module ignition.gui - -GzColor 1.0 GzColor.qml -GzPose 1.0 GzPose.qml -GzSnackBar 1.0 GzSnackBar.qml -GzSpinBox 1.0 GzSpinBox.qml -GzVector3 1.0 GzVector3.qml - -IgnSnackBar 1.0 GzSnackBar.qml -IgnSpinBox 1.0 GzSpinBox.qml diff --git a/include/gz/gui/resources.qrc b/include/gz/gui/resources.qrc index dd5fb9bc4..8a18a99f6 100644 --- a/include/gz/gui/resources.qrc +++ b/include/gz/gui/resources.qrc @@ -43,13 +43,4 @@ qml/GzVector3.qml - - - qml/qmldir_deprecated - qml/GzColor.qml - qml/GzPose.qml - qml/GzSnackBar.qml - qml/GzSpinBox.qml - qml/GzVector3.qml - diff --git a/include/ignition/gui.hh b/include/ignition/gui.hh deleted file mode 100644 index 432d7aabc..000000000 --- a/include/ignition/gui.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/Application.hh b/include/ignition/gui/Application.hh deleted file mode 100644 index 7b3377be8..000000000 --- a/include/ignition/gui/Application.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/Conversions.hh b/include/ignition/gui/Conversions.hh deleted file mode 100644 index 63f926f5f..000000000 --- a/include/ignition/gui/Conversions.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/Dialog.hh b/include/ignition/gui/Dialog.hh deleted file mode 100644 index c2b3b862e..000000000 --- a/include/ignition/gui/Dialog.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/DragDropModel.hh b/include/ignition/gui/DragDropModel.hh deleted file mode 100644 index fcd5b1412..000000000 --- a/include/ignition/gui/DragDropModel.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/Enums.hh b/include/ignition/gui/Enums.hh deleted file mode 100644 index e87d512bc..000000000 --- a/include/ignition/gui/Enums.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/Export.hh b/include/ignition/gui/Export.hh deleted file mode 100644 index 145530e06..000000000 --- a/include/ignition/gui/Export.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/GuiEvents.hh b/include/ignition/gui/GuiEvents.hh deleted file mode 100644 index e8961662d..000000000 --- a/include/ignition/gui/GuiEvents.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/Helpers.hh b/include/ignition/gui/Helpers.hh deleted file mode 100644 index b123adb8b..000000000 --- a/include/ignition/gui/Helpers.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/MainWindow.hh b/include/ignition/gui/MainWindow.hh deleted file mode 100644 index 5df5762da..000000000 --- a/include/ignition/gui/MainWindow.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/PlottingInterface.hh b/include/ignition/gui/PlottingInterface.hh deleted file mode 100644 index 309ec3859..000000000 --- a/include/ignition/gui/PlottingInterface.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/Plugin.hh b/include/ignition/gui/Plugin.hh deleted file mode 100644 index fd5a6338c..000000000 --- a/include/ignition/gui/Plugin.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/SearchModel.hh b/include/ignition/gui/SearchModel.hh deleted file mode 100644 index b168d1034..000000000 --- a/include/ignition/gui/SearchModel.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/config.hh b/include/ignition/gui/config.hh deleted file mode 100644 index f73a89e14..000000000 --- a/include/ignition/gui/config.hh +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef IGNITION_GUI__CONFIG_HH_ -#define IGNITION_GUI__CONFIG_HH_ - -#include - -#define IGNITION_GUI_MAJOR_VERSION GZ_GUI_MAJOR_VERSION -#define IGNITION_GUI_MINOR_VERSION GZ_GUI_MINOR_VERSION -#define IGNITION_GUI_PATCH_VERSION GZ_GUI_PATCH_VERSION - -#define IGNITION_GUI_VERSION GZ_GUI_VERSION -#define IGNITION_GUI_VERSION_FULL GZ_GUI_VERSION_FULL - -#define IGNITION_GUI_VERSION_HEADER GZ_GUI_VERSION_HEADER - -#define IGN_GUI_PLUGIN_INSTALL_DIR GZ_GUI_PLUGIN_INSTALL_DIR - -namespace gz -{ -} - -namespace ignition -{ - #ifndef SUPPRESS_IGNITION_HEADER_DEPRECATION - #pragma message("ignition namespace is deprecated! Use gz instead!") - #endif - using namespace gz; -} - -#endif diff --git a/include/ignition/gui/ign.hh b/include/ignition/gui/ign.hh deleted file mode 100644 index 52c6f06ef..000000000 --- a/include/ignition/gui/ign.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/include/ignition/gui/qt.h b/include/ignition/gui/qt.h deleted file mode 100644 index bc538a3e2..000000000 --- a/include/ignition/gui/qt.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include diff --git a/src/Application.cc b/src/Application.cc index f83596be5..8e197bef2 100644 --- a/src/Application.cc +++ b/src/Application.cc @@ -543,11 +543,6 @@ bool Application::LoadPlugin(const std::string &_filename, systemPaths.AddPluginPaths(home + "/.gz/gui/plugins:" + GZ_GUI_PLUGIN_INSTALL_DIR); - // TODO(CH3): Deprecated. Remove on tock. - systemPaths.AddPluginPaths(home + "/.ignition/gui/plugins:" + - GZ_GUI_PLUGIN_INSTALL_DIR); - - auto pathToLib = systemPaths.FindSharedLibrary(_filename); if (pathToLib.empty()) { @@ -851,9 +846,6 @@ std::vector>> common::env(GZ_HOMEDIR, home); paths.push_back(home + "/.gz/gui/plugins"); - // TODO(CH3): Deprecated. Remove on tock. - paths.push_back(home + "/.ignition/gui/plugins"); - // 4. Install path paths.push_back(GZ_GUI_PLUGIN_INSTALL_DIR); diff --git a/src/MainWindow.cc b/src/MainWindow.cc index c90d09a7a..55f9c435d 100644 --- a/src/MainWindow.cc +++ b/src/MainWindow.cc @@ -947,16 +947,7 @@ void MainWindow::SetShowDialogOnExit(bool _showDialogOnExit) ///////////////////////////////////////////////// void MainWindow::SetRenderEngine(const std::string &_renderEngine) { - // Deprecated: accept ignition-prefixed engines - auto renderEngine = _renderEngine; - auto pos = renderEngine.find("ignition"); - if (pos != std::string::npos) - { - renderEngine.replace(pos, pos + 8, "gz"); - gzwarn << "Trying to load deprecated plugin [" << _renderEngine - << "]. Use [" << renderEngine << "] instead." << std::endl; - } - this->setProperty("renderEngine", renderEngine.c_str()); + this->setProperty("renderEngine", _renderEngine.c_str()); } ///////////////////////////////////////////////// diff --git a/src/Plugin.cc b/src/Plugin.cc index 9760db493..961ce4af4 100644 --- a/src/Plugin.cc +++ b/src/Plugin.cc @@ -172,18 +172,6 @@ void Plugin::Load(const tinyxml2::XMLElement *_pluginElem) { this->LoadCommonConfig(_pluginElem->FirstChildElement("gz-gui")); } - // TODO(CH3): Deprecated. Remove on tock. - // Try deprecated ignition-gui element if gz-gui is missing - else - { - guiElem = _pluginElem->FirstChildElement("ignition-gui"); - if (guiElem) - { - gzwarn << "The `ignition-gui` element is deprecated. Please use " - << "`gz-gui` instead." << std::endl; - this->LoadCommonConfig(_pluginElem->FirstChildElement("ignition-gui")); - } - } // Load custom configuration this->LoadConfig(_pluginElem); diff --git a/src/gz.cc b/src/gz.cc index fb6b8a3c3..d146c3ea9 100644 --- a/src/gz.cc +++ b/src/gz.cc @@ -30,7 +30,7 @@ int g_argc = 1; char* g_argv[] = { - reinterpret_cast(const_cast("./ignition")), + reinterpret_cast(const_cast("./gz")), }; ////////////////////////////////////////////////// @@ -51,11 +51,6 @@ extern "C" GZ_GUI_VISIBLE char *gzVersion() return strdup(GZ_GUI_VERSION_FULL); } -extern "C" GZ_GUI_VISIBLE char *ignitionVersion() -{ - return gzVersion(); -} - ////////////////////////////////////////////////// extern "C" GZ_GUI_VISIBLE void cmdPluginList() { diff --git a/src/plugins/minimal_scene/MinimalScene.cc b/src/plugins/minimal_scene/MinimalScene.cc index 94ae25335..ca74bad9c 100644 --- a/src/plugins/minimal_scene/MinimalScene.cc +++ b/src/plugins/minimal_scene/MinimalScene.cc @@ -1304,16 +1304,7 @@ void RenderWindowItem::SetAmbientLight(const math::Color &_ambient) ///////////////////////////////////////////////// void RenderWindowItem::SetEngineName(const std::string &_name) { - // Deprecated: accept ignition-prefixed engines - auto name = _name; - auto pos = name.find("ignition"); - if (pos != std::string::npos) - { - name.replace(pos, pos + 8, "gz"); - gzwarn << "Trying to load deprecated plugin [" << _name << "]. Use [" - << name << "] instead." << std::endl; - } - this->dataPtr->renderThread->gzRenderer.engineName = name; + this->dataPtr->renderThread->gzRenderer.engineName = _name; } ///////////////////////////////////////////////// diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc deleted file mode 100644 index ddc0fefce..000000000 --- a/test/integration/deprecated_TEST.cc +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2022 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * -*/ - -#include - -#define SUPPRESS_IGNITION_HEADER_DEPRECATION - -#include -#include - -///////////////////////////////////////////////// -// Make sure the ignition namespace still works -TEST(Deprecated, IgnitionNamespace) -{ - ignition::gui::Plugin plugin; - EXPECT_TRUE(plugin.Title().empty()); -} - -#undef SUPPRESS_IGNITION_HEADER_DEPRECATION From c5b78a0f808f593c89a0bdbd243df936b0792721 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Thu, 27 Jul 2023 21:46:48 -0700 Subject: [PATCH 2/9] version bumps Signed-off-by: Nate Koenig --- CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 229237a5e..a86dad597 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(gz-gui8 VERSION 8.0.0) #============================================================================ # Find gz-cmake #============================================================================ -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 REQUIRED) #============================================================================ # Configure the project @@ -40,23 +40,23 @@ gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2) #-------------------------------------- # Find gz-utils -gz_find_package(gz-utils2 REQUIRED) -set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR}) +gz_find_package(gz-utils3 REQUIRED) +set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR}) #-------------------------------------- # Find gz-math -gz_find_package(gz-math7 REQUIRED) -set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR}) +gz_find_package(gz-math8 REQUIRED) +set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR}) #-------------------------------------- # Find gz-common -gz_find_package(gz-common5 REQUIRED COMPONENTS profiler) -set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) +gz_find_package(gz-common6 REQUIRED COMPONENTS profiler) +set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) #-------------------------------------- # Find gz-plugin -gz_find_package(gz-plugin2 REQUIRED COMPONENTS loader register) -set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR}) +gz_find_package(gz-plugin3 REQUIRED COMPONENTS loader register) +set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR}) #-------------------------------------- # Find gz-transport From d99b5204db2bf7dae7132a621b29b678b5e3819b Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Fri, 28 Jul 2023 06:18:56 -0700 Subject: [PATCH 3/9] Fix examples Signed-off-by: Nate Koenig --- examples/standalone/marker/CMakeLists.txt | 4 ++-- examples/standalone/point_cloud/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/standalone/marker/CMakeLists.txt b/examples/standalone/marker/CMakeLists.txt index 571fc03b1..a9d4c7fee 100644 --- a/examples/standalone/marker/CMakeLists.txt +++ b/examples/standalone/marker/CMakeLists.txt @@ -6,8 +6,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) - find_package(gz-common5 REQUIRED) - set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) + find_package(gz-common6 REQUIRED) + set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) find_package(gz-msgs10 REQUIRED) set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR}) diff --git a/examples/standalone/point_cloud/CMakeLists.txt b/examples/standalone/point_cloud/CMakeLists.txt index 617e7e816..d4f30b32b 100644 --- a/examples/standalone/point_cloud/CMakeLists.txt +++ b/examples/standalone/point_cloud/CMakeLists.txt @@ -6,8 +6,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) - find_package(gz-common5 REQUIRED) - set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) + find_package(gz-common6 REQUIRED) + set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) find_package(gz-msgs10 REQUIRED) set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR}) From 34cbecc1c8fa9fdfed6065c8bab15f8adfc42a2a Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Wed, 2 Aug 2023 05:37:02 -0700 Subject: [PATCH 4/9] harmonic Signed-off-by: Nate Koenig --- CMakeLists.txt | 14 +++++++------- src/MainWindow.cc | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a86dad597..783d08716 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(gz-gui8 VERSION 8.0.0) #============================================================================ # Find gz-cmake #============================================================================ -find_package(gz-cmake4 REQUIRED) +find_package(gz-cmake3 REQUIRED) #============================================================================ # Configure the project @@ -45,18 +45,18 @@ set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR}) #-------------------------------------- # Find gz-math -gz_find_package(gz-math8 REQUIRED) -set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR}) +gz_find_package(gz-math7 REQUIRED) +set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR}) #-------------------------------------- # Find gz-common -gz_find_package(gz-common6 REQUIRED COMPONENTS profiler) -set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) +gz_find_package(gz-common5 REQUIRED COMPONENTS profiler) +set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) #-------------------------------------- # Find gz-plugin -gz_find_package(gz-plugin3 REQUIRED COMPONENTS loader register) -set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR}) +gz_find_package(gz-plugin2 REQUIRED COMPONENTS loader register) +set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR}) #-------------------------------------- # Find gz-transport diff --git a/src/MainWindow.cc b/src/MainWindow.cc index 55f9c435d..a084d485d 100644 --- a/src/MainWindow.cc +++ b/src/MainWindow.cc @@ -947,7 +947,7 @@ void MainWindow::SetShowDialogOnExit(bool _showDialogOnExit) ///////////////////////////////////////////////// void MainWindow::SetRenderEngine(const std::string &_renderEngine) { - this->setProperty("renderEngine", _renderEngine.c_str()); + this->setProperty("renderEngine", _renderEngine.c_str()); } ///////////////////////////////////////////////// From 72dc7799f6f0f0f0d37f57f9087d5f5738960e82 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Wed, 2 Aug 2023 05:37:32 -0700 Subject: [PATCH 5/9] harmonic Signed-off-by: Nate Koenig --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 783d08716..229237a5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,8 @@ gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2) #-------------------------------------- # Find gz-utils -gz_find_package(gz-utils3 REQUIRED) -set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR}) +gz_find_package(gz-utils2 REQUIRED) +set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR}) #-------------------------------------- # Find gz-math From 6851f0453613fd8079e8c3378a7d94d3d847fcf8 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Wed, 2 Aug 2023 05:38:23 -0700 Subject: [PATCH 6/9] harmonic examples Signed-off-by: Nate Koenig --- examples/standalone/marker/CMakeLists.txt | 4 ++-- examples/standalone/point_cloud/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/standalone/marker/CMakeLists.txt b/examples/standalone/marker/CMakeLists.txt index a9d4c7fee..571fc03b1 100644 --- a/examples/standalone/marker/CMakeLists.txt +++ b/examples/standalone/marker/CMakeLists.txt @@ -6,8 +6,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) - find_package(gz-common6 REQUIRED) - set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) + find_package(gz-common5 REQUIRED) + set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) find_package(gz-msgs10 REQUIRED) set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR}) diff --git a/examples/standalone/point_cloud/CMakeLists.txt b/examples/standalone/point_cloud/CMakeLists.txt index d4f30b32b..617e7e816 100644 --- a/examples/standalone/point_cloud/CMakeLists.txt +++ b/examples/standalone/point_cloud/CMakeLists.txt @@ -6,8 +6,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) - find_package(gz-common6 REQUIRED) - set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) + find_package(gz-common5 REQUIRED) + set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) find_package(gz-msgs10 REQUIRED) set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR}) From 5844641a444195bfbaaf0b11d41bbd340c13f6a3 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Thu, 10 Aug 2023 05:44:38 -0700 Subject: [PATCH 7/9] remve more ign Signed-off-by: Nate Koenig --- examples/plugin/gz_components/GzComponents.qml | 9 --------- include/gz/gui/qml/qmldir | 4 ---- src/Application.cc | 4 ---- src/Plugin.cc | 2 +- src/plugins/marker_manager/MarkerManager.cc | 2 +- 5 files changed, 2 insertions(+), 19 deletions(-) diff --git a/examples/plugin/gz_components/GzComponents.qml b/examples/plugin/gz_components/GzComponents.qml index d1d921be9..7a7fd7997 100644 --- a/examples/plugin/gz_components/GzComponents.qml +++ b/examples/plugin/gz_components/GzComponents.qml @@ -40,13 +40,4 @@ Column { value: 5.8 width: 300 } - - // Deprecated spin box - IgnSpinBox { - minimumValue: -2 - maximumValue: 19 - decimals: 0 - stepSize: 3 - value: 5 - } } diff --git a/include/gz/gui/qml/qmldir b/include/gz/gui/qml/qmldir index 023113ebd..04de27323 100644 --- a/include/gz/gui/qml/qmldir +++ b/include/gz/gui/qml/qmldir @@ -5,7 +5,3 @@ GzPose 1.0 GzPose.qml GzSnackBar 1.0 GzSnackBar.qml GzSpinBox 1.0 GzSpinBox.qml GzVector3 1.0 GzVector3.qml - -# Deprecated components, remove on tock -IgnSnackBar 1.0 GzSnackBar.qml -IgnSpinBox 1.0 GzSpinBox.qml diff --git a/src/Application.cc b/src/Application.cc index 8e197bef2..4c0f51d99 100644 --- a/src/Application.cc +++ b/src/Application.cc @@ -58,10 +58,6 @@ namespace gz /// these until it is ok to unload the plugin's shared library. public: std::vector> pluginsAdded; - /// \brief Deprecated environment variable which holds paths to look for - /// plugins - public: std::string pluginPathEnvDeprecated = "IGN_GUI_PLUGIN_PATH"; - /// \brief Environment variable which holds paths to look for plugins public: std::string pluginPathEnv = "GZ_GUI_PLUGIN_PATH"; diff --git a/src/Plugin.cc b/src/Plugin.cc index 961ce4af4..e2c05684a 100644 --- a/src/Plugin.cc +++ b/src/Plugin.cc @@ -72,7 +72,7 @@ class gz::gui::PluginPrivate public: QQmlContext *context{nullptr}; /// \brief Map of card properties to be passed to QML card object. - /// Accepts all QML Pane properties plus custom Igntiion GUI properties. + /// Accepts all QML Pane properties plus custom Gazeb: GUI properties. /// https://doc.qt.io/qt-5/qml-qtquick-controls2-pane-members.html public: std::map cardProperties; diff --git a/src/plugins/marker_manager/MarkerManager.cc b/src/plugins/marker_manager/MarkerManager.cc index 379efa725..d460683d3 100644 --- a/src/plugins/marker_manager/MarkerManager.cc +++ b/src/plugins/marker_manager/MarkerManager.cc @@ -353,7 +353,7 @@ bool MarkerManagerPrivate::ProcessMarkerMsg(const gz::msgs::Marker &_msg) else { // Create the name for the marker - std::string name = "__IGN_MARKER_VISUAL_" + ns + "_" + + std::string name = "__GZ_MARKER_VISUAL_" + ns + "_" + std::to_string(id); // Create the new marker From 5fbbcf2f9a5cfa41dd71d049de4f54c81de3f39f Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Thu, 24 Aug 2023 20:21:20 +0000 Subject: [PATCH 8/9] remove references to deprecated plugin path Signed-off-by: Ian Chen --- src/Application.cc | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/src/Application.cc b/src/Application.cc index 4c0f51d99..25fe4672a 100644 --- a/src/Application.cc +++ b/src/Application.cc @@ -542,23 +542,9 @@ bool Application::LoadPlugin(const std::string &_filename, auto pathToLib = systemPaths.FindSharedLibrary(_filename); if (pathToLib.empty()) { - // Try deprecated environment variable - common::SystemPaths systemPathsDep; - systemPathsDep.SetPluginPathEnv(this->dataPtr->pluginPathEnvDeprecated); - pathToLib = systemPathsDep.FindSharedLibrary(_filename); - if (pathToLib.empty()) - { - gzerr << "Failed to load plugin [" << _filename << - "] : couldn't find shared library." << std::endl; - return false; - } - else - { - gzwarn << "Found plugin [" << _filename - << "] using deprecated environment variable [" - << this->dataPtr->pluginPathEnvDeprecated << "]. Please use [" - << this->dataPtr->pluginPathEnv << "] instead." << std::endl; - } + gzerr << "Failed to load plugin [" << _filename << + "] : couldn't find shared library." << std::endl; + return false; } // Load plugin @@ -826,13 +812,6 @@ std::vector>> // 1. Paths from env variable auto paths = common::SystemPaths::PathsFromEnv(this->dataPtr->pluginPathEnv); - // 1.5 Paths from deprecated env variable - auto pathsDeprecated = - common::SystemPaths::PathsFromEnv(this->dataPtr->pluginPathEnvDeprecated); - - for (auto const &path : pathsDeprecated) - paths.push_back(path); - // 2. Paths added by calling addPluginPath for (auto const &path : this->dataPtr->pluginPaths) paths.push_back(path); From 19401060518842296baf256ebf1b2bdfec26a43c Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Thu, 24 Aug 2023 23:11:39 +0000 Subject: [PATCH 9/9] fix typo Signed-off-by: Ian Chen --- src/Plugin.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Plugin.cc b/src/Plugin.cc index e2c05684a..3da524344 100644 --- a/src/Plugin.cc +++ b/src/Plugin.cc @@ -72,7 +72,7 @@ class gz::gui::PluginPrivate public: QQmlContext *context{nullptr}; /// \brief Map of card properties to be passed to QML card object. - /// Accepts all QML Pane properties plus custom Gazeb: GUI properties. + /// Accepts all QML Pane properties plus custom Gazebo: GUI properties. /// https://doc.qt.io/qt-5/qml-qtquick-controls2-pane-members.html public: std::map cardProperties;