From 63ba647ee0fcdcb42f1e36e4a8f82c6c40cbb8f2 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sun, 9 Aug 2009 10:57:33 +0000
Subject: Clean up bootloader installation debug output a bit.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22219 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'rbutil/rbutilqt/base/bootloaderinstallmi4.cpp')

diff --git a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp
index 0b42425903..8ae872d5ab 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp
@@ -32,7 +32,7 @@ BootloaderInstallMi4::BootloaderInstallMi4(QObject *parent)
 bool BootloaderInstallMi4::install(void)
 {
     emit logItem(tr("Downloading bootloader"), LOGINFO);
-    qDebug() << __func__;
+    qDebug() << "[BootloaderInstallMi4] installing bootloader";
     downloadBlStart(m_blurl);
     connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2()));
     return true;
@@ -49,17 +49,17 @@ void BootloaderInstallMi4::installStage2(void)
     QString moved = QFileInfo(resolvePathCase(m_blfile)).absolutePath()
                         + "/OF.mi4";
     if(!QFileInfo(moved).exists()) {
-        qDebug() << "renaming" << fwfile << "->" << moved;
+        qDebug() << "[BootloaderInstallMi4] renaming" << fwfile << "to" << moved;
         oldbl.rename(moved);
     }
     else {
-        qDebug() << "OF.mi4 already present, not renaming again.";
+        qDebug() << "[BootloaderInstallMi4] OF.mi4 already present, not renaming again.";
         oldbl.remove();
     }
 
     // place new bootloader
     m_tempfile.open();
-    qDebug() << "renaming" << m_tempfile.fileName() << "->" << fwfile;
+    qDebug() << "[BootloaderInstallMi4] renaming" << m_tempfile.fileName() << "to" << fwfile;
     m_tempfile.close();
     m_tempfile.rename(fwfile);
 
@@ -72,7 +72,7 @@ void BootloaderInstallMi4::installStage2(void)
 
 bool BootloaderInstallMi4::uninstall(void)
 {
-    qDebug() << __func__;
+    qDebug() << "[BootloaderInstallMi4] Uninstalling bootloader";
 
     // check if it's actually a Rockbox bootloader
     emit logItem(tr("Checking for Rockbox bootloader"), LOGINFO);
@@ -117,7 +117,7 @@ BootloaderInstallBase::BootloaderType BootloaderInstallMi4::installed(void)
     QString resolved;
     resolved = resolvePathCase(m_blfile);
     if(resolved.isEmpty()) {
-        qDebug("%s: BootloaderNone", __func__);
+        qDebug() << "[BootloaderInstallMi4] installed: BootloaderNone";
         return BootloaderNone;
     }
 
@@ -129,11 +129,11 @@ BootloaderInstallBase::BootloaderType BootloaderInstallMi4::installed(void)
     f.close();
 
     if(!memcmp(magic, "RBBL", 4)) {
-        qDebug("%s: BootloaderRockbox", __func__);
+        qDebug() << "[BootloaderInstallMi4] installed: BootloaderRockbox";
         return BootloaderRockbox;
     }
     else {
-        qDebug("%s: BootloaderOther", __func__);
+        qDebug() << "[BootloaderInstallMi4] installed: BootloaderOther";
         return BootloaderOther;
     }
 }
@@ -141,7 +141,7 @@ BootloaderInstallBase::BootloaderType BootloaderInstallMi4::installed(void)
 
 BootloaderInstallBase::Capabilities BootloaderInstallMi4::capabilities(void)
 {
-    qDebug() << __func__;
+    qDebug() << "[BootloaderInstallMi4] getting capabilities";
     return Install | Uninstall | Backup | IsFile | CanCheckInstalled | CanCheckVersion;
 }
 
-- 
cgit v1.2.3