Martchus
/
pianobooster
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve string-literals 

* Use `QStringLiteral()` for QString-literals
* Use `QString()` for constructing an empty QString
This commit is contained in:
Martchus 2023-06-27 20:46:13 +02:00
parent cff96605ea
commit ff76de974b
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Draw.cpp
View File

@ -314,7 +314,7 @@ void CDraw::drawNoteName(int midiNote, float x, float y, int type)
if(0<item.pianoNote && item.pianoNote < 8)
{
QString accident = QString("");
auto accident = QString();
switch(item.accidental)
{
case -1:

38
src/GuiMidiSetupDialog.cpp
View File

@ -200,15 +200,15 @@ void GuiMidiSetupDialog::accept()
{
// save FluidSynth settings
if (m_settings->getFluidSoundFontNames().size()==0){
m_settings->remove("FluidSynth");
m_settings->remove(QStringLiteral("FluidSynth"));
}else{
m_settings->setValue("FluidSynth/masterGainSpin",masterGainSpin->value());
m_settings->setValue("FluidSynth/bufferSizeCombo", bufferSizeCombo->currentText());
m_settings->setValue("FluidSynth/bufferCountCombo", bufferCountCombo->currentText());
m_settings->setValue("FluidSynth/reverbCheck",reverbCheck->isChecked());
m_settings->setValue("FluidSynth/chorusCheck",chorusCheck->isChecked());
m_settings->setValue("FluidSynth/audioDriverCombo",audioDriverCombo->currentText());
m_settings->setValue("FluidSynth/sampleRateCombo",sampleRateCombo->currentText());
m_settings->setValue(QStringLiteral("FluidSynth/masterGainSpin"),masterGainSpin->value());
m_settings->setValue(QStringLiteral("FluidSynth/bufferSizeCombo"), bufferSizeCombo->currentText());
m_settings->setValue(QStringLiteral("FluidSynth/bufferCountCombo"), bufferCountCombo->currentText());
m_settings->setValue(QStringLiteral("FluidSynth/reverbCheck"),reverbCheck->isChecked());
m_settings->setValue(QStringLiteral("FluidSynth/chorusCheck"),chorusCheck->isChecked());
m_settings->setValue(QStringLiteral("FluidSynth/audioDriverCombo"),audioDriverCombo->currentText());
m_settings->setValue(QStringLiteral("FluidSynth/sampleRateCombo"),sampleRateCombo->currentText());
}
m_settings->saveSoundFontSettings();
@ -218,14 +218,14 @@ void GuiMidiSetupDialog::accept()
if (midiInputCombo->currentText().startsWith(tr("None")))
CChord::setPianoRange(PC_KEY_LOWEST_NOTE, PC_KEY_HIGHEST_NOTE);
else
CChord::setPianoRange(m_settings->value("Keyboard/LowestNote", 0).toInt(),
m_settings->value("Keyboard/HighestNote", 127).toInt());
CChord::setPianoRange(m_settings->value(QStringLiteral("Keyboard/LowestNote"), 0).toInt(),
m_settings->value(QStringLiteral("Keyboard/HighestNote"), 127).toInt());
if (midiOutputCombo->currentIndex()==0){
m_settings->setValue("Midi/Output", "");
m_song->openMidiPort(CMidiDevice::MIDI_OUTPUT,"");
m_settings->setValue(QStringLiteral("Midi/Output"), QString());
m_song->openMidiPort(CMidiDevice::MIDI_OUTPUT, QString());
}else{
m_settings->setValue("Midi/Output", midiOutputCombo->currentText());
m_settings->setValue(QStringLiteral("Midi/Output"), midiOutputCombo->currentText());
m_song->openMidiPort(CMidiDevice::MIDI_OUTPUT, midiOutputCombo->currentText() );
}
m_settings->updateWarningMessages();
@ -237,16 +237,16 @@ void GuiMidiSetupDialog::accept()
{
if( m_latencyFix> 0)
{
int rightSound = m_settings->value("Keyboard/RightSound", Cfg::defaultRightPatch()).toInt();
m_settings->setValue("Keyboard/RightSoundPrevious", rightSound); // Save the current right sound
int rightSound = m_settings->value(QStringLiteral("Keyboard/RightSound"), Cfg::defaultRightPatch()).toInt();
m_settings->setValue(QStringLiteral("Keyboard/RightSoundPrevious"), rightSound); // Save the current right sound
// Mute the Piano if we are using the latency fix;
m_settings->setValue("Keyboard/RightSound", 0);
m_settings->setValue(QStringLiteral("Keyboard/RightSound"), 0);
m_song->setPianoSoundPatches( -1, -2); // -1 means no sound and -2 means ignore this parameter
}
else
{
int previousRightSound = m_settings->value("Keyboard/RightSoundPrevious", Cfg::defaultRightPatch()).toInt();
m_settings->setValue("Keyboard/RightSound", previousRightSound);
int previousRightSound = m_settings->value(QStringLiteral("Keyboard/RightSoundPrevious"), Cfg::defaultRightPatch()).toInt();
m_settings->setValue(QStringLiteral("Keyboard/RightSound"), previousRightSound);
m_song->setPianoSoundPatches(previousRightSound, -2); // -2 means ignore this parameter
}
m_latencyChanged = false;
@ -280,7 +280,7 @@ void GuiMidiSetupDialog::on_fluidLoadButton_clicked ( bool checked )
{
Q_UNUSED(checked)
#if WITH_INTERNAL_FLUIDSYNTH
QString lastSoundFont = m_settings->value("LastSoundFontDir","").toString();
QString lastSoundFont = m_settings->value(QStringLiteral("LastSoundFontDir"), QString()).toString();
if (lastSoundFont.isEmpty()) {

4
src/GuiTopBar.cpp
View File

@ -165,8 +165,8 @@ void GuiTopBar::setPlayButtonState(bool checked, bool atTheEnd)
if (checked)
{
playButton->setIcon(QIcon(QStringLiteral(":/images/breeze/media-playback-stop.svg")));
playButton->setToolTip("");
playFromStartButton->setToolTip("");
playButton->setToolTip(QString());
playFromStartButton->setToolTip(QString());
}
else
{

2
src/Settings.h
View File

@ -149,7 +149,7 @@ public:
void updateWarningMessages();
QString selectedLangauge() {
QString locale = value("General/lang","").toString();
auto locale = value(QStringLiteral("General/lang"), QString()).toString();
if (locale.isEmpty()) {
locale = QLocale::system().bcp47Name();
int n = locale.indexOf("_");