Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
flatpak-qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
3d81ae85
Commit
3d81ae85
authored
Jun 03, 2010
by
Roberto Raggi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduced the usage of CppQuickFixOperation.
parent
a40349c0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
39 deletions
+26
-39
src/plugins/cppeditor/cppeditor.cpp
src/plugins/cppeditor/cppeditor.cpp
+3
-6
src/plugins/cppeditor/cppeditor.h
src/plugins/cppeditor/cppeditor.h
+1
-1
src/plugins/cppeditor/cppquickfix.cpp
src/plugins/cppeditor/cppquickfix.cpp
+12
-23
src/plugins/cppeditor/cppquickfix.h
src/plugins/cppeditor/cppquickfix.h
+3
-9
src/plugins/texteditor/quickfix.cpp
src/plugins/texteditor/quickfix.cpp
+6
-0
src/plugins/texteditor/quickfix.h
src/plugins/texteditor/quickfix.h
+1
-0
No files found.
src/plugins/cppeditor/cppeditor.cpp
View file @
3d81ae85
...
...
@@ -1586,11 +1586,8 @@ bool CPPEditor::event(QEvent *e)
void
CPPEditor
::
performQuickFix
(
int
index
)
{
CppQuickFixCollector
*
quickFixCollector
=
CppPlugin
::
instance
()
->
quickFixCollector
();
CppQuickFixOperationPtr
op
=
m_quickFixes
.
at
(
index
);
quickFixCollector
->
perform
(
op
);
//op->createChangeSet();
//setChangeSet(op->changeSet());
TextEditor
::
QuickFixOperation
::
Ptr
op
=
m_quickFixes
.
at
(
index
);
op
->
perform
();
}
void
CPPEditor
::
contextMenuEvent
(
QContextMenuEvent
*
e
)
...
...
@@ -1614,7 +1611,7 @@ void CPPEditor::contextMenuEvent(QContextMenuEvent *e)
m_quickFixes
=
quickFixCollector
->
quickFixes
();
for
(
int
index
=
0
;
index
<
m_quickFixes
.
size
();
++
index
)
{
CppQuickFixOperation
Ptr
op
=
m_quickFixes
.
at
(
index
);
TextEditor
::
QuickFixOperation
::
Ptr
op
=
m_quickFixes
.
at
(
index
);
QAction
*
action
=
menu
->
addAction
(
op
->
description
());
mapper
.
setMapping
(
action
,
index
);
connect
(
action
,
SIGNAL
(
triggered
()),
&
mapper
,
SLOT
(
map
()));
...
...
src/plugins/cppeditor/cppeditor.h
View file @
3d81ae85
...
...
@@ -309,7 +309,7 @@ private:
SemanticHighlighter
*
m_semanticHighlighter
;
SemanticInfo
m_lastSemanticInfo
;
QList
<
CppQuickFixOperation
Ptr
>
m_quickFixes
;
QList
<
TextEditor
::
QuickFixOperation
::
Ptr
>
m_quickFixes
;
bool
m_initialized
;
};
...
...
src/plugins/cppeditor/cppquickfix.cpp
View file @
3d81ae85
...
...
@@ -62,6 +62,7 @@ class CppQuickFixState: public TextEditor::QuickFixState
{
public:
QList
<
CPlusPlus
::
AST
*>
path
;
SemanticInfo
info
;
};
/*
...
...
@@ -880,6 +881,8 @@ CppQuickFixOperation::Range CppQuickFixOperation::topLevelRange() const
int
CppQuickFixOperation
::
match
(
TextEditor
::
QuickFixState
*
state
)
{
CppQuickFixState
*
s
=
static_cast
<
CppQuickFixState
*>
(
state
);
_document
=
s
->
info
.
doc
;
_snapshot
=
s
->
info
.
snapshot
;
return
match
(
s
->
path
);
}
...
...
@@ -892,15 +895,9 @@ void CppQuickFixOperation::setTopLevelNode(CPlusPlus::AST *topLevelNode)
Document
::
Ptr
CppQuickFixOperation
::
document
()
const
{
return
_document
;
}
void
CppQuickFixOperation
::
setDocument
(
CPlusPlus
::
Document
::
Ptr
document
)
{
_document
=
document
;
}
Snapshot
CppQuickFixOperation
::
snapshot
()
const
const
Snapshot
&
CppQuickFixOperation
::
snapshot
()
const
{
return
_snapshot
;
}
void
CppQuickFixOperation
::
setSnapshot
(
const
CPlusPlus
::
Snapshot
&
snapshot
)
{
_snapshot
=
snapshot
;
}
const
CPlusPlus
::
Token
&
CppQuickFixOperation
::
tokenAt
(
unsigned
index
)
const
{
return
_document
->
translationUnit
()
->
tokenAt
(
index
);
}
...
...
@@ -1081,7 +1078,7 @@ int CppQuickFixCollector::startCompletion(TextEditor::ITextEditable *editable)
QSharedPointer
<
WrapStringLiteral
>
wrapStringLiteral
(
new
WrapStringLiteral
(
_editor
));
QSharedPointer
<
CStringToNSString
>
wrapCString
(
new
CStringToNSString
(
_editor
));
QList
<
CppQuickFixOperation
Ptr
>
candidates
;
QList
<
TextEditor
::
QuickFixOperation
::
Ptr
>
candidates
;
candidates
.
append
(
rewriteLogicalAndOp
);
candidates
.
append
(
splitIfStatementOp
);
candidates
.
append
(
moveDeclarationOutOfIfOp
);
...
...
@@ -1094,21 +1091,20 @@ int CppQuickFixCollector::startCompletion(TextEditor::ITextEditable *editable)
if
(
_editor
->
mimeType
()
==
CppTools
::
Constants
::
OBJECTIVE_CPP_SOURCE_MIMETYPE
)
candidates
.
append
(
wrapCString
);
QMap
<
int
,
QList
<
CppQuickFixOperation
Ptr
>
>
matchedOps
;
QMap
<
int
,
QList
<
TextEditor
::
QuickFixOperation
::
Ptr
>
>
matchedOps
;
CppQuickFixState
state
;
state
.
path
=
path
;
state
.
info
=
info
;
foreach
(
CppQuickFixOperationPtr
op
,
candidates
)
{
op
->
setSnapshot
(
info
.
snapshot
);
op
->
setDocument
(
info
.
doc
);
foreach
(
TextEditor
::
QuickFixOperation
::
Ptr
op
,
candidates
)
{
op
->
setTextCursor
(
_editor
->
textCursor
());
int
priority
=
op
->
match
(
&
state
);
if
(
priority
!=
-
1
)
matchedOps
[
priority
].
append
(
op
);
}
QMapIterator
<
int
,
QList
<
CppQuickFixOperation
Ptr
>
>
it
(
matchedOps
);
QMapIterator
<
int
,
QList
<
TextEditor
::
QuickFixOperation
::
Ptr
>
>
it
(
matchedOps
);
it
.
toBack
();
if
(
it
.
hasPrevious
())
{
it
.
previous
();
...
...
@@ -1126,7 +1122,7 @@ int CppQuickFixCollector::startCompletion(TextEditor::ITextEditable *editable)
void
CppQuickFixCollector
::
completions
(
QList
<
TextEditor
::
CompletionItem
>
*
quickFixItems
)
{
for
(
int
i
=
0
;
i
<
_quickFixes
.
size
();
++
i
)
{
CppQuickFixOperation
Ptr
op
=
_quickFixes
.
at
(
i
);
TextEditor
::
QuickFixOperation
::
Ptr
op
=
_quickFixes
.
at
(
i
);
TextEditor
::
CompletionItem
item
(
this
);
item
.
text
=
op
->
description
();
...
...
@@ -1140,18 +1136,11 @@ void CppQuickFixCollector::complete(const TextEditor::CompletionItem &item)
const
int
index
=
item
.
data
.
toInt
();
if
(
index
<
_quickFixes
.
size
())
{
CppQuickFixOperation
Ptr
quickFix
=
_quickFixes
.
at
(
index
);
perform
(
quickFix
);
TextEditor
::
QuickFixOperation
::
Ptr
quickFix
=
_quickFixes
.
at
(
index
);
quickFix
->
perform
(
);
}
}
void
CppQuickFixCollector
::
perform
(
CppQuickFixOperationPtr
op
)
{
op
->
setTextCursor
(
_editor
->
textCursor
());
op
->
createChangeSet
();
op
->
apply
();
}
void
CppQuickFixCollector
::
cleanup
()
{
_quickFixes
.
clear
();
...
...
src/plugins/cppeditor/cppquickfix.h
View file @
3d81ae85
...
...
@@ -63,10 +63,7 @@ public:
virtual
int
match
(
const
QList
<
CPlusPlus
::
AST
*>
&
path
)
=
0
;
CPlusPlus
::
Document
::
Ptr
document
()
const
;
void
setDocument
(
CPlusPlus
::
Document
::
Ptr
document
);
CPlusPlus
::
Snapshot
snapshot
()
const
;
void
setSnapshot
(
const
CPlusPlus
::
Snapshot
&
snapshot
);
const
CPlusPlus
::
Snapshot
&
snapshot
()
const
;
virtual
Range
topLevelRange
()
const
;
virtual
int
match
(
TextEditor
::
QuickFixState
*
state
);
...
...
@@ -123,7 +120,7 @@ public:
CppQuickFixCollector
();
virtual
~
CppQuickFixCollector
();
QList
<
CppQuickFixOperation
Ptr
>
quickFixes
()
const
{
return
_quickFixes
;
}
QList
<
TextEditor
::
QuickFixOperation
::
Ptr
>
quickFixes
()
const
{
return
_quickFixes
;
}
virtual
TextEditor
::
ITextEditable
*
editor
()
const
;
virtual
int
startPosition
()
const
;
...
...
@@ -134,14 +131,11 @@ public:
virtual
void
complete
(
const
TextEditor
::
CompletionItem
&
item
);
virtual
void
cleanup
();
public
Q_SLOTS
:
void
perform
(
CppQuickFixOperationPtr
op
);
private:
CppTools
::
CppModelManagerInterface
*
_modelManager
;
TextEditor
::
ITextEditable
*
_editable
;
CPPEditor
*
_editor
;
QList
<
CppQuickFixOperation
Ptr
>
_quickFixes
;
QList
<
TextEditor
::
QuickFixOperation
::
Ptr
>
_quickFixes
;
};
}
// end of namespace Internal
...
...
src/plugins/texteditor/quickfix.cpp
View file @
3d81ae85
...
...
@@ -160,3 +160,9 @@ QString QuickFixOperation::textOf(int start, int end) const
tc
.
setPosition
(
end
,
QTextCursor
::
KeepAnchor
);
return
tc
.
selectedText
();
}
void
QuickFixOperation
::
perform
()
{
createChangeSet
();
apply
();
}
src/plugins/texteditor/quickfix.h
View file @
3d81ae85
...
...
@@ -77,6 +77,7 @@ public:
virtual
int
match
(
QuickFixState
*
state
)
=
0
;
void
perform
();
void
apply
();
TextEditor
::
BaseTextEditor
*
editor
()
const
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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