Skip to content

Commit e6d15b1

Browse files
firewavefirewave
authored
extracted FileSettings from ImportProject to filesettings.h (cppcheck-opensource#5604)
1 parent 8d5fa19 commit e6d15b1

33 files changed

Lines changed: 278 additions & 231 deletions

‎Makefile‎

Lines changed: 120 additions & 120 deletions
Large diffs are not rendered by default.

‎cli/cmdlineparser.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "cppcheckexecutor.h"
2424
#include "errorlogger.h"
2525
#include "errortypes.h"
26+
#include "filesettings.h"
2627
#include "importproject.h"
2728
#include "path.h"
2829
#include "platform.h"

‎cli/cppcheckexecutor.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "cppcheck.h"
2929
#include "errortypes.h"
3030
#include "filelister.h"
31-
#include "importproject.h"
31+
#include "filesettings.h"
3232
#include "library.h"
3333
#include "path.h"
3434
#include "pathmatch.h"
@@ -196,10 +196,10 @@ bool CppCheckExecutor::parseFromArgs(Settings &settings, int argc, const char* c
196196
#endif
197197
if (!settings.fileSettings.empty() && !settings.fileFilters.empty()) {
198198
// filter only for the selected filenames from all project files
199-
std::list<ImportProject::FileSettings> newList;
199+
std::list<FileSettings> newList;
200200

201-
const std::list<ImportProject::FileSettings>& fileSettings = settings.fileSettings;
202-
std::copy_if(fileSettings.cbegin(), fileSettings.cend(), std::back_inserter(newList), [&](const ImportProject::FileSettings& fs) {
201+
const std::list<FileSettings>& fileSettings = settings.fileSettings;
202+
std::copy_if(fileSettings.cbegin(), fileSettings.cend(), std::back_inserter(newList), [&](const FileSettings& fs) {
203203
return matchglobs(settings.fileFilters, fs.filename);
204204
});
205205
if (!newList.empty())

‎cli/cppcheckexecutor.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#define CPPCHECKEXECUTOR_H
2121

2222
#include "color.h"
23+
#include "config.h"
2324
#include "errorlogger.h"
2425

2526
#include <cstdio>

‎cli/processexecutor.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "cppcheck.h"
2525
#include "errorlogger.h"
2626
#include "errortypes.h"
27-
#include "importproject.h"
27+
#include "filesettings.h"
2828
#include "settings.h"
2929
#include "suppressions.h"
3030
#include "timer.h"
@@ -237,7 +237,7 @@ unsigned int ProcessExecutor::check()
237237
std::map<int, std::string> pipeFile;
238238
std::size_t processedsize = 0;
239239
std::map<std::string, std::size_t>::const_iterator iFile = mFiles.cbegin();
240-
std::list<ImportProject::FileSettings>::const_iterator iFileSettings = mSettings.fileSettings.cbegin();
240+
std::list<FileSettings>::const_iterator iFileSettings = mSettings.fileSettings.cbegin();
241241
for (;;) {
242242
// Start a new child
243243
const size_t nchildren = childFile.size();

‎cli/singleexecutor.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "singleexecutor.h"
2020

2121
#include "cppcheck.h"
22-
#include "importproject.h"
22+
#include "filesettings.h"
2323
#include "library.h"
2424
#include "settings.h"
2525
#include "timer.h"
@@ -66,7 +66,7 @@ unsigned int SingleExecutor::check()
6666
} else {
6767
// filesettings
6868
// check all files of the project
69-
for (const ImportProject::FileSettings &fs : mSettings.fileSettings) {
69+
for (const FileSettings &fs : mSettings.fileSettings) {
7070
if (!mSettings.library.markupFile(fs.filename)
7171
|| !mSettings.library.processMarkupAfterCode(fs.filename)) {
7272
result += mCppcheck.check(fs);
@@ -96,7 +96,7 @@ unsigned int SingleExecutor::check()
9696
}
9797
}
9898
else {
99-
for (const ImportProject::FileSettings &fs : mSettings.fileSettings) {
99+
for (const FileSettings &fs : mSettings.fileSettings) {
100100
if (mSettings.library.markupFile(fs.filename)
101101
&& mSettings.library.processMarkupAfterCode(fs.filename)) {
102102
result += mCppcheck.check(fs);

‎cli/threadexecutor.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "config.h"
2222
#include "cppcheck.h"
2323
#include "errorlogger.h"
24-
#include "importproject.h"
24+
#include "filesettings.h"
2525
#include "settings.h"
2626
#include "timer.h"
2727

@@ -81,7 +81,7 @@ class SyncLogForwarder : public ErrorLogger
8181
class ThreadData
8282
{
8383
public:
84-
ThreadData(ThreadExecutor &threadExecutor, ErrorLogger &errorLogger, const Settings &settings, const std::map<std::string, std::size_t> &files, const std::list<ImportProject::FileSettings> &fileSettings, CppCheck::ExecuteCmdFn executeCommand)
84+
ThreadData(ThreadExecutor &threadExecutor, ErrorLogger &errorLogger, const Settings &settings, const std::map<std::string, std::size_t> &files, const std::list<FileSettings> &fileSettings, CppCheck::ExecuteCmdFn executeCommand)
8585
: mFiles(files), mFileSettings(fileSettings), mSettings(settings), mExecuteCommand(std::move(executeCommand)), logForwarder(threadExecutor, errorLogger)
8686
{
8787
mItNextFile = mFiles.begin();
@@ -93,7 +93,7 @@ class ThreadData
9393
});
9494
}
9595

96-
bool next(const std::string *&file, const ImportProject::FileSettings *&fs, std::size_t &fileSize) {
96+
bool next(const std::string *&file, const FileSettings *&fs, std::size_t &fileSize) {
9797
std::lock_guard<std::mutex> l(mFileSync);
9898
if (mItNextFile != mFiles.end()) {
9999
file = &mItNextFile->first;
@@ -113,7 +113,7 @@ class ThreadData
113113
return false;
114114
}
115115

116-
unsigned int check(ErrorLogger &errorLogger, const std::string *file, const ImportProject::FileSettings *fs) const {
116+
unsigned int check(ErrorLogger &errorLogger, const std::string *file, const FileSettings *fs) const {
117117
CppCheck fileChecker(errorLogger, false, mExecuteCommand);
118118
fileChecker.settings() = mSettings; // this is a copy
119119

@@ -142,8 +142,8 @@ class ThreadData
142142
private:
143143
const std::map<std::string, std::size_t> &mFiles;
144144
std::map<std::string, std::size_t>::const_iterator mItNextFile;
145-
const std::list<ImportProject::FileSettings> &mFileSettings;
146-
std::list<ImportProject::FileSettings>::const_iterator mItNextFileSettings;
145+
const std::list<FileSettings> &mFileSettings;
146+
std::list<FileSettings>::const_iterator mItNextFileSettings;
147147

148148
std::size_t mProcessedFiles{};
149149
std::size_t mTotalFiles{};
@@ -163,7 +163,7 @@ static unsigned int STDCALL threadProc(ThreadData *data)
163163
unsigned int result = 0;
164164

165165
const std::string *file;
166-
const ImportProject::FileSettings *fs;
166+
const FileSettings *fs;
167167
std::size_t fileSize;
168168

169169
while (data->next(file, fs, fileSize)) {

‎gui/checkthread.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "erroritem.h"
2525
#include "errorlogger.h"
2626
#include "errortypes.h"
27+
#include "filesettings.h"
2728
#include "settings.h"
2829
#include "standards.h"
2930
#include "threadresult.h"
@@ -130,7 +131,7 @@ void CheckThread::run()
130131
file = mResult.getNextFile();
131132
}
132133

133-
ImportProject::FileSettings fileSettings = mResult.getNextFileSettings();
134+
FileSettings fileSettings = mResult.getNextFileSettings();
134135
while (!fileSettings.filename.empty() && mState == Running) {
135136
file = QString::fromStdString(fileSettings.filename);
136137
qDebug() << "Checking file" << file;
@@ -150,7 +151,7 @@ void CheckThread::run()
150151
emit done();
151152
}
152153

153-
void CheckThread::runAddonsAndTools(const ImportProject::FileSettings *fileSettings, const QString &fileName)
154+
void CheckThread::runAddonsAndTools(const FileSettings *fileSettings, const QString &fileName)
154155
{
155156
for (const QString& addon : mAddonsAndTools) {
156157
if (addon == CLANG_ANALYZER || addon == CLANG_TIDY) {

‎gui/checkthread.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#define CHECKTHREAD_H
2222

2323
#include "cppcheck.h"
24-
#include "importproject.h"
2524
#include "suppressions.h"
2625

2726
#include <atomic>
@@ -34,6 +33,7 @@
3433

3534
class Settings;
3635
class ThreadResult;
36+
struct FileSettings;
3737

3838
/// @addtogroup GUI
3939
/// @{
@@ -130,7 +130,7 @@ class CheckThread : public QThread {
130130
CppCheck mCppcheck;
131131

132132
private:
133-
void runAddonsAndTools(const ImportProject::FileSettings *fileSettings, const QString &fileName);
133+
void runAddonsAndTools(const FileSettings *fileSettings, const QString &fileName);
134134

135135
void parseClangErrors(const QString &tool, const QString &file0, QString err);
136136

‎gui/codeeditorstyle.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
#include "codeeditorstyle.h"
2020

21-
#include <utility>
22-
2321
#include <QSettings>
2422
#include <QStringList>
2523
#include <QVariant>

0 commit comments

Comments
 (0)