Merge pull request #807 from isanae/logging-rework

Logging rework

1 files changed, 9 insertions, 9 deletions

diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp
index e967b27c..0ca39b19 100644
--- a/src/selfupdater.cpp
+++ b/src/selfupdater.cpp
@@ -150,23 +150,23 @@ void SelfUpdater::testForUpdate()
         VersionInfo newestVer(newest["tag_name"].toString());

         if (newestVer > this->m_MOVersion) {

           m_UpdateCandidate = newest;

-          qDebug("update available: %s -> %s",

-                 qUtf8Printable(this->m_MOVersion.displayString(3)),

-                 qUtf8Printable(newestVer.displayString(3)));

+          log::debug("update available: {} -> {}",

+                 this->m_MOVersion.displayString(3),

+                 newestVer.displayString(3));

           emit updateAvailable();

         } else if (newestVer < this->m_MOVersion) {

           // this could happen if the user switches from using prereleases to

           // stable builds. Should we downgrade?

-          qDebug("This version is newer than the latest released one: %s -> %s",

-                 qUtf8Printable(this->m_MOVersion.displayString(3)),

-                 qUtf8Printable(newestVer.displayString(3)));

+          log::debug("This version is newer than the latest released one: {} -> {}",

+                 this->m_MOVersion.displayString(3),

+                 newestVer.displayString(3));

         }

       }

     });

   }

   //Catch all is bad by design, should be improved

   catch (...) {

-		qDebug("Unable to connect to github.com to check version");

+		log::debug("Unable to connect to github.com to check version");

   }

 }

 

@@ -230,7 +230,7 @@ void SelfUpdater::closeProgress()
 void SelfUpdater::openOutputFile(const QString &fileName)

 {

   QString outputPath = QDir::fromNativeSeparators(qApp->property("dataPath").toString()) + "/" + fileName;

-  qDebug("downloading to %s", qUtf8Printable(outputPath));

+  log::debug("downloading to {}", outputPath);

   m_UpdateFile.setFileName(outputPath);

   m_UpdateFile.open(QIODevice::WriteOnly);

 }

@@ -312,7 +312,7 @@ void SelfUpdater::downloadFinished()
     return;

   }

 

-  qDebug("download: %s", m_UpdateFile.fileName().toUtf8().constData());

+  log::debug("download: {}", m_UpdateFile.fileName());

 

   try {

     installUpdate();