Skip to content

Commit 8d704f7

Browse files
danmardanmar
committed
GUI: Rename methods in ProjectFile
1 parent 6c42470 commit 8d704f7

6 files changed

Lines changed: 112 additions & 116 deletions

File tree

‎gui/mainwindow.cpp‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ void MainWindow::DoCheckProject(ImportProject p)
362362
mIsLogfileLoaded = false;
363363
if (mProject) {
364364
std::vector<std::string> v;
365-
foreach (const QString &s, mProject->getProjectFile()->GetExcludedPaths()) {
365+
foreach (const QString &s, mProject->getProjectFile()->getExcludedPaths()) {
366366
v.push_back(s.toStdString());
367367
}
368368
p.ignorePaths(v);
@@ -386,7 +386,7 @@ void MainWindow::DoCheckProject(ImportProject p)
386386
checkSettings.force = false;
387387

388388
if (mProject)
389-
qDebug() << "Checking project file" << mProject->getProjectFile()->GetFilename();
389+
qDebug() << "Checking project file" << mProject->getProjectFile()->getFilename();
390390

391391
if (!checkSettings.buildDir.empty()) {
392392
std::list<std::string> sourcefiles;
@@ -409,7 +409,7 @@ void MainWindow::DoCheckFiles(const QStringList &files)
409409
FileList pathList;
410410
pathList.AddPathList(files);
411411
if (mProject) {
412-
pathList.AddExcludeList(mProject->getProjectFile()->GetExcludedPaths());
412+
pathList.AddExcludeList(mProject->getProjectFile()->getExcludedPaths());
413413
} else {
414414
EnableProjectActions(false);
415415
}
@@ -441,7 +441,7 @@ void MainWindow::DoCheckFiles(const QStringList &files)
441441
Settings checkSettings = GetCppcheckSettings();
442442

443443
if (mProject)
444-
qDebug() << "Checking project file" << mProject->getProjectFile()->GetFilename();
444+
qDebug() << "Checking project file" << mProject->getProjectFile()->getFilename();
445445

446446
if (!checkSettings.buildDir.empty()) {
447447
std::list<std::string> sourcefiles;
@@ -642,7 +642,7 @@ Library::Error MainWindow::LoadLibrary(Library *library, QString filename)
642642

643643
// Try to load the library from the project folder..
644644
if (mProject) {
645-
QString path = QFileInfo(mProject->getProjectFile()->GetFilename()).canonicalPath();
645+
QString path = QFileInfo(mProject->getProjectFile()->getFilename()).canonicalPath();
646646
ret = library->load(NULL, (path+"/"+filename).toLatin1());
647647
if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
648648
return ret;
@@ -742,24 +742,23 @@ Settings MainWindow::GetCppcheckSettings()
742742
// If project file loaded, read settings from it
743743
if (mProject) {
744744
ProjectFile *pfile = mProject->getProjectFile();
745-
QStringList dirs = pfile->GetIncludeDirs();
745+
QStringList dirs = pfile->getIncludeDirs();
746746
AddIncludeDirs(dirs, result);
747747

748-
const QStringList defines = pfile->GetDefines();
749-
QString define;
750-
foreach (define, defines) {
748+
const QStringList defines = pfile->getDefines();
749+
foreach (QString define, defines) {
751750
if (!result.userDefines.empty())
752751
result.userDefines += ";";
753752
result.userDefines += define.toStdString();
754753
}
755754

756-
const QStringList libraries = pfile->GetLibraries();
755+
const QStringList libraries = pfile->getLibraries();
757756
foreach (QString library, libraries) {
758757
const QString filename = library + ".cfg";
759758
TryLoadLibrary(&result.library, filename);
760759
}
761760

762-
const QStringList suppressions = pfile->GetSuppressions();
761+
const QStringList suppressions = pfile->getSuppressions();
763762
foreach (QString suppression, suppressions) {
764763
result.nomsg.addSuppressionLine(suppression.toStdString());
765764
}
@@ -768,9 +767,9 @@ Settings MainWindow::GetCppcheckSettings()
768767
if (!defines.isEmpty())
769768
result.maxConfigs = 1;
770769

771-
QString buildDir = pfile->GetBuildDir();
770+
QString buildDir = pfile->getBuildDir();
772771
if (!buildDir.isEmpty()) {
773-
QString prjpath = QFileInfo(pfile->GetFilename()).absolutePath();
772+
QString prjpath = QFileInfo(pfile->getFilename()).absolutePath();
774773
result.buildDir = (prjpath + '/' + buildDir).toStdString();
775774
}
776775
}
@@ -934,7 +933,7 @@ void MainWindow::ReCheckSelected(QStringList files, bool all)
934933
FileList pathList;
935934
pathList.AddPathList(files);
936935
if (mProject)
937-
pathList.AddExcludeList(mProject->getProjectFile()->GetExcludedPaths());
936+
pathList.AddExcludeList(mProject->getProjectFile()->getExcludedPaths());
938937
QStringList fileNames = pathList.GetFileList();
939938
CheckLockDownUI(); // lock UI while checking
940939
mUI.mResults->CheckingStarted(fileNames.size());
@@ -965,7 +964,7 @@ void MainWindow::ReCheck(bool all)
965964
mUI.mResults->CheckingStarted(files.size());
966965

967966
if (mProject)
968-
qDebug() << "Rechecking project file" << mProject->getProjectFile()->GetFilename();
967+
qDebug() << "Rechecking project file" << mProject->getProjectFile()->getFilename();
969968

970969
mThread->SetCheckFiles(all);
971970
mThread->Check(GetCppcheckSettings(), all);
@@ -1323,7 +1322,7 @@ void MainWindow::CheckProject(Project *project)
13231322
}
13241323

13251324
QFileInfo inf(project->getFilename());
1326-
const QString rootpath = project->getProjectFile()->GetRootPath();
1325+
const QString rootpath = project->getProjectFile()->getRootPath();
13271326

13281327
// If the root path is not given or is not "current dir", use project
13291328
// file's location directory as root path
@@ -1334,15 +1333,15 @@ void MainWindow::CheckProject(Project *project)
13341333
else
13351334
mCurrentDirectory = rootpath;
13361335

1337-
if (!project->getProjectFile()->GetImportProject().isEmpty()) {
1336+
if (!project->getProjectFile()->getImportProject().isEmpty()) {
13381337
ImportProject p;
1339-
QString prjfile = inf.canonicalPath() + '/' + project->getProjectFile()->GetImportProject();
1338+
QString prjfile = inf.canonicalPath() + '/' + project->getProjectFile()->getImportProject();
13401339
p.import(prjfile.toStdString());
13411340
DoCheckProject(p);
13421341
return;
13431342
}
13441343

1345-
QStringList paths = project->getProjectFile()->GetCheckPaths();
1344+
QStringList paths = project->getProjectFile()->getCheckPaths();
13461345

13471346
// If paths not given then check the root path (which may be the project
13481347
// file's location, see above). This is to keep the compatibility with

‎gui/project.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ bool Project::open()
6868
if (!QFile::exists(mFilename))
6969
return false;
7070

71-
if (!mProjectFile->Read()) {
71+
if (!mProjectFile->read()) {
7272
QMessageBox msg(QMessageBox::Critical,
7373
tr("Cppcheck"),
7474
tr("Could not read the project file."),
7575
QMessageBox::Ok,
7676
mParentWidget);
7777
msg.exec();
7878
mFilename = QString();
79-
mProjectFile->SetFilename(mFilename);
79+
mProjectFile->setFilename(mFilename);
8080
return false;
8181
}
8282

@@ -92,7 +92,7 @@ bool Project::edit()
9292

9393
dlg.SaveToProjectFile(mProjectFile);
9494

95-
if (!mProjectFile->Write()) {
95+
if (!mProjectFile->write()) {
9696
QMessageBox msg(QMessageBox::Critical,
9797
tr("Cppcheck"),
9898
tr("Could not write the project file."),

‎gui/projectfile.cpp‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ ProjectFile::ProjectFile(const QString &filename, QObject *parent) :
6262
{
6363
}
6464

65-
bool ProjectFile::Read(const QString &filename)
65+
bool ProjectFile::read(const QString &filename)
6666
{
6767
if (!filename.isEmpty())
6868
mFilename = filename;
@@ -83,43 +83,43 @@ bool ProjectFile::Read(const QString &filename)
8383
}
8484
// Read root path from inside project element
8585
if (insideProject && xmlReader.name() == RootPathName)
86-
ReadRootPath(xmlReader);
86+
readRootPath(xmlReader);
8787

8888
// Read root path from inside project element
8989
if (insideProject && xmlReader.name() == BuildDirElementName)
90-
ReadBuildDir(xmlReader);
90+
readBuildDir(xmlReader);
9191

9292
// Find paths to check from inside project element
9393
if (insideProject && xmlReader.name() == PathsElementName)
94-
ReadCheckPaths(xmlReader);
94+
readCheckPaths(xmlReader);
9595

9696
if (insideProject && xmlReader.name() == ImportProjectElementName)
97-
ReadImportProject(xmlReader);
97+
readImportProject(xmlReader);
9898

9999
// Find include directory from inside project element
100100
if (insideProject && xmlReader.name() == IncludeDirElementName)
101-
ReadIncludeDirs(xmlReader);
101+
readIncludeDirs(xmlReader);
102102

103103
// Find preprocessor define from inside project element
104104
if (insideProject && xmlReader.name() == DefinesElementName)
105-
ReadDefines(xmlReader);
105+
readDefines(xmlReader);
106106

107107
// Find exclude list from inside project element
108108
if (insideProject && xmlReader.name() == ExcludeElementName)
109-
ReadExcludes(xmlReader);
109+
readExcludes(xmlReader);
110110

111111
// Find ignore list from inside project element
112112
// These are read for compatibility
113113
if (insideProject && xmlReader.name() == IgnoreElementName)
114-
ReadExcludes(xmlReader);
114+
readExcludes(xmlReader);
115115

116116
// Find libraries list from inside project element
117117
if (insideProject && xmlReader.name() == LibrariesElementName)
118-
ReadStringList(mLibraries, xmlReader,LibraryElementName);
118+
readStringList(mLibraries, xmlReader,LibraryElementName);
119119

120120
// Find suppressions list from inside project element
121121
if (insideProject && xmlReader.name() == SuppressionsElementName)
122-
ReadStringList(mSuppressions, xmlReader,SuppressionElementName);
122+
readStringList(mSuppressions, xmlReader,SuppressionElementName);
123123

124124
break;
125125

@@ -143,21 +143,18 @@ bool ProjectFile::Read(const QString &filename)
143143
}
144144

145145
file.close();
146-
if (projectTagFound)
147-
return true;
148-
else
149-
return false;
146+
return projectTagFound;
150147
}
151148

152-
void ProjectFile::ReadRootPath(QXmlStreamReader &reader)
149+
void ProjectFile::readRootPath(QXmlStreamReader &reader)
153150
{
154151
QXmlStreamAttributes attribs = reader.attributes();
155152
QString name = attribs.value("", RootPathNameAttrib).toString();
156153
if (!name.isEmpty())
157154
mRootPath = name;
158155
}
159156

160-
void ProjectFile::ReadBuildDir(QXmlStreamReader &reader)
157+
void ProjectFile::readBuildDir(QXmlStreamReader &reader)
161158
{
162159
mBuildDir.clear();
163160
do {
@@ -182,7 +179,7 @@ void ProjectFile::ReadBuildDir(QXmlStreamReader &reader)
182179
} while (1);
183180
}
184181

185-
void ProjectFile::ReadImportProject(QXmlStreamReader &reader)
182+
void ProjectFile::readImportProject(QXmlStreamReader &reader)
186183
{
187184
mImportProject.clear();
188185
do {
@@ -207,7 +204,7 @@ void ProjectFile::ReadImportProject(QXmlStreamReader &reader)
207204
} while (1);
208205
}
209206

210-
void ProjectFile::ReadIncludeDirs(QXmlStreamReader &reader)
207+
void ProjectFile::readIncludeDirs(QXmlStreamReader &reader)
211208
{
212209
QXmlStreamReader::TokenType type;
213210
bool allRead = false;
@@ -245,7 +242,7 @@ void ProjectFile::ReadIncludeDirs(QXmlStreamReader &reader)
245242
} while (!allRead);
246243
}
247244

248-
void ProjectFile::ReadDefines(QXmlStreamReader &reader)
245+
void ProjectFile::readDefines(QXmlStreamReader &reader)
249246
{
250247
QXmlStreamReader::TokenType type;
251248
bool allRead = false;
@@ -282,7 +279,7 @@ void ProjectFile::ReadDefines(QXmlStreamReader &reader)
282279
} while (!allRead);
283280
}
284281

285-
void ProjectFile::ReadCheckPaths(QXmlStreamReader &reader)
282+
void ProjectFile::readCheckPaths(QXmlStreamReader &reader)
286283
{
287284
QXmlStreamReader::TokenType type;
288285
bool allRead = false;
@@ -320,7 +317,7 @@ void ProjectFile::ReadCheckPaths(QXmlStreamReader &reader)
320317
} while (!allRead);
321318
}
322319

323-
void ProjectFile::ReadExcludes(QXmlStreamReader &reader)
320+
void ProjectFile::readExcludes(QXmlStreamReader &reader)
324321
{
325322
QXmlStreamReader::TokenType type;
326323
bool allRead = false;
@@ -367,7 +364,7 @@ void ProjectFile::ReadExcludes(QXmlStreamReader &reader)
367364
}
368365

369366

370-
void ProjectFile::ReadStringList(QStringList &stringlist, QXmlStreamReader &reader, const char elementname[])
367+
void ProjectFile::readStringList(QStringList &stringlist, QXmlStreamReader &reader, const char elementname[])
371368
{
372369
QXmlStreamReader::TokenType type;
373370
bool allRead = false;
@@ -405,37 +402,37 @@ void ProjectFile::ReadStringList(QStringList &stringlist, QXmlStreamReader &read
405402
} while (!allRead);
406403
}
407404

408-
void ProjectFile::SetIncludes(const QStringList &includes)
405+
void ProjectFile::setIncludes(const QStringList &includes)
409406
{
410407
mIncludeDirs = includes;
411408
}
412409

413-
void ProjectFile::SetDefines(const QStringList &defines)
410+
void ProjectFile::setDefines(const QStringList &defines)
414411
{
415412
mDefines = defines;
416413
}
417414

418-
void ProjectFile::SetCheckPaths(const QStringList &paths)
415+
void ProjectFile::setCheckPaths(const QStringList &paths)
419416
{
420417
mPaths = paths;
421418
}
422419

423-
void ProjectFile::SetExcludedPaths(const QStringList &paths)
420+
void ProjectFile::setExcludedPaths(const QStringList &paths)
424421
{
425422
mExcludedPaths = paths;
426423
}
427424

428-
void ProjectFile::SetLibraries(const QStringList &libraries)
425+
void ProjectFile::setLibraries(const QStringList &libraries)
429426
{
430427
mLibraries = libraries;
431428
}
432429

433-
void ProjectFile::SetSuppressions(const QStringList &suppressions)
430+
void ProjectFile::setSuppressions(const QStringList &suppressions)
434431
{
435432
mSuppressions = suppressions;
436433
}
437434

438-
bool ProjectFile::Write(const QString &filename)
435+
bool ProjectFile::write(const QString &filename)
439436
{
440437
if (!filename.isEmpty())
441438
mFilename = filename;
@@ -508,12 +505,12 @@ bool ProjectFile::Write(const QString &filename)
508505
xmlWriter.writeEndElement();
509506
}
510507

511-
WriteStringList(xmlWriter,
508+
writeStringList(xmlWriter,
512509
mLibraries,
513510
LibrariesElementName,
514511
LibraryElementName);
515512

516-
WriteStringList(xmlWriter,
513+
writeStringList(xmlWriter,
517514
mSuppressions,
518515
SuppressionsElementName,
519516
SuppressionElementName);
@@ -523,7 +520,7 @@ bool ProjectFile::Write(const QString &filename)
523520
return true;
524521
}
525522

526-
void ProjectFile::WriteStringList(QXmlStreamWriter &xmlWriter, const QStringList &stringlist, const char startelementname[], const char stringelementname[])
523+
void ProjectFile::writeStringList(QXmlStreamWriter &xmlWriter, const QStringList &stringlist, const char startelementname[], const char stringelementname[])
527524
{
528525
if (stringlist.isEmpty())
529526
return;

0 commit comments

Comments
 (0)