From f2c145b2fc9d6ffce838398e06f7aa583d05887d Mon Sep 17 00:00:00 2001
From: LostDragonist <lost.dragonist@gmail.com>
Date: Sat, 5 Jan 2019 16:34:10 -0600
Subject: Change qPrintable to qUtf8Printable to better support non-ASCII text

---
 src/organizercore.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/organizercore.cpp')

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 9ebe9f47..c4029a6d 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -47,7 +47,7 @@
 #include <QWidget>
 
 #include <QtDebug>
-#include <QtGlobal> // for qPrintable, etc
+#include <QtGlobal> // for qUtf8Printable, etc
 
 #include <Psapi.h>
 #include <Shlobj.h>
@@ -89,8 +89,8 @@ static bool isOnline()
         continue;
       }
       qDebug("interface %s seems to be up (address: %s)",
-             qPrintable(iter->humanReadableName()),
-             qPrintable(addresses[0].ip().toString()));
+             qUtf8Printable(iter->humanReadableName()),
+             qUtf8Printable(addresses[0].ip().toString()));
       connected = true;
     }
   }
@@ -640,7 +640,7 @@ bool OrganizerCore::nexusLogin(bool retry)
     if ((!retry && m_Settings.getNexusLogin(username, password))
         || (m_AskForNexusPW && queryLogin(username, password))) {
       // credentials stored or user entered them manually
-      qDebug("attempt login with username %s", qPrintable(username));
+      qDebug("attempt login with username %s", qUtf8Printable(username));
       accessManager->login(username, password);
       return true;
     } else {
@@ -681,7 +681,7 @@ void OrganizerCore::startMOUpdate()
 
 void OrganizerCore::downloadRequestedNXM(const QString &url)
 {
-  qDebug("download requested: %s", qPrintable(url));
+  qDebug("download requested: %s", qUtf8Printable(url));
   if (nexusLogin()) {
     m_PendingDownloads.append(url);
   } else {
@@ -1116,7 +1116,7 @@ QStringList OrganizerCore::findFiles(
       }
     }
   } else {
-    qWarning("directory %s not found", qPrintable(path));
+    qWarning("directory %s not found", qUtf8Printable(path));
   }
   return result;
 }
@@ -1135,7 +1135,7 @@ QStringList OrganizerCore::getFileOrigins(const QString &fileName) const
           ToQString(m_DirectoryStructure->getOriginByID(i.first).getName()));
     }
   } else {
-    qDebug("%s not found", qPrintable(fileName));
+    qDebug("%s not found", qUtf8Printable(fileName));
   }
   return result;
 }
@@ -1402,7 +1402,7 @@ HANDLE OrganizerCore::spawnBinaryProcess(const QFileInfo &binary,
     }
   } else {
     qDebug("start of \"%s\" canceled by plugin",
-           qPrintable(binary.absoluteFilePath()));
+           qUtf8Printable(binary.absoluteFilePath()));
     return INVALID_HANDLE_VALUE;
   }
 }
@@ -1781,7 +1781,7 @@ void OrganizerCore::updateModActiveState(int index, bool active)
        dir.entryList(QStringList() << "*.esm", QDir::Files)) {
     const FileEntry::Ptr file = m_DirectoryStructure->findFile(ToWString(esm));
     if (file.get() == nullptr) {
-      qWarning("failed to activate %s", qPrintable(esm));
+      qWarning("failed to activate %s", qUtf8Printable(esm));
       continue;
     }
 
@@ -1797,7 +1797,7 @@ void OrganizerCore::updateModActiveState(int index, bool active)
        dir.entryList(QStringList() << "*.esl", QDir::Files)) {
     const FileEntry::Ptr file = m_DirectoryStructure->findFile(ToWString(esl));
     if (file.get() == nullptr) {
-      qWarning("failed to activate %s", qPrintable(esl));
+      qWarning("failed to activate %s", qUtf8Printable(esl));
       continue;
     }
 
@@ -1813,7 +1813,7 @@ void OrganizerCore::updateModActiveState(int index, bool active)
   for (const QString &esp : esps) {
     const FileEntry::Ptr file = m_DirectoryStructure->findFile(ToWString(esp));
     if (file.get() == nullptr) {
-      qWarning("failed to activate %s", qPrintable(esp));
+      qWarning("failed to activate %s", qUtf8Printable(esp));
       continue;
     }
 
@@ -2140,7 +2140,7 @@ std::vector<unsigned int> OrganizerCore::activeProblems() const
     // of a "log spam". But since this is a sevre error which will most likely make the
     // game crash/freeze/etc. and is very hard to diagnose,  this "log spam" will make it
     // easier for the user to notice the warning.
-    qWarning("hook.dll found in game folder: %s", qPrintable(hookdll));
+    qWarning("hook.dll found in game folder: %s", qUtf8Printable(hookdll));
     problems.push_back(PROBLEM_MO1SCRIPTEXTENDERWORKAROUND);
   }
   return problems;
-- 
cgit v1.3.1