From 671438341ee8a250f82c536bbb0034458fb20d16 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Tue, 13 Feb 2018 11:39:27 +0100
Subject: [PATCH] Remove references to hpp-gui when possible.
* The node `hpp-gui` created by the interface is referenced by many
* other entities. It cannot be removed easily.
---
include/gepetto/gui/plugin-interface.hh | 8 ++++----
include/gepetto/gui/pythonwidget.hh | 2 +-
include/gepetto/gui/ui/mainwindow.ui | 2 +-
src/gui/settings.cc | 10 +++++-----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/gepetto/gui/plugin-interface.hh b/include/gepetto/gui/plugin-interface.hh
index 0228cfd..5e5f239 100644
--- a/include/gepetto/gui/plugin-interface.hh
+++ b/include/gepetto/gui/plugin-interface.hh
@@ -93,10 +93,10 @@ namespace gepetto {
} // namespace gui
} // namespace gepetto
-Q_DECLARE_INTERFACE (gepetto::gui::PluginInterface, "hpp-gui.plugins/0.0")
-Q_DECLARE_INTERFACE (gepetto::gui::JointModifierInterface, "hpp-gui.plugin.joint-modifier/0.0")
-Q_DECLARE_INTERFACE (gepetto::gui::ModelInterface, "hpp-gui.plugin.model/0.0")
-Q_DECLARE_INTERFACE (gepetto::gui::CorbaInterface, "hpp-gui.plugin.corba/0.0")
+Q_DECLARE_INTERFACE (gepetto::gui::PluginInterface, "gepetto-gui.plugins/0.0")
+Q_DECLARE_INTERFACE (gepetto::gui::JointModifierInterface, "gepetto-gui.plugin.joint-modifier/0.0")
+Q_DECLARE_INTERFACE (gepetto::gui::ModelInterface, "gepetto-gui.plugin.model/0.0")
+Q_DECLARE_INTERFACE (gepetto::gui::CorbaInterface, "gepetto-gui.plugin.corba/0.0")
diff --git a/include/gepetto/gui/pythonwidget.hh b/include/gepetto/gui/pythonwidget.hh
index ef9d40e..1c8e4dd 100644
--- a/include/gepetto/gui/pythonwidget.hh
+++ b/include/gepetto/gui/pythonwidget.hh
@@ -5,7 +5,7 @@
#include <gepetto/gui/config-dep.hh>
#if ! GEPETTO_GUI_HAS_PYTHONQT
-# error "hpp-gui was not compile with PythonQt dependency."
+# error "gepetto-viewer-corba was not compile with PythonQt dependency."
#endif
#include <QVariant>
diff --git a/include/gepetto/gui/ui/mainwindow.ui b/include/gepetto/gui/ui/mainwindow.ui
index cc2f2e0..83bb24c 100644
--- a/include/gepetto/gui/ui/mainwindow.ui
+++ b/include/gepetto/gui/ui/mainwindow.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>HPP</string>
+ <string>Gepetto GUI</string>
</property>
<property name="windowIcon">
<iconset theme="hpp-gui">
diff --git a/src/gui/settings.cc b/src/gui/settings.cc
index 8ff7bac..c8e3b64 100644
--- a/src/gui/settings.cc
+++ b/src/gui/settings.cc
@@ -1,18 +1,18 @@
// Copyright (c) 2015, Joseph Mirabel
// Authors: Joseph Mirabel (joseph.mirabel@laas.fr)
//
-// This file is part of hpp-gui.
-// hpp-gui is free software: you can redistribute it
+// This file is part of gepetto-viewer-corba.
+// gepetto-viewer-corba is free software: you can redistribute it
// and/or modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation, either version
// 3 of the License, or (at your option) any later version.
//
-// hpp-gui is distributed in the hope that it will be
+// gepetto-viewer-corba is distributed in the hope that it will be
// useful, but WITHOUT ANY WARRANTY; without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// General Lesser Public License for more details. You should have
// received a copy of the GNU Lesser General Public License along with
-// hpp-gui. If not, see <http://www.gnu.org/licenses/>.
+// gepetto-viewer-corba. If not, see <http://www.gnu.org/licenses/>.
#include <gepetto/gui/settings.hh>
@@ -49,7 +49,7 @@ namespace gepetto {
, mw (0)
{
QDir user (QDir::home());
- const char path[] = "Pictures/hpp-gui";
+ const char path[] = "Pictures/gepetto-gui";
user.mkpath (path);
user.cd (path);
captureDirectory = user.absolutePath().toStdString();
--
GitLab