Skip to content

Commit 98803bb

Browse files
danmardanmar
committed
GUI: Renamed methods in ThreadHandler
1 parent 90dd04d commit 98803bb

7 files changed

Lines changed: 113 additions & 113 deletions

File tree

‎gui/checkthread.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,25 @@ void CheckThread::run()
6969
return;
7070
}
7171

72-
QString file = mResult.GetNextFile();
72+
QString file = mResult.getNextFile();
7373
while (!file.isEmpty() && mState == Running) {
7474
qDebug() << "Checking file" << file;
7575
mCppcheck.check(file.toStdString());
7676
emit FileChecked(file);
7777

7878
if (mState == Running)
79-
file = mResult.GetNextFile();
79+
file = mResult.getNextFile();
8080
}
8181

82-
ImportProject::FileSettings fileSettings = mResult.GetNextFileSettings();
82+
ImportProject::FileSettings fileSettings = mResult.getNextFileSettings();
8383
while (!fileSettings.filename.empty() && mState == Running) {
8484
file = QString::fromStdString(fileSettings.filename);
8585
qDebug() << "Checking file" << file;
8686
mCppcheck.check(fileSettings);
8787
emit FileChecked(file);
8888

8989
if (mState == Running)
90-
fileSettings = mResult.GetNextFileSettings();
90+
fileSettings = mResult.getNextFileSettings();
9191
}
9292

9393
if (mState == Running)

‎gui/mainwindow.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
121121
connect(mUI.mActionToolBarFilter, SIGNAL(toggled(bool)), this, SLOT(toggleFilterToolBar()));
122122

123123
connect(mUI.mActionAuthors, SIGNAL(triggered()), this, SLOT(showAuthors()));
124-
connect(mThread, SIGNAL(Done()), this, SLOT(checkDone()));
124+
connect(mThread, SIGNAL(done()), this, SLOT(checkDone()));
125125
connect(mUI.mResults, SIGNAL(gotResults()), this, SLOT(resultsAdded()));
126126
connect(mUI.mResults, SIGNAL(resultsHidden(bool)), mUI.mActionShowHidden, SLOT(setEnabled(bool)));
127127
connect(mUI.mResults, SIGNAL(checkSelected(QStringList)), this, SLOT(performSelectedFilesCheck(QStringList)));
@@ -138,7 +138,7 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
138138

139139
loadSettings();
140140

141-
mThread->Initialize(mUI.mResults);
141+
mThread->initialize(mUI.mResults);
142142
formatAndSetTitle();
143143

144144
enableCheckButtons(true);
@@ -371,7 +371,7 @@ void MainWindow::doCheckProject(ImportProject p)
371371
}
372372

373373
mUI.mResults->clear(true);
374-
mThread->ClearFiles();
374+
mThread->clearFiles();
375375

376376
mUI.mResults->checkingStarted(p.fileSettings.size());
377377

@@ -394,8 +394,8 @@ void MainWindow::doCheckProject(ImportProject p)
394394
}
395395

396396
//mThread->SetCheckProject(true);
397-
mThread->SetProject(p);
398-
mThread->Check(checkSettings, true);
397+
mThread->setProject(p);
398+
mThread->check(checkSettings, true);
399399
}
400400

401401
void MainWindow::doCheckFiles(const QStringList &files)
@@ -416,7 +416,7 @@ void MainWindow::doCheckFiles(const QStringList &files)
416416
QStringList fileNames = pathList.getFileList();
417417

418418
mUI.mResults->clear(true);
419-
mThread->ClearFiles();
419+
mThread->clearFiles();
420420

421421
if (fileNames.isEmpty()) {
422422
QMessageBox msg(QMessageBox::Warning,
@@ -430,7 +430,7 @@ void MainWindow::doCheckFiles(const QStringList &files)
430430

431431
mUI.mResults->checkingStarted(fileNames.count());
432432

433-
mThread->SetFiles(fileNames);
433+
mThread->setFiles(fileNames);
434434
QDir inf(mCurrentDirectory);
435435
const QString checkPath = inf.canonicalPath();
436436
setPath(SETTINGS_LAST_CHECK_PATH, checkPath);
@@ -450,15 +450,15 @@ void MainWindow::doCheckFiles(const QStringList &files)
450450
AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, checkSettings.project.fileSettings);
451451
}
452452

453-
mThread->SetCheckFiles(true);
454-
mThread->Check(checkSettings, true);
453+
mThread->setCheckFiles(true);
454+
mThread->check(checkSettings, true);
455455
}
456456

