From 8cc10790072f20f042815760384037ab941a7fc3 Mon Sep 17 00:00:00 2001
From: Mirko Waechter <mirko.waechter@kit.edu>
Date: Sat, 15 Apr 2017 15:42:13 +0200
Subject: [PATCH] made error message more clear
---
.../cloning/GroupCloner.cpp | 30 +++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/cloning/GroupCloner.cpp b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/cloning/GroupCloner.cpp
index 7e3625a3..9cf527e2 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/cloning/GroupCloner.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/cloning/GroupCloner.cpp
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- * @package
- * @author
- * @date
+ * @package
+ * @author
+ * @date
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License
*/
@@ -63,7 +63,7 @@ QVector<StatechartGroupPtr> GroupCloner::getMappedGroups(const StatechartGroupMa
{
QVector<StatechartGroupPtr> result;
- for (const auto & groupMapping : mapping.groupMappings)
+ for (const auto& groupMapping : mapping.groupMappings)
{
auto group = treeModel.lock()->getGroupByName(groupMapping.groupName);
@@ -85,7 +85,7 @@ boost::optional<StatechartGroupMapping> GroupCloner::cloneGroupsTo(const QVector
StatechartGroupMapping newMapping = mapping;
ARMARX_INFO_S << "Groups that will be cloned: ";
- for (const auto & gEntry : groupsNames)
+ for (const auto& gEntry : groupsNames)
{
const auto& g = gEntry.first;
ARMARX_INFO_S << " " << g->getName() << " -> " << gEntry.second;
@@ -105,7 +105,7 @@ boost::optional<StatechartGroupMapping> GroupCloner::cloneGroupsTo(const QVector
StatechartGroupMapping::GroupMapping groupMapping {g->getName(), gEntry.second, g->getPackageName(), {}};
- for (const statechartmodel::StatePtr & state : states)
+ for (const statechartmodel::StatePtr& state : states)
{
bool stateMapped = std::find_if(groupMapping.stateMappings.cbegin(), groupMapping.stateMappings.cend(), [&](const StatechartGroupMapping::StateMapping & sm)
{
@@ -135,18 +135,18 @@ boost::optional<StatechartGroupMapping> GroupCloner::cloneGroupsTo(const QVector
return p.first;
});
- for (const StatechartGroupPtr & g : groups)
+ for (const StatechartGroupPtr& g : groups)
{
if (!g->existsCMakeLists())
{
- ARMARX_WARNING_S << g->getName() << " at " << g->getGroupPath() << " contains no CMakeLists.txt - is it an installed package? Installed packages cannot be cloned.";
+ ARMARX_WARNING_S << g->getName() << " at " << g->getGroupPath() << " contains no CMakeLists.txt - is it an installed package? Installed packages cannot be cloned since they do not contain the CMakelists file and CPP files";
return boost::optional<StatechartGroupMapping>();
}
}
registerGroups(groups, newMapping, packageDir);
- for (const auto & g : groups)
+ for (const auto& g : groups)
{
if (!cloneGroupTo(g, packageDir, newMapping))
{
@@ -164,7 +164,7 @@ void GroupCloner::registerGroups(const QVector<StatechartGroupPtr>& groups, cons
{
const QString packageName = QFileInfo(packageDir).fileName();
- for (const StatechartGroupPtr & g : groups)
+ for (const StatechartGroupPtr& g : groups)
{
if (auto groupName = mapping.queryMappedGroupName(g->getName()))
{
@@ -232,7 +232,7 @@ bool GroupCloner::cloneGroupTo(const StatechartGroupPtr& group, const QString& p
QVector<StateTreeNodePtr> allNodes = group->getAllNodes();
- for (const StateTreeNodePtr & n : allNodes)
+ for (const StateTreeNodePtr& n : allNodes)
{
if (!n->isState())
{
@@ -399,7 +399,7 @@ bool GroupCloner::cloneGroupTo(const StatechartGroupPtr& group, const QString& p
}
}
- for (const auto & f : expectedFileSeenMap.toStdMap())
+ for (const auto& f : expectedFileSeenMap.toStdMap())
{
if (!f.second)
{
@@ -415,7 +415,7 @@ QVector<StatechartGroupPtr> GroupCloner::GetGroupsFromStates(const StateTreeMode
{
QVector<StatechartGroupPtr> result;
- for (const auto & state : states)
+ for (const auto& state : states)
{
auto stateGroup = treeModel->getNodeByState(state)->getGroup();
ARMARX_CHECK_EXPRESSION(stateGroup);
@@ -471,7 +471,7 @@ bool GroupCloner::CopyRecursively(const QString& srcPath, const QString& tgtPare
QDir sourceDir(srcPath);
QStringList fileNames = sourceDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
- for (const QString & fileName : fileNames)
+ for (const QString& fileName : fileNames)
{
const QString newSrcFilePath = srcPath + QDir::separator() + fileName;
@@ -499,7 +499,7 @@ void GroupCloner::RegexReplaceFile(const QString& srcFilePath, const QString& tg
{
QString fileContent = GuiStatechartGroupXmlReader::ReadFileContents(srcFilePath);
- for (const auto & replace : replaceList)
+ for (const auto& replace : replaceList)
{
fileContent = fileContent.replace(replace.first, replace.second);
}
--
GitLab