Make logs more consistent in format and content

11 files changed, 27 insertions, 27 deletions

diff --git a/src/bbcode.cpp b/src/bbcode.cpp
index 84d7a7c0..3475f1b2 100644
--- a/src/bbcode.cpp
+++ b/src/bbcode.cpp
@@ -100,7 +100,7 @@ public:
           // expression doesn't match. either the input string is invalid

           // or the expression is

           qWarning("%s doesn't match the expression for %s",

-                   temp.toUtf8().constData(), tagName.toUtf8().constData());

+                   qUtf8Printable(temp), qUtf8Printable(tagName));

           length = 0;

           return QString();

         }

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 15831126..1e4ec1f4 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -1510,7 +1510,7 @@ void DownloadManager::nxmFilesAvailable(QString, int, QVariant userData, QVarian
   } else {

     if (info->m_FileInfo->fileID == 0) {

       qWarning("could not determine file id for %s (state %d)",

-               info->m_FileName.toUtf8().constData(), info->m_State);

+               qUtf8Printable(info->m_FileName), info->m_State);

     }

   }

 

diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index 83128e4b..be838867 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -526,7 +526,7 @@ bool InstallationManager::testOverwrite(GuessedValue<QString> &modName, bool *me
           settingsFile.write(originalSettings);
           settingsFile.close();
         } else {
-          qCritical("failed to restore original settings: %s", metaFilename.toUtf8().constData());
+          qCritical("failed to restore original settings: %s", qUtf8Printable(metaFilename));
         }
         return true;
       } else if (overwriteDialog.action() == QueryOverwriteDialog::ACT_MERGE) {
@@ -575,7 +575,7 @@ bool InstallationManager::doInstall(GuessedValue<QString> &modName, QString game
   QString targetDirectory = QDir(m_ModsDirectory + "/" + modName).canonicalPath();
   QString targetDirectoryNative = QDir::toNativeSeparators(targetDirectory);
 
-  qDebug("installing to \"%s\"", targetDirectoryNative.toUtf8().constData());
+  qDebug("installing to \"%s\"", qUtf8Printable(targetDirectoryNative));
 
   m_InstallationProgress = new QProgressDialog(m_ParentWidget);
   ON_BLOCK_EXIT([this] () {
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8bcf7ba7..9904845b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1190,7 +1190,7 @@ void MainWindow::startExeAction()
         selectedExecutable.m_WorkingDirectory.length() != 0

             ? selectedExecutable.m_WorkingDirectory

             : selectedExecutable.m_BinaryInfo.absolutePath(),

-        selectedExecutable.m_SteamAppID, 

+        selectedExecutable.m_SteamAppID,

         customOverwrite,

         forcedLibraries);

   } else {

@@ -1990,7 +1990,7 @@ void MainWindow::on_startButton_clicked() {
         selectedExecutable.m_WorkingDirectory.length() != 0

             ? selectedExecutable.m_WorkingDirectory

             : selectedExecutable.m_BinaryInfo.absolutePath(),

-        selectedExecutable.m_SteamAppID, 

+        selectedExecutable.m_SteamAppID,

         customOverwrite,

         forcedLibraries);

   } catch (...) {

@@ -2961,7 +2961,7 @@ void MainWindow::displayModInformation(const QString &modName, int tab)
 {

   unsigned int index = ModInfo::getIndex(modName);

   if (index == UINT_MAX) {

-    qCritical("failed to resolve mod name %s", modName.toUtf8().constData());

+    qCritical("failed to resolve mod name %s", qUtf8Printable(modName));

     return;

   }

 

@@ -5531,7 +5531,7 @@ BSA::EErrorCode MainWindow::extractBSA(BSA::Archive &archive, BSA::Folder::Ptr f
 

   for (unsigned int i = 0; i < folder->getNumFiles(); ++i) {

     BSA::File::Ptr file = folder->getFile(i);

-    BSA::EErrorCode res = archive.extract(file, destination.toUtf8().constData());

+    BSA::EErrorCode res = archive.extract(file, qUtf8Printable(destination));

     if (res != BSA::ERROR_NONE) {

       reportError(tr("failed to read %1: %2").arg(file->getName().c_str()).arg(res));

       result = res;

diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index 04506374..c2ded812 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -331,7 +331,7 @@ void ModInfoDialog::refreshLists()
           QStringList fields(relativeName.prepend("..."));

           fields.append(ToQString(altString.str()));

 

-          QTreeWidgetItem *item = new QTreeWidgetItem(fields);        

+          QTreeWidgetItem *item = new QTreeWidgetItem(fields);

           item->setData(0, Qt::UserRole, fileName);

           item->setData(1, Qt::UserRole, ToQString(m_Directory->getOriginByID(alternatives.back().first).getName()));

           item->setData(1, Qt::UserRole + 1, alternatives.back().first);

@@ -1123,7 +1123,7 @@ void ModInfoDialog::openFile(const QModelIndex &index)
 

   HINSTANCE res = ::ShellExecuteW(nullptr, L"open", ToWString(fileName).c_str(), nullptr, nullptr, SW_SHOW);

   if ((unsigned long long)res <= 32) {

-    qCritical("failed to invoke %s: %d", fileName.toUtf8().constData(), res);

+    qCritical("failed to invoke %s: %d", qUtf8Printable(fileName), res);

   }

 }

 

diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp
index f29d3725..15ce56ba 100644
--- a/src/modinforegular.cpp
+++ b/src/modinforegular.cpp
@@ -64,7 +64,7 @@ ModInfoRegular::~ModInfoRegular()
     saveMeta();
   } catch (const std::exception &e) {
     qCritical("failed to save meta information for \"%s\": %s",
-              m_Name.toUtf8().constData(), e.what());
+              qUtf8Printable(m_Name), e.what());
   }
 }
 
@@ -631,7 +631,7 @@ QString ModInfoRegular::getURL() const
 
 
 
-QStringList ModInfoRegular::archives(bool checkOnDisk) 
+QStringList ModInfoRegular::archives(bool checkOnDisk)
 {
   if (checkOnDisk) {
     QStringList result;
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 4fa09ab6..a3addcb4 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -1208,18 +1208,18 @@ QStringList OrganizerCore::modsSortedByProfilePriority() const
            ++i) {

     int modIndex = currentProfile()->modIndexByPriority(i);

     auto modInfo = ModInfo::getByIndex(modIndex);

-    if (!modInfo->hasFlag(ModInfo::FLAG_OVERWRITE) && 

+    if (!modInfo->hasFlag(ModInfo::FLAG_OVERWRITE) &&

         !modInfo->hasFlag(ModInfo::FLAG_BACKUP)) {

       res.push_back(ModInfo::getByIndex(modIndex)->name());

-    } 

+    }

   }

   return res;

 }

 

-void OrganizerCore::spawnBinary(const QFileInfo &binary, 

-                                const QString &arguments, 

-                                const QDir &currentDirectory, 

-                                const QString &steamAppID, 

+void OrganizerCore::spawnBinary(const QFileInfo &binary,

+                                const QString &arguments,

+                                const QDir &currentDirectory,

+                                const QString &steamAppID,

                                 const QString &customOverwrite,

                                 const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries)

 {

@@ -1349,7 +1349,7 @@ HANDLE OrganizerCore::spawnBinaryProcess(const QFileInfo &binary,
     try {

       m_USVFS.updateMapping(fileMapping(profileName, customOverwrite));

       m_USVFS.updateForcedLibraries(forcedLibraries);

-      

+

     } catch (const UsvfsConnectorException &e) {

       qDebug(e.what());

       return INVALID_HANDLE_VALUE;

@@ -1453,7 +1453,7 @@ HANDLE OrganizerCore::runShortcut(const MOShortcut& shortcut)
     exe.m_WorkingDirectory.length() != 0

     ? exe.m_WorkingDirectory

     : exe.m_BinaryInfo.absolutePath(),

-    exe.m_SteamAppID, 

+    exe.m_SteamAppID,

     "",

     forcedLibaries);

 }

@@ -1521,7 +1521,7 @@ HANDLE OrganizerCore::startApplication(const QString &executable,
       }

     } catch (const std::runtime_error &) {

       qWarning("\"%s\" not set up as executable",

-               executable.toUtf8().constData());

+               qUtf8Printable(executable));

       binary = QFileInfo(executable);

     }

   }

@@ -1585,7 +1585,7 @@ bool OrganizerCore::waitForProcessCompletion(HANDLE handle, LPDWORD exitCode, IL
         uilock->setProcessName(processName);

       qDebug() << "Waiting for"

         << (originalHandle ? "spawned" : "usvfs")

-        << "process completion :" << processName.toUtf8().constData();

+        << "process completion :" << qUtf8Printable(processName);

       newHandle = false;

     }

 

@@ -1840,7 +1840,7 @@ void OrganizerCore::updateModsActiveState(const QList<unsigned int> &modIndices,
         m_PluginList.blockSignals(false);

       }

     }

-    

+

     for (const QString &esl :

       dir.entryList(QStringList() << "*.esl", QDir::Files)) {

       const FileEntry::Ptr file = m_DirectoryStructure->findFile(ToWString(esl));

diff --git a/src/overwriteinfodialog.cpp b/src/overwriteinfodialog.cpp
index d1289c91..3d82cf17 100644
--- a/src/overwriteinfodialog.cpp
+++ b/src/overwriteinfodialog.cpp
@@ -221,7 +221,7 @@ void OverwriteInfoDialog::openFile(const QModelIndex &index)
 

   HINSTANCE res = ::ShellExecuteW(nullptr, L"open", ToWString(fileName).c_str(), nullptr, nullptr, SW_SHOW);

   if ((INT_PTR)res <= 32) {

-    qCritical("failed to invoke %s: %d", fileName.toUtf8().constData(), res);

+    qCritical("failed to invoke %s: %d", qUtf8Printable(fileName), res);

   }

 }

 

diff --git a/src/profile.cpp b/src/profile.cpp
index a5e3bc54..79f7d59e 100644
--- a/src/profile.cpp
+++ b/src/profile.cpp
@@ -349,7 +349,7 @@ void Profile::renameModInList(QFile &modList, const QString &oldName, const QStr
       modName = newName;
       ++renamed;
     }
-    outBuffer.write(modName.toUtf8().constData());
+    outBuffer.write(qUtf8Printable(modName));
     outBuffer.write("\r\n");
   }
   modList.close();
