summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lioncash2019-05-24 20:53:36 -0400
committerGravatar Lioncash2019-05-24 21:27:12 -0400
commitf5d416e07147e6667f620dd1a3f32b71f1f37099 (patch)
tree6b633b1c2b7fcd6947e203c1ab87f4312e574a19
parentyuzu/main: Specify string conversions where applicable (diff)
downloadyuzu-f5d416e07147e6667f620dd1a3f32b71f1f37099.tar.gz
yuzu-f5d416e07147e6667f620dd1a3f32b71f1f37099.tar.xz
yuzu-f5d416e07147e6667f620dd1a3f32b71f1f37099.zip
yuzu/applets/error: Specify string conversions explicitly
Allows the error applet to build successfully with implicit string conversions disabled.
-rw-r--r--src/yuzu/applets/error.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/yuzu/applets/error.cpp b/src/yuzu/applets/error.cpp
index 106dde9e2..97435592e 100644
--- a/src/yuzu/applets/error.cpp
+++ b/src/yuzu/applets/error.cpp
@@ -32,8 +32,9 @@ void QtErrorDisplay::ShowErrorWithTimestamp(ResultCode error, std::chrono::secon
32 emit MainWindowDisplayError( 32 emit MainWindowDisplayError(
33 tr("An error occured on %1 at %2.\nPlease try again or contact the " 33 tr("An error occured on %1 at %2.\nPlease try again or contact the "
34 "developer of the software.\n\nError Code: %3-%4 (0x%5)") 34 "developer of the software.\n\nError Code: %3-%4 (0x%5)")
35 .arg(QDateTime::fromSecsSinceEpoch(time.count()).toString("dddd, MMMM d, yyyy")) 35 .arg(QDateTime::fromSecsSinceEpoch(time.count())
36 .arg(QDateTime::fromSecsSinceEpoch(time.count()).toString("h:mm:ss A")) 36 .toString(QStringLiteral("dddd, MMMM d, yyyy")))
37 .arg(QDateTime::fromSecsSinceEpoch(time.count()).toString(QStringLiteral("h:mm:ss A")))
37 .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0')) 38 .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0'))
38 .arg(error.description, 4, 10, QChar::fromLatin1('0')) 39 .arg(error.description, 4, 10, QChar::fromLatin1('0'))
39 .arg(error.raw, 8, 16, QChar::fromLatin1('0'))); 40 .arg(error.raw, 8, 16, QChar::fromLatin1('0')));