From 99ca9796b122184c753d7d2292a61e6753bbb58d Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Mon, 13 Mar 2023 22:00:55 +0800 Subject: [PATCH] fix typos. --- RedPandaIDE/compiler/filecompiler.cpp | 2 +- RedPandaIDE/settings.cpp | 6 +++--- RedPandaIDE/settings.h | 3 +-- RedPandaIDE/settingsdialog/compilersetoptionwidget.cpp | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/RedPandaIDE/compiler/filecompiler.cpp b/RedPandaIDE/compiler/filecompiler.cpp index 3ff149da..3ddf3045 100644 --- a/RedPandaIDE/compiler/filecompiler.cpp +++ b/RedPandaIDE/compiler/filecompiler.cpp @@ -74,7 +74,7 @@ bool FileCompiler::prepareForCompile() mArguments+=" -E"; break; case Settings::CompilerSet::CompilationStage::CompilationProperOnly: - mOutputFile=changeFileExt(mFilename,compilerSet()->warnBigObject()); + mOutputFile=changeFileExt(mFilename,compilerSet()->compilationProperSuffix()); mArguments+=" -S -fverbose-asm"; break; case Settings::CompilerSet::CompilationStage::AssemblingOnly: diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index 6473aaea..4dc14fba 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -2610,7 +2610,7 @@ QString Settings::CompilerSet::getOutputFilename(const QString &sourceFilename, case Settings::CompilerSet::CompilationStage::PreprocessingOnly: return changeFileExt(sourceFilename, preprocessingSuffix()); case Settings::CompilerSet::CompilationStage::CompilationProperOnly: - return changeFileExt(sourceFilename, warnBigObject()); + return changeFileExt(sourceFilename, compilationProperSuffix()); case Settings::CompilerSet::CompilationStage::AssemblingOnly: return changeFileExt(sourceFilename, assemblingSuffix()); case Settings::CompilerSet::CompilationStage::GenerateExecutable: @@ -2639,7 +2639,7 @@ void Settings::CompilerSet::setAssemblingSuffix(const QString &newAssemblingSuff mAssemblingSuffix = newAssemblingSuffix; } -const QString &Settings::CompilerSet::warnBigObject() const +const QString &Settings::CompilerSet::compilationProperSuffix() const { return mCompilationProperSuffix; } @@ -3123,7 +3123,7 @@ void Settings::CompilerSets::saveSet(int index) mSettings->mSettings.setValue("MaxObjectSize",pSet->maxObjectSize()); 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("executableSuffix", pSet->executableSuffix()); mSettings->mSettings.setValue("compilationStage", (int)pSet->compilationStage()); diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index 20f4100d..f4f4a41a 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -1409,7 +1409,7 @@ public: const QString &preprocessingSuffix() const; void setPreprocessingSuffix(const QString &newPreprocessingSuffix); - const QString &warnBigObject() const; + const QString &compilationProperSuffix() const; void setCompilationProperSuffix(const QString &newCompilationProperSuffix); const QString &assemblingSuffix() const; @@ -1486,7 +1486,6 @@ public: // Options QMap mCompileOptions; - Q_PROPERTY(bool warnStackExcceeded READ warnStackExcceeded WRITE setWarnStackExcceeded NOTIFY warnStackExcceededChanged) }; typedef std::shared_ptr PCompilerSet; diff --git a/RedPandaIDE/settingsdialog/compilersetoptionwidget.cpp b/RedPandaIDE/settingsdialog/compilersetoptionwidget.cpp index 9321bd7c..2e6c34b5 100644 --- a/RedPandaIDE/settingsdialog/compilersetoptionwidget.cpp +++ b/RedPandaIDE/settingsdialog/compilersetoptionwidget.cpp @@ -122,7 +122,7 @@ static void loadCompilerSetSettings(Settings::PCompilerSet pSet, Ui::CompilerSet } ui->txtPreprocessingSuffix->setText(pSet->preprocessingSuffix()); - ui->txtCompilationSuffix->setText(pSet->warnBigObject()); + ui->txtCompilationSuffix->setText(pSet->compilationProperSuffix()); ui->txtExecutableSuffix->setText(pSet->executableSuffix()); switch(pSet->compilationStage()) { case Settings::CompilerSet::CompilationStage::PreprocessingOnly: