2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-01 15:15:13 +00:00

Avoid using const_string for constant consumed by std::string

This commit is contained in:
Ilya Fedin
2023-07-20 18:06:45 +04:00
committed by John Preston
parent 68fa3e36d7
commit 9ccb11bd1a
4 changed files with 58 additions and 61 deletions

View File

@@ -54,8 +54,6 @@ using Platform::internal::WaylandIntegration;
namespace Platform {
namespace {
constexpr auto kDesktopFile = ":/misc/org.telegram.desktop.desktop"_cs;
bool PortalAutostart(bool start, bool silent) {
if (cExeName().isEmpty()) {
return false;
@@ -138,8 +136,8 @@ bool PortalAutostart(bool start, bool silent) {
loop->quit();
},
std::string(base::Platform::XDP::kService),
std::string(base::Platform::XDP::kRequestInterface),
base::Platform::XDP::kService,
base::Platform::XDP::kRequestInterface,
"Response",
requestPath);
@@ -150,14 +148,14 @@ bool PortalAutostart(bool start, bool silent) {
});
connection->call_sync(
std::string(base::Platform::XDP::kObjectPath),
base::Platform::XDP::kObjectPath,
"org.freedesktop.portal.Background",
"RequestBackground",
Glib::create_variant(std::tuple{
parentWindowId,
options,
}),
std::string(base::Platform::XDP::kService));
base::Platform::XDP::kService);
if (signalId != 0) {
QWidget window;
@@ -190,7 +188,7 @@ bool GenerateDesktopFile(
DEBUG_LOG(("App Info: placing .desktop file to %1").arg(targetPath));
if (!QDir(targetPath).exists()) QDir().mkpath(targetPath);
const auto sourceFile = kDesktopFile.utf16();
const auto sourceFile = u":/misc/org.telegram.desktop.desktop"_q;
const auto targetFile = targetPath
+ QGuiApplication::desktopFileName()
+ u".desktop"_q;