generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 18:42:41 +01:00
Code Issues Projects Releases Wiki Activity

GH #1050 Foundation: fix gcc -Wshadow warnings

Browse Source
This commit is contained in:
Miklos Vajna
2015-11-30 15:49:07 +01:00
parent c38ed216d2
commit b9cfd346a1
46 changed files with 360 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Foundation/src/File.cpp
View File

@@ -44,17 +44,17 @@ File::File()
}
File::File(const std::string& path): FileImpl(path)
File::File(const std::string& rPath): FileImpl(rPath)
{
}
File::File(const char* path): FileImpl(std::string(path))
File::File(const char* pPath): FileImpl(std::string(pPath))
{
}
File::File(const Path& path): FileImpl(path.toString())
File::File(const Path& rPath): FileImpl(rPath.toString())
{
}
@@ -76,24 +76,24 @@ File& File::operator = (const File& file)
}
File& File::operator = (const std::string& path)
File& File::operator = (const std::string& rPath)
{
setPathImpl(path);
setPathImpl(rPath);
return *this;
}
File& File::operator = (const char* path)
File& File::operator = (const char* pPath)
{
poco_check_ptr (path);
setPathImpl(path);
poco_check_ptr (pPath);
setPathImpl(pPath);
return *this;
}
File& File::operator = (const Path& path)
File& File::operator = (const Path& rPath)
{
setPathImpl(path.toString());
setPathImpl(rPath.toString());
return *this;
}
@@ -211,11 +211,11 @@ File& File::setExecutable(bool flag)
}
void File::copyTo(const std::string& path) const
void File::copyTo(const std::string& rPath) const
{
Path src(getPathImpl());
Path dest(path);
File destFile(path);
Path dest(rPath);
File destFile(rPath);
if ((destFile.exists() && destFile.isDirectory()) || dest.isDirectory())
{
dest.makeDirectory();
@@ -228,9 +228,9 @@ void File::copyTo(const std::string& path) const
}
void File::copyDirectory(const std::string& path) const
void File::copyDirectory(const std::string& rPath) const
{
File target(path);
File target(rPath);
target.createDirectories();
Path src(getPathImpl());
@@ -239,23 +239,23 @@ void File::copyDirectory(const std::string& path) const
DirectoryIterator end;
for (; it != end; ++it)
{
it->copyTo(path);
it->copyTo(rPath);
}
}
void File::moveTo(const std::string& path)
void File::moveTo(const std::string& rPath)
{
copyTo(path);
copyTo(rPath);
remove(true);
setPathImpl(path);
setPathImpl(rPath);
}
void File::renameTo(const std::string& path)
void File::renameTo(const std::string& rPath)
{
renameToImpl(path);
setPathImpl(path);
renameToImpl(rPath);
setPathImpl(rPath);
}