diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-08-21 20:45:59 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-09-27 10:57:58 +0200 |
commit | 201e9bcde8d0d222d71792dc577d9eced4f45ebc (patch) | |
tree | 536d06ff4785a539a344388c606433d189b377ef /rbutil | |
parent | f1f72ff8df68e190a43a56d14dfc820d1e58d96b (diff) | |
download | rockbox-201e9bcde8d0d222d71792dc577d9eced4f45ebc.tar.gz rockbox-201e9bcde8d0d222d71792dc577d9eced4f45ebc.zip |
rbutil: Fix some minor issues found by clazy.
Change-Id: I0e63df09caf959dcb325c6ad2297c4348388a831
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/talkfile.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/ttsexes.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/ttssapi.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/uninstall.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/utils.cpp | 3 |
6 files changed, 7 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp index b0e83a8585..597c3ac37b 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | |||
@@ -48,7 +48,7 @@ void BootloaderInstallMi4::installStage2(void) | |||
48 | QFile oldbl(fwfile); | 48 | QFile oldbl(fwfile); |
49 | QString moved = QFileInfo(Utils::resolvePathCase(m_blfile)).absolutePath() | 49 | QString moved = QFileInfo(Utils::resolvePathCase(m_blfile)).absolutePath() |
50 | + "/OF.mi4"; | 50 | + "/OF.mi4"; |
51 | if(!QFileInfo(moved).exists()) { | 51 | if(!QFileInfo::exists(moved)) { |
52 | LOG_INFO() << "renaming" << fwfile << "to" << moved; | 52 | LOG_INFO() << "renaming" << fwfile << "to" << moved; |
53 | oldbl.rename(moved); | 53 | oldbl.rename(moved); |
54 | } | 54 | } |
diff --git a/rbutil/rbutilqt/base/talkfile.cpp b/rbutil/rbutilqt/base/talkfile.cpp index 1e9a968576..b4f05762e9 100644 --- a/rbutil/rbutilqt/base/talkfile.cpp +++ b/rbutil/rbutilqt/base/talkfile.cpp | |||
@@ -145,7 +145,7 @@ bool TalkFileCreator::createTalkList(QDir startDir) | |||
145 | if(!dir.dirName().isEmpty() && m_talkFolders) | 145 | if(!dir.dirName().isEmpty() && m_talkFolders) |
146 | { | 146 | { |
147 | // check if we should ignore it | 147 | // check if we should ignore it |
148 | if(m_generateOnlyNew && QFileInfo(dir.path() + "/_dirname.talk").exists()) | 148 | if(m_generateOnlyNew && QFileInfo::exists(dir.path() + "/_dirname.talk")) |
149 | { | 149 | { |
150 | continue; | 150 | continue; |
151 | } | 151 | } |
@@ -186,7 +186,7 @@ bool TalkFileCreator::createTalkList(QDir startDir) | |||
186 | continue; | 186 | continue; |
187 | 187 | ||
188 | // check if we should ignore it | 188 | // check if we should ignore it |
189 | if(m_generateOnlyNew && QFileInfo(fileInf.path() + "/" + fileInf.fileName() + ".talk").exists()) | 189 | if(m_generateOnlyNew && QFileInfo::exists(fileInf.path() + "/" + fileInf.fileName() + ".talk")) |
190 | { | 190 | { |
191 | continue; | 191 | continue; |
192 | } | 192 | } |
diff --git a/rbutil/rbutilqt/base/ttsexes.cpp b/rbutil/rbutilqt/base/ttsexes.cpp index a8c10bfb19..446725968f 100644 --- a/rbutil/rbutilqt/base/ttsexes.cpp +++ b/rbutil/rbutilqt/base/ttsexes.cpp | |||
@@ -119,7 +119,7 @@ TTSStatus TTSExes::voice(QString text, QString wavfile, QString *errStr) | |||
119 | bool TTSExes::configOk() | 119 | bool TTSExes::configOk() |
120 | { | 120 | { |
121 | loadSettings(); | 121 | loadSettings(); |
122 | if (QFileInfo(m_TTSexec).exists()) | 122 | if (QFileInfo::exists(m_TTSexec)) |
123 | return true; | 123 | return true; |
124 | else | 124 | else |
125 | return false; | 125 | return false; |
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp index 3d07c09a98..75d83e7d21 100644 --- a/rbutil/rbutilqt/base/ttssapi.cpp +++ b/rbutil/rbutilqt/base/ttssapi.cpp | |||
@@ -42,7 +42,7 @@ void TTSSapi::generateSettings() | |||
42 | // language | 42 | // language |
43 | QMap<QString, QStringList> languages = SystemInfo::languages(); | 43 | QMap<QString, QStringList> languages = SystemInfo::languages(); |
44 | QStringList langs; | 44 | QStringList langs; |
45 | for(int i = 0; i < languages.values().size(); ++i) { | 45 | for(int i = 0; i < languages.size(); ++i) { |
46 | langs.append(languages.values().at(i).at(0)); | 46 | langs.append(languages.values().at(i).at(0)); |
47 | } | 47 | } |
48 | EncTtsSetting* setting = new EncTtsSetting(this, | 48 | EncTtsSetting* setting = new EncTtsSetting(this, |
diff --git a/rbutil/rbutilqt/base/uninstall.cpp b/rbutil/rbutilqt/base/uninstall.cpp index 498edbb057..4b90bc6b77 100644 --- a/rbutil/rbutilqt/base/uninstall.cpp +++ b/rbutil/rbutilqt/base/uninstall.cpp | |||
@@ -121,6 +121,6 @@ QStringList Uninstaller::getAllSections() | |||
121 | 121 | ||
122 | bool Uninstaller::uninstallPossible() | 122 | bool Uninstaller::uninstallPossible() |
123 | { | 123 | { |
124 | return QFileInfo(m_mountpoint +"/.rockbox/rbutil.log").exists(); | 124 | return QFileInfo::exists(m_mountpoint +"/.rockbox/rbutil.log"); |
125 | } | 125 | } |
126 | 126 | ||
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp index 277dcb512c..a61ef0d951 100644 --- a/rbutil/rbutilqt/base/utils.cpp +++ b/rbutil/rbutilqt/base/utils.cpp | |||
@@ -69,7 +69,7 @@ bool Utils::recursiveRmdir( const QString &dirName ) | |||
69 | // make list of entries in directory | 69 | // make list of entries in directory |
70 | QStringList list = dir.entryList(QDir::AllEntries | QDir::NoDotAndDotDot); | 70 | QStringList list = dir.entryList(QDir::AllEntries | QDir::NoDotAndDotDot); |
71 | QFileInfo fileInfo; | 71 | QFileInfo fileInfo; |
72 | QString curItem, lstAt; | 72 | QString curItem; |
73 | for(int i = 0; i < list.size(); i++){ // loop through all items of list | 73 | for(int i = 0; i < list.size(); i++){ // loop through all items of list |
74 | QString name = list.at(i); | 74 | QString name = list.at(i); |
75 | curItem = dirN + "/" + name; | 75 | curItem = dirN + "/" + name; |
@@ -281,7 +281,6 @@ qulonglong Utils::filesystemSize(QString path, enum Utils::Size type) | |||
281 | //! \brief searches for a Executable in the Environement Path | 281 | //! \brief searches for a Executable in the Environement Path |
282 | QString Utils::findExecutable(QString name) | 282 | QString Utils::findExecutable(QString name) |
283 | { | 283 | { |
284 | QString exepath; | ||
285 | //try autodetect tts | 284 | //try autodetect tts |
286 | #if defined(Q_OS_LINUX) || defined(Q_OS_MACX) || defined(Q_OS_OPENBSD) | 285 | #if defined(Q_OS_LINUX) || defined(Q_OS_MACX) || defined(Q_OS_OPENBSD) |
287 | #if QT_VERSION >= 0x050e00 | 286 | #if QT_VERSION >= 0x050e00 |