From 2b71d9744997490fa473db6ba3d111e3c75c81b1 Mon Sep 17 00:00:00 2001 From: seraphima Date: Mon, 27 May 2024 16:23:03 +0200 Subject: [PATCH] removed hwnd from json --- src/modules/Projects/ProjectsEditor/Data/ProjectsData.cs | 2 -- src/modules/Projects/ProjectsEditor/Models/Application.cs | 2 -- src/modules/Projects/ProjectsEditor/Models/Project.cs | 1 - src/modules/Projects/ProjectsEditor/Utils/ProjectsEditorIO.cs | 2 -- src/modules/Projects/ProjectsSnapshotTool/main.cpp | 1 - src/modules/Projects/projects-common/Data.h | 4 ---- 6 files changed, 12 deletions(-) diff --git a/src/modules/Projects/ProjectsEditor/Data/ProjectsData.cs b/src/modules/Projects/ProjectsEditor/Data/ProjectsData.cs index ca4952e903..d3fc650056 100644 --- a/src/modules/Projects/ProjectsEditor/Data/ProjectsData.cs +++ b/src/modules/Projects/ProjectsEditor/Data/ProjectsData.cs @@ -31,8 +31,6 @@ namespace ProjectsEditor.Data public int Height { get; set; } } - public long Hwnd { get; set; } - public string Application { get; set; } public string ApplicationPath { get; set; } diff --git a/src/modules/Projects/ProjectsEditor/Models/Application.cs b/src/modules/Projects/ProjectsEditor/Models/Application.cs index 32c3bff5e2..efa51ca9ad 100644 --- a/src/modules/Projects/ProjectsEditor/Models/Application.cs +++ b/src/modules/Projects/ProjectsEditor/Models/Application.cs @@ -33,8 +33,6 @@ namespace ProjectsEditor.Models public int Height { get; set; } } - public IntPtr Hwnd { get; set; } - public string AppName { get; set; } public string AppPath { get; set; } diff --git a/src/modules/Projects/ProjectsEditor/Models/Project.cs b/src/modules/Projects/ProjectsEditor/Models/Project.cs index af59129f43..8937a20485 100644 --- a/src/modules/Projects/ProjectsEditor/Models/Project.cs +++ b/src/modules/Projects/ProjectsEditor/Models/Project.cs @@ -202,7 +202,6 @@ namespace ProjectsEditor.Models { Applications.Add(new Application() { - Hwnd = item.Hwnd, AppPath = item.AppPath, AppTitle = item.AppTitle, CommandLineArguments = item.CommandLineArguments, diff --git a/src/modules/Projects/ProjectsEditor/Utils/ProjectsEditorIO.cs b/src/modules/Projects/ProjectsEditor/Utils/ProjectsEditorIO.cs index c0d3e30245..8aee9b8f27 100644 --- a/src/modules/Projects/ProjectsEditor/Utils/ProjectsEditorIO.cs +++ b/src/modules/Projects/ProjectsEditor/Utils/ProjectsEditorIO.cs @@ -102,7 +102,6 @@ namespace ProjectsEditor.Utils { newProject.Applications.Add(new Models.Application() { - Hwnd = new IntPtr(app.Hwnd), AppName = app.Application, AppPath = app.ApplicationPath, AppTitle = app.Title, @@ -158,7 +157,6 @@ namespace ProjectsEditor.Utils { wrapper.Applications.Add(new ProjectsData.ApplicationWrapper { - Hwnd = app.Hwnd, Application = app.AppName, ApplicationPath = app.AppPath, Title = app.AppTitle, diff --git a/src/modules/Projects/ProjectsSnapshotTool/main.cpp b/src/modules/Projects/ProjectsSnapshotTool/main.cpp index 80aeaa113e..6135feca42 100644 --- a/src/modules/Projects/ProjectsSnapshotTool/main.cpp +++ b/src/modules/Projects/ProjectsSnapshotTool/main.cpp @@ -122,7 +122,6 @@ int main(int argc, char* argv[]) } Project::Application app { - .hwnd = window, .name = data.value().name, .title = title, .path = data.value().installPath, diff --git a/src/modules/Projects/projects-common/Data.h b/src/modules/Projects/projects-common/Data.h index 62c4cdeb67..60ac6c03c5 100644 --- a/src/modules/Projects/projects-common/Data.h +++ b/src/modules/Projects/projects-common/Data.h @@ -23,7 +23,6 @@ struct Project } }; - HWND hwnd{}; std::wstring name; std::wstring title; std::wstring path; @@ -125,7 +124,6 @@ namespace JsonUtils const static wchar_t* AppNameID = L"application"; const static wchar_t* AppPathID = L"application-path"; const static wchar_t* AppPackageFullNameID = L"package-full-name"; - const static wchar_t* HwndID = L"hwnd"; const static wchar_t* AppTitleID = L"title"; const static wchar_t* CommandLineArgsID = L"command-line-arguments"; const static wchar_t* MinimizedID = L"minimized"; @@ -137,7 +135,6 @@ namespace JsonUtils inline json::JsonObject ToJson(const Project::Application& data) { json::JsonObject json{}; - json.SetNamedValue(NonLocalizable::HwndID, json::value(static_cast(reinterpret_cast(data.hwnd)))); json.SetNamedValue(NonLocalizable::AppNameID, json::value(data.name)); json.SetNamedValue(NonLocalizable::AppPathID, json::value(data.path)); json.SetNamedValue(NonLocalizable::AppTitleID, json::value(data.title)); @@ -156,7 +153,6 @@ namespace JsonUtils Project::Application result; try { - result.hwnd = reinterpret_cast(static_cast(json.GetNamedNumber(NonLocalizable::HwndID))); if (json.HasKey(NonLocalizable::AppNameID)) { result.name = json.GetNamedString(NonLocalizable::AppNameID);