len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up several debug messages.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21314 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-06-16 18:45:20 +00:00
parent 5a5cccf10b
commit f2a8dd3ce5
5 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rbutil/rbutilqt/base/rbsettings.cpp
View file

@ -119,13 +119,13 @@ void RbSettings::ensureRbSettingsExists()
{ {
userSettings = new QSettings(QCoreApplication::instance()->applicationDirPath() userSettings = new QSettings(QCoreApplication::instance()->applicationDirPath()
+ "/RockboxUtility.ini", QSettings::IniFormat, NULL); + "/RockboxUtility.ini", QSettings::IniFormat, NULL);
qDebug() << "config: portable"; qDebug() << "[Settings] configuration: portable";
} }
else else
{ {
userSettings = new QSettings(QSettings::IniFormat, userSettings = new QSettings(QSettings::IniFormat,
QSettings::UserScope, "rockbox.org", "RockboxUtility",NULL); QSettings::UserScope, "rockbox.org", "RockboxUtility",NULL);
qDebug() << "config: system"; qDebug() << "[Settings] configuration: system";
} }
} }
} }

8
rbutil/rbutilqt/base/zipinstaller.cpp
View file

@ -31,7 +31,7 @@ ZipInstaller::ZipInstaller(QObject* parent): QObject(parent)
void ZipInstaller::install() void ZipInstaller::install()
{ {
qDebug() << "[ZipInstall] install()"; qDebug() << "[ZipInstall] initializing installation";
runner = 0; runner = 0;
connect(this, SIGNAL(cont()), this, SLOT(installContinue())); connect(this, SIGNAL(cont()), this, SLOT(installContinue()));
@ -51,7 +51,7 @@ void ZipInstaller::abort()
void ZipInstaller::installContinue() void ZipInstaller::installContinue()
{ {
qDebug() << "[ZipInstall] installContinue"; qDebug() << "[ZipInstall] continuing installation";
runner++; // this gets called when a install finished, so increase first. runner++; // this gets called when a install finished, so increase first.
qDebug() << "[ZipInstall] runner done:" << runner << "/" << m_urllist.size(); qDebug() << "[ZipInstall] runner done:" << runner << "/" << m_urllist.size();
@ -75,7 +75,7 @@ void ZipInstaller::installContinue()
void ZipInstaller::installStart() void ZipInstaller::installStart()
{ {
qDebug() << "[ZipInstall] installStart"; qDebug() << "[ZipInstall] starting installation";
emit logItem(tr("Downloading file %1.%2").arg(QFileInfo(m_url).baseName(), emit logItem(tr("Downloading file %1.%2").arg(QFileInfo(m_url).baseName(),
QFileInfo(m_url).completeSuffix()),LOGINFO); QFileInfo(m_url).completeSuffix()),LOGINFO);
@ -105,7 +105,7 @@ void ZipInstaller::installStart()
void ZipInstaller::downloadDone(bool error) void ZipInstaller::downloadDone(bool error)
{ {
qDebug() << "[ZipInstall] downloadDone, error:" << error; qDebug() << "[ZipInstall] download done, error:" << error;
QStringList zipContents; // needed later QStringList zipContents; // needed later
// update progress bar // update progress bar

2
rbutil/rbutilqt/browsedirtree.cpp
View file

@ -44,7 +44,7 @@ BrowseDirtree::BrowseDirtree(QWidget *parent, const QString &caption) : QDialog(
void BrowseDirtree::setDir(const QDir &dir) 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. // do not try to hilight directory if it's not valid.
if(!dir.exists()) return; if(!dir.exists()) return;

10
rbutil/rbutilqt/install.cpp
View file

@ -92,7 +92,7 @@ void Install::accept()
logger = new ProgressLoggerGui(this); logger = new ProgressLoggerGui(this);
logger->show(); logger->show();
QString mountPoint = RbSettings::value(RbSettings::Mountpoint).toString(); 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 // show dialog with error if mount point is wrong
if(!QFileInfo(mountPoint).isDir()) { if(!QFileInfo(mountPoint).isDir()) {
logger->addItem(tr("Mount point is wrong!"),LOGERROR); logger->addItem(tr("Mount point is wrong!"),LOGERROR);
@ -128,7 +128,7 @@ void Install::accept()
myversion = "r" + version.value("bleed_rev"); myversion = "r" + version.value("bleed_rev");
} }
else { else {
qDebug() << "no build selected -- this shouldn't happen"; qDebug() << "[Install] no build selected -- this shouldn't happen";
return; return;
} }
RbSettings::sync(); RbSettings::sync();
@ -212,7 +212,7 @@ void Install::changeBackupPath()
// Zip installer has finished // Zip installer has finished
void Install::done(bool error) void Install::done(bool error)
{ {
qDebug() << "Install::done, error:" << error; qDebug() << "[Install] done, error:" << error;
if(error) if(error)
{ {
@ -285,7 +285,7 @@ void Install::setVersionStrings(QMap<QString, QString>& ver)
if(version.value("arch_rev").isEmpty()) { if(version.value("arch_rev").isEmpty()) {
ui.radioArchived->setEnabled(false); 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()) { if(version.value("rel_rev").isEmpty()) {
ui.radioStable->setEnabled(false); ui.radioStable->setEnabled(false);
@ -316,7 +316,7 @@ void Install::setVersionStrings(QMap<QString, QString>& ver)
ui.radioCurrent->setFont(font); ui.radioCurrent->setFont(font);
} }
qDebug() << "Install::setVersionStrings" << version; qDebug() << "[Install] setting version strings to:" << version;
} }

26
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -163,7 +163,7 @@ void RbUtilQt::downloadInfo()
daily->setCache(true); daily->setCache(true);
else else
daily->setCache(false); daily->setCache(false);
qDebug() << "downloading build info"; qDebug() << "[RbUtil] downloading build info";
daily->setFile(&buildInfo); daily->setFile(&buildInfo);
daily->getFile(QUrl(RbSettings::value(RbSettings::ServerConfUrl).toString())); daily->getFile(QUrl(RbSettings::value(RbSettings::ServerConfUrl).toString()));
} }
@ -172,12 +172,12 @@ void RbUtilQt::downloadInfo()
void RbUtilQt::downloadDone(bool error) void RbUtilQt::downloadDone(bool error)
{ {
if(error) { if(error) {
qDebug() << "network error:" << daily->error(); qDebug() << "[RbUtil] network error:" << daily->error();
QMessageBox::critical(this, tr("Network error"), QMessageBox::critical(this, tr("Network error"),
tr("Can't get version information.")); tr("Can't get version information."));
return; return;
} }
qDebug() << "network status:" << daily->error(); qDebug() << "[RbUtil] network status:" << daily->error();
buildInfo.open(); buildInfo.open();
QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); QSettings info(buildInfo.fileName(), QSettings::IniFormat, this);
@ -229,7 +229,7 @@ void RbUtilQt::downloadDone(bool error)
void RbUtilQt::downloadBleedingDone(bool error) void RbUtilQt::downloadBleedingDone(bool error)
{ {
if(error) { if(error) {
qDebug() << "network error:" << bleeding->error(); qDebug() << "[RbUtil] network error:" << bleeding->error();
} }
else { else {
bleedingInfo.open(); bleedingInfo.open();
@ -237,7 +237,7 @@ void RbUtilQt::downloadBleedingDone(bool error)
bleedingInfo.close(); bleedingInfo.close();
versmap.insert("bleed_rev", info.value("bleeding/rev").toString()); versmap.insert("bleed_rev", info.value("bleeding/rev").toString());
versmap.insert("bleed_date", info.value("bleeding/timestamp").toString()); versmap.insert("bleed_date", info.value("bleeding/timestamp").toString());
qDebug() << "versmap =" << versmap; qDebug() << "[RbUtil] version map:" << versmap;
m_gotInfo = true; m_gotInfo = true;
} }
@ -253,7 +253,7 @@ void RbUtilQt::downloadDone(int id, bool error)
QMessageBox::about(this, "Network Error", errorString); QMessageBox::about(this, "Network Error", errorString);
m_networkerror = daily->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() void RbUtilQt::updateSettings()
{ {
qDebug() << "updateSettings()"; qDebug() << "[RbUtil] updating current settings";
updateDevice(); updateDevice();
updateManual(); updateManual();
if(RbSettings::value(RbSettings::ProxyType) == "system") { if(RbSettings::value(RbSettings::ProxyType) == "system") {
@ -505,7 +505,7 @@ bool RbUtilQt::smallInstallInner()
void RbUtilQt::installdone(bool error) void RbUtilQt::installdone(bool error)
{ {
qDebug() << "install done"; qDebug() << "[RbUtil] install done";
m_installed = true; m_installed = true;
m_error = error; m_error = error;
} }
@ -715,7 +715,7 @@ void RbUtilQt::installBootloader()
tree.exec(); tree.exec();
backupDestination = tree.getSelected() + "/" + targetFolder; backupDestination = tree.getSelected() + "/" + targetFolder;
qDebug() << backupDestination; qDebug() << "[RbUtil] backing up to" << backupDestination;
// backup needs to be done after the logger has been set up. // backup needs to be done after the logger has been set up.
} }
} }
@ -770,7 +770,7 @@ void RbUtilQt::installBootloader()
void RbUtilQt::installBootloaderPost(bool error) 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 an error occured don't perform post install steps.
if(error) { if(error) {
m_error = true; m_error = true;
@ -859,7 +859,7 @@ void RbUtilQt::installVoice()
voiceurl += RbSettings::value(RbSettings::CurBuildserverModel).toString() + "-" + voiceurl += RbSettings::value(RbSettings::CurBuildserverModel).toString() + "-" +
versmap.value("arch_date") + "-english.zip"; versmap.value("arch_date") + "-english.zip";
qDebug() << voiceurl; qDebug() << "[RbUtil] voicefile URL:" << voiceurl;
installer->setUrl(voiceurl); installer->setUrl(voiceurl);
installer->setLogSection("Voice"); installer->setLogSection("Voice");
@ -1053,7 +1053,7 @@ void RbUtilQt::downloadManual(void)
section = "Manual (HTML)"; section = "Manual (HTML)";
} }
manualurl = RbSettings::value(RbSettings::ManualUrl).toString() + "/" + target; manualurl = RbSettings::value(RbSettings::ManualUrl).toString() + "/" + target;
qDebug() << "manualurl =" << manualurl; qDebug() << "[RbUtil] Manual URL:" << manualurl;
ProgressLoggerGui* logger = new ProgressLoggerGui(this); ProgressLoggerGui* logger = new ProgressLoggerGui(this);
logger->show(); logger->show();
@ -1126,7 +1126,7 @@ void RbUtilQt::installPortable(void)
void RbUtilQt::updateInfo() void RbUtilQt::updateInfo()
{ {
qDebug() << "RbUtilQt::updateInfo()"; qDebug() << "[RbUtil] updating server info";
QSettings log(RbSettings::value(RbSettings::Mountpoint).toString() QSettings log(RbSettings::value(RbSettings::Mountpoint).toString()
+ "/.rockbox/rbutil.log", QSettings::IniFormat, this); + "/.rockbox/rbutil.log", QSettings::IniFormat, this);