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
20158a8c
Commit
20158a8c
authored
Dec 03, 2008
by
mae
Browse files
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
parents
484a8183
d1e84135
Changes
2
Hide whitespace changes
Inline
Side-by-side
shared/cplusplus/CheckDeclaration.cpp
View file @
20158a8c
...
...
@@ -236,13 +236,21 @@ bool CheckDeclaration::visit(FunctionDefinitionAST *ast)
_scope
->
enterSymbol
(
fun
);
if
(
ast
->
ctor_initializer
&&
(
ty
.
isValid
()
||
(
fun
->
identity
()
&&
!
fun
->
identity
()
->
isNameId
())))
{
translationUnit
()
->
error
(
ast
->
ctor_initializer
->
firstToken
(),
"only constructors take base initializers"
);
if
(
ast
->
ctor_initializer
)
{
bool
looksLikeCtor
=
false
;
if
(
ty
.
isValid
()
||
!
fun
->
identity
())
looksLikeCtor
=
false
;
else
if
(
fun
->
identity
()
->
isNameId
()
||
fun
->
identity
()
->
isTemplateNameId
())
looksLikeCtor
=
true
;
if
(
!
looksLikeCtor
)
{
translationUnit
()
->
error
(
ast
->
ctor_initializer
->
firstToken
(),
"only constructors take base initializers"
);
}
}
int
previousVisibility
=
semantic
()
->
switchVisibility
(
Symbol
::
Public
);
int
previousMethodKey
=
semantic
()
->
switchMethodKey
(
Function
::
NormalMethod
);
const
int
previousVisibility
=
semantic
()
->
switchVisibility
(
Symbol
::
Public
);
const
int
previousMethodKey
=
semantic
()
->
switchMethodKey
(
Function
::
NormalMethod
);
semantic
()
->
check
(
ast
->
function_body
,
fun
->
members
());
...
...
src/plugins/debugger/debuggermanager.cpp
View file @
20158a8c
...
...
@@ -791,6 +791,11 @@ bool DebuggerManager::startNewDebugger(StartMode mode)
m_processArgs
=
QStringList
();
m_workingDir
=
QString
();
m_attachedPID
=
dlg
.
attachPID
();
if
(
m_attachedPID
==
0
)
{
QMessageBox
::
warning
(
mainWindow
(),
tr
(
"Warning"
),
tr
(
"Cannot attach to PID 0"
));
return
false
;
}
}
else
if
(
startMode
()
==
startInternal
)
{
if
(
m_executable
.
isEmpty
())
{
QString
startDirectory
=
m_executable
;
...
...
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