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

Avoid unnecessary copies when passing strings

This commit is contained in:
Martchus 2022-12-20 22:34:17 +01:00 committed by Fabien Givors
parent 3401ef5ab4
commit 4b921a55bb
17 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GuiSidePanel.cpp
View File

@ -196,7 +196,7 @@ void GuiSidePanel::autoSetMuteYourPart()
m_song->mutePianistPart(checked);
}
void GuiSidePanel::setSongName(QString songName)
void GuiSidePanel::setSongName(const QString &songName)
{
for (int i = 0; i < songCombo->count(); ++i)
{
@ -205,7 +205,7 @@ void GuiSidePanel::setSongName(QString songName)
}
}
void GuiSidePanel::setBookName(QString bookName)
void GuiSidePanel::setBookName(const QString &bookName)
{
for (int i = 0; i < bookCombo->count(); ++i)
{
@ -215,7 +215,7 @@ void GuiSidePanel::setBookName(QString bookName)
}
// pass either 'left' 'right' or 'both'
void GuiSidePanel::setCurrentHand(QString hand)
void GuiSidePanel::setCurrentHand(const QString &hand)
{
if (hand == "left")
leftHandRadio->setChecked(true);

6
src/GuiSidePanel.h
View File

@ -52,11 +52,11 @@ public:
void refresh();
void loadBookList();
void setBookName(QString bookName);
void setSongName(QString songName);
void setBookName(const QString &bookName);
void setSongName(const QString &songName);
int getSongIndex() {return songCombo->currentIndex();}
void setSongIndex(int index){songCombo->setCurrentIndex(index);}
void setCurrentHand(QString hand);
void setCurrentHand(const QString &hand);
bool isRepeatSong(){return repeatSong->isChecked();}

14
src/MidiDevice.cpp
View File

@ -70,7 +70,7 @@ QStringList CMidiDevice::getMidiPortList(midiType_t type)
return list;
}
bool CMidiDevice::openMidiPort(midiType_t type, QString portName)
bool CMidiDevice::openMidiPort(midiType_t type, const QString &portName)
{
closeMidiPort(type, -1);
@ -147,42 +147,42 @@ bool CMidiDevice::validMidiOutput()
return m_validOutput;
}
int CMidiDevice::midiSettingsSetStr(QString name, QString str)
int CMidiDevice::midiSettingsSetStr(const QString &name, const QString &str)
{
if (m_selectedMidiOutputDevice)
return m_selectedMidiOutputDevice->midiSettingsSetStr(name, str);
return 0;
}
int CMidiDevice::midiSettingsSetNum(QString name, double val)
int CMidiDevice::midiSettingsSetNum(const QString &name, double val)
{
if (m_selectedMidiOutputDevice)
return m_selectedMidiOutputDevice->midiSettingsSetNum(name, val);
return 0;
}
int CMidiDevice::midiSettingsSetInt(QString name, int val)
int CMidiDevice::midiSettingsSetInt(const QString &name, int val)
{
if (m_selectedMidiOutputDevice)
return m_selectedMidiOutputDevice->midiSettingsSetInt(name, val);
return 0;
}
QString CMidiDevice::midiSettingsGetStr(QString name)
QString CMidiDevice::midiSettingsGetStr(const QString &name)
{
if (m_selectedMidiOutputDevice)
return m_selectedMidiOutputDevice->midiSettingsGetStr(name);
return QString();
}
double CMidiDevice::midiSettingsGetNum(QString name)
double CMidiDevice::midiSettingsGetNum(const QString &name)
{
if (m_selectedMidiOutputDevice)
return m_selectedMidiOutputDevice->midiSettingsGetNum(name);
return 0.0;
}
int CMidiDevice::midiSettingsGetInt(QString name)
int CMidiDevice::midiSettingsGetInt(const QString &name)
{
if (m_selectedMidiOutputDevice)
return m_selectedMidiOutputDevice->midiSettingsGetInt(name);

14
src/MidiDevice.h
View File

@ -53,15 +53,15 @@ public:
virtual bool validMidiConnection() {return validMidiOutput();}
QStringList getMidiPortList(midiType_t type);
bool openMidiPort(midiType_t type, QString portName);
bool openMidiPort(midiType_t type, const QString &portName);
void closeMidiPort(midiType_t type, int index);
// based on the fluid synth settings
virtual int midiSettingsSetStr(QString name, QString str);
virtual int midiSettingsSetNum(QString name, double val);
virtual int midiSettingsSetInt(QString name, int val);
virtual QString midiSettingsGetStr(QString name);
virtual double midiSettingsGetNum(QString name);
virtual int midiSettingsGetInt(QString name);
virtual int midiSettingsSetStr(const QString &name, const QString &str);
virtual int midiSettingsSetNum(const QString &name, double val);
virtual int midiSettingsSetInt(const QString &name, int val);
virtual QString midiSettingsGetStr(const QString &name);
virtual double midiSettingsGetNum(const QString &name);
virtual int midiSettingsGetInt(const QString &name);
void flushMidiInput()
{

14
src/MidiDeviceBase.h
View File

@ -49,18 +49,18 @@ public:
typedef enum {MIDI_INPUT, MIDI_OUTPUT} midiType_t;
virtual QStringList getMidiPortList(midiType_t type) = 0;
virtual bool openMidiPort(midiType_t type, QString portName) = 0;
virtual bool openMidiPort(midiType_t type, const QString &portName) = 0;
virtual bool validMidiConnection() = 0;
virtual void closeMidiPort(midiType_t type, int index) = 0;
// based on the fluid synth settings
virtual int midiSettingsSetStr(QString name, QString str) = 0;
virtual int midiSettingsSetNum(QString name, double val) = 0;
virtual int midiSettingsSetInt(QString name, int val) = 0;
virtual QString midiSettingsGetStr(QString name) = 0;
virtual double midiSettingsGetNum(QString name) = 0;
virtual int midiSettingsGetInt(QString name) = 0;
virtual int midiSettingsSetStr(const QString &name, const QString &str) = 0;
virtual int midiSettingsSetNum(const QString &name, double val) = 0;
virtual int midiSettingsSetInt(const QString &name, int val) = 0;
virtual QString midiSettingsGetStr(const QString &name) = 0;
virtual double midiSettingsGetNum(const QString &name) = 0;
virtual int midiSettingsGetInt(const QString &name) = 0;
void setQSettings(QSettings* settings) {qsettings = settings;}
//you should always have a virtual destructor when using virtual functions

16
src/MidiDeviceFluidSynth.cpp
View File

@ -79,11 +79,11 @@ QStringList CMidiDeviceFluidSynth::getMidiPortList(midiType_t type)
return fontList;
}
bool CMidiDeviceFluidSynth::openMidiPort(midiType_t type, QString portName)
bool CMidiDeviceFluidSynth::openMidiPort(midiType_t type, const QString &portName)
{
closeMidiPort(MIDI_OUTPUT, -1);
if (portName.length() == 0)
if (portName.isEmpty())
return false;
if (type == MIDI_INPUT)
@ -227,7 +227,7 @@ CMidiEvent CMidiDeviceFluidSynth::readMidiInput()
return midiEvent;
}
int CMidiDeviceFluidSynth::midiSettingsSetStr(QString name, QString str)
int CMidiDeviceFluidSynth::midiSettingsSetStr(const QString &name, const QString &str)
{
if (!m_fluidSettings)
return 0;
@ -235,14 +235,14 @@ int CMidiDeviceFluidSynth::midiSettingsSetStr(QString name, QString str)
return fluid_settings_setstr(m_fluidSettings, (char *)qPrintable(name), (char *)qPrintable(str));
}
int CMidiDeviceFluidSynth::midiSettingsSetNum(QString name, double val)
int CMidiDeviceFluidSynth::midiSettingsSetNum(const QString &name, double val)
{
if (!m_fluidSettings)
return 0;
return fluid_settings_setnum(m_fluidSettings, (char *)qPrintable(name), val);
}
int CMidiDeviceFluidSynth::midiSettingsSetInt(QString name, int val)
int CMidiDeviceFluidSynth::midiSettingsSetInt(const QString &name, int val)
{
if (!m_fluidSettings)
return 0;
@ -250,7 +250,7 @@ int CMidiDeviceFluidSynth::midiSettingsSetInt(QString name, int val)
return fluid_settings_setint(m_fluidSettings, (char *)qPrintable(name), val);
}
QString CMidiDeviceFluidSynth::midiSettingsGetStr(QString name)
QString CMidiDeviceFluidSynth::midiSettingsGetStr(const QString &name)
{
Q_UNUSED(name)
//char buffer[200];
@ -261,7 +261,7 @@ QString CMidiDeviceFluidSynth::midiSettingsGetStr(QString name)
return QString(); // FIXME: buffer is never initialized here, let's just return QString() for now
}
double CMidiDeviceFluidSynth::midiSettingsGetNum(QString name)
double CMidiDeviceFluidSynth::midiSettingsGetNum(const QString &name)
{
if (!m_fluidSettings)
return 0.0;
@ -270,7 +270,7 @@ double CMidiDeviceFluidSynth::midiSettingsGetNum(QString name)
return val;
}
int CMidiDeviceFluidSynth::midiSettingsGetInt(QString name)
int CMidiDeviceFluidSynth::midiSettingsGetInt(const QString &name)
{
if (!m_fluidSettings)
return 0;

14
src/MidiDeviceFluidSynth.h
View File

@ -44,18 +44,18 @@ class CMidiDeviceFluidSynth : public CMidiDeviceBase
virtual CMidiEvent readMidiInput();
virtual QStringList getMidiPortList(midiType_t type);
virtual bool openMidiPort(midiType_t type, QString portName);
virtual bool openMidiPort(midiType_t type, const QString &portName);
virtual void closeMidiPort(midiType_t type, int index);
virtual bool validMidiConnection() {return m_validConnection;}
// based on the fluid synth settings
virtual int midiSettingsSetStr(QString name, QString str);
virtual int midiSettingsSetNum(QString name, double val);
virtual int midiSettingsSetInt(QString name, int val);
virtual QString midiSettingsGetStr(QString name);
virtual double midiSettingsGetNum(QString name);
virtual int midiSettingsGetInt(QString name);
virtual int midiSettingsSetStr(const QString &name, const QString &str);
virtual int midiSettingsSetNum(const QString &name, double val);
virtual int midiSettingsSetInt(const QString &name, int val);
virtual QString midiSettingsGetStr(const QString &name);
virtual double midiSettingsGetNum(const QString &name);
virtual int midiSettingsGetInt(const QString &name);
public:
CMidiDeviceFluidSynth();

16
src/MidiDeviceRt.cpp
View File

@ -121,7 +121,7 @@ QStringList CMidiDeviceRt::getMidiPortList(midiType_t type)
return portNameList;
}
bool CMidiDeviceRt::openMidiPort(midiType_t type, QString portName)
bool CMidiDeviceRt::openMidiPort(midiType_t type, const QString &portName)
{
init();
if (m_midiin == nullptr || m_midiout == nullptr) {
@ -132,7 +132,7 @@ bool CMidiDeviceRt::openMidiPort(midiType_t type, QString portName)
QString name;
RtMidi* midiDevice;
if (portName.length() == 0)
if (portName.isEmpty())
return false;
int dev;
@ -328,40 +328,40 @@ CMidiEvent CMidiDeviceRt::readMidiInput()
return midiEvent;
}
int CMidiDeviceRt::midiSettingsSetStr(QString name, QString str)
int CMidiDeviceRt::midiSettingsSetStr(const QString &name, const QString &str)
{
Q_UNUSED(name)
Q_UNUSED(str)
return 0;
}
int CMidiDeviceRt::midiSettingsSetNum(QString name, double val)
int CMidiDeviceRt::midiSettingsSetNum(const QString &name, double val)
{
Q_UNUSED(name)
Q_UNUSED(val)
return 0;
}
int CMidiDeviceRt::midiSettingsSetInt(QString name, int val)
int CMidiDeviceRt::midiSettingsSetInt(const QString &name, int val)
{
Q_UNUSED(name)
Q_UNUSED(val)
return 0;
}
QString CMidiDeviceRt::midiSettingsGetStr(QString name)
QString CMidiDeviceRt::midiSettingsGetStr(const QString &name)
{
Q_UNUSED(name)
return QString();
}
double CMidiDeviceRt::midiSettingsGetNum(QString name)
double CMidiDeviceRt::midiSettingsGetNum(const QString &name)
{
Q_UNUSED(name)
return 0.0;
}
int CMidiDeviceRt::midiSettingsGetInt(QString name)
int CMidiDeviceRt::midiSettingsGetInt(const QString &name)
{
Q_UNUSED(name)
return 0;

14
src/MidiDeviceRt.h
View File

@ -40,18 +40,18 @@ class CMidiDeviceRt : public CMidiDeviceBase
virtual QStringList getMidiPortList(midiType_t type);
virtual bool openMidiPort(midiType_t type, QString portName);
virtual bool openMidiPort(midiType_t type, const QString &portName);
virtual void closeMidiPort(midiType_t type, int index);
virtual bool validMidiConnection() {return m_validConnection;}
// based on the fluid synth settings
virtual int midiSettingsSetStr(QString name, QString str);
virtual int midiSettingsSetNum(QString name, double val);
virtual int midiSettingsSetInt(QString name, int val);
virtual QString midiSettingsGetStr(QString name);
virtual double midiSettingsGetNum(QString name);
virtual int midiSettingsGetInt(QString name);
virtual int midiSettingsSetStr(const QString &name, const QString &str);
virtual int midiSettingsSetNum(const QString &name, double val);
virtual int midiSettingsSetInt(const QString &name, int val);
virtual QString midiSettingsGetStr(const QString &name);
virtual double midiSettingsGetNum(const QString &name);
virtual int midiSettingsGetInt(const QString &name);
public:
CMidiDeviceRt();

6
src/MidiFile.cpp
View File

@ -74,7 +74,7 @@ int CMidiFile::readHeader(void)
return i;
}
void CMidiFile::openMidiFile(string filename)
void CMidiFile::openMidiFile(const std::string &filename)
{
if (m_file.is_open())
m_file.close();
@ -84,14 +84,14 @@ void CMidiFile::openMidiFile(string filename)
if (m_file.fail() == true)
{
QMessageBox::warning(nullptr, QMessageBox::tr("MIDI File Error"),
QMessageBox::tr("Cannot open \"%1\"").arg(QString(filename.c_str())));
QMessageBox::tr("Cannot open \"%1\"").arg(QString::fromStdString(filename)));
midiError(SMF_CANNOT_OPEN_FILE);
return;
}
rewind();
if (getMidiError() != SMF_NO_ERROR)
QMessageBox::warning(nullptr, QMessageBox::tr("MIDI File Error"),
QMessageBox::tr("MIDI file \"%1\" is corrupted").arg(QString(filename.c_str())));
QMessageBox::tr("MIDI file \"%1\" is corrupted").arg(QString::fromStdString(filename)));
}
void CMidiFile::rewind()

2
src/MidiFile.h
View File

@ -54,7 +54,7 @@ public:
m_numberOfTracks = 0;
}
void openMidiFile(string filename);
void openMidiFile(const std::string &filename);
int readWord(void);
int readHeader(void);
void rewind();

