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
699ff228
Commit
699ff228
authored
Sep 27, 2010
by
Thomas Hartmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QmlDesigner.Model: check ids for qml keywords
ids are now checked if they are a qml keyword
parent
2e80355e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletion
+10
-1
src/plugins/qmldesigner/designercore/model/modelnode.cpp
src/plugins/qmldesigner/designercore/model/modelnode.cpp
+10
-1
No files found.
src/plugins/qmldesigner/designercore/model/modelnode.cpp
View file @
699ff228
...
...
@@ -160,6 +160,15 @@ QString ModelNode::validId()
return
id
();
}
static
bool
idIsQmlKeyWord
(
const
QString
&
id
)
{
QStringList
keywords
;
keywords
<<
"import"
<<
"property"
<<
"signal"
<<
"as"
<<
"on"
<<
"list"
;
return
keywords
.
contains
(
id
);
}
static
bool
idContainsWrongLetter
(
const
QString
&
id
)
{
static
QRegExp
idExpr
(
QLatin1String
(
"[a-z][a-zA-Z0-9_]*"
));
...
...
@@ -168,7 +177,7 @@ static bool idContainsWrongLetter(const QString& id)
bool
ModelNode
::
isValidId
(
const
QString
&
id
)
{
return
id
.
isEmpty
()
||
!
idContainsWrongLetter
(
id
);
return
id
.
isEmpty
()
||
(
!
idContainsWrongLetter
(
id
)
&&
!
idIsQmlKeyWord
(
id
)
);
}
void
ModelNode
::
setId
(
const
QString
&
id
)
...
...
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