diff --git a/src/syncoverwritedialog.cpp b/src/syncoverwritedialog.cpp
index 7c341567..4ee4716e 100644
--- a/src/syncoverwritedialog.cpp
+++ b/src/syncoverwritedialog.cpp
@@ -86,7 +86,7 @@ void SyncOverwriteDialog::readTree(const QString &path, DirectoryEntry *director
       if (subDir != nullptr) {

         readTree(fileInfo.absoluteFilePath(), subDir, newItem);

       } else {

-        qCritical("no directory structure for %s?", file.toUtf8().constData());

+        qCritical("no directory structure for %s?", qUtf8Printable(file));

         delete newItem;

         newItem = nullptr;

       }

diff --git a/src/transfersavesdialog.cpp b/src/transfersavesdialog.cpp
index 61dab6e5..130df14f 100644
--- a/src/transfersavesdialog.cpp
+++ b/src/transfersavesdialog.cpp
@@ -342,7 +342,7 @@ bool TransferSavesDialog::transferCharacters(
       if (!method(sourceFile.absoluteFilePath(), destinationFile)) {

         qCritical(errmsg,

                   sourceFile.absoluteFilePath().toUtf8().constData(),

-                  destinationFile.toUtf8().constData());

+                  qUtf8Printable(destinationFile));

       }

     }

   }