Skip to content
GitLab
Menu
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
e76d7a5b
Commit
e76d7a5b
authored
Dec 11, 2008
by
hjk
Browse files
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
parents
9da7aef4
f149c17d
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/libs/cplusplus/TypeOfExpression.cpp
View file @
e76d7a5b
...
...
@@ -107,6 +107,8 @@ void TypeOfExpression::processEnvironment(QMap<QString, Document::Ptr> documents
Document
::
Ptr
doc
,
Environment
*
env
,
QSet
<
QString
>
*
processed
)
const
{
if
(
!
doc
)
return
;
if
(
processed
->
contains
(
doc
->
fileName
()))
return
;
processed
->
insert
(
doc
->
fileName
());
...
...
src/plugins/cppeditor/cppeditor.cpp
View file @
e76d7a5b
...
...
@@ -744,7 +744,8 @@ void CPPEditor::unCommentSelection()
QString
endText
=
endBlock
.
text
();
int
endPos
=
end
-
endBlock
.
position
();
bool
hasTrailingCharacters
=
!
endText
.
mid
(
endPos
).
trimmed
().
isEmpty
();
bool
hasTrailingCharacters
=
!
endText
.
left
(
endPos
).
remove
(
QLatin1String
(
"//"
)).
trimmed
().
isEmpty
()
&&
!
endText
.
mid
(
endPos
).
trimmed
().
isEmpty
();
if
((
endPos
<=
endText
.
length
()
-
2
&&
endText
.
at
(
endPos
)
==
QLatin1Char
(
'*'
)
&&
endText
.
at
(
endPos
+
1
)
==
QLatin1Char
(
'/'
)))
{
...
...
src/plugins/texteditor/basetexteditor.cpp
View file @
e76d7a5b
...
...
@@ -735,12 +735,15 @@ void BaseTextEditor::moveLineUpDown(bool up)
move
.
clearSelection
();
move
.
insertText
(
text
);
int
end
=
move
.
position
();
move
.
endEditBlock
();
if
(
hasSelection
)
{
move
.
setPosition
(
start
);
move
.
setPosition
(
end
,
QTextCursor
::
KeepAnchor
);
}
indent
(
document
(),
move
,
QChar
::
Null
);
move
.
endEditBlock
();
setTextCursor
(
move
);
}
...
...
@@ -2765,6 +2768,8 @@ void BaseTextEditor::handleHomeKey(bool anchor)
while
(
character
==
tab
||
character
.
category
()
==
QChar
::
Separator_Space
)
{
++
pos
;
if
(
pos
==
initpos
)
break
;
character
=
characterAt
(
pos
);
}
...
...
@@ -2952,12 +2957,13 @@ void BaseTextEditor::markBlocksAsChanged(QList<int> blockNumbers) {
TextBlockUserData
::
MatchType
TextBlockUserData
::
checkOpenParenthesis
(
QTextCursor
*
cursor
,
QChar
c
)
{
if
(
!
TextEditDocumentLayout
::
hasParentheses
(
cursor
->
block
()))
QTextBlock
block
=
cursor
->
block
();
if
(
!
TextEditDocumentLayout
::
hasParentheses
(
block
)
||
TextEditDocumentLayout
::
ifdefedOut
(
block
))
return
NoMatch
;
Parentheses
parenList
=
TextEditDocumentLayout
::
parentheses
(
cursor
->
block
()
);
Parentheses
parenList
=
TextEditDocumentLayout
::
parentheses
(
block
);
Parenthesis
openParen
,
closedParen
;
QTextBlock
closedParenParag
=
cursor
->
block
()
;
QTextBlock
closedParenParag
=
block
;
const
int
cursorPos
=
cursor
->
position
()
-
closedParenParag
.
position
();
int
i
=
0
;
...
...
@@ -2982,7 +2988,8 @@ TextBlockUserData::MatchType TextBlockUserData::checkOpenParenthesis(QTextCursor
closedParenParag
=
closedParenParag
.
next
();
if
(
!
closedParenParag
.
isValid
())
return
NoMatch
;
if
(
TextEditDocumentLayout
::
hasParentheses
(
closedParenParag
))
{
if
(
TextEditDocumentLayout
::
hasParentheses
(
closedParenParag
)
&&
!
TextEditDocumentLayout
::
ifdefedOut
(
closedParenParag
))
{
parenList
=
TextEditDocumentLayout
::
parentheses
(
closedParenParag
);
break
;
}
...
...
@@ -3019,12 +3026,13 @@ TextBlockUserData::MatchType TextBlockUserData::checkOpenParenthesis(QTextCursor
TextBlockUserData
::
MatchType
TextBlockUserData
::
checkClosedParenthesis
(
QTextCursor
*
cursor
,
QChar
c
)
{
if
(
!
TextEditDocumentLayout
::
hasParentheses
(
cursor
->
block
()))
QTextBlock
block
=
cursor
->
block
();
if
(
!
TextEditDocumentLayout
::
hasParentheses
(
block
)
||
TextEditDocumentLayout
::
ifdefedOut
(
block
))
return
NoMatch
;
Parentheses
parenList
=
TextEditDocumentLayout
::
parentheses
(
cursor
->
block
()
);
Parentheses
parenList
=
TextEditDocumentLayout
::
parentheses
(
block
);
Parenthesis
openParen
,
closedParen
;
QTextBlock
openParenParag
=
cursor
->
block
()
;
QTextBlock
openParenParag
=
block
;
const
int
cursorPos
=
cursor
->
position
()
-
openParenParag
.
position
();
int
i
=
parenList
.
count
()
-
1
;
...
...
@@ -3050,7 +3058,8 @@ TextBlockUserData::MatchType TextBlockUserData::checkClosedParenthesis(QTextCurs
if
(
!
openParenParag
.
isValid
())
return
NoMatch
;
if
(
TextEditDocumentLayout
::
hasParentheses
(
openParenParag
))
{
if
(
TextEditDocumentLayout
::
hasParentheses
(
openParenParag
)
&&
!
TextEditDocumentLayout
::
ifdefedOut
(
openParenParag
))
{
parenList
=
TextEditDocumentLayout
::
parentheses
(
openParenParag
);
break
;
}
...
...
@@ -3092,7 +3101,7 @@ bool TextBlockUserData::findPreviousOpenParenthesis(QTextCursor *cursor, bool se
int
ignore
=
0
;
while
(
block
.
isValid
())
{
Parentheses
parenList
=
TextEditDocumentLayout
::
parentheses
(
block
);
if
(
!
parenList
.
isEmpty
())
{
if
(
!
parenList
.
isEmpty
()
&&
!
TextEditDocumentLayout
::
ifdefedOut
(
block
)
)
{
for
(
int
i
=
parenList
.
count
()
-
1
;
i
>=
0
;
--
i
)
{
Parenthesis
paren
=
parenList
.
at
(
i
);
if
(
block
==
cursor
->
block
()
&&
position
-
block
.
position
()
<=
paren
.
pos
+
1
)
...
...
@@ -3119,7 +3128,7 @@ bool TextBlockUserData::findNextClosingParenthesis(QTextCursor *cursor, bool sel
int
ignore
=
0
;
while
(
block
.
isValid
())
{
Parentheses
parenList
=
TextEditDocumentLayout
::
parentheses
(
block
);
if
(
!
parenList
.
isEmpty
())
{
if
(
!
parenList
.
isEmpty
()
&&
!
TextEditDocumentLayout
::
ifdefedOut
(
block
)
)
{
for
(
int
i
=
0
;
i
<
parenList
.
count
();
++
i
)
{
Parenthesis
paren
=
parenList
.
at
(
i
);
if
(
block
==
cursor
->
block
()
&&
position
-
block
.
position
()
>=
paren
.
pos
)
...
...
@@ -3144,7 +3153,7 @@ TextBlockUserData::MatchType TextBlockUserData::matchCursorBackward(QTextCursor
cursor
->
clearSelection
();
const
QTextBlock
block
=
cursor
->
block
();
if
(
!
TextEditDocumentLayout
::
hasParentheses
(
block
))
if
(
!
TextEditDocumentLayout
::
hasParentheses
(
block
)
||
TextEditDocumentLayout
::
ifdefedOut
(
block
)
)
return
NoMatch
;
const
int
relPos
=
cursor
->
position
()
-
block
.
position
();
...
...
@@ -3166,7 +3175,7 @@ TextBlockUserData::MatchType TextBlockUserData::matchCursorForward(QTextCursor *
cursor
->
clearSelection
();
const
QTextBlock
block
=
cursor
->
block
();
if
(
!
TextEditDocumentLayout
::
hasParentheses
(
block
))
if
(
!
TextEditDocumentLayout
::
hasParentheses
(
block
)
||
TextEditDocumentLayout
::
ifdefedOut
(
block
)
)
return
NoMatch
;
const
int
relPos
=
cursor
->
position
()
-
block
.
position
();
...
...
Write
Preview
Supports
Markdown
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