Skip to content

Commit

Permalink
GH pocoproject#1050 PageCompiler: fix gcc -Wshadow warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
Miklos Vajna committed Mar 29, 2016
1 parent 16fd082 commit b997cc2
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 51 deletions.
4 changes: 2 additions & 2 deletions Data/src/RecordSet.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
32 changes: 16 additions & 16 deletions PageCompiler/File2Page/src/File2Page.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,92 +63,92 @@ class File2PageApp: public Application
// 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<File2PageApp>(this, &File2PageApp::handleHelp)));

options.addOption(
rOptions.addOption(
Option("contentType", "t", "Specify a content type.")
.required(false)
.repeatable(false)
.argument("MIME-Type")
.callback(OptionCallback<File2PageApp>(this, &File2PageApp::handleContentType)));

options.addOption(
rOptions.addOption(
Option("contentLanguage", "l", "Specify a content language.")
.required(false)
.repeatable(false)
.argument("language")
.callback(OptionCallback<File2PageApp>(this, &File2PageApp::handleContentLang)));

options.addOption(
rOptions.addOption(
Option("class", "c", "Specify the handler class name.")
.required(false)
.repeatable(false)
.argument("class-name")
.callback(OptionCallback<File2PageApp>(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<File2PageApp>(this, &File2PageApp::handleNamespace)));

options.addOption(
rOptions.addOption(
Option("output", "o", "Specify the output file name.")
.required(false)
.repeatable(false)
.argument("path")
.callback(OptionCallback<File2PageApp>(this, &File2PageApp::handleOutput)));

options.addOption(
rOptions.addOption(
Option("path", "p", "Specify the server path of the file.")
.required(false)
.repeatable(false)
.argument("path")
.callback(OptionCallback<File2PageApp>(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;
}
Expand Down
4 changes: 2 additions & 2 deletions PageCompiler/src/ApacheCodeWriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
}

Expand Down
6 changes: 3 additions & 3 deletions PageCompiler/src/CodeWriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
}

Expand Down
4 changes: 2 additions & 2 deletions PageCompiler/src/OSPCodeWriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
}

Expand Down
52 changes: 26 additions & 26 deletions PageCompiler/src/PageCompiler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@ class CompilerApp: public Application
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<CompilerApp>(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 "
Expand All @@ -91,109 +91,109 @@ class CompilerApp: public Application
.argument("<name>=<value>")
.callback(OptionCallback<CompilerApp>(this, &CompilerApp::handleDefine)));

options.addOption(
rOptions.addOption(
Option("config-file", "f", "Load configuration data from the given file.")
.required(false)
.repeatable(true)
.argument("<file>")
.callback(OptionCallback<CompilerApp>(this, &CompilerApp::handleConfig)));

options.addOption(
rOptions.addOption(
Option("output-dir", "o", "Write output files to directory <dir>.")
.required(false)
.repeatable(false)
.argument("<dir>")
.callback(OptionCallback<CompilerApp>(this, &CompilerApp::handleOutputDir)));

options.addOption(
rOptions.addOption(
Option("header-output-dir", "H", "Write header file to directory <dir>.")
.required(false)
.repeatable(false)
.argument("<dir>")
.callback(OptionCallback<CompilerApp>(this, &CompilerApp::handleHeaderOutputDir)));

options.addOption(
rOptions.addOption(
Option("header-prefix", "P", "Prepend the given <prefix> to the header file name in the generated #include directive.")
.required(false)
.repeatable(false)
.argument("<prefix>")
.callback(OptionCallback<CompilerApp>(this, &CompilerApp::handleHeaderPrefix)));

options.addOption(
rOptions.addOption(
Option("base-file-name", "b", "Use <name> instead of the class name for the output file name.")
.required(false)
.repeatable(false)
.argument("<name>")
.callback(OptionCallback<CompilerApp>(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<CompilerApp>(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<CompilerApp>(this, &CompilerApp::handleApache)));

options.addOption(
rOptions.addOption(
Option("noline", "N", "Do not include #line directives in generated code.")
.required(false)
.repeatable(false)
.callback(OptionCallback<CompilerApp>(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;
}
Expand Down Expand Up @@ -223,16 +223,16 @@ class CompilerApp: public Application

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<std::string>& args)
Expand Down

0 comments on commit b997cc2

Please sign in to comment.