From a140912fb699676cf5518da9437fc506226d5ad0 Mon Sep 17 00:00:00 2001
From: Sona Kurazyan <sona.kurazyan@qt.io>
Date: Thu, 22 Sep 2022 21:07:24 +0200
Subject: [PATCH] Rename the header qtypetraits.h -> qttypetraits.h

Change-Id: I6a487543730678190eb9581d45f3ec12c441756a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/CMakeLists.txt                                | 2 +-
 src/corelib/global/qglobal.h                              | 2 +-
 src/corelib/global/{qtypetraits.h => qttypetraits.h}      | 8 ++++----
 .../global/{qtypetraits.qdoc => qttypetraits.qdoc}        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename src/corelib/global/{qtypetraits.h => qttypetraits.h} (82%)
 rename src/corelib/global/{qtypetraits.qdoc => qttypetraits.qdoc} (92%)

diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index c5f460f931..54f65b27f5 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -83,10 +83,10 @@ qt_internal_add_module(Core
         global/qtrace_p.h
         global/qtresource.h
         global/qttranslation.h
+        global/qttypetraits.h
         global/qtversionchecks.h
         global/qtypeinfo.h
         global/qtypes.cpp global/qtypes.h
-        global/qtypetraits.h
         global/qvolatile_p.h
         global/q20algorithm.h
         global/q20functional.h
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 630ebf6b79..3bccae6729 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -102,7 +102,7 @@ QT_END_NAMESPACE
 #include <QtCore/qtenvironmentvariables.h>
 #include <QtCore/qtresource.h>
 #include <QtCore/qttranslation.h>
-#include <QtCore/qtypetraits.h>
+#include <QtCore/qttypetraits.h>
 #include <QtCore/qversiontagging.h>
 
 #endif /* __cplusplus */
diff --git a/src/corelib/global/qtypetraits.h b/src/corelib/global/qttypetraits.h
similarity index 82%
rename from src/corelib/global/qtypetraits.h
rename to src/corelib/global/qttypetraits.h
index 7cb02117c6..02921f2b64 100644
--- a/src/corelib/global/qtypetraits.h
+++ b/src/corelib/global/qttypetraits.h
@@ -1,15 +1,15 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QTYPETRAITS_H
-#define QTYPETRAITS_H
+#ifndef QTTYPETRAITS_H
+#define QTTYPETRAITS_H
 
 #include <QtCore/qtconfigmacros.h>
 
 #include <type_traits>
 
 #if 0
-#pragma qt_class(QTypeTraits)
+#pragma qt_class(QtTypeTraits)
 #pragma qt_sync_stop_processing
 #endif
 
@@ -24,4 +24,4 @@ constexpr std::underlying_type_t<Enum> qToUnderlying(Enum e) noexcept
 
 QT_END_NAMESPACE
 
-#endif // QTYPETRAITS_H
+#endif // QTTYPETRAITS_H
diff --git a/src/corelib/global/qtypetraits.qdoc b/src/corelib/global/qttypetraits.qdoc
similarity index 92%
rename from src/corelib/global/qtypetraits.qdoc
rename to src/corelib/global/qttypetraits.qdoc
index e482694266..5c87f81a8b 100644
--- a/src/corelib/global/qtypetraits.qdoc
+++ b/src/corelib/global/qttypetraits.qdoc
@@ -3,7 +3,7 @@
 
 /*!
     \fn template <typename Enum> std::underlying_type_t<Enum> qToUnderlying(Enum e)
-    \relates <QTypeTraits>
+    \relates <QtTypeTraits>
     \since 6.2
 
     Converts the enumerator \a e to the equivalent value expressed in its