From c121ec656f3af960d47e7d22972f13b9848ec34f Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 17 Jan 2024 17:04:18 +0100
Subject: [PATCH] ResourceEditor: Rename oddly-named resourceeditorw files

Change-Id: Idfa59b2562e30c80eed5ffe378f1b2a8743463b9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/resourceeditor/CMakeLists.txt                   | 6 ++++--
 .../{resourceeditorw.cpp => resourceeditor.cpp}             | 4 ++--
 .../resourceeditor/{resourceeditorw.h => resourceeditor.h}  | 0
 src/plugins/resourceeditor/resourceeditor.qbs               | 6 +++---
 src/plugins/resourceeditor/resourceeditorplugin.cpp         | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)
 rename src/plugins/resourceeditor/{resourceeditorw.cpp => resourceeditor.cpp} (99%)
 rename src/plugins/resourceeditor/{resourceeditorw.h => resourceeditor.h} (100%)

diff --git a/src/plugins/resourceeditor/CMakeLists.txt b/src/plugins/resourceeditor/CMakeLists.txt
index 5579d7b017b..47d9d7c6452 100644
--- a/src/plugins/resourceeditor/CMakeLists.txt
+++ b/src/plugins/resourceeditor/CMakeLists.txt
@@ -7,9 +7,11 @@ add_qtc_plugin(ResourceEditor
     qrceditor/resourceview.cpp qrceditor/resourceview.h
     qrceditor/undocommands.cpp qrceditor/undocommands_p.h
     resource_global.h
+    resourceeditor.cpp
+    resourceeditor.h
     resourceeditorconstants.h
     resourceeditorplugin.cpp
     resourceeditortr.h
-    resourceeditorw.cpp resourceeditorw.h
-    resourcenode.cpp resourcenode.h
+    resourcenode.cpp
+    resourcenode.h
 )
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditor.cpp
similarity index 99%
rename from src/plugins/resourceeditor/resourceeditorw.cpp
rename to src/plugins/resourceeditor/resourceeditor.cpp
index 04de0485553..6ac2ab3382f 100644
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditor.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "resourceeditorw.h"
+#include "resourceeditor.h"
 
 #include "projectexplorer/projectexplorerconstants.h"
 #include "resourceeditorconstants.h"
@@ -421,4 +421,4 @@ void setupResourceEditor(QObject *guard)
 
 } // ResourceEditor::Internal
 
-#include "resourceeditorw.moc"
+#include "resourceeditor.moc"
diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditor.h
similarity index 100%
rename from src/plugins/resourceeditor/resourceeditorw.h
rename to src/plugins/resourceeditor/resourceeditor.h
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index 00533a6b9e3..37a9cd41c73 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -14,12 +14,12 @@ QtcPlugin {
     Group {
         name: "General"
         files: [
+            "resource_global.h",
+            "resourceeditor.cpp",
+            "resourceeditor.h",
             "resourceeditorconstants.h",
             "resourceeditorplugin.cpp",
             "resourceeditortr.h",
-            "resourceeditorw.cpp",
-            "resourceeditorw.h",
-            "resource_global.h",
             "resourcenode.cpp",
             "resourcenode.h"
         ]
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp
index 4c2326665b9..84cac185076 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.cpp
+++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp
@@ -1,9 +1,9 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "resourceeditor.h"
 #include "resourceeditorconstants.h"
 #include "resourceeditortr.h"
-#include "resourceeditorw.h"
 #include "resourcenode.h"
 
 #include <coreplugin/icore.h>