diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-03-20 20:14:21 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-03-20 20:14:21 +0100 |
commit | c7c9a0f069978135a5cf98e68d2c19586905720c (patch) | |
tree | 254a59c6b09cae4f6a76ffc20a164cb09a653eda | |
parent | 04e22d8719dabb33de38eea5cdf4199d147b7b28 (diff) | |
download | rockbox-c7c9a0f069978135a5cf98e68d2c19586905720c.tar.gz rockbox-c7c9a0f069978135a5cf98e68d2c19586905720c.zip |
rbutil: Minor code cleanup.
Change-Id: Ia1b05747e64b2122cfe17ee0c2f7bf5477f3ba09
-rw-r--r-- | utils/rbutilqt/base/autodetection.cpp | 10 | ||||
-rw-r--r-- | utils/rbutilqt/base/autodetection.h | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/utils/rbutilqt/base/autodetection.cpp b/utils/rbutilqt/base/autodetection.cpp index 341f219c30..5021e1b3cc 100644 --- a/utils/rbutilqt/base/autodetection.cpp +++ b/utils/rbutilqt/base/autodetection.cpp | |||
@@ -92,7 +92,8 @@ void Autodetection::detectUsb() | |||
92 | 92 | ||
93 | int i = attached.size(); | 93 | int i = attached.size(); |
94 | while(i--) { | 94 | while(i--) { |
95 | QStringList a = PlayerBuildInfo::instance()->value(PlayerBuildInfo::UsbIdTargetList, attached.at(i)).toStringList(); | 95 | QStringList a = PlayerBuildInfo::instance()->value( |
96 | PlayerBuildInfo::UsbIdTargetList, attached.at(i)).toStringList(); | ||
96 | if(a.size() > 0) { | 97 | if(a.size() > 0) { |
97 | struct Detected d; | 98 | struct Detected d; |
98 | d.status = PlayerOk; | 99 | d.status = PlayerOk; |
@@ -100,7 +101,8 @@ void Autodetection::detectUsb() | |||
100 | m_detected.append(d); | 101 | m_detected.append(d); |
101 | LOG_INFO() << "[USB] detected supported player" << d.usbdevices; | 102 | LOG_INFO() << "[USB] detected supported player" << d.usbdevices; |
102 | } | 103 | } |
103 | QStringList b = PlayerBuildInfo::instance()->value(PlayerBuildInfo::UsbIdErrorList, attached.at(i)).toStringList(); | 104 | QStringList b = PlayerBuildInfo::instance()->value( |
105 | PlayerBuildInfo::UsbIdErrorList, attached.at(i)).toStringList(); | ||
104 | if(b.size() > 0) { | 106 | if(b.size() > 0) { |
105 | struct Detected d; | 107 | struct Detected d; |
106 | d.status = PlayerMtpMode; | 108 | d.status = PlayerMtpMode; |
@@ -310,7 +312,7 @@ void Autodetection::mergePatcher(void) | |||
310 | } | 312 | } |
311 | 313 | ||
312 | 314 | ||
313 | QString Autodetection::detectAjbrec(QString root) | 315 | QString Autodetection::detectAjbrec(const QString& root) |
314 | { | 316 | { |
315 | QFile f(root + "/ajbrec.ajz"); | 317 | QFile f(root + "/ajbrec.ajz"); |
316 | char header[24]; | 318 | char header[24]; |
@@ -347,7 +349,7 @@ QString Autodetection::detectAjbrec(QString root) | |||
347 | } | 349 | } |
348 | 350 | ||
349 | 351 | ||
350 | int Autodetection::findDetectedDevice(QString device) | 352 | int Autodetection::findDetectedDevice(const QString& device) |
351 | { | 353 | { |
352 | int i = m_detected.size(); | 354 | int i = m_detected.size(); |
353 | while(i--) { | 355 | while(i--) { |
diff --git a/utils/rbutilqt/base/autodetection.h b/utils/rbutilqt/base/autodetection.h index cdbb94d303..183f240bd0 100644 --- a/utils/rbutilqt/base/autodetection.h +++ b/utils/rbutilqt/base/autodetection.h | |||
@@ -55,12 +55,11 @@ public: | |||
55 | QList<struct Detected> detected(void) { return m_detected; } | 55 | QList<struct Detected> detected(void) { return m_detected; } |
56 | 56 | ||
57 | private: | 57 | private: |
58 | QString resolveMountPoint(QString); | ||
59 | void detectUsb(void); | 58 | void detectUsb(void); |
60 | void mergeMounted(void); | 59 | void mergeMounted(void); |
61 | void mergePatcher(void); | 60 | void mergePatcher(void); |
62 | QString detectAjbrec(QString); | 61 | QString detectAjbrec(const QString&); |
63 | int findDetectedDevice(QString device); | 62 | int findDetectedDevice(const QString& device); |
64 | void updateDetectedDevice(struct Detected& entry); | 63 | void updateDetectedDevice(struct Detected& entry); |
65 | 64 | ||
66 | QList<struct Detected> m_detected; | 65 | QList<struct Detected> m_detected; |