diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-04-17 12:26:43 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-04-17 23:21:19 +0200 |
commit | 62108a96137dff6fefb61d2af8dc59e8716ccb96 (patch) | |
tree | 621b185a5f3d9b88a41fdae89b348f413cd6b7b2 | |
parent | 8c55ce62b9e65533619870d1e5b72612a1a16406 (diff) | |
download | rockbox-62108a96137dff6fefb61d2af8dc59e8716ccb96.tar.gz rockbox-62108a96137dff6fefb61d2af8dc59e8716ccb96.zip |
rbutil: Use references to avoid creating temporary objects.
Get rid of some unnecessary object creating / copying by using
references.
Change-Id: Ia44e34f6f66d230caa9af7ef7c0eca73be12de2a
-rw-r--r-- | utils/rbutilqt/base/ttsbase.h | 4 | ||||
-rw-r--r-- | utils/rbutilqt/base/ttscarbon.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/ttscarbon.h | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/ttsexes.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/ttsexes.h | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/ttsfestival.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/ttsfestival.h | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/ttssapi.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/ttssapi.h | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/uninstall.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/utils.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/voicefile.cpp | 10 | ||||
-rw-r--r-- | utils/rbutilqt/base/zipinstaller.h | 11 | ||||
-rw-r--r-- | utils/rbutilqt/test/stubs/stubs-talkgenerator.cpp | 4 |
14 files changed, 24 insertions, 25 deletions
diff --git a/utils/rbutilqt/base/ttsbase.h b/utils/rbutilqt/base/ttsbase.h index 125fe49ff4..f9279006bd 100644 --- a/utils/rbutilqt/base/ttsbase.h +++ b/utils/rbutilqt/base/ttsbase.h | |||
@@ -36,9 +36,9 @@ class TTSBase : public EncTtsSettingInterface | |||
36 | 36 | ||
37 | TTSBase(QObject *parent); | 37 | TTSBase(QObject *parent); |
38 | //! Child class should generate a clip | 38 | //! Child class should generate a clip |
39 | virtual TTSStatus voice(QString text,QString wavfile, QString* errStr) =0; | 39 | virtual TTSStatus voice(const QString& text, const QString& wavfile, QString* errStr) = 0; |
40 | //! Child class should do startup | 40 | //! Child class should do startup |
41 | virtual bool start(QString *errStr) =0; | 41 | virtual bool start(QString *errStr) = 0; |
42 | //! child class should stop | 42 | //! child class should stop |
43 | virtual bool stop() =0; | 43 | virtual bool stop() =0; |
44 | 44 | ||
diff --git a/utils/rbutilqt/base/ttscarbon.cpp b/utils/rbutilqt/base/ttscarbon.cpp index 2d9fa49dbe..6b20de764f 100644 --- a/utils/rbutilqt/base/ttscarbon.cpp +++ b/utils/rbutilqt/base/ttscarbon.cpp | |||
@@ -171,7 +171,7 @@ void TTSCarbon::saveSettings(void) | |||
171 | 171 | ||
172 | /** @brief create wav file from text using the selected TTS voice. | 172 | /** @brief create wav file from text using the selected TTS voice. |
173 | */ | 173 | */ |
174 | TTSStatus TTSCarbon::voice(QString text, QString wavfile, QString* errStr) | 174 | TTSStatus TTSCarbon::voice(const QString& text, const QString& wavfile, QString* errStr) |
175 | { | 175 | { |
176 | TTSStatus status = NoError; | 176 | TTSStatus status = NoError; |
177 | OSErr error; | 177 | OSErr error; |
diff --git a/utils/rbutilqt/base/ttscarbon.h b/utils/rbutilqt/base/ttscarbon.h index 2e9e84aa7d..80235b8b12 100644 --- a/utils/rbutilqt/base/ttscarbon.h +++ b/utils/rbutilqt/base/ttscarbon.h | |||
@@ -39,7 +39,7 @@ class TTSCarbon : public TTSBase | |||
39 | TTSCarbon(QObject *parent = NULL); | 39 | TTSCarbon(QObject *parent = NULL); |
40 | 40 | ||
41 | //! Child class should generate a clip | 41 | //! Child class should generate a clip |
42 | TTSStatus voice(QString text, QString wavfile, QString* errStr); | 42 | TTSStatus voice(const QString& text, const QString& wavfile, QString* errStr); |
43 | //! Child class should do startup | 43 | //! Child class should do startup |
44 | bool start(QString *errStr); | 44 | bool start(QString *errStr); |
45 | //! child class should stop | 45 | //! child class should stop |
diff --git a/utils/rbutilqt/base/ttsexes.cpp b/utils/rbutilqt/base/ttsexes.cpp index 446725968f..3eae930eef 100644 --- a/utils/rbutilqt/base/ttsexes.cpp +++ b/utils/rbutilqt/base/ttsexes.cpp | |||
@@ -80,7 +80,7 @@ bool TTSExes::start(QString *errStr) | |||
80 | } | 80 | } |
81 | } | 81 | } |
82 | 82 | ||
83 | TTSStatus TTSExes::voice(QString text, QString wavfile, QString *errStr) | 83 | TTSStatus TTSExes::voice(const QString& text, const QString& wavfile, QString *errStr) |
84 | { | 84 | { |
85 | (void) errStr; | 85 | (void) errStr; |
86 | QString execstring; | 86 | QString execstring; |
diff --git a/utils/rbutilqt/base/ttsexes.h b/utils/rbutilqt/base/ttsexes.h index 5707c827fe..470b007e92 100644 --- a/utils/rbutilqt/base/ttsexes.h +++ b/utils/rbutilqt/base/ttsexes.h | |||
@@ -35,7 +35,7 @@ class TTSExes : public TTSBase | |||
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | public: | 36 | public: |
37 | TTSExes(QObject* parent=nullptr); | 37 | TTSExes(QObject* parent=nullptr); |
38 | TTSStatus voice(QString text, QString wavfile, QString *errStr); | 38 | TTSStatus voice(const QString& text, const QString& wavfile, QString *errStr); |
39 | bool start(QString *errStr); | 39 | bool start(QString *errStr); |
40 | bool stop() {return true;} | 40 | bool stop() {return true;} |
41 | QString voiceVendor(void) { return QString(); } | 41 | QString voiceVendor(void) { return QString(); } |
diff --git a/utils/rbutilqt/base/ttsfestival.cpp b/utils/rbutilqt/base/ttsfestival.cpp index fce1d8cb3e..9cdad7fe64 100644 --- a/utils/rbutilqt/base/ttsfestival.cpp +++ b/utils/rbutilqt/base/ttsfestival.cpp | |||
@@ -182,7 +182,7 @@ bool TTSFestival::stop() | |||
182 | return true; | 182 | return true; |
183 | } | 183 | } |
184 | 184 | ||
185 | TTSStatus TTSFestival::voice(QString text, QString wavfile, QString* errStr) | 185 | TTSStatus TTSFestival::voice(const QString& text, const QString& wavfile, QString* errStr) |
186 | { | 186 | { |
187 | LOG_INFO() << "Voicing" << text << "->" << wavfile; | 187 | LOG_INFO() << "Voicing" << text << "->" << wavfile; |
188 | 188 | ||
diff --git a/utils/rbutilqt/base/ttsfestival.h b/utils/rbutilqt/base/ttsfestival.h index 5f6dc13ab5..28409e2a4e 100644 --- a/utils/rbutilqt/base/ttsfestival.h +++ b/utils/rbutilqt/base/ttsfestival.h | |||
@@ -40,7 +40,7 @@ class TTSFestival : public TTSBase | |||
40 | ~TTSFestival(); | 40 | ~TTSFestival(); |
41 | bool start(QString *errStr); | 41 | bool start(QString *errStr); |
42 | bool stop(); | 42 | bool stop(); |
43 | TTSStatus voice(QString text,QString wavfile, QString *errStr); | 43 | TTSStatus voice(const QString& text, const QString& wavfile, QString *errStr); |
44 | QString voiceVendor(void) { return QString(); } | 44 | QString voiceVendor(void) { return QString(); } |
45 | Capabilities capabilities(); | 45 | Capabilities capabilities(); |
46 | 46 | ||
diff --git a/utils/rbutilqt/base/ttssapi.cpp b/utils/rbutilqt/base/ttssapi.cpp index 66ca6cc144..c1a642a14e 100644 --- a/utils/rbutilqt/base/ttssapi.cpp +++ b/utils/rbutilqt/base/ttssapi.cpp | |||
@@ -228,7 +228,7 @@ QStringList TTSSapi::getVoiceList(QString language) | |||
228 | 228 | ||
229 | 229 | ||
230 | 230 | ||
231 | TTSStatus TTSSapi::voice(QString text,QString wavfile, QString *errStr) | 231 | TTSStatus TTSSapi::voice(const QString& text, const QString& wavfile, QString *errStr) |
232 | { | 232 | { |
233 | (void) errStr; | 233 | (void) errStr; |
234 | QString query = "SPEAK\t"+wavfile+"\t"+text; | 234 | QString query = "SPEAK\t"+wavfile+"\t"+text; |
diff --git a/utils/rbutilqt/base/ttssapi.h b/utils/rbutilqt/base/ttssapi.h index 25d7d3dab7..b30b9d5fac 100644 --- a/utils/rbutilqt/base/ttssapi.h +++ b/utils/rbutilqt/base/ttssapi.h | |||
@@ -38,7 +38,7 @@ class TTSSapi : public TTSBase | |||
38 | public: | 38 | public: |
39 | TTSSapi(QObject* parent=nullptr); | 39 | TTSSapi(QObject* parent=nullptr); |
40 | 40 | ||
41 | TTSStatus voice(QString text,QString wavfile, QString *errStr); | 41 | TTSStatus voice(const QString& text, const QString& wavfile, QString *errStr); |
42 | bool start(QString *errStr); | 42 | bool start(QString *errStr); |
43 | bool stop(); | 43 | bool stop(); |
44 | QString voiceVendor(void); | 44 | QString voiceVendor(void); |
diff --git a/utils/rbutilqt/base/uninstall.cpp b/utils/rbutilqt/base/uninstall.cpp index e6ced811d6..ea0ce31eed 100644 --- a/utils/rbutilqt/base/uninstall.cpp +++ b/utils/rbutilqt/base/uninstall.cpp | |||
@@ -102,7 +102,7 @@ void Uninstaller::uninstall(void) | |||
102 | } | 102 | } |
103 | // for speed reasons update log file only at the end. | 103 | // for speed reasons update log file only at the end. |
104 | installlog.beginGroup(uninstallSections.at(i)); | 104 | installlog.beginGroup(uninstallSections.at(i)); |
105 | for (auto file : deletedItems) | 105 | for (const auto& file : deletedItems) |
106 | { | 106 | { |
107 | installlog.remove(file); | 107 | installlog.remove(file); |
108 | } | 108 | } |
diff --git a/utils/rbutilqt/base/utils.cpp b/utils/rbutilqt/base/utils.cpp index e63a9b5dce..7b6eed30bc 100644 --- a/utils/rbutilqt/base/utils.cpp +++ b/utils/rbutilqt/base/utils.cpp | |||
@@ -62,7 +62,7 @@ | |||
62 | #endif | 62 | #endif |
63 | 63 | ||
64 | // recursive function to delete a dir with files | 64 | // recursive function to delete a dir with files |
65 | bool Utils::recursiveRmdir( const QString &dirName ) | 65 | bool Utils::recursiveRmdir(const QString &dirName) |
66 | { | 66 | { |
67 | QString dirN = dirName; | 67 | QString dirN = dirName; |
68 | QDir dir(dirN); | 68 | QDir dir(dirN); |
diff --git a/utils/rbutilqt/base/voicefile.cpp b/utils/rbutilqt/base/voicefile.cpp index c5a239d720..dbdd56e53e 100644 --- a/utils/rbutilqt/base/voicefile.cpp +++ b/utils/rbutilqt/base/voicefile.cpp | |||
@@ -96,7 +96,7 @@ bool VoiceFileCreator::createVoiceFile() | |||
96 | // header (4 bytes): cookie = 9a, version = 06, targetid, options | 96 | // header (4 bytes): cookie = 9a, version = 06, targetid, options |
97 | // subheader for each user. Only "core" for now. | 97 | // subheader for each user. Only "core" for now. |
98 | // subheader (6 bytes): count (2bytes), size (2bytes), offset (2bytes) | 98 | // subheader (6 bytes): count (2bytes), size (2bytes), offset (2bytes) |
99 | if(buf[0] != (char)0x9a || buf[1] != 0x06 || buf[2] != m_targetid) { | 99 | if(buf[0] != '\x9a' || buf[1] != '\x06' || buf[2] != m_targetid) { |
100 | emit logItem(tr("Extracted voice strings incompatible"), LOGINFO); | 100 | emit logItem(tr("Extracted voice strings incompatible"), LOGINFO); |
101 | } | 101 | } |
102 | else { | 102 | else { |
@@ -121,14 +121,14 @@ bool VoiceFileCreator::createVoiceFile() | |||
121 | QTemporaryFile voicefontlist; | 121 | QTemporaryFile voicefontlist; |
122 | voicefontlist.open(); | 122 | voicefontlist.open(); |
123 | m_filename = voicefontlist.fileName(); | 123 | m_filename = voicefontlist.fileName(); |
124 | for(int i = 0; i < voicestrings.size(); ++i) { | 124 | for(auto key : voicestrings.keys()) { |
125 | QByteArray qba; | 125 | QByteArray qba; |
126 | qba = QString("id: %1_%2\n") | 126 | qba = QString("id: %1_%2\n") |
127 | .arg(voicestrings.keys().at(i) < 0x8000 ? "LANG" : "VOICE") | 127 | .arg(key < 0x8000 ? "LANG" : "VOICE") |
128 | .arg(voicestrings.keys().at(i)).toUtf8(); | 128 | .arg(key).toUtf8(); |
129 | voicefontlist.write(qba); | 129 | voicefontlist.write(qba); |
130 | qba = QString("voice: \"%1\"\n").arg( | 130 | qba = QString("voice: \"%1\"\n").arg( |
131 | voicestrings[voicestrings.keys().at(i)]).toUtf8(); | 131 | voicestrings[key]).toUtf8(); |
132 | voicefontlist.write(qba); | 132 | voicefontlist.write(qba); |
133 | } | 133 | } |
134 | voicefontlist.close(); | 134 | voicefontlist.close(); |
diff --git a/utils/rbutilqt/base/zipinstaller.h b/utils/rbutilqt/base/zipinstaller.h index 32a42ef6a2..87c38b7700 100644 --- a/utils/rbutilqt/base/zipinstaller.h +++ b/utils/rbutilqt/base/zipinstaller.h | |||
@@ -37,13 +37,12 @@ class ZipInstaller : public QObject | |||
37 | Q_OBJECT | 37 | Q_OBJECT |
38 | public: | 38 | public: |
39 | ZipInstaller(QObject* parent); | 39 | ZipInstaller(QObject* parent); |
40 | ~ZipInstaller(){} | ||
41 | void install(void); | 40 | void install(void); |
42 | void setMountPoint(QString mountpoint) {m_mountpoint = mountpoint;} | 41 | void setMountPoint(QString& mountpoint) {m_mountpoint = mountpoint;} |
43 | void setUrl(QString url){m_urllist = QStringList(url);} | 42 | void setUrl(QString& url){m_urllist = QStringList(url);} |
44 | void setUrl(QStringList url) { m_urllist = url; } | 43 | void setUrl(QStringList& url) { m_urllist = url; } |
45 | void setLogSection(QString name) {m_loglist = QStringList(name);} | 44 | void setLogSection(QString name) {m_loglist = QStringList(name);} |
46 | void setLogSection(QStringList name) { m_loglist = name; } | 45 | void setLogSection(QStringList& name) { m_loglist = name; } |
47 | void setLogVersion(QString v = "") | 46 | void setLogVersion(QString v = "") |
48 | { m_verlist = QStringList(v); LOG_INFO() << m_verlist;} | 47 | { m_verlist = QStringList(v); LOG_INFO() << m_verlist;} |
49 | void setLogVersion(QStringList v) | 48 | void setLogVersion(QStringList v) |
@@ -52,7 +51,7 @@ public: | |||
52 | void setUnzip(bool i) { m_unzip = i; } | 51 | void setUnzip(bool i) { m_unzip = i; } |
53 | /** Set target filename for copy mode. | 52 | /** Set target filename for copy mode. |
54 | * If not set the filename part of the download URL is used. */ | 53 | * If not set the filename part of the download URL is used. */ |
55 | void setTarget(QString t) { m_target = t; } | 54 | void setTarget(QString& t) { m_target = t; } |
56 | void setCache(bool c) { m_usecache = c; } | 55 | void setCache(bool c) { m_usecache = c; } |
57 | 56 | ||
58 | public slots: | 57 | public slots: |
diff --git a/utils/rbutilqt/test/stubs/stubs-talkgenerator.cpp b/utils/rbutilqt/test/stubs/stubs-talkgenerator.cpp index 295dc81a78..a67600a0ae 100644 --- a/utils/rbutilqt/test/stubs/stubs-talkgenerator.cpp +++ b/utils/rbutilqt/test/stubs/stubs-talkgenerator.cpp | |||
@@ -54,7 +54,7 @@ public: | |||
54 | TTSFakeEspeak(QObject *parent): TTSBase(parent) {} | 54 | TTSFakeEspeak(QObject *parent): TTSBase(parent) {} |
55 | virtual bool start(QString *errStr) { (void)errStr; return true; } | 55 | virtual bool start(QString *errStr) { (void)errStr; return true; } |
56 | virtual bool stop() { return true; } | 56 | virtual bool stop() { return true; } |
57 | virtual TTSStatus voice(QString text, QString wavfile, QString *errStr) | 57 | virtual TTSStatus voice(const QString& text, const QString& wavfile, QString *errStr) |
58 | { (void)text; (void)wavfile; (void)errStr; return NoError; } | 58 | { (void)text; (void)wavfile; (void)errStr; return NoError; } |
59 | virtual QString voiceVendor() { return QString("DummyVendor"); } | 59 | virtual QString voiceVendor() { return QString("DummyVendor"); } |
60 | virtual bool configOk() { return true; } | 60 | virtual bool configOk() { return true; } |
@@ -67,7 +67,7 @@ TTSBase::TTSBase(QObject* parent) : EncTtsSettingInterface(parent) | |||
67 | { | 67 | { |
68 | } | 68 | } |
69 | 69 | ||
70 | TTSStatus TTSBase::voice(QString /*text*/, QString /*wavfile*/, QString* /*errStr*/) | 70 | TTSStatus TTSBase::voice(const QString& /*text*/, const QString& /*wavfile*/, QString* /*errStr*/) |
71 | { | 71 | { |
72 | return NoError; | 72 | return NoError; |
73 | } | 73 | } |