diff --git a/src/gui/formupdate.cpp b/src/gui/formupdate.cpp index 0e6db7c12..4987121ad 100755 --- a/src/gui/formupdate.cpp +++ b/src/gui/formupdate.cpp @@ -152,7 +152,7 @@ void FormUpdate::saveUpdateFile(const QByteArray &file_contents) { } else { qDebug("Cannot save downloaded update file because target temporary file '%s' cannot be " - "opened for writing.", output_file_name); + "opened for writing.", qPrintable(output_file_name)); } } else { @@ -161,7 +161,7 @@ void FormUpdate::saveUpdateFile(const QByteArray &file_contents) { } void FormUpdate::updateCompleted(QNetworkReply::NetworkError status, QByteArray contents) { - qDebug("Download of application update file was completed with code '%s'.", + qDebug("Download of application update file was completed with code '%d'.", status); switch (status) { diff --git a/src/updater/main.cpp b/src/updater/main.cpp index 9fd0b701b..3cb89fd89 100644 --- a/src/updater/main.cpp +++ b/src/updater/main.cpp @@ -73,14 +73,14 @@ bool copyPath(QString src, QString dst) { if (!QFile::exists(destination_file) || QFile::remove(destination_file)) { if (QFile::copy(src + QDir::separator() + f, destination_file)) { - qDebug("Copied file '%s'.", qPrintable(f)); + qDebug("Copied file %s", qPrintable(f)); } else { - qDebug("Failed to copy file '%s'.", qPrintable(original_file)); + qDebug("Failed to copy file %s", qPrintable(original_file)); } } else { - qDebug("Failed to remove file '%s'.", qPrintable(original_file)); + qDebug("Failed to remove file %s", qPrintable(original_file)); } } @@ -125,17 +125,17 @@ int main(int argc, char *argv[]) { qDebug("\n===== Files & versions ====\n"); - qDebug("This process:\n\t %s", qPrintable(this_process_path)); - qDebug("Application executable:\n\t %s", qPrintable(rssguard_executable_path)); - qDebug("TEMP path:\n\t %s", qPrintable(temp_path)); + qDebug("This process:\n -> %s", qPrintable(this_process_path)); + qDebug("Application executable:\n -> %s", qPrintable(rssguard_executable_path)); + qDebug("TEMP path:\n -> %s", qPrintable(temp_path)); qDebug("\n===== Update file metadata ====\n"); bool update_file_exists = QFile::exists(update_file_path); - qDebug("Update file exists:\n\t %s", update_file_exists ? "yes" : "no"); - qDebug("Update file path:\n\t %s", qPrintable(update_file_path)); - qDebug("Update file size:\n\t %d bytes", QFileInfo(update_file_path).size()); + qDebug("Update file exists:\n -> %s", update_file_exists ? "yes" : "no"); + qDebug("Update file path:\n -> %s", qPrintable(update_file_path)); + qDebug("Update file size:\n -> %lld bytes", QFileInfo(update_file_path).size()); if (!update_file_exists) { qDebug("\nUpdate file does NOT exist. Updater cannot proceed."); @@ -146,13 +146,13 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } + qDebug("\n===== Cleanup ====\n"); + // Check if main RSS Guard instance is running. if (application.sendMessage(APP_QUIT_INSTANCE)) { qDebug("RSS Guard application is running. Quitting it."); } - qDebug("\n===== Cleanup ====\n"); - // Remove old folders. if (QDir(output_temp_path).exists()) { if (!removeDir(output_temp_path)) {