From 389b7b211c3aa9485079c6199a6813f411f471eb Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Wed, 22 May 2024 15:25:46 +0200
Subject: [PATCH] TextEditor: Make RefactoringFile::apply() a no-op for empty
 change sets

To simplify some calling sites.

Change-Id: I9736e88053659e5e90bca7b70e6d7e84b0d4fb4e
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 .../cppeditor/quickfixes/cppcodegenerationquickfixes.cpp    | 6 ++----
 .../cppeditor/quickfixes/cppinsertvirtualmethods.cpp        | 3 +--
 src/plugins/cppeditor/quickfixes/movefunctiondefinition.cpp | 6 ++----
 src/plugins/texteditor/refactoringchanges.cpp               | 3 +++
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/plugins/cppeditor/quickfixes/cppcodegenerationquickfixes.cpp b/src/plugins/cppeditor/quickfixes/cppcodegenerationquickfixes.cpp
index 842683cac51..2d486e18173 100644
--- a/src/plugins/cppeditor/quickfixes/cppcodegenerationquickfixes.cpp
+++ b/src/plugins/cppeditor/quickfixes/cppcodegenerationquickfixes.cpp
@@ -307,10 +307,8 @@ public:
             insertAndIndent(m_sourceFile, m_sourceFileInsertionPoint, m_sourceFileCode);
         }
 
-        if (!m_headerFileChangeSet.isEmpty())
-            m_headerFile->apply(m_headerFileChangeSet);
-        if (!m_sourceFileChangeSet.isEmpty())
-            m_sourceFile->apply(m_sourceFileChangeSet);
+        m_headerFile->apply(m_headerFileChangeSet);
+        m_sourceFile->apply(m_sourceFileChangeSet);
     }
 
     bool hasSourceFile() const { return m_headerFile != m_sourceFile; }
diff --git a/src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.cpp
index 5b7b5e19127..31193e5cec0 100644
--- a/src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.cpp
+++ b/src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.cpp
@@ -920,8 +920,7 @@ public:
                 implementationChangeSet.insert(insertPos,  QLatin1String("\n\n") + defText);
             }
 
-            if (!implementationChangeSet.isEmpty())
-                implementationFile->apply(implementationChangeSet);
+            implementationFile->apply(implementationChangeSet);
         }
     }
 
diff --git a/src/plugins/cppeditor/quickfixes/movefunctiondefinition.cpp b/src/plugins/cppeditor/quickfixes/movefunctiondefinition.cpp
index 0008f53863f..ef7dac7f68d 100644
--- a/src/plugins/cppeditor/quickfixes/movefunctiondefinition.cpp
+++ b/src/plugins/cppeditor/quickfixes/movefunctiondefinition.cpp
@@ -135,10 +135,8 @@ public:
 
     void applyChanges()
     {
-        if (!m_toFileChangeSet.isEmpty())
-            m_toFile->apply(m_toFileChangeSet);
-        if (!m_fromFileChangeSet.isEmpty())
-            m_fromFile->apply(m_fromFileChangeSet);
+        m_toFile->apply(m_toFileChangeSet);
+        m_fromFile->apply(m_fromFileChangeSet);
     }
 
 private:
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index da45c14a0ef..c8688f2fba5 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -214,6 +214,9 @@ void RefactoringFile::setOpenEditor(bool activate, int pos)
 
 bool RefactoringFile::apply()
 {
+    if (m_changes.isEmpty())
+        return true;
+
     // test file permissions
     if (!m_filePath.isWritableFile()) {
         ReadOnlyFilesDialog roDialog(m_filePath, ICore::dialogParent());