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
4abd0aef
Commit
4abd0aef
authored
Nov 24, 2009
by
Roberto Raggi
Browse files
Removed the extra QTextCursor formal argument from QuickFixOperator::match().
parent
7586847b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/cppeditor/cppquickfix.cpp
View file @
4abd0aef
...
...
@@ -108,10 +108,8 @@ public:
return
QLatin1String
(
"Rewrite condition using ||"
);
// ### tr?
}
virtual
int
match
(
const
QList
<
AST
*>
&
path
,
QTextCursor
tc
)
virtual
int
match
(
const
QList
<
AST
*>
&
path
)
{
setTextCursor
(
tc
);
BinaryExpressionAST
*
expression
=
0
;
int
index
=
path
.
size
()
-
1
;
...
...
@@ -198,10 +196,8 @@ public:
return
true
;
}
virtual
int
match
(
const
QList
<
AST
*>
&
path
,
QTextCursor
tc
)
virtual
int
match
(
const
QList
<
AST
*>
&
path
)
{
setTextCursor
(
tc
);
CoreDeclaratorAST
*
core_declarator
=
0
;
int
index
=
path
.
size
()
-
1
;
...
...
@@ -215,7 +211,7 @@ public:
if
(
checkDeclaration
(
simpleDecl
))
{
declaration
=
simpleDecl
;
const
int
cursorPosition
=
tc
.
selectionStart
();
const
int
cursorPosition
=
selectionStart
();
const
int
startOfDeclSpecifier
=
startOf
(
declaration
->
decl_specifier_list
->
firstToken
());
const
int
endOfDeclSpecifier
=
endOf
(
declaration
->
decl_specifier_list
->
lastToken
()
-
1
);
...
...
@@ -279,10 +275,8 @@ public:
return
QLatin1String
(
"Add curly braces"
);
// ### tr?
}
virtual
int
match
(
const
QList
<
AST
*>
&
path
,
QTextCursor
tc
)
virtual
int
match
(
const
QList
<
AST
*>
&
path
)
{
setTextCursor
(
tc
);
// show when we're on the 'if' of an if statement
int
index
=
path
.
size
()
-
1
;
IfStatementAST
*
ifStatement
=
path
.
at
(
index
)
->
asIfStatement
();
...
...
@@ -341,10 +335,8 @@ public:
return
QLatin1String
(
"Move declaration out of condition"
);
// ### tr?
}
virtual
int
match
(
const
QList
<
AST
*>
&
path
,
QTextCursor
tc
)
virtual
int
match
(
const
QList
<
AST
*>
&
path
)
{
setTextCursor
(
tc
);
condition
=
mk
.
Condition
();
pattern
=
mk
.
IfStatement
(
condition
);
...
...
@@ -409,10 +401,8 @@ public:
return
QLatin1String
(
"Move declaration out of condition"
);
// ### tr?
}
virtual
int
match
(
const
QList
<
AST
*>
&
path
,
QTextCursor
tc
)
virtual
int
match
(
const
QList
<
AST
*>
&
path
)
{
setTextCursor
(
tc
);
condition
=
mk
.
Condition
();
pattern
=
mk
.
WhileStatement
(
condition
);
...
...
@@ -505,10 +495,8 @@ public:
return
QLatin1String
(
"Split if statement"
);
// ### tr?
}
virtual
int
match
(
const
QList
<
AST
*>
&
path
,
QTextCursor
tc
)
virtual
int
match
(
const
QList
<
AST
*>
&
path
)
{
setTextCursor
(
tc
);
pattern
=
0
;
int
index
=
path
.
size
()
-
1
;
...
...
@@ -634,6 +622,12 @@ QTextCursor QuickFixOperation::textCursor() const
void
QuickFixOperation
::
setTextCursor
(
const
QTextCursor
&
cursor
)
{
_textCursor
=
cursor
;
}
int
QuickFixOperation
::
selectionStart
()
const
{
return
_textCursor
.
selectionStart
();
}
int
QuickFixOperation
::
selectionEnd
()
const
{
return
_textCursor
.
selectionEnd
();
}
const
CPlusPlus
::
Token
&
QuickFixOperation
::
tokenAt
(
unsigned
index
)
const
{
return
_doc
->
translationUnit
()
->
tokenAt
(
index
);
}
...
...
@@ -708,7 +702,7 @@ void QuickFixOperation::reindent(const Range &range)
void
QuickFixOperation
::
move
(
int
start
,
int
end
,
int
to
)
{
if
(
end
>
start
)
_
textWriter
.
move
(
start
,
end
-
start
,
to
);
_
changeSet
.
move
(
start
,
end
-
start
,
to
);
}
void
QuickFixOperation
::
move
(
unsigned
tokenIndex
,
int
to
)
...
...
@@ -724,7 +718,7 @@ void QuickFixOperation::move(const CPlusPlus::AST *ast, int to)
void
QuickFixOperation
::
replace
(
int
start
,
int
end
,
const
QString
&
replacement
)
{
if
(
end
>=
start
)
_
textWriter
.
replace
(
start
,
end
-
start
,
replacement
);
_
changeSet
.
replace
(
start
,
end
-
start
,
replacement
);
}
void
QuickFixOperation
::
replace
(
unsigned
tokenIndex
,
const
QString
&
replacement
)
...
...
@@ -758,13 +752,17 @@ QString QuickFixOperation::textOf(AST *ast) const
void
QuickFixOperation
::
applyChanges
(
AST
*
ast
)
{
Range
range
;
if
(
ast
)
range
=
createRange
(
ast
);
_textCursor
.
beginEditBlock
();
_textWriter
.
write
(
&
_textCursor
);
_changeSet
.
write
(
&
_textCursor
);
if
(
ast
)
reindent
(
range
);
_textCursor
.
endEditBlock
();
}
...
...
@@ -820,7 +818,8 @@ int CPPQuickFixCollector::startCompletion(TextEditor::ITextEditable *editable)
QMap
<
int
,
QList
<
QuickFixOperationPtr
>
>
matchedOps
;
foreach
(
QuickFixOperationPtr
op
,
candidates
)
{
int
priority
=
op
->
match
(
path
,
_editor
->
textCursor
());
op
->
setTextCursor
(
_editor
->
textCursor
());
int
priority
=
op
->
match
(
path
);
if
(
priority
!=
-
1
)
matchedOps
[
priority
].
append
(
op
);
}
...
...
src/plugins/cppeditor/cppquickfix.h
View file @
4abd0aef
...
...
@@ -63,7 +63,7 @@ public:
virtual
~
QuickFixOperation
();
virtual
QString
description
()
const
=
0
;
virtual
int
match
(
const
QList
<
CPlusPlus
::
AST
*>
&
path
,
QTextCursor
tc
)
=
0
;
virtual
int
match
(
const
QList
<
CPlusPlus
::
AST
*>
&
path
)
=
0
;
CPlusPlus
::
Document
::
Ptr
document
()
const
{
return
_doc
;
}
CPlusPlus
::
Snapshot
snapshot
()
const
{
return
_snapshot
;
}
...
...
@@ -71,6 +71,9 @@ public:
QTextCursor
textCursor
()
const
;
void
setTextCursor
(
const
QTextCursor
&
cursor
);
int
selectionStart
()
const
;
int
selectionEnd
()
const
;
CPPEditor
*
editor
()
const
;
virtual
void
apply
()
=
0
;
...
...
@@ -114,7 +117,7 @@ private:
CPlusPlus
::
Document
::
Ptr
_doc
;
CPlusPlus
::
Snapshot
_snapshot
;
QTextCursor
_textCursor
;
Utils
::
ChangeSet
_
textWriter
;
Utils
::
ChangeSet
_
changeSet
;
CPPEditor
*
_editor
;
};
...
...
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