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

Remove namespace App.

This commit is contained in:
John Preston
2022-11-30 17:28:09 +04:00
parent 01139e1b04
commit ad3f8e72a0
24 changed files with 80 additions and 74 deletions

View File

@@ -303,8 +303,11 @@ void LaunchGApplication() {
app->signal_activate().connect([] {
Core::Sandbox::Instance().customEnterFromEventLoop([] {
if (const auto w = App::wnd()) {
w->activate();
const auto window = Core::IsAppLaunched()
? Core::App().primaryWindow()
: nullptr;
if (window) {
window->activate();
}
});
}, true);
@@ -329,17 +332,19 @@ void LaunchGApplication() {
continue;
}
if (Core::StartUrlRequiresActivate(url)) {
if (const auto w = App::wnd()) {
w->activate();
const auto window = Core::IsAppLaunched()
? Core::App().primaryWindow()
: nullptr;
if (window) {
window->activate();
}
}
cSetStartUrl(url);
Core::App().checkStartUrl();
}
if (!cSendPaths().isEmpty()) {
if (const auto w = App::wnd()) {
w->sendPaths();
}
Core::App().checkSendPaths();
}
});
}, true);
@@ -429,7 +434,7 @@ bool GenerateDesktopFile(
}
return std::string();
}();
if (sourceText.empty()) {
if (!silent) {
LOG(("App Error: Could not open '%1' for read").arg(sourceFile));