Skip to content
Permalink
Browse files

Update RemoveSIMPLMacros generated source codes to be const correct.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
  • Loading branch information...
imikejackson committed Nov 1, 2019
1 parent d82a62c commit 32efdc7059ddab89d96ed3c10cbe95dec861408c
Showing with 47 additions and 45 deletions.
  1. +45 −43 Tools/SandboxTool.cpp
  2. +2 −2 Tools/SandboxTool/RemoveSIMPLMacros.h
@@ -1,37 +1,37 @@
/* ============================================================================
* Copyright (c) 2009-2016 BlueQuartz Software, LLC
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* Redistributions in binary form must reproduce the above copyright notice, this
* list of conditions and the following disclaimer in the documentation and/or
* other materials provided with the distribution.
*
* Neither the name of BlueQuartz Software, the US Air Force, nor the names of its
* contributors may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The code contained herein was partially funded by the followig contracts:
* United States Air Force Prime Contract FA8650-07-D-5800
* United States Air Force Prime Contract FA8650-10-D-5210
* United States Prime Contract Navy N00173-07-C-2068
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
\/* ============================================================================
* Copyright (c) 2009-2016 BlueQuartz Software, LLC
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* Redistributions in binary form must reproduce the above copyright notice, this
* list of conditions and the following disclaimer in the documentation and/or
* other materials provided with the distribution.
*
* Neither the name of BlueQuartz Software, the US Air Force, nor the names of its
* contributors may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The code contained herein was partially funded by the followig contracts:
* United States Air Force Prime Contract FA8650-07-D-5800
* United States Air Force Prime Contract FA8650-10-D-5210
* United States Prime Contract Navy N00173-07-C-2068
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */

#include <cstdint>
#include <iostream>
@@ -59,14 +59,15 @@
#include "SandboxTool/RemoveSIMPLMacros.h"
#include "SandboxTool/UpdateFilterHeaders.hpp"

/**
* @brief findPath
* @param groupName
* @param filtName
* @param ext
* @return
*/
QString findPath(const QString& groupName, const QString& filtName, const QString& ext)
/**
* @brief findPath
* @param groupName
* @param filtName
* @param ext
* @return
*/
QString
findPath(const QString& groupName, const QString& filtName, const QString& ext)
{
// std::cout << groupName.toStdString() << "::" << filtName.toStdString() << std::endl;
QString prefix = D3DTools::GetDREAM3DSourceDir() + "/";
@@ -116,7 +117,8 @@ QString findPath(const QString& groupName, const QString& filtName, const QStrin
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
template <typename T> void RecursiveFileSearch(const QDir& currentDir, const QStringList& filters)
template <typename T>
void RecursiveFileSearch(const QDir& currentDir, const QStringList& filters)
{

if(currentDir.dirName().compare("zRel") == 0 || currentDir.dirName().compare("Build") == 0)
@@ -424,7 +424,7 @@ class RemoveSIMPLMacros : public Sandbox
pubCodeOut << " using Pointer = std::shared_ptr<Self>;\n";
pubCodeOut << " using ConstPointer = std::shared_ptr<const Self>;\n";
pubCodeOut << " using WeakPointer = std::weak_ptr<Self>;\n";
pubCodeOut << " using ConstWeakPointer = std::weak_ptr<Self>;\n";
pubCodeOut << " using ConstWeakPointer = std::weak_ptr<const Self>;\n";
pubCodeOut << " static Pointer NullPointer();\n";

definitionCodeOut << "// -----------------------------------------------------------------------------\n";
@@ -728,7 +728,7 @@ class RemoveSIMPLMacros : public Sandbox
definitionCodeOut << "" << varType << "* " << fi.baseName() << "::get" << varName << "() const\n";
definitionCodeOut << "{\n";
definitionCodeOut << " return m_" << varName << ";\n";
definitionCodeOut << "}\n";
definitionCodeOut << "}";

line = pubCode;
}

0 comments on commit 32efdc7

Please sign in to comment.
You can’t perform that action at this time.