OSDN Git Service
(root)
/
kde
/
Katie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
be06be1
)
remove duplicated code from moc generator
author
Ivailo Monev
<xakepa10@laimg.moc>
Sun, 21 Aug 2016 01:30:25 +0000
(
01:30
+0000)
committer
Ivailo Monev
<xakepa10@laimg.moc>
Sun, 21 Aug 2016 01:30:25 +0000
(
01:30
+0000)
upstream commits:
https://github.com/qt/qtbase/commit/
4a8ce53ad6998af8fd62eb1eddca57636cd8e47c
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
src/tools/moc/generator.cpp
patch
|
blob
|
history
diff --git
a/src/tools/moc/generator.cpp
b/src/tools/moc/generator.cpp
index
5f70e55
..
ecacbea
100644
(file)
--- a/
src/tools/moc/generator.cpp
+++ b/
src/tools/moc/generator.cpp
@@
-461,11
+461,6
@@
void Generator::generateFunctions(QList<FunctionDef>& list, const char *functype
flags |= AccessPublic;
else if (f.access == FunctionDef::Protected)
flags |= AccessProtected;
- if (f.access == FunctionDef::Private)
- flags |= AccessPrivate;
- else if (f.access == FunctionDef::Public)
- flags |= AccessPublic;
- else if (f.access == FunctionDef::Protected)
flags |= AccessProtected;
if (f.wasCloned)
flags |= MethodCloned;