summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2013-11-03 11:08:18 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2013-11-04 23:32:52 +0100
commit4d2ce949b3b41f8bf0af446fa20205ddd229e579 (patch)
tree01fa19471d9831b296bea5d7049f765e38b30bbb /rbutil/rbutilqt/base/bootloaderinstallipod.cpp
parent335ec75d60bba82f23fc47b20f9390e0cba9c9c5 (diff)
downloadrockbox-4d2ce949b3b41f8bf0af446fa20205ddd229e579.tar.gz
rockbox-4d2ce949b3b41f8bf0af446fa20205ddd229e579.zip
Use cutelogger for Rockbox Utility internal trace.
Change tracing from qDebug() to use cutelogger, which is available under the LGPL2.1. This allows to automatically add filename and line number to the log, and also provides multiple log levels. Change-Id: I5dbdaf902ba54ea99f07ae10a07467c52fdac910
Diffstat (limited to 'rbutil/rbutilqt/base/bootloaderinstallipod.cpp')
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallipod.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
index de7aaa897b..6c23bc200f 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
@@ -22,6 +22,7 @@
22 22
23#include "../ipodpatcher/ipodpatcher.h" 23#include "../ipodpatcher/ipodpatcher.h"
24#include "utils.h" 24#include "utils.h"
25#include "Logger.h"
25 26
26 27
27BootloaderInstallIpod::BootloaderInstallIpod(QObject *parent) 28BootloaderInstallIpod::BootloaderInstallIpod(QObject *parent)
@@ -131,7 +132,8 @@ void BootloaderInstallIpod::installStage3(bool mounted)
131 emit logItem(tr("Writing log aborted"), LOGERROR); 132 emit logItem(tr("Writing log aborted"), LOGERROR);
132 emit done(true); 133 emit done(true);
133 } 134 }
134 qDebug() << "[BootloaderInstallIpod] version installed:" << m_blversion.toString(Qt::ISODate); 135 LOG_INFO() << "version installed:"
136 << m_blversion.toString(Qt::ISODate);
135} 137}
136 138
137 139
@@ -190,7 +192,7 @@ BootloaderInstallBase::BootloaderType BootloaderInstallIpod::installed(void)
190 BootloaderInstallBase::BootloaderType result = BootloaderRockbox; 192 BootloaderInstallBase::BootloaderType result = BootloaderRockbox;
191 193
192 if(!ipodInitialize(&ipod)) { 194 if(!ipodInitialize(&ipod)) {
193 qDebug() << "[BootloaderInstallIpod] installed: BootloaderUnknown"; 195 LOG_INFO() << "installed: BootloaderUnknown";
194 result = BootloaderUnknown; 196 result = BootloaderUnknown;
195 } 197 }
196 else { 198 else {
@@ -200,7 +202,7 @@ BootloaderInstallBase::BootloaderType BootloaderInstallIpod::installed(void)
200 result = BootloaderOther; 202 result = BootloaderOther;
201 } 203 }
202 else { 204 else {
203 qDebug() << "[BootloaderInstallIpod] installed: BootloaderRockbox"; 205 LOG_INFO() << "installed: BootloaderRockbox";
204 } 206 }
205 } 207 }
206 ipod_close(&ipod); 208 ipod_close(&ipod);
@@ -235,12 +237,12 @@ bool BootloaderInstallIpod::ipodInitialize(struct ipod_t *ipod)
235 sprintf(ipod->diskname, "%s", 237 sprintf(ipod->diskname, "%s",
236 qPrintable(devicename.remove(QRegExp("[0-9]+$")))); 238 qPrintable(devicename.remove(QRegExp("[0-9]+$"))));
237#endif 239#endif
238 qDebug() << "[BootloaderInstallIpod] ipodpatcher: overriding scan, using" 240 LOG_INFO() << "ipodpatcher: overriding scan, using"
239 << ipod->diskname; 241 << ipod->diskname;
240 } 242 }
241 else { 243 else {
242 emit logItem(tr("Error: no mountpoint specified!"), LOGERROR); 244 emit logItem(tr("Error: no mountpoint specified!"), LOGERROR);
243 qDebug() << "[BootloaderInstallIpod] no mountpoint specified!"; 245 LOG_ERROR() << "no mountpoint specified!";
244 } 246 }
245 int result = ipod_open(ipod, 1); 247 int result = ipod_open(ipod, 1);
246 if(result == -2) { 248 if(result == -2) {