10
src/QtWindow.cpp
View File

@ -176,7 +176,7 @@ void QtWindow::displayUsage()
fprintf(stdout, " --lights Turns on the keyboard lights.\n");
}
int QtWindow::decodeIntegerParam(QString arg, int defaultParam)
int QtWindow::decodeIntegerParam(const QString &arg, int defaultParam)
{
int n = arg.lastIndexOf('=');
if (n == -1 || (n + 1) >= arg.size())
@ -188,7 +188,7 @@ int QtWindow::decodeIntegerParam(QString arg, int defaultParam)
return defaultParam;
}
bool QtWindow::validateIntegerParam(QString arg)
bool QtWindow::validateIntegerParam(const QString &arg)
{
int n = arg.lastIndexOf('=');
if (n == -1 || (n + 1) >= arg.size())
@ -197,7 +197,7 @@ bool QtWindow::validateIntegerParam(QString arg)
arg.mid(n+1).toInt(&ok);
return ok;
}
bool QtWindow::validateIntegerParamWithMessage(QString arg)
bool QtWindow::validateIntegerParamWithMessage(const QString &arg)
{
bool ok = validateIntegerParam(arg);
if (!ok) {
@ -207,7 +207,7 @@ bool QtWindow::validateIntegerParamWithMessage(QString arg)
return ok;
}
void QtWindow::decodeMidiFileArg(QString arg)
void QtWindow::decodeMidiFileArg(const QString &arg)
{
QFileInfo fileInfo(arg);
@ -592,7 +592,7 @@ void QtWindow::about()
msgBox.exec();
}
QString QtWindow::displayShortCut(QString key, QString description)
QString QtWindow::displayShortCut(const QString &key, const QString &description)
{
QString str = QStringLiteral("<tr>"
"<td>%1</td>"

10
src/QtWindow.h
View File

@ -175,11 +175,11 @@ protected:
private:
void decodeCommandLine();
int decodeIntegerParam(QString arg, int defaultParam);
bool validateIntegerParam(QString arg);
bool validateIntegerParamWithMessage(QString arg);
void decodeMidiFileArg(QString arg);
QString displayShortCut(QString code, QString description);
int decodeIntegerParam(const QString &arg, int defaultParam);
bool validateIntegerParam(const QString &arg);
bool validateIntegerParamWithMessage(const QString &arg);
void decodeMidiFileArg(const QString &arg);
QString displayShortCut(const QString &code, const QString &description);
void addShortcutAction(const QString & key, const char * method);
void updateRecentFileActions();
QString strippedName(const QString &fullFileName);

8
src/Settings.h
View File

@ -105,19 +105,19 @@ public:
{
return m_fluidSoundFontNames;
}
void setFluidSoundFontNames(QStringList names)
void setFluidSoundFontNames(const QStringList &names)
{
m_fluidSoundFontNames = names;
}
void setFluidSoundFontNames(QString names)
void setFluidSoundFontNames(const QString &names)
{
m_fluidSoundFontNames = QStringList(names);
}
void addFluidSoundFontName(QString sfName)
void addFluidSoundFontName(const QString &sfName)
{
m_fluidSoundFontNames.append(sfName);
}
void removeFluidSoundFontName(QString sfName)
void removeFluidSoundFontName(const QString &sfName)
{
m_fluidSoundFontNames.removeAll(sfName);
}

2
src/Song.h
View File

@ -84,7 +84,7 @@ public:
CTrackList* getTrackList() {return m_trackList;}
void refreshScroll();
QString getSongTitle() {return m_songTitle;}
const QString &getSongTitle() {return m_songTitle;}
private:
void midiFileInfo();

2
src/Util.cpp
View File

@ -268,7 +268,7 @@ static qint64 benchMarkUpdate(benchData_t *pBench, qint64 previousTime)
return time;
}
void benchMark(unsigned int id, QString message)
void benchMark(unsigned int id, const QString &message)
{
if (id >= arraySize(s_benchData))
return;

2
src/Util.h
View File

@ -89,7 +89,7 @@ constexpr qint64 deltaAdjustL (qint64 delta) { return delta / SPEED_ADJUST_FACTO
constexpr float deltaAdjustF (qint64 delta) { return static_cast<float>(delta) / static_cast<float>(SPEED_ADJUST_FACTOR); }
void benchMarkInit();
void benchMark(unsigned int id, QString message);
void benchMark(unsigned int id, const QString &message);
void benchMarkResults();
class Util {