Ensure we don't format log messages in anything but utf8

3 files changed, 17 insertions, 12 deletions

diff --git a/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp b/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp
index f7229df5a..1575b3742 100644
--- a/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp
+++ b/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp
@@ -100,7 +100,7 @@ bool QtLocalPeer::isClient()
         qWarning("QtSingleCoreApplication: could not cleanup socket");
     bool res = server->listen(socketName);
     if (!res)
-        qWarning("QtSingleCoreApplication: listen on local socket failed, %s", qPrintable(server->errorString()));
+        qWarning("QtSingleCoreApplication: listen on local socket failed, %s", qUtf8Printable(server->errorString()));
     QObject::connect(server, &QLocalServer::newConnection, this, &QtLocalPeer::receiveConnection);
     return false;
 }
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 9661a429a..fc8070dd9 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -239,7 +239,7 @@ private:
 QString queryPassword(const QString &user)
 {
     EchoDisabler disabler;
-    std::cout << "Password for user " << qPrintable(user) << ": ";
+    std::cout << "Password for user " << qUtf8Printable(user) << ": ";
     std::string s;
     std::getline(std::cin, s);
     return QString::fromStdString(s);
@@ -342,7 +342,7 @@ void parseOptions(const QStringList &app_args, CmdOptions *options)
     }
     QFileInfo fi(options->source_dir);
     if (!fi.exists()) {
-        std::cerr << "Source dir '" << qPrintable(options->source_dir) << "' does not exist." << std::endl;
+        std::cerr << "Source dir '" << qUtf8Printable(options->source_dir) << "' does not exist." << std::endl;
         exit(1);
     }
     options->source_dir = fi.absoluteFilePath();
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 7d063a53e..140456b59 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -932,10 +932,13 @@ void FolderMan::slotFolderSyncStarted()
     if (!f)
         return;
 
-    qCInfo(lcFolderMan, ">========== Sync started for folder [%s] of account [%s] with remote [%s]",
-        qPrintable(f->shortGuiLocalPath()),
-        qPrintable(f->accountState()->account()->displayName()),
-        qPrintable(f->remoteUrl().toString()));
+    qCInfo(lcFolderMan) << ">========== Sync started for folder ["
+                        << f->shortGuiLocalPath()
+                        << "] of account ["
+                        << f->accountState()->account()->displayName()
+                        << "] with remote ["
+                        << f->remoteUrl().toDisplayString()
+                        << "]";
 }
 
 /*
@@ -951,11 +954,13 @@ void FolderMan::slotFolderSyncFinished(const SyncResult &)
     if (!f)
         return;
 
-    qCInfo(lcFolderMan, "<========== Sync finished for folder [%s] of account [%s] with remote [%s]",
-        qPrintable(f->shortGuiLocalPath()),
-        qPrintable(f->accountState()->account()->displayName()),
-        qPrintable(f->remoteUrl().toString()));
-
+    qCInfo(lcFolderMan) << "<========== Sync finished for folder ["
+                        << f->shortGuiLocalPath()
+                        << "] of account ["
+                        << f->accountState()->account()->displayName()
+                        << "] with remote ["
+                        << f->remoteUrl().toDisplayString()
+                        << "]";
     if (f == _currentSyncFolder) {
         _lastSyncFolder = _currentSyncFolder;
         _currentSyncFolder = nullptr;