5 files changed, 25 insertions, 25 deletions

diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp
index fec68b5336..8ab340faa3 100644
--- a/rbutil/rbutilqt/base/rbsettings.cpp
+++ b/rbutil/rbutilqt/base/rbsettings.cpp
@@ -119,13 +119,13 @@ void RbSettings::ensureRbSettingsExists()
         {
             userSettings = new QSettings(QCoreApplication::instance()->applicationDirPath()
                 + "/RockboxUtility.ini", QSettings::IniFormat, NULL);
-            qDebug() << "config: portable";
+            qDebug() << "[Settings] configuration: portable";
         }
         else
         {
             userSettings = new QSettings(QSettings::IniFormat,
             QSettings::UserScope, "rockbox.org", "RockboxUtility",NULL);
-            qDebug() << "config: system";
+            qDebug() << "[Settings] configuration: system";
         }
     }
 }
diff --git a/rbutil/rbutilqt/base/zipinstaller.cpp b/rbutil/rbutilqt/base/zipinstaller.cpp
index 268ae49935..6a59cdad02 100644
--- a/rbutil/rbutilqt/base/zipinstaller.cpp
+++ b/rbutil/rbutilqt/base/zipinstaller.cpp
@@ -31,7 +31,7 @@ ZipInstaller::ZipInstaller(QObject* parent): QObject(parent)
 
 void ZipInstaller::install()
 {
-    qDebug() << "[ZipInstall] install()";
+    qDebug() << "[ZipInstall] initializing installation";
 
     runner = 0;
     connect(this, SIGNAL(cont()), this, SLOT(installContinue()));
@@ -51,7 +51,7 @@ void ZipInstaller::abort()
 
 void ZipInstaller::installContinue()
 {
-    qDebug() << "[ZipInstall] installContinue";
+    qDebug() << "[ZipInstall] continuing installation";
 
     runner++; // this gets called when a install finished, so increase first.
     qDebug() << "[ZipInstall] runner done:" << runner << "/" << m_urllist.size();
@@ -75,7 +75,7 @@ void ZipInstaller::installContinue()
 
 void ZipInstaller::installStart()
 {
-    qDebug() << "[ZipInstall] installStart";
+    qDebug() << "[ZipInstall] starting installation";
 
     emit logItem(tr("Downloading file %1.%2").arg(QFileInfo(m_url).baseName(),
             QFileInfo(m_url).completeSuffix()),LOGINFO);
@@ -105,7 +105,7 @@ void ZipInstaller::installStart()
 
 void ZipInstaller::downloadDone(bool error)
 {
-    qDebug() << "[ZipInstall] downloadDone, error:" << error;
+    qDebug() << "[ZipInstall] download done, error:" << error;
     QStringList zipContents; // needed later
      // update progress bar
 
diff --git a/rbutil/rbutilqt/browsedirtree.cpp b/rbutil/rbutilqt/browsedirtree.cpp
index c2441f27cd..fa8aa74bff 100644
--- a/rbutil/rbutilqt/browsedirtree.cpp
+++ b/rbutil/rbutilqt/browsedirtree.cpp
@@ -44,7 +44,7 @@ BrowseDirtree::BrowseDirtree(QWidget *parent, const QString &caption) : QDialog(
 
 void BrowseDirtree::setDir(const QDir &dir)
 {
-    qDebug() << "BrowseDirtree::setDir()" << model.index(dir.absolutePath());
+    qDebug() << "[BrowseDirtree] setDir()" << model.index(dir.absolutePath());
 
     // do not try to hilight directory if it's not valid.
     if(!dir.exists()) return;
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp
index d3854b06fc..099575fec4 100644
--- a/rbutil/rbutilqt/install.cpp
+++ b/rbutil/rbutilqt/install.cpp
@@ -92,7 +92,7 @@ void Install::accept()
     logger = new ProgressLoggerGui(this);
     logger->show();
     QString mountPoint = RbSettings::value(RbSettings::Mountpoint).toString();
-    qDebug() << "mountpoint:" << RbSettings::value(RbSettings::Mountpoint).toString();
+    qDebug() << "[Install] mountpoint:" << RbSettings::value(RbSettings::Mountpoint).toString();
     // show dialog with error if mount point is wrong
     if(!QFileInfo(mountPoint).isDir()) {
         logger->addItem(tr("Mount point is wrong!"),LOGERROR);
@@ -128,7 +128,7 @@ void Install::accept()
         myversion = "r" + version.value("bleed_rev");
     }
     else {
-        qDebug() << "no build selected -- this shouldn't happen";
+        qDebug() << "[Install] no build selected -- this shouldn't happen";
         return;
     }
     RbSettings::sync();
@@ -212,7 +212,7 @@ void Install::changeBackupPath()
 // Zip installer has finished
 void Install::done(bool error)
 {
-    qDebug() << "Install::done, error:" << error;
+    qDebug() << "[Install] done, error:" << error;
 
     if(error)
     {
@@ -285,7 +285,7 @@ void Install::setVersionStrings(QMap<QString, QString>& ver)
 
     if(version.value("arch_rev").isEmpty()) {
         ui.radioArchived->setEnabled(false);
-        qDebug() << "no information about archived version available!";
+        qDebug() << "[Install] no information about archived version available!";
     }
     if(version.value("rel_rev").isEmpty()) {
         ui.radioStable->setEnabled(false);
@@ -316,7 +316,7 @@ void Install::setVersionStrings(QMap<QString, QString>& ver)
         ui.radioCurrent->setFont(font);
     }
 
-    qDebug() << "Install::setVersionStrings" << version;
+    qDebug() << "[Install] setting version strings to:" << version;
 }
 
 
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index e159c34ed8..c8513b1187 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -163,7 +163,7 @@ void RbUtilQt::downloadInfo()
         daily->setCache(true);
     else
         daily->setCache(false);
-    qDebug() << "downloading build info";
+    qDebug() << "[RbUtil] downloading build info";
     daily->setFile(&buildInfo);
     daily->getFile(QUrl(RbSettings::value(RbSettings::ServerConfUrl).toString()));
 }
@@ -172,12 +172,12 @@ void RbUtilQt::downloadInfo()
 void RbUtilQt::downloadDone(bool error)
 {
     if(error) {
-        qDebug() << "network error:" << daily->error();
+        qDebug() << "[RbUtil] network error:" << daily->error();
         QMessageBox::critical(this, tr("Network error"),
             tr("Can't get version information."));
         return;
     }
-    qDebug() << "network status:" << daily->error();
+    qDebug() << "[RbUtil] network status:" << daily->error();
 
     buildInfo.open();
     QSettings info(buildInfo.fileName(), QSettings::IniFormat, this);
@@ -229,7 +229,7 @@ void RbUtilQt::downloadDone(bool error)
 void RbUtilQt::downloadBleedingDone(bool error)
 {
     if(error) {
-        qDebug() << "network error:" << bleeding->error();
+        qDebug() << "[RbUtil] network error:" << bleeding->error();
     }
     else {
         bleedingInfo.open();
@@ -237,7 +237,7 @@ void RbUtilQt::downloadBleedingDone(bool error)
         bleedingInfo.close();
         versmap.insert("bleed_rev", info.value("bleeding/rev").toString());
         versmap.insert("bleed_date", info.value("bleeding/timestamp").toString());
-        qDebug() << "versmap =" << versmap;
+        qDebug() << "[RbUtil] version map:" << versmap;
 
         m_gotInfo = true;
     }
@@ -253,7 +253,7 @@ void RbUtilQt::downloadDone(int id, bool error)
         QMessageBox::about(this, "Network Error", errorString);
         m_networkerror = daily->errorString();
     }
-    qDebug() << "downloadDone:" << id << "error:" << error;
+    qDebug() << "[RbUtil] downloadDone:" << id << "error:" << error;
 }
 
 
@@ -304,7 +304,7 @@ void RbUtilQt::configDialog()
 
 void RbUtilQt::updateSettings()
 {
-    qDebug() << "updateSettings()";
+    qDebug() << "[RbUtil] updating current settings";
     updateDevice();
     updateManual();
     if(RbSettings::value(RbSettings::ProxyType) == "system") {
@@ -505,7 +505,7 @@ bool RbUtilQt::smallInstallInner()
 
 void RbUtilQt::installdone(bool error)
 {
-    qDebug() << "install done";
+    qDebug() << "[RbUtil] install done";
     m_installed = true;
     m_error = error;
 }
@@ -715,7 +715,7 @@ void RbUtilQt::installBootloader()
             tree.exec();
 
             backupDestination = tree.getSelected() + "/" + targetFolder;
-            qDebug() << backupDestination;
+            qDebug() << "[RbUtil] backing up to" << backupDestination;
             // backup needs to be done after the logger has been set up.
         }
     }
@@ -770,7 +770,7 @@ void RbUtilQt::installBootloader()
 
 void RbUtilQt::installBootloaderPost(bool error)
 {
-    qDebug() << __func__ << error;
+    qDebug() << "[RbUtil] Bootloader Post-Installation, error state:" << error;
     // if an error occured don't perform post install steps.
     if(error) {
         m_error = true;
@@ -859,7 +859,7 @@ void RbUtilQt::installVoice()
 
     voiceurl += RbSettings::value(RbSettings::CurBuildserverModel).toString() + "-" +
         versmap.value("arch_date") + "-english.zip";
-    qDebug() << voiceurl;
+    qDebug() << "[RbUtil] voicefile URL:" << voiceurl;
 
     installer->setUrl(voiceurl);
     installer->setLogSection("Voice");
@@ -1053,7 +1053,7 @@ void RbUtilQt::downloadManual(void)
         section = "Manual (HTML)";
     }
     manualurl = RbSettings::value(RbSettings::ManualUrl).toString() + "/" + target;
-    qDebug() << "manualurl =" << manualurl;
+    qDebug() << "[RbUtil] Manual URL:" << manualurl;
 
     ProgressLoggerGui* logger = new ProgressLoggerGui(this);
     logger->show();
@@ -1126,7 +1126,7 @@ void RbUtilQt::installPortable(void)
 
 void RbUtilQt::updateInfo()
 {
-    qDebug() << "RbUtilQt::updateInfo()";
+    qDebug() << "[RbUtil] updating server info";
 
     QSettings log(RbSettings::value(RbSettings::Mountpoint).toString()
                     + "/.rockbox/rbutil.log", QSettings::IniFormat, this);