From c90098132cc45a23aa68996aebd97278191bd300 Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Sun, 21 Jul 2024 13:17:05 +0200
Subject: [PATCH] Remove unused includes from generators

Pick-to: 6.8
Change-Id: I227d17e747dddc5c4767fde12d689efa94aa507e
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
---
 src/tools/qtgrpcgen/clientdeclarationprinter.cpp     | 3 ---
 src/tools/qtgrpcgen/serverdeclarationprinter.h       | 1 -
 src/tools/qtprotobufgen/enumdeclarationprinter.cpp   | 1 -
 src/tools/qtprotobufgen/enumdefinitionprinter.cpp    | 2 --
 src/tools/qtprotobufgen/messagedefinitionprinter.cpp | 1 -
 src/tools/qtprotobufgen/qprotobufgenerator.cpp       | 4 ----
 src/tools/qtprotoccommon/generatorcommon.cpp         | 1 -
 src/tools/qtprotoccommon/utils.cpp                   | 1 -
 8 files changed, 14 deletions(-)

diff --git a/src/tools/qtgrpcgen/clientdeclarationprinter.cpp b/src/tools/qtgrpcgen/clientdeclarationprinter.cpp
index d8a400c5..e6ac0bb1 100644
--- a/src/tools/qtgrpcgen/clientdeclarationprinter.cpp
+++ b/src/tools/qtgrpcgen/clientdeclarationprinter.cpp
@@ -9,9 +9,6 @@
 #include <google/protobuf/io/zero_copy_stream.h>
 #include <google/protobuf/stubs/common.h>
 
-#include <string>
-#include <unordered_set>
-
 #include "generatorcommon.h"
 #include "commontemplates.h"
 #include "grpctemplates.h"
diff --git a/src/tools/qtgrpcgen/serverdeclarationprinter.h b/src/tools/qtgrpcgen/serverdeclarationprinter.h
index 802b5447..e72cb086 100644
--- a/src/tools/qtgrpcgen/serverdeclarationprinter.h
+++ b/src/tools/qtgrpcgen/serverdeclarationprinter.h
@@ -7,7 +7,6 @@
 
 #include "descriptorprinterbase.h"
 #include "grpctemplates.h"
-#include <string>
 
 namespace google::protobuf {
 class ServiceDescriptor;
diff --git a/src/tools/qtprotobufgen/enumdeclarationprinter.cpp b/src/tools/qtprotobufgen/enumdeclarationprinter.cpp
index de98fd34..eb7d09f7 100644
--- a/src/tools/qtprotobufgen/enumdeclarationprinter.cpp
+++ b/src/tools/qtprotobufgen/enumdeclarationprinter.cpp
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "enumdeclarationprinter.h"
-#include "utils.h"
 #include "generatorcommon.h"
 
 using namespace ::QtProtobuf;
diff --git a/src/tools/qtprotobufgen/enumdefinitionprinter.cpp b/src/tools/qtprotobufgen/enumdefinitionprinter.cpp
index d433ebe8..0cf654b6 100644
--- a/src/tools/qtprotobufgen/enumdefinitionprinter.cpp
+++ b/src/tools/qtprotobufgen/enumdefinitionprinter.cpp
@@ -4,8 +4,6 @@
 
 #include "enumdefinitionprinter.h"
 
-#include "options.h"
-
 using namespace ::QtProtobuf;
 using namespace ::qtprotoccommon;
 using namespace ::google::protobuf;
diff --git a/src/tools/qtprotobufgen/messagedefinitionprinter.cpp b/src/tools/qtprotobufgen/messagedefinitionprinter.cpp
index 8f03f889..a92b3748 100644
--- a/src/tools/qtprotobufgen/messagedefinitionprinter.cpp
+++ b/src/tools/qtprotobufgen/messagedefinitionprinter.cpp
@@ -6,7 +6,6 @@
 
 #include <google/protobuf/descriptor.h>
 #include "utils.h"
-#include "options.h"
 #include "commontemplates.h"
 #include "generatorcommon.h"
 
diff --git a/src/tools/qtprotobufgen/qprotobufgenerator.cpp b/src/tools/qtprotobufgen/qprotobufgenerator.cpp
index be1e7a57..4693790d 100644
--- a/src/tools/qtprotobufgen/qprotobufgenerator.cpp
+++ b/src/tools/qtprotobufgen/qprotobufgenerator.cpp
@@ -12,11 +12,7 @@
 #include "utils.h"
 #include "options.h"
 
-#include "qtprotocdefs.h"
-
-#include <array>
 #include <cassert>
-#include <numeric>
 #include <unordered_set>
 
 #include <google/protobuf/stubs/common.h>
diff --git a/src/tools/qtprotoccommon/generatorcommon.cpp b/src/tools/qtprotoccommon/generatorcommon.cpp
index be4c1a6c..167405ab 100644
--- a/src/tools/qtprotoccommon/generatorcommon.cpp
+++ b/src/tools/qtprotoccommon/generatorcommon.cpp
@@ -14,7 +14,6 @@
 #endif
 
 #include <cassert>
-#include <algorithm>
 #include <string_view>
 
 using namespace ::google::protobuf;
diff --git a/src/tools/qtprotoccommon/utils.cpp b/src/tools/qtprotoccommon/utils.cpp
index 74c768a2..46efc4c8 100644
--- a/src/tools/qtprotoccommon/utils.cpp
+++ b/src/tools/qtprotoccommon/utils.cpp
@@ -4,7 +4,6 @@
 
 #include "utils.h"
 
-#include <sstream>
 #include <string_view>
 
 #include <cctype>