fix typos.

This commit is contained in:
Roy Qu 2023-03-13 22:00:55 +08:00
parent 436a047821
commit 99ca9796b1
4 changed files with 6 additions and 7 deletions

View File

@ -74,7 +74,7 @@ bool FileCompiler::prepareForCompile()
mArguments+=" -E"; mArguments+=" -E";
break; break;
case Settings::CompilerSet::CompilationStage::CompilationProperOnly: case Settings::CompilerSet::CompilationStage::CompilationProperOnly:
mOutputFile=changeFileExt(mFilename,compilerSet()->warnBigObject()); mOutputFile=changeFileExt(mFilename,compilerSet()->compilationProperSuffix());
mArguments+=" -S -fverbose-asm"; mArguments+=" -S -fverbose-asm";
break; break;
case Settings::CompilerSet::CompilationStage::AssemblingOnly: case Settings::CompilerSet::CompilationStage::AssemblingOnly:

View File

@ -2610,7 +2610,7 @@ QString Settings::CompilerSet::getOutputFilename(const QString &sourceFilename,
case Settings::CompilerSet::CompilationStage::PreprocessingOnly: case Settings::CompilerSet::CompilationStage::PreprocessingOnly:
return changeFileExt(sourceFilename, preprocessingSuffix()); return changeFileExt(sourceFilename, preprocessingSuffix());
case Settings::CompilerSet::CompilationStage::CompilationProperOnly: case Settings::CompilerSet::CompilationStage::CompilationProperOnly:
return changeFileExt(sourceFilename, warnBigObject()); return changeFileExt(sourceFilename, compilationProperSuffix());
case Settings::CompilerSet::CompilationStage::AssemblingOnly: case Settings::CompilerSet::CompilationStage::AssemblingOnly:
return changeFileExt(sourceFilename, assemblingSuffix()); return changeFileExt(sourceFilename, assemblingSuffix());
case Settings::CompilerSet::CompilationStage::GenerateExecutable: case Settings::CompilerSet::CompilationStage::GenerateExecutable:
@ -2639,7 +2639,7 @@ void Settings::CompilerSet::setAssemblingSuffix(const QString &newAssemblingSuff
mAssemblingSuffix = newAssemblingSuffix; mAssemblingSuffix = newAssemblingSuffix;
} }
const QString &Settings::CompilerSet::warnBigObject() const const QString &Settings::CompilerSet::compilationProperSuffix() const
{ {
return mCompilationProperSuffix; return mCompilationProperSuffix;
} }
@ -3123,7 +3123,7 @@ void Settings::CompilerSets::saveSet(int index)
mSettings->mSettings.setValue("MaxObjectSize",pSet->maxObjectSize()); mSettings->mSettings.setValue("MaxObjectSize",pSet->maxObjectSize());
mSettings->mSettings.setValue("preprocessingSuffix", pSet->preprocessingSuffix()); mSettings->mSettings.setValue("preprocessingSuffix", pSet->preprocessingSuffix());
mSettings->mSettings.setValue("compilationProperSuffix", pSet->warnBigObject()); mSettings->mSettings.setValue("compilationProperSuffix", pSet->compilationProperSuffix());
mSettings->mSettings.setValue("assemblingSuffix", pSet->assemblingSuffix()); mSettings->mSettings.setValue("assemblingSuffix", pSet->assemblingSuffix());
mSettings->mSettings.setValue("executableSuffix", pSet->executableSuffix()); mSettings->mSettings.setValue("executableSuffix", pSet->executableSuffix());
mSettings->mSettings.setValue("compilationStage", (int)pSet->compilationStage()); mSettings->mSettings.setValue("compilationStage", (int)pSet->compilationStage());

View File

@ -1409,7 +1409,7 @@ public:
const QString &preprocessingSuffix() const; const QString &preprocessingSuffix() const;
void setPreprocessingSuffix(const QString &newPreprocessingSuffix); void setPreprocessingSuffix(const QString &newPreprocessingSuffix);
const QString &warnBigObject() const; const QString &compilationProperSuffix() const;
void setCompilationProperSuffix(const QString &newCompilationProperSuffix); void setCompilationProperSuffix(const QString &newCompilationProperSuffix);
const QString &assemblingSuffix() const; const QString &assemblingSuffix() const;
@ -1486,7 +1486,6 @@ public:
// Options // Options
QMap<QString,QString> mCompileOptions; QMap<QString,QString> mCompileOptions;
Q_PROPERTY(bool warnStackExcceeded READ warnStackExcceeded WRITE setWarnStackExcceeded NOTIFY warnStackExcceededChanged)
}; };
typedef std::shared_ptr<CompilerSet> PCompilerSet; typedef std::shared_ptr<CompilerSet> PCompilerSet;

View File

@ -122,7 +122,7 @@ static void loadCompilerSetSettings(Settings::PCompilerSet pSet, Ui::CompilerSet
} }
ui->txtPreprocessingSuffix->setText(pSet->preprocessingSuffix()); ui->txtPreprocessingSuffix->setText(pSet->preprocessingSuffix());
ui->txtCompilationSuffix->setText(pSet->warnBigObject()); ui->txtCompilationSuffix->setText(pSet->compilationProperSuffix());
ui->txtExecutableSuffix->setText(pSet->executableSuffix()); ui->txtExecutableSuffix->setText(pSet->executableSuffix());
switch(pSet->compilationStage()) { switch(pSet->compilationStage()) {
case Settings::CompilerSet::CompilationStage::PreprocessingOnly: case Settings::CompilerSet::CompilationStage::PreprocessingOnly: