From 5be333ec34a6b6496002f62845bfd8d695b188ad Mon Sep 17 00:00:00 2001
From: "CW01\\uig08771" <felixfxu@gmail.com>
Date: Mon, 22 Jan 2024 15:09:05 +0800
Subject: [PATCH] rename qobject folder to metaobject

---
 CMakeLists.txt | 2 +-
 generator.cpp  | 6 +++---
 moc.cpp        | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1c744e..739568b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ target_compile_definitions(${PROJECT_NAME} PUBLIC
   UNICODE
 )
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../qobject")
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../metaobject")
   message(STATUS "Building with qcorelib source code: " "${CMAKE_CURRENT_SOURCE_DIR}/../qobject")
   #build with qcorelib source code
   target_link_libraries(${PROJECT_NAME} qcorelib)
diff --git a/generator.cpp b/generator.cpp
index c5dd1ce..e1173e1 100644
--- a/generator.cpp
+++ b/generator.cpp
@@ -7,9 +7,9 @@
 #include "cbordevice.h"
 #include "outputrevision.h"
 #include "utils.h"
-#include <qobject/qmetatype.h>
-#include <qobject/qmetaobject.h>
-#include <qobject/qmetamethod.h> //enum PropertyFlags
+#include <metaobject/qmetatype.h>
+#include <metaobject/qmetaobject.h>
+#include <metaobject/qmetamethod.h> //enum PropertyFlags
 
 #include <serialization/qjsondocument.h>
 #include <serialization/qjsonobject.h>
diff --git a/moc.cpp b/moc.cpp
index 5199d21..90d1917 100644
--- a/moc.cpp
+++ b/moc.cpp
@@ -12,7 +12,7 @@
 #include <io/qdir.h>
 #include <serialization/qjsondocument.h>
 
-#include <qobject/qmetaobject_moc.h> // for normalizeTypeInternal
+#include <metaobject/qmetaobject_moc.h> // for normalizeTypeInternal
 #include <tools/qduplicatetracker.h>
 
 QT_BEGIN_NAMESPACE
@@ -1090,7 +1090,7 @@ void Moc::generate(FILE *out, FILE *jsonOutput)
     if (classList.size() && classList.constFirst().classname == "Qt")
         fprintf(out, "#include <QtCore/qobject.h>\n");
 
-    fprintf(out, "#include <qobject/qmetatype.h>\n");  // For QMetaType::Type
+    fprintf(out, "#include <metaobject/qmetatype.h>\n");  // For QMetaType::Type
     if (mustIncludeQPluginH)
         fprintf(out, "#include <QtCore/qplugin.h>\n");
 
@@ -1098,9 +1098,9 @@ void Moc::generate(FILE *out, FILE *jsonOutput)
     for (const QByteArray &qtContainer : qtContainers)
         fprintf(out, "#include <QtCore/%s>\n", qtContainer.constData());
 
-    fprintf(out, "\n%s#include <qobject/qtmochelpers.h>\n%s\n",
+    fprintf(out, "\n%s#include <metaobject/qtmochelpers.h>\n%s\n",
 #if QT_VERSION <= QT_VERSION_CHECK(6, 9, 0)
-            "#if __has_include(<qobject/qtmochelpers.h>)\n",
+            "#if __has_include(<metaobject/qtmochelpers.h>)\n",
             "#else\n"
             "QT_BEGIN_MOC_NAMESPACE\n"
             "#endif\n"