Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
138266e3
Commit
138266e3
authored
Jan 19, 2010
by
Erik Verbruggen
Browse files
Fixed compiler errors from previous commit.
parent
972ef2b2
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/core/model/modeltotextmerger.cpp
View file @
138266e3
...
...
@@ -194,7 +194,7 @@ RewriterView *ModelToTextMerger::view()
bool
ModelToTextMerger
::
applyChanges
()
{
if
(
m_rewriteActions
.
isEmpty
())
return
;
return
true
;
dumpRewriteActions
(
QLatin1String
(
"Before compression"
));
RewriteActionCompressor
compress
(
getPropertyOrder
());
...
...
@@ -202,18 +202,20 @@ bool ModelToTextMerger::applyChanges()
dumpRewriteActions
(
QLatin1String
(
"After compression"
));
if
(
m_rewriteActions
.
isEmpty
())
return
;
return
true
;
Document
::
Ptr
tmpDocument
(
Document
::
create
(
QLatin1String
(
"<ModelToTextMerger>"
)));
tmpDocument
->
setSource
(
m_rewriterView
->
textModifier
()
->
text
());
if
(
!
tmpDocument
->
parseQml
())
{
qDebug
()
<<
"*** Possible problem: QML file wasn't parsed correctly."
;
qDebug
()
<<
"*** QML text:"
<<
m_rewriterView
->
textModifier
()
->
text
();
return
;
return
false
;
}
TextModifier
*
textModifier
=
m_rewriterView
->
textModifier
();
bool
success
=
true
;
try
{
ModelNodePositionRecalculator
positionRecalculator
(
m_rewriterView
->
positionStorage
(),
m_rewriterView
->
positionStorage
()
->
modelNodes
());
positionRecalculator
.
connectTo
(
textModifier
);
...
...
@@ -223,8 +225,6 @@ bool ModelToTextMerger::applyChanges()
textModifier
->
deactivateChangeSignals
();
textModifier
->
startGroup
();
bool
success
=
true
;
for
(
int
i
=
0
;
i
<
m_rewriteActions
.
size
();
++
i
)
{
if
(
i
!=
0
)
{
textModifier
->
flushGroup
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment