FIX(client): Replace deprecated Qt::SystemLocaleDate and Qt::DefaultL…

…ocaleShortDate
mumble-voip · Oct 1, 2023 · 9672bf6 · 9672bf6
1 parent 9681ab3
commit 9672bf6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/mumble/Cert.cpp b/src/mumble/Cert.cpp
@@ -96,11 +96,13 @@ void CertView::setCert(const QList< QSslCertificate > &cert) {
 		else
 			qlSubjectEmail->setText(tr("(none)"));
 
+		const auto expiryDateStr = QLocale::system().toString(qscCert.expiryDate(), QLocale::ShortFormat);
+
 		if (qscCert.expiryDate() <= QDateTime::currentDateTime())
-			qlExpiry->setText(QString::fromLatin1("<font color=\"red\"><b>%1</b></font>")
-								  .arg(qscCert.expiryDate().toString(Qt::SystemLocaleDate).toHtmlEscaped()));
+			qlExpiry->setText(
+				QString::fromLatin1("<font color=\"red\"><b>%1</b></font>").arg(expiryDateStr.toHtmlEscaped()));
 		else
-			qlExpiry->setText(qscCert.expiryDate().toString(Qt::SystemLocaleDate));
+			qlExpiry->setText(expiryDateStr);
 
 		if (qlCert.count() > 1)
 			qscCert = qlCert.last();

diff --git a/src/mumble/Log.cpp b/src/mumble/Log.cpp
@@ -732,7 +732,7 @@ void Log::log(MsgType mt, const QString &console, const QString &terse, bool own
 			qdDate = dt.date();
 			tc.insertBlock();
 			tc.insertHtml(
-				tr("[Date changed to %1]\n").arg(qdDate.toString(Qt::DefaultLocaleShortDate).toHtmlEscaped()));
+				tr("[Date changed to %1]\n").arg(QLocale().toString(qdDate, QLocale::ShortFormat).toHtmlEscaped()));
 			tc.movePosition(QTextCursor::End);
 		}