From b997cc25d00a2e212634a0664648afcebcf76f19 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 29 Mar 2016 15:07:35 +0200 Subject: [PATCH] GH #1050 PageCompiler: fix gcc -Wshadow warnings --- Data/src/RecordSet.cpp | 4 +- PageCompiler/File2Page/src/File2Page.cpp | 32 +++++++-------- PageCompiler/src/ApacheCodeWriter.cpp | 4 +- PageCompiler/src/CodeWriter.cpp | 6 +-- PageCompiler/src/OSPCodeWriter.cpp | 4 +- PageCompiler/src/PageCompiler.cpp | 52 ++++++++++++------------ 6 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Data/src/RecordSet.cpp b/Data/src/RecordSet.cpp index b630a3153..e3788706d 100644 --- a/Data/src/RecordSet.cpp +++ b/Data/src/RecordSet.cpp @@ -103,8 +103,8 @@ void RecordSet::reset(const Statement& stmt) _totalRowCount = UNKNOWN_TOTAL_ROW_COUNT; RowMap::iterator it = _rowMap.begin(); - RowMap::iterator end = _rowMap.end(); - for (; it != end; ++it) delete it->second; + RowMap::iterator itEnd = _rowMap.end(); + for (; it != itEnd; ++it) delete it->second; _rowMap.clear(); Statement::operator = (stmt); diff --git a/PageCompiler/File2Page/src/File2Page.cpp b/PageCompiler/File2Page/src/File2Page.cpp index 9fd5036ff..2a682382a 100644 --- a/PageCompiler/File2Page/src/File2Page.cpp +++ b/PageCompiler/File2Page/src/File2Page.cpp @@ -63,52 +63,52 @@ protected: // add your own reinitialization code here } - void defineOptions(OptionSet& options) + void defineOptions(OptionSet& rOptions) { - Application::defineOptions(options); + Application::defineOptions(rOptions); - options.addOption( + rOptions.addOption( Option("help", "h", "Display help information on command line arguments.") .required(false) .repeatable(false) .callback(OptionCallback(this, &File2PageApp::handleHelp))); - options.addOption( + rOptions.addOption( Option("contentType", "t", "Specify a content type.") .required(false) .repeatable(false) .argument("MIME-Type") .callback(OptionCallback(this, &File2PageApp::handleContentType))); - options.addOption( + rOptions.addOption( Option("contentLanguage", "l", "Specify a content language.") .required(false) .repeatable(false) .argument("language") .callback(OptionCallback(this, &File2PageApp::handleContentLang))); - options.addOption( + rOptions.addOption( Option("class", "c", "Specify the handler class name.") .required(false) .repeatable(false) .argument("class-name") .callback(OptionCallback(this, &File2PageApp::handleClassName))); - options.addOption( + rOptions.addOption( Option("namespace", "n", "Specify the handler class namespace name.") .required(false) .repeatable(false) .argument("namespace-name") .callback(OptionCallback(this, &File2PageApp::handleNamespace))); - options.addOption( + rOptions.addOption( Option("output", "o", "Specify the output file name.") .required(false) .repeatable(false) .argument("path") .callback(OptionCallback(this, &File2PageApp::handleOutput))); - options.addOption( + rOptions.addOption( Option("path", "p", "Specify the server path of the file.") .required(false) .repeatable(false) @@ -116,39 +116,39 @@ protected: .callback(OptionCallback(this, &File2PageApp::handlePath))); } - void handleHelp(const std::string& name, const std::string& value) + void handleHelp(const std::string& rName, const std::string& value) { _helpRequested = true; displayHelp(); stopOptionsProcessing(); } - void handleContentType(const std::string& name, const std::string& value) + void handleContentType(const std::string& rName, const std::string& value) { _contentType = value; } - void handleContentLang(const std::string& name, const std::string& value) + void handleContentLang(const std::string& rName, const std::string& value) { _contentLang = value; } - void handleClassName(const std::string& name, const std::string& value) + void handleClassName(const std::string& rName, const std::string& value) { _clazz = value; } - void handleNamespace(const std::string& name, const std::string& value) + void handleNamespace(const std::string& rName, const std::string& value) { _namespace = value; } - void handleOutput(const std::string& name, const std::string& value) + void handleOutput(const std::string& rName, const std::string& value) { _output = value; } - void handlePath(const std::string& name, const std::string& value) + void handlePath(const std::string& rName, const std::string& value) { _path = value; } diff --git a/PageCompiler/src/ApacheCodeWriter.cpp b/PageCompiler/src/ApacheCodeWriter.cpp index 7536f5854..dfc6099a1 100644 --- a/PageCompiler/src/ApacheCodeWriter.cpp +++ b/PageCompiler/src/ApacheCodeWriter.cpp @@ -14,8 +14,8 @@ #include "Page.h" -ApacheCodeWriter::ApacheCodeWriter(const Page& page, const std::string& clazz): - CodeWriter(page, clazz) +ApacheCodeWriter::ApacheCodeWriter(const Page& rPage, const std::string& rClazz): + CodeWriter(rPage, rClazz) { } diff --git a/PageCompiler/src/CodeWriter.cpp b/PageCompiler/src/CodeWriter.cpp index 442f38d84..8cbf8bd7f 100644 --- a/PageCompiler/src/CodeWriter.cpp +++ b/PageCompiler/src/CodeWriter.cpp @@ -21,9 +21,9 @@ using Poco::Path; using Poco::StringTokenizer; -CodeWriter::CodeWriter(const Page& page, const std::string& clazz): - _page(page), - _class(clazz) +CodeWriter::CodeWriter(const Page& rPage, const std::string& rClazz): + _page(rPage), + _class(rClazz) { } diff --git a/PageCompiler/src/OSPCodeWriter.cpp b/PageCompiler/src/OSPCodeWriter.cpp index ee085821d..d40643606 100644 --- a/PageCompiler/src/OSPCodeWriter.cpp +++ b/PageCompiler/src/OSPCodeWriter.cpp @@ -15,8 +15,8 @@ #include "Poco/NumberParser.h" -OSPCodeWriter::OSPCodeWriter(const Page& page, const std::string& clazz): - CodeWriter(page, clazz) +OSPCodeWriter::OSPCodeWriter(const Page& rPage, const std::string& rClazz): + CodeWriter(rPage, rClazz) { } diff --git a/PageCompiler/src/PageCompiler.cpp b/PageCompiler/src/PageCompiler.cpp index da59a6e67..a3ac328dd 100644 --- a/PageCompiler/src/PageCompiler.cpp +++ b/PageCompiler/src/PageCompiler.cpp @@ -71,17 +71,17 @@ protected: Application::initialize(self); } - void defineOptions(OptionSet& options) + void defineOptions(OptionSet& rOptions) { - Application::defineOptions(options); + Application::defineOptions(rOptions); - options.addOption( + rOptions.addOption( Option("help", "h", "Display help information on command line arguments.") .required(false) .repeatable(false) .callback(OptionCallback(this, &CompilerApp::handleHelp))); - options.addOption( + rOptions.addOption( Option("define", "D", "Define a configuration property. A configuration property " "defined with this option can be referenced in the input " @@ -91,109 +91,109 @@ protected: .argument("=") .callback(OptionCallback(this, &CompilerApp::handleDefine))); - options.addOption( + rOptions.addOption( Option("config-file", "f", "Load configuration data from the given file.") .required(false) .repeatable(true) .argument("") .callback(OptionCallback(this, &CompilerApp::handleConfig))); - options.addOption( + rOptions.addOption( Option("output-dir", "o", "Write output files to directory .") .required(false) .repeatable(false) .argument("") .callback(OptionCallback(this, &CompilerApp::handleOutputDir))); - options.addOption( + rOptions.addOption( Option("header-output-dir", "H", "Write header file to directory .") .required(false) .repeatable(false) .argument("") .callback(OptionCallback(this, &CompilerApp::handleHeaderOutputDir))); - options.addOption( + rOptions.addOption( Option("header-prefix", "P", "Prepend the given to the header file name in the generated #include directive.") .required(false) .repeatable(false) .argument("") .callback(OptionCallback(this, &CompilerApp::handleHeaderPrefix))); - options.addOption( + rOptions.addOption( Option("base-file-name", "b", "Use instead of the class name for the output file name.") .required(false) .repeatable(false) .argument("") .callback(OptionCallback(this, &CompilerApp::handleBase))); - options.addOption( + rOptions.addOption( Option("osp", "O", "Add factory class definition and implementation for use with the Open Service Platform.") .required(false) .repeatable(false) .callback(OptionCallback(this, &CompilerApp::handleOSP))); - options.addOption( + rOptions.addOption( Option("apache", "A", "Add factory class definition and implementation, and shared library manifest for use with ApacheConnector.") .required(false) .repeatable(false) .callback(OptionCallback(this, &CompilerApp::handleApache))); - options.addOption( + rOptions.addOption( Option("noline", "N", "Do not include #line directives in generated code.") .required(false) .repeatable(false) .callback(OptionCallback(this, &CompilerApp::handleNoLine))); } - void handleHelp(const std::string& name, const std::string& value) + void handleHelp(const std::string& rName, const std::string& value) { _helpRequested = true; stopOptionsProcessing(); } - void handleDefine(const std::string& name, const std::string& value) + void handleDefine(const std::string& rName, const std::string& value) { defineProperty(value); } - void handleConfig(const std::string& name, const std::string& value) + void handleConfig(const std::string& rName, const std::string& value) { loadConfiguration(value); } - void handleOutputDir(const std::string& name, const std::string& value) + void handleOutputDir(const std::string& rName, const std::string& value) { _outputDir = value; } - void handleHeaderOutputDir(const std::string& name, const std::string& value) + void handleHeaderOutputDir(const std::string& rName, const std::string& value) { _headerOutputDir = value; } - void handleHeaderPrefix(const std::string& name, const std::string& value) + void handleHeaderPrefix(const std::string& rName, const std::string& value) { _headerPrefix = value; if (!_headerPrefix.empty() && _headerPrefix[_headerPrefix.size() - 1] != '/') _headerPrefix += '/'; } - void handleBase(const std::string& name, const std::string& value) + void handleBase(const std::string& rName, const std::string& value) { _base = value; } - void handleOSP(const std::string& name, const std::string& value) + void handleOSP(const std::string& rName, const std::string& value) { _generateOSPCode = true; } - void handleApache(const std::string& name, const std::string& value) + void handleApache(const std::string& rName, const std::string& value) { _generateApacheCode = true; } - void handleNoLine(const std::string& name, const std::string& value) + void handleNoLine(const std::string& rName, const std::string& value) { _emitLineDirectives = false; } @@ -223,16 +223,16 @@ protected: void defineProperty(const std::string& def) { - std::string name; + std::string configName; std::string value; std::string::size_type pos = def.find('='); if (pos != std::string::npos) { - name.assign(def, 0, pos); + configName.assign(def, 0, pos); value.assign(def, pos + 1, def.length() - pos); } - else name = def; - config().setString(name, value); + else configName = def; + config().setString(configName, value); } int main(const std::vector& args)