457457
void MainWindow::checkCode(const QString& code, const QString& filename)
458458
{
459459
// Initialize dummy ThreadResult as ErrorLogger
460460
ThreadResult result;
461-
result.SetFiles(QStringList(filename));
461+
result.setFiles(QStringList(filename));
462462
connect(&result, SIGNAL(Progress(int, const QString&)),
463463
mUI.mResults, SLOT(Progress(int, const QString&)));
464464
connect(&result, SIGNAL(Error(const ErrorItem &)),
@@ -921,7 +921,7 @@ void MainWindow::reCheckSelected(QStringList files, bool all)
921921
{
922922
if (files.empty())
923923
return;
924-
if (mThread->IsChecking())
924+
if (mThread->isChecking())
925925
return;
926926

927927
// Clear details, statistics and progress
@@ -937,19 +937,19 @@ void MainWindow::reCheckSelected(QStringList files, bool all)
937937
QStringList fileNames = pathList.getFileList();
938938
checkLockDownUI(); // lock UI while checking
939939
mUI.mResults->checkingStarted(fileNames.size());
940-
mThread->SetCheckFiles(fileNames);
940+
mThread->setCheckFiles(fileNames);
941941

942942
// Saving last check start time, otherwise unchecked modified files will not be
943943
// considered in "Modified Files Check" performed after "Selected Files Check"
944944
// TODO: Should we store per file CheckStartTime?
945-
QDateTime saveCheckStartTime = mThread->GetCheckStartTime();
946-
mThread->Check(getCppcheckSettings(), all);
947-
mThread->SetCheckStartTime(saveCheckStartTime);
945+
QDateTime saveCheckStartTime = mThread->getCheckStartTime();
946+
mThread->check(getCppcheckSettings(), all);
947+
mThread->setCheckStartTime(saveCheckStartTime);
948948
}
949949

950950
void MainWindow::reCheck(bool all)
951951
{
952-
const QStringList files = mThread->GetReCheckFiles(all);
952+
const QStringList files = mThread->getReCheckFiles(all);
953953
if (files.empty())
954954
return;
955955

@@ -966,8 +966,8 @@ void MainWindow::reCheck(bool all)
966966
if (mProject)
967967
qDebug() << "Rechecking project file" << mProject->getProjectFile()->getFilename();
968968

969-
mThread->SetCheckFiles(all);
970-
mThread->Check(getCppcheckSettings(), all);
969+
mThread->setCheckFiles(all);
970+
mThread->check(getCppcheckSettings(), all);
971971
}
972972

973973
void MainWindow::clearResults()
@@ -1036,7 +1036,7 @@ void MainWindow::enableCheckButtons(bool enable)
10361036
mUI.mActionStop->setEnabled(!enable);
10371037
mUI.mActionCheckFiles->setEnabled(enable);
10381038

1039-
if (!enable || mThread->HasPreviousFiles()) {
1039+
if (!enable || mThread->hasPreviousFiles()) {
10401040
mUI.mActionRecheckModified->setEnabled(enable);
10411041
mUI.mActionRecheckAll->setEnabled(enable);
10421042
}
@@ -1087,7 +1087,7 @@ void MainWindow::uncheckAll()
10871087
void MainWindow::closeEvent(QCloseEvent *event)
10881088
{
10891089
// Check that we aren't checking files
1090-
if (!mThread->IsChecking()) {
1090+
if (!mThread->isChecking()) {
10911091
saveSettings();
10921092
event->accept();
10931093
} else {
@@ -1105,7 +1105,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
11051105
if (rv == QMessageBox::Yes) {
11061106
// This isn't really very clean way to close threads but since the app is
11071107
// exiting it doesn't matter.
1108-
mThread->Stop();
1108+
mThread->stop();
11091109
saveSettings();
11101110
mExiting = true;
11111111
}
@@ -1253,7 +1253,7 @@ void MainWindow::aboutToShowViewMenu()
12531253

12541254
void MainWindow::stopChecking()
12551255
{
1256-
mThread->Stop();
1256+
mThread->stop();
12571257
mUI.mResults->disableProgressbar();
12581258
}
12591259

@@ -1432,8 +1432,8 @@ void MainWindow::showStatistics()
14321432
statsDialog.setProject(*mProject);
14331433
}
14341434
statsDialog.setPathSelected(mCurrentDirectory);
1435-
statsDialog.setNumberOfFilesScanned(mThread->GetPreviousFilesCount());
1436-
statsDialog.setScanDuration(mThread->GetPreviousScanDuration() / 1000.0);
1435+
statsDialog.setNumberOfFilesScanned(mThread->getPreviousFilesCount());
1436+
statsDialog.setScanDuration(mThread->getPreviousScanDuration() / 1000.0);
14371437
statsDialog.setStatistics(mUI.mResults->getStatistics());
14381438

14391439
statsDialog.exec();

‎gui/resultstree.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
580580
hideallid->setDisabled(true);
581581
opencontainingfolder->setDisabled(true);
582582
}
583-
if (mThread->IsChecking())
583+
if (mThread->isChecking())
584584
recheckSelectedFiles->setDisabled(true);
585585
else
586586
recheckSelectedFiles->setDisabled(false);

0 commit comments

Comments
 (0)