From 488a613858cb3ad279f9d3ff79000579c1314c03 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Wed, 23 Dec 2020 01:12:27 +0100 Subject: [PATCH] TextEditor: Rename {Main => TextEditor}Window.gml Calling the file MainWindow.gml (and subsequently using MainWindowGML.h for the generated file's name) suggests that's possible for every application, but having a second one anywhere results in the following CMake error: add_custom_target cannot create target "generate_MainWindowGML.h" because another target with the same name already exists. The existing target is a custom target created in source directory [...] It's now also more consistent with the other applications already using GML, namely "BrowserWindow.gml" and "FileManagerWindow.gml". --- Applications/TextEditor/CMakeLists.txt | 4 ++-- Applications/TextEditor/TextEditorWidget.cpp | 4 ++-- .../TextEditor/{MainWindow.gml => TextEditorWindow.gml} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename Applications/TextEditor/{MainWindow.gml => TextEditorWindow.gml} (100%) diff --git a/Applications/TextEditor/CMakeLists.txt b/Applications/TextEditor/CMakeLists.txt index e43a95aace..07eccd212e 100644 --- a/Applications/TextEditor/CMakeLists.txt +++ b/Applications/TextEditor/CMakeLists.txt @@ -1,9 +1,9 @@ -compile_gml(MainWindow.gml MainWindowGML.h main_window_gml) +compile_gml(TextEditorWindow.gml TextEditorWindowGML.h text_editor_window_gml) set(SOURCES main.cpp TextEditorWidget.cpp - MainWindowGML.h + TextEditorWindowGML.h ) serenity_app(TextEditor ICON app-text-editor) diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp index 303e9bb238..b57cd73a40 100644 --- a/Applications/TextEditor/TextEditorWidget.cpp +++ b/Applications/TextEditor/TextEditorWidget.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -62,7 +62,7 @@ TextEditorWidget::TextEditorWidget() { - load_from_gml(main_window_gml); + load_from_gml(text_editor_window_gml); auto& toolbar = static_cast(*find_descendant_by_name("toolbar")); diff --git a/Applications/TextEditor/MainWindow.gml b/Applications/TextEditor/TextEditorWindow.gml similarity index 100% rename from Applications/TextEditor/MainWindow.gml rename to Applications/TextEditor/TextEditorWindow.gml