From: Ivailo Monev <xakepa10@laimg.moc>
Date: Sun, 21 Aug 2016 01:30:25 +0000 (+0000)
Subject: remove duplicated code from moc generator
X-Git-Tag: 4.12.0~6816
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8a0b955b916f2ec3759aa6c7b46fa0e23c333fc4;p=kde%2FKatie.git

remove duplicated code from moc generator

upstream commits:
https://github.com/qt/qtbase/commit/4a8ce53ad6998af8fd62eb1eddca57636cd8e47c

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 5f70e55f8..ecacbeac0 100644
--- 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;