Merge pull request #1833 from Integral-Tech/refactor-string-conversion

refactor: use fmt lib to avoid back-and-forth conversion
pull/1662/merge
DeepBlueV7.X 3 weeks ago committed by GitHub
commit 1a00d91316
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 5
      src/timeline/InputBar.cpp

@ -20,6 +20,8 @@
#include <QVideoFrame>
#include <QVideoSink>
#include <fmt/format.h>
#include <nlohmann/json.hpp>
#include <mtx/responses/common.hpp>
@ -578,8 +580,7 @@ InputBar::message(const QString &msg, MarkdownOverride useMarkdown, bool rainbow
}
}
text.body =
QStringLiteral("%1\n%2").arg(body, QString::fromStdString(text.body)).toStdString();
text.body = fmt::format("{}\n{}", body.toStdString(), text.body);
// NOTE(Nico): rich replies always need a formatted_body!
text.format = "org.matrix.custom.html";

Loading…
Cancel
Save