feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Make RefactoringFile::apply() a no-op for empty change sets

Browse Source 
To simplify some calling sites.

Change-Id: I9736e88053659e5e90bca7b70e6d7e84b0d4fb4e
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2024-05-22 15:25:46 +02:00
parent 3697aac20e
commit 389b7b211c
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/quickfixes/cppcodegenerationquickfixes.cpp
View File

@@ -307,10 +307,8 @@ public:
insertAndIndent(m_sourceFile, m_sourceFileInsertionPoint, m_sourceFileCode); insertAndIndent(m_sourceFile, m_sourceFileInsertionPoint, m_sourceFileCode);
} }
if (!m_headerFileChangeSet.isEmpty()) m_headerFile->apply(m_headerFileChangeSet);
m_headerFile->apply(m_headerFileChangeSet); m_sourceFile->apply(m_sourceFileChangeSet);
if (!m_sourceFileChangeSet.isEmpty())
m_sourceFile->apply(m_sourceFileChangeSet);
} }
bool hasSourceFile() const { return m_headerFile != m_sourceFile; } bool hasSourceFile() const { return m_headerFile != m_sourceFile; }

3
src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.cpp
View File

@@ -920,8 +920,7 @@ public:
implementationChangeSet.insert(insertPos, QLatin1String("\n\n") + defText); implementationChangeSet.insert(insertPos, QLatin1String("\n\n") + defText);
} }
if (!implementationChangeSet.isEmpty()) implementationFile->apply(implementationChangeSet);
implementationFile->apply(implementationChangeSet);
} }
} }

6
src/plugins/cppeditor/quickfixes/movefunctiondefinition.cpp
View File

@@ -135,10 +135,8 @@ public:
void applyChanges() void applyChanges()
{ {
if (!m_toFileChangeSet.isEmpty()) m_toFile->apply(m_toFileChangeSet);
m_toFile->apply(m_toFileChangeSet); m_fromFile->apply(m_fromFileChangeSet);
if (!m_fromFileChangeSet.isEmpty())
m_fromFile->apply(m_fromFileChangeSet);
} }
private: private:

3
src/plugins/texteditor/refactoringchanges.cpp
View File

@@ -214,6 +214,9 @@ void RefactoringFile::setOpenEditor(bool activate, int pos)
bool RefactoringFile::apply() bool RefactoringFile::apply()
{ {
if (m_changes.isEmpty())
return true;
// test file permissions // test file permissions
if (!m_filePath.isWritableFile()) { if (!m_filePath.isWritableFile()) {
ReadOnlyFilesDialog roDialog(m_filePath, ICore::dialogParent()); ReadOnlyFilesDialog roDialog(m_filePath, ICore::dialogParent());