Skip to content

Commit 5428dab

Browse files
committed
set file sizes in CmdLineParser::fillSettingsFromArgs
1 parent 7bac35c commit 5428dab

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

cli/cmdlineparser.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,13 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
214214

215215
mFileSettings.clear();
216216

217+
for (auto &fs : fileSettings)
218+
{
219+
std::string error = fs.updateFileSize();
220+
if (!error.empty())
221+
mLogger.printError(error);
222+
}
223+
217224
// sort the markup last
218225
std::copy_if(fileSettings.cbegin(), fileSettings.cend(), std::back_inserter(mFileSettings), [&](const FileSettings &fs) {
219226
return !mSettings.library.markupFile(fs.filename()) || !mSettings.library.processMarkupAfterCode(fs.filename());
@@ -284,6 +291,13 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
284291
files = std::move(filesResolved);
285292
}
286293

294+
for (auto &f : files)
295+
{
296+
std::string error = f.updateSize();
297+
if (!error.empty())
298+
mLogger.printError(error);
299+
}
300+
287301
// sort the markup last
288302
std::copy_if(files.cbegin(), files.cend(), std::inserter(mFiles, mFiles.end()), [&](const FileWithDetails& entry) {
289303
return !mSettings.library.markupFile(entry.path()) || !mSettings.library.processMarkupAfterCode(entry.path());

lib/importproject.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -194,33 +194,28 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings
194194
if (endsWith(filename, ".json")) {
195195
if (importCompileCommands(fin)) {
196196
setRelativePaths(filename);
197-
setFileSizes();
198197
return ImportProject::Type::COMPILE_DB;
199198
}
200199
} else if (endsWith(filename, ".sln")) {
201200
if (importSln(fin, mPath, fileFilters)) {
202201
setRelativePaths(filename);
203-
setFileSizes();
204202
return ImportProject::Type::VS_SLN;
205203
}
206204
} else if (endsWith(filename, ".vcxproj")) {
207205
std::map<std::string, std::string, cppcheck::stricmp> variables;
208206
std::vector<SharedItemsProject> sharedItemsProjects;
209207
if (importVcxproj(filename, variables, emptyString, fileFilters, sharedItemsProjects)) {
210208
setRelativePaths(filename);
211-
setFileSizes();
212209
return ImportProject::Type::VS_VCXPROJ;
213210
}
214211
} else if (endsWith(filename, ".bpr")) {
215212
if (importBcb6Prj(filename)) {
216213
setRelativePaths(filename);
217-
setFileSizes();
218214
return ImportProject::Type::BORLAND;
219215
}
220216
} else if (settings && endsWith(filename, ".cppcheck")) {
221217
if (importCppcheckGuiProject(fin, settings)) {
222218
setRelativePaths(filename);
223-
setFileSizes();
224219
return ImportProject::Type::CPPCHECK_GUI;
225220
}
226221
} else {
@@ -1502,10 +1497,3 @@ bool ImportProject::sourceFileExists(const std::string &file)
15021497
{
15031498
return Path::isFile(file);
15041499
}
1505-
1506-
void ImportProject::setFileSizes()
1507-
{
1508-
for (auto &fs : fileSettings) {
1509-
fs.updateFileSize();
1510-
}
1511-
}

0 commit comments

Comments
 (0)