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
a2128885
Commit
a2128885
authored
May 14, 2010
by
Roberto Raggi
Browse files
Get rid of some obsoleted code.
parent
13625c21
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/cppeditor/cppeditor.cpp
View file @
a2128885
...
...
@@ -560,40 +560,6 @@ protected:
}
// end of anonymous namespace
static
const
QualifiedNameId
*
qualifiedNameIdForSymbol
(
Symbol
*
s
,
Control
*
control
)
{
const
Name
*
symbolName
=
s
->
name
();
if
(
!
symbolName
)
return
0
;
// nothing to do.
QVector
<
const
Name
*>
names
;
for
(
Scope
*
scope
=
s
->
scope
();
scope
;
scope
=
scope
->
enclosingScope
())
{
if
(
scope
->
isClassScope
()
||
scope
->
isNamespaceScope
())
{
if
(
scope
->
owner
()
&&
scope
->
owner
()
->
name
())
{
const
Name
*
ownerName
=
scope
->
owner
()
->
name
();
if
(
const
QualifiedNameId
*
q
=
ownerName
->
asQualifiedNameId
())
{
for
(
unsigned
i
=
0
;
i
<
q
->
nameCount
();
++
i
)
{
names
.
prepend
(
q
->
nameAt
(
i
));
}
}
else
{
names
.
prepend
(
ownerName
);
}
}
}
}
if
(
const
QualifiedNameId
*
q
=
symbolName
->
asQualifiedNameId
())
{
for
(
unsigned
i
=
0
;
i
<
q
->
nameCount
();
++
i
)
{
names
.
append
(
q
->
nameAt
(
i
));
}
}
else
{
names
.
append
(
symbolName
);
}
return
control
->
qualifiedNameId
(
names
.
constData
(),
names
.
size
());
}
CPPEditorEditable
::
CPPEditorEditable
(
CPPEditor
*
editor
)
:
BaseTextEditorEditable
(
editor
)
{
...
...
@@ -1172,59 +1138,6 @@ void CPPEditor::updateUsesNow()
semanticRehighlight
();
}
static
bool
isCompatible
(
const
Name
*
name
,
const
Name
*
otherName
)
{
if
(
const
NameId
*
nameId
=
name
->
asNameId
())
{
if
(
const
TemplateNameId
*
otherTemplId
=
otherName
->
asTemplateNameId
())
return
nameId
->
identifier
()
->
isEqualTo
(
otherTemplId
->
identifier
());
}
else
if
(
const
TemplateNameId
*
templId
=
name
->
asTemplateNameId
())
{
if
(
const
NameId
*
otherNameId
=
otherName
->
asNameId
())
return
templId
->
identifier
()
->
isEqualTo
(
otherNameId
->
identifier
());
}
return
name
->
isEqualTo
(
otherName
);
}
static
bool
isCompatible
(
Function
*
definition
,
Symbol
*
declaration
,
const
QualifiedNameId
*
declarationName
)
{
Function
*
declTy
=
declaration
->
type
()
->
asFunctionType
();
if
(
!
declTy
)
return
false
;
const
Name
*
definitionName
=
definition
->
name
();
if
(
const
QualifiedNameId
*
q
=
definitionName
->
asQualifiedNameId
())
{
if
(
!
isCompatible
(
q
->
unqualifiedNameId
(),
declaration
->
name
()))
return
false
;
else
if
(
q
->
nameCount
()
>
declarationName
->
nameCount
())
return
false
;
else
if
(
declTy
->
argumentCount
()
!=
definition
->
argumentCount
())
return
false
;
else
if
(
declTy
->
isConst
()
!=
definition
->
isConst
())
return
false
;
else
if
(
declTy
->
isVolatile
()
!=
definition
->
isVolatile
())
return
false
;
for
(
unsigned
i
=
0
;
i
<
definition
->
argumentCount
();
++
i
)
{
Symbol
*
arg
=
definition
->
argumentAt
(
i
);
Symbol
*
otherArg
=
declTy
->
argumentAt
(
i
);
if
(
!
arg
->
type
().
isEqualTo
(
otherArg
->
type
()))
return
false
;
}
for
(
unsigned
i
=
0
;
i
!=
q
->
nameCount
();
++
i
)
{
const
Name
*
n
=
q
->
nameAt
(
q
->
nameCount
()
-
i
-
1
);
const
Name
*
m
=
declarationName
->
nameAt
(
declarationName
->
nameCount
()
-
i
-
1
);
if
(
!
isCompatible
(
n
,
m
))
return
false
;
}
return
true
;
}
else
{
// ### TODO: implement isCompatible for unqualified name ids.
}
return
false
;
}
void
CPPEditor
::
switchDeclarationDefinition
()
{
if
(
!
m_modelManager
)
...
...
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