Skip to content

Commit e45aaf1

Browse files
dlemstradlemstra
committed
Use auto where possible.
1 parent e8eb5c6 commit e45aaf1

File tree

12 files changed

+70
-72
lines changed

12 files changed

+70
-72
lines changed

‎src/Config.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@ const set<wstring>& Config::excludes(const Architecture architecture) const
3838
{
3939
switch (architecture)
4040
{
41-
case Architecture::Arm64: return(_excludesArm64);
42-
case Architecture::x64: return(_excludesX64);
43-
case Architecture::x86: return(_excludesX86);
44-
default: throwException(L"Unknown architecture");
41+
case Architecture::Arm64: return(_excludesArm64);
42+
case Architecture::x64: return(_excludesX64);
43+
case Architecture::x86: return(_excludesX86);
44+
default: throwException(L"Unknown architecture");
4545
}
4646
}
4747

4848
const set<wstring>& Config::nasmIncludes(const Architecture architecture) const
4949
{
5050
switch (architecture)
5151
{
52-
case Architecture::x64: return(_includesNasmX64);
53-
case Architecture::x86: return(_includesNasmX86);
54-
default: throwException(L"Unsupported architecture");
52+
case Architecture::x64: return(_includesNasmX64);
53+
case Architecture::x86: return(_includesNasmX86);
54+
default: throwException(L"Unsupported architecture");
5555
}
5656
}
5757

@@ -241,7 +241,7 @@ void Config::load(const wstring &configFile)
241241
_includesNasmX86.insert(include);
242242
}
243243

244-
const wstring resourceFileName=configFile.substr(0,configFile.find_last_of(L"\\") + 1) + L"ImageMagick.rc";
244+
const auto resourceFileName=configFile.substr(0,configFile.find_last_of(L"\\") + 1) + L"ImageMagick.rc";
245245
if (filesystem::exists(resourceFileName))
246246
_resourceFileName=resourceFileName;
247247
}
@@ -272,7 +272,7 @@ vector<wstring> Config::readLines(wifstream &config)
272272

