From dd54e32d9a8edc0955ef5fc491dbe6a3dd8e26fc Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Mon, 10 Mar 2025 14:22:03 +0100 Subject: [PATCH] qdbusxml2cpp: remove unneeded newlines in the end of the cpp files The tool was writing too many newlines, which either produced unneeded newlines directly in the end of the file, or before the moc-related include. Amends 351b7a31aa24a704dba09121d91cb34190892315. Task-number: QTBUG-133611 Change-Id: I38046cabe86625ecc3da827c434db0dca09a0d63 Reviewed-by: Juha Vuolle --- src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp index b4fd38ff26d..0b089178835 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -810,8 +810,7 @@ void QDBusXmlToCpp::writeProxy(const QString &filename, if (!customNamespace.isEmpty()) { hs << "} // end of namespace " << customNamespace << "\n" << "\n"; - cs << "} // end of namespace " << customNamespace << "\n" - << "\n"; + cs << "} // end of namespace " << customNamespace << "\n"; } if (!skipNamespaces) { @@ -1162,8 +1161,7 @@ void QDBusXmlToCpp::writeAdaptor(const QString &filename, if (!customNamespace.isEmpty()) { hs << "} // end of namespace " << customNamespace << "\n" << "\n"; - cs << "} // end of namespace " << customNamespace << "\n" - << "\n"; + cs << "} // end of namespace " << customNamespace << "\n"; } // close the include guard