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

CppEditor: Quick fix "move definition" keeps ctor-initialization list

Browse Source 
Task-number: QTCREATORBUG-9157

Change-Id: Ic46086ba07a86292bbf48de62b69e3f33628fd86
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Lorenz Haas
2013-04-18 11:21:12 +02:00
committed by Nikolai Kosjar
parent 7d2a7685aa
commit 39d000430e
3 changed files with 91 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -3645,7 +3645,6 @@ public:
{
CppRefactoringChanges refactoring(snapshot());
CppRefactoringFilePtr fromFile = refactoring.file(m_headerFileName);
const QString textFuncBody = fromFile->textOf(m_funcDef->function_body);
CppRefactoringFilePtr toFile;
int insertPos = 0;
Scope *scopeAtInsertPos = 0;
@@ -3666,6 +3665,10 @@ public:
// construct definition
const QString funcDec = getDefinitionSignature(assistInterface(), m_func, toFile,
scopeAtInsertPos);
QString textFuncBody;
if (m_funcDef->ctor_initializer)
textFuncBody = fromFile->textOf(m_funcDef->ctor_initializer) + QLatin1Char(' ');
textFuncBody += fromFile->textOf(m_funcDef->function_body);
QString funcDef = QString::fromLatin1("\n%1 %2\n")
.arg(funcDec)
.arg(textFuncBody);
@@ -3792,8 +3795,11 @@ public:
CppRefactoringFilePtr toFile = refactoring.file(m_toFileName);
ChangeSet::Range fromRange = fromFile->range(m_funcAST);
const QString definitionText = fromFile->textOf(m_funcAST->function_body);
const QString wholeFunctionText = QString::fromLatin1("%1 %2").arg(m_declarationText)
.arg(definitionText);
QString wholeFunctionText = m_declarationText;
if (m_funcAST->ctor_initializer)
wholeFunctionText += QLatin1Char(' ') + fromFile->textOf(m_funcAST->ctor_initializer);
wholeFunctionText += QLatin1Char(' ') + definitionText;
// Replace declaration with function and delete old definition
Utils::ChangeSet toTarget;