273273
while (!config.eof())
274274
{
275-
wstring line=readLine(config);
275+
const auto line=readLine(config);
276276
if (line.empty())
277277
return(lines);
278278

‎src/Configs.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,17 @@ void Configs::loadCoders(const Options &options,vector<Config> &configs)
8383
vector<Config>
8484
coders;
8585

86-
wstring coderDirectory=L"ImageMagick\\coders\\";
86+
const auto coderDirectory=L"ImageMagick\\coders\\";
8787
if (!filesystem::exists(options.rootDirectory + coderDirectory))
8888
throwException(L"Cannot find coders directory");
8989

90-
wstring coderProjectsDirectory=options.rootDirectory + L"Configure\\Configs\\coders\\";
90+
const auto coderProjectsDirectory=options.rootDirectory + L"Configure\\Configs\\coders\\";
9191
for (const auto& entry : filesystem::directory_iterator(coderProjectsDirectory))
9292
{
9393
if (!entry.is_regular_file() || !endsWith(entry.path().filename(),L".txt"))
9494
continue;
9595

96-
wstring name=entry.path().stem().wstring().substr(6);
96+
auto name=entry.path().stem().wstring().substr(6);
9797
if (name.empty())
9898
name=L"coders";
9999
else
@@ -106,27 +106,27 @@ void Configs::loadCoders(const Options &options,vector<Config> &configs)
106106

107107
void Configs::loadDirectory(const Options &options,const wstring directory,vector<Config> &configs)
108108
{
109-
wstring fullProjectDirectory=options.rootDirectory + L"\\" + directory;
109+
const auto fullProjectDirectory=options.rootDirectory + L"\\" + directory;
110110
if (!filesystem::exists(fullProjectDirectory))
111111
return;
112112

113113
for (const auto& entry : filesystem::directory_iterator(fullProjectDirectory))
114114
{
115115
if (entry.is_directory())
116116
{
117-
wstring name=entry.path().filename().wstring();
118-
wstring projectDirectory=directory + L"\\" + entry.path().filename().wstring() + L"\\";
119-
wstring configFile=options.rootDirectory + L"\\" + projectDirectory + L".ImageMagick\\Config.txt";
117+
const auto name=entry.path().filename().wstring();
118+
const auto projectDirectory=directory + L"\\" + entry.path().filename().wstring() + L"\\";
119+
const auto configFile=options.rootDirectory + L"\\" + projectDirectory + L".ImageMagick\\Config.txt";
120120

121-
Config config=Config::load(name,projectDirectory,configFile);
121+
auto config=Config::load(name,projectDirectory,configFile);
122122
addConfig(config,options,configs);
123123
}
124124
}
125125
}
126126

127127
Config Configs::loadConfig(const Options &options,const wstring &name,const wstring &directory)
128128
{
129-
wstring projectDirectory=options.rootDirectory + L"Configure\\Configs\\" + name;
129+
const auto projectDirectory=options.rootDirectory + L"Configure\\Configs\\" + name;
130130
if (!filesystem::exists(projectDirectory))
131131
throwException(L"Cannot find project directory");
132132

@@ -146,7 +146,7 @@ void Configs::removeInvalidReferences(const Options &options,vector<Config> &con
146146
set<wstring> invalidReferences;
147147
for (auto& reference : config.references())
148148
{
149-
bool found = false;
149+
auto found = false;
150150
for (const auto& otherConfig : configs)
151151
{
152152
if (&otherConfig == &config)

‎src/ConfigureApp.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ BOOL ConfigureApp::InitInstance()
4848
Options options(getRootDirectory());
4949
options.checkImageMagickVersion();
5050

51-
CommandLineInfo info=CommandLineInfo(options);
51+
CommandLineInfo info(options);
5252
ParseCommandLine(info);
5353

5454
if (info.showWizard)
@@ -89,7 +89,7 @@ void ConfigureApp::cleanupDirectories(Options &options,WaitDialog &waitDialog)
8989

9090
void ConfigureApp::copyFiles(Options &options)
9191
{
92-
wstring binDirectory=options.rootDirectory + L"Artifacts\\bin";
92+
const auto binDirectory=options.rootDirectory + L"Artifacts\\bin";
9393

9494
if (!filesystem::exists(binDirectory))
9595
filesystem::create_directories(binDirectory);
@@ -141,7 +141,7 @@ BOOL ConfigureApp::createFiles(Options &options,WaitDialog &waitDialog) const
141141

142142
const wstring ConfigureApp::getRootDirectory() const
143143
{
144-
filesystem::path directory=filesystem::current_path();
144+
auto directory=filesystem::current_path();
145145
while (directory.has_parent_path())
146146
{
147147
if (directory.filename() == L"Configure")

‎src/InstallerConfig.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void InstallerConfig::write(const Options &options,const VersionInfo &versionInf
2525
if (!filesystem::exists(options.rootDirectory + L"Configure\\Installer"))
2626
return;
2727

28-
wstring configFileName=L"Configure\\Installer\\Inno\\config.isx";
28+
const auto configFileName=L"Configure\\Installer\\Inno\\config.isx";
2929
versionInfo.write(L"Configure\\Installer\\Inno\\config.isx.in",configFileName);
3030

3131
wofstream configFile(options.rootDirectory + configFileName,ios::app);

‎src/MagickBaseConfig.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void MagickBaseConfig::write(const Options &options)
2525
if (!configIn)
2626
throwException(L"Unable to open magick-baseconfig.h.in");
2727

28-
wstring directory=options.rootDirectory + L"\\ImageMagick\\" + options.magickCoreName();
28+
const auto directory=options.rootDirectory + L"\\ImageMagick\\" + options.magickCoreName();
2929
wofstream configOut(directory + L"\\magick-baseconfig.h");
3030
if (!configOut)
3131
throwException(L"Unable to open magick-baseconfig.h");
@@ -127,7 +127,7 @@ void MagickBaseConfig::write(const Options &options)
127127
if (!entry.is_regular_file() || !endsWith(entry.path().filename(),L".h"))
128128
continue;
129129

130-
wstring fileName=entry.path().wstring();
130+
const auto fileName=entry.path().wstring();
131131
wifstream versionFile(fileName);
132132
if (!versionFile)
133133
throwException(L"Unable to open: " + fileName);

‎src/Options.cpp‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ const wstring Options::architectureName() const
5151
{
5252
switch (architecture)
5353
{
54-
case Architecture::x86: return(L"x86");
55-
case Architecture::x64: return(L"x64");
56-
case Architecture::Arm64: return(L"arm64");
57-
default: throwException(L"Unknown architecture");
54+
case Architecture::x86: return(L"x86");
55+
case Architecture::x64: return(L"x64");
56+
case Architecture::Arm64: return(L"arm64");
57+
default: throwException(L"Unknown architecture");
5858
}
5959
}
6060

@@ -73,10 +73,10 @@ const wstring Options::platform() const
7373
{
7474
switch (architecture)
7575
{
76-
case Architecture::x86: return(L"Win32");
77-
case Architecture::x64: return(L"x64");
78-
case Architecture::Arm64: return(L"ARM64");
79-
default: throwException(L"Unknown architecture");
76+
case Architecture::x86: return(L"Win32");
77+
case Architecture::x64: return(L"x64");
78+
case Architecture::Arm64: return(L"ARM64");
79+
default: throwException(L"Unknown architecture");
8080
}
8181
}
8282

@@ -132,10 +132,7 @@ VisualStudioVersion Options::getVisualStudioVersion()
132132

133133
bool Options::hasVisualStudioDirectory(const wchar_t *name)
134134
{
135-
wstring
136-
path;
137-
138-
path=getEnvironmentVariable(L"ProgramW6432") + L"\\Microsoft Visual Studio\\" + name;
135+
auto path=getEnvironmentVariable(L"ProgramW6432") + L"\\Microsoft Visual Studio\\" + name;
139136
if (filesystem::exists(path))
140137
return(true);
141138
path=getEnvironmentVariable(L"ProgramFiles(x86)") + L"\\Microsoft Visual Studio\\" + name;

‎src/PerlMagick.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void PerlMagick::configure(const Options &options)
3131
if (!makeFile)
3232
throwException(L"Unable to open Makefile.PL for writing.");
3333

34-
wstring libName=magickCoreLibraryName(options);
34+
const auto libName=magickCoreLibraryName(options);
3535

3636
wstring line;
3737
while (getline(makeFileIn,line))

‎src/Project.cpp‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ const wstring Project::prefix() const
175175
{
176176
case ProjectType::Application: return(L"APP");
177177
case ProjectType::Coder:
178-
return(_options.isStaticBuild ? L"CORE" : L"IM_MOD");
178+
return(_options.isStaticBuild ? L"CORE" : L"IM_MOD");
179179
case ProjectType::DynamicLibrary: return(L"CORE");
180180
case ProjectType::Demo: return(L"DEMO");
181181
case ProjectType::Filter:
182-
return(_options.isStaticBuild ? L"CORE" :L"FILTER");
182+
return(_options.isStaticBuild ? L"CORE" :L"FILTER");
183183
case ProjectType::Fuzz: return(L"FUZZ");
184184
case ProjectType::StaticLibrary: return(L"CORE");
185185
default: throwException(L"Unsupported project type");
@@ -230,7 +230,7 @@ bool Project::isExcluded(const wstring fileName,set<wstring> &excludes,multiset<
230230

231231
if (endsWith(fileName,L".h"))
232232
{
233-
size_t lastDot=fileName.find_last_of(L'.');
233+
const auto lastDot=fileName.find_last_of(L'.');
234234

235235
if (isExcluded(fileName.substr(0,lastDot) + L".c",excludes,foundExcludes))
236236
return(true);
@@ -357,14 +357,14 @@ const wstring Project::targetName(bool debug) const
357357

358358
void Project::write(const vector<Project> &allProjects) const
359359
{
360-
const wstring vcxprojFileName=_options.rootDirectory + fileName();
360+
const auto vcxprojFileName=_options.rootDirectory + fileName();
361361
filesystem::create_directories(filesystem::path(vcxprojFileName).parent_path());
362362

363363
wofstream file(vcxprojFileName);
364364
if (!file)
365365
throwException(L"Failed to open file: " + vcxprojFileName);
366366

367-
const bool includeMasm=hasAsmfiles() && !_config.useNasm() && _options.architecture != Architecture::Arm64;
367+
const auto includeMasm=hasAsmfiles() && !_config.useNasm() && _options.architecture != Architecture::Arm64;
368368

369369
file << "<?xml version=\"1.0\" encoding=\"utf-8\"?>" << endl;
370370
file << "<Project DefaultTargets=\"Build\" ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">" << endl;
@@ -384,6 +384,7 @@ void Project::write(const vector<Project> &allProjects) const
384384
writeCopyIncludes(file);
385385
file << "</Project>" << endl;
386386
}
387+
387388
void Project::writeCompilationConfiguration(wofstream &file) const
388389
{
389390
file << " <ItemDefinitionGroup>" << endl;
@@ -467,7 +468,7 @@ void Project::writeFiles(wofstream &file) const
467468
file << " <ItemGroup>" << endl;
468469
for (auto& fileName : _files)
469470
{
470-
wstring objectName=fileName.substr(fileName.find_last_of(L"\\") + 1);
471+
const auto objectName=fileName.substr(fileName.find_last_of(L"\\") + 1);
471472

472473
if (endsWith(fileName,L".h"))
473474
file << " <ClInclude Include=\"$(SolutionDir)" << _config.directory() << fileName << "\" />" << endl;
@@ -539,17 +540,17 @@ void Project::writeFilters() const
539540
if (slashIndex == wstring::npos)
540541
continue;
541542

542-
wstring directory=fileName.substr(0,slashIndex);
543+
const auto directory=fileName.substr(0,slashIndex);
543544
directories.insert(directory);
544-
wstring parentDirectory=directory;
545+
auto parentDirectory=directory;
545546
while (slashIndex != wstring::npos)
546547
{
547548
parentDirectory=parentDirectory.substr(0,slashIndex);
548549
directories.insert(parentDirectory);
549550
slashIndex=parentDirectory.find_last_of(L"\\");
550551
}
551552

552-
wstring tag=L"ClCompile";
553+
auto tag=L"ClCompile";
553554

554555
if (endsWith(fileName, L".h"))
555556
{
@@ -593,22 +594,22 @@ void Project::writeLicense() const
593594
if (_config.licenses().empty())
594595
return;
595596

596-
wstring targetDirectory=_options.rootDirectory + L"Artifacts\\license\\";
597+
const auto targetDirectory=_options.rootDirectory + L"Artifacts\\license\\";
597598
filesystem::create_directories(targetDirectory);
598599

599600
wofstream licenseFile(targetDirectory + name() + L".txt");
600601
for (const auto& license : _config.licenses())
601602
{
602-
wstring sourceFileName=_options.rootDirectory + _config.directory() + license;
603+
const auto sourceFileName=_options.rootDirectory + _config.directory() + license;
603604
wifstream sourceLicenseFile(sourceFileName);
604605
if (!sourceLicenseFile)
605606
throwException(L"Failed to open license file: " + sourceFileName);
606607

607-
wstring versionFileName=_options.rootDirectory + _config.directory() + L".ImageMagick\\ImageMagick.version.h";
608-
wstring projectName=name();
608+
auto versionFileName=_options.rootDirectory + _config.directory() + L".ImageMagick\\ImageMagick.version.h";
609+
auto projectName=name();
609610
if (!filesystem::exists(versionFileName))
610611
{
611-
wstring configDirectory=sourceFileName.substr(0,sourceFileName.find_last_of(L"\\"));
612+
const auto configDirectory=sourceFileName.substr(0,sourceFileName.find_last_of(L"\\"));
612613
versionFileName=configDirectory + L"\\.ImageMagick\\ImageMagick.version.h";
613614
projectName=configDirectory.substr(configDirectory.find_last_of(L"\\") + 1);
614615
}
@@ -665,13 +666,13 @@ void Project::writeMagickBaseconfigDefine() const
665666
if (_config.magickBaseconfigDefine().empty())
666667
return;
667668

668-
wstring targetDirectory=_options.rootDirectory + L"Artifacts\\config\\";
669+
const auto targetDirectory=_options.rootDirectory + L"Artifacts\\config\\";
669670
filesystem::create_directories(targetDirectory);
670671

671-
wstring configFileName=targetDirectory + name() + L".h";
672+
const auto configFileName=targetDirectory + name() + L".h";
672673
wofstream configFile(configFileName);
673-
if (!configFile)
674-
throwException(L"Failed to open license file: " + configFileName);
674+
if (!configFile)
675+
throwException(L"Failed to open license file: " + configFileName);
675676

676677
configFile << _config.magickBaseconfigDefine();
677678
}

‎src/Projects.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void Projects::createCoderProjects(const Options &options,vector<Config> &config
5555
for (const auto& project : projects)
5656
allNames.insert(project.name());
5757

58-
Project codersProject=Project::create(*codersConfig,options);
58+
auto codersProject=Project::create(*codersConfig,options);
5959

6060
if (options.isStaticBuild)
6161
{
@@ -86,7 +86,7 @@ void Projects::createDemoProjects(const Options &options,vector<Config> &configs
8686
if (demoConfig == configs.end())
8787
return;
8888

89-
Project demoProject=Project::create(*demoConfig,options);
89+
const auto demoProject=Project::create(*demoConfig,options);
9090
for (const auto& project : demoProject.splitToFiles())
9191
projects.push_back(project);
9292
}
@@ -97,7 +97,7 @@ void Projects::createFilterProjects(const Options &options,vector<Config> &confi
9797
if (filtersConfig == configs.end())
9898
return;
9999

100-
Project filtersProject=Project::create(*filtersConfig,options);
100+
const auto filtersProject=Project::create(*filtersConfig,options);
101101

102102
if (options.isStaticBuild)
103103
{
@@ -116,7 +116,7 @@ void Projects::createFuzzProjects(const Options &options,vector<Config> &configs
116116
if (fuzzConfig == configs.end())
117117
return;
118118

119-
Project fuzzProject=Project::create(*fuzzConfig,options);
119+
const auto fuzzProject=Project::create(*fuzzConfig,options);
120120
for (const auto& project : fuzzProject.splitToFiles({ L"main.cc" }))
121121
projects.push_back(project);
122122
}

0 commit comments

Comments
 (0)