From 299ebea0e290c0cfda501e6bc03f8e0290ca4500 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 21 Aug 2025 16:55:09 -0400 Subject: [PATCH] refactor: replace QString::toStdString().c_str with qPrintable(...) --- src/apps/deskflow-daemon/deskflow-daemon.cpp | 5 ++--- src/lib/deskflow/DaemonApp.cpp | 2 +- src/lib/gui/VersionChecker.cpp | 2 +- src/lib/net/SecureSocket.cpp | 6 +++--- src/lib/platform/XWindowsKeyState.cpp | 5 +---- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/apps/deskflow-daemon/deskflow-daemon.cpp b/src/apps/deskflow-daemon/deskflow-daemon.cpp index 2c0730b8b..1c21c1977 100644 --- a/src/apps/deskflow-daemon/deskflow-daemon.cpp +++ b/src/apps/deskflow-daemon/deskflow-daemon.cpp @@ -79,7 +79,7 @@ int main(int argc, char **argv) // useful for troubleshooting Windows services. // It's important to write the version number to the log file so we can be certain the old daemon // was uninstalled, since sometimes Windows services can get stuck and fail to be removed. - LOG_PRINT("%s v%s", QCoreApplication::applicationName().toStdString().c_str(), kDisplayVersion); + LOG_PRINT("%s v%s", qPrintable(QCoreApplication::applicationName()), kDisplayVersion); // Default log level to system setting (found in Registry). auto logLevel = Settings::value(Settings::Daemon::LogLevel).toString().toStdString(); @@ -105,8 +105,7 @@ int main(int argc, char **argv) return s_exitSuccess; } - const auto ipcServer = - new ipc::DaemonIpcServer(&app, DaemonApp::logFilename().toStdString().c_str()); // NOSONAR - Qt managed + const auto ipcServer = new ipc::DaemonIpcServer(&app, qPrintable(DaemonApp::logFilename())); // NOSONAR - Qt managed ipcServer->listen(); daemon.connectIpcServer(ipcServer); diff --git a/src/lib/deskflow/DaemonApp.cpp b/src/lib/deskflow/DaemonApp.cpp index 4d8df4d76..6d7d30d22 100644 --- a/src/lib/deskflow/DaemonApp.cpp +++ b/src/lib/deskflow/DaemonApp.cpp @@ -250,7 +250,7 @@ void DaemonApp::initLogging() } #endif - m_pFileLogOutputter = new FileLogOutputter(logFilename().toStdString().c_str()); // NOSONAR - Adopted by `Log` + m_pFileLogOutputter = new FileLogOutputter(qPrintable(logFilename())); // NOSONAR - Adopted by `Log` CLOG->insert(m_pFileLogOutputter); } diff --git a/src/lib/gui/VersionChecker.cpp b/src/lib/gui/VersionChecker.cpp index 87a40d771..395bdd704 100644 --- a/src/lib/gui/VersionChecker.cpp +++ b/src/lib/gui/VersionChecker.cpp @@ -31,7 +31,7 @@ void VersionChecker::checkLatest() const auto userAgent = QString("%1 %2 on %3").arg(kAppName, kVersion, QSysInfo::prettyProductName()); request.setHeader(QNetworkRequest::UserAgentHeader, userAgent); request.setRawHeader("X-Deskflow-Version", kVersion); - request.setRawHeader("X-Deskflow-Language", QLocale::system().name().toStdString().c_str()); + request.setRawHeader("X-Deskflow-Language", qPrintable(QLocale::system().name())); m_network->get(request); } diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp index 861adc7af..8263b65fd 100644 --- a/src/lib/net/SecureSocket.cpp +++ b/src/lib/net/SecureSocket.cpp @@ -636,7 +636,7 @@ bool SecureSocket::verifyCertFingerprint(const QString &FingerprintDatabasePath) return false; // Gui Must Parse this line, DO NOT CHANGE - LOG_NOTE("peer fingerprint: %s", deskflow::formatSSLFingerprint(sha256.data, false).toStdString().c_str()); + LOG_NOTE("peer fingerprint: %s", qPrintable(deskflow::formatSSLFingerprint(sha256.data, false))); QFile file(FingerprintDatabasePath); @@ -646,12 +646,12 @@ bool SecureSocket::verifyCertFingerprint(const QString &FingerprintDatabasePath) const auto &path = FingerprintDatabasePath; if (file.exists() && emptyDB) { - LOG_ERR("failed to open trusted fingerprints file: %s", path.toStdString().c_str()); + LOG_ERR("failed to open trusted fingerprints file: %s", qPrintable(path)); return false; } if (!emptyDB) { - LOG_DEBUG("read %d fingerprint(s) from file: %s", db.fingerprints().size(), path.toStdString().c_str()); + LOG_DEBUG("read %d fingerprint(s) from file: %s", db.fingerprints().size(), qPrintable(path)); } if (!db.isTrusted(sha256)) { diff --git a/src/lib/platform/XWindowsKeyState.cpp b/src/lib/platform/XWindowsKeyState.cpp index f286a123f..8fbe81d2a 100644 --- a/src/lib/platform/XWindowsKeyState.cpp +++ b/src/lib/platform/XWindowsKeyState.cpp @@ -242,10 +242,7 @@ bool XWindowsKeyState::setCurrentLanguageWithDBus(int32_t group) const if (!reply.isValid()) { auto qerror = reply.error(); - LOG( - (CLOG_WARN "keyboard layout fail %s : %s", qerror.name().toStdString().c_str(), - qerror.message().toStdString().c_str()) - ); + LOG((CLOG_WARN "keyboard layout fail %s : %s", qPrintable(qerror.name()), qPrintable(qerror.message()))); return true; }