shiboken6: Remove unused function modifications

As a drive-by, fix the "public" modification flag to be 4.

Task-number: PYSIDE-2602
Pick-to: 6.7
Change-Id: I5bacc2bf17e5307df02b9e6d6adadc09d04a9ded
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

7 files changed, 1 insertions, 53 deletions

diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
index 0f6ddcc80..4de9be38d 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
@@ -1554,16 +1554,12 @@ void AbstractMetaBuilderPrivate::applyFunctionModifications(AbstractMetaFunction
             func->setOriginalName(func->name());
             func->setName(mod.renamedToName());
         } else if (mod.isAccessModifier()) {
-            funcRef -= AbstractMetaFunction::Friendly;
-
             if (mod.isPublic())
                 funcRef.modifyAccess(Access::Public);
             else if (mod.isProtected())
                 funcRef.modifyAccess(Access::Protected);
             else if (mod.isPrivate())
                 funcRef.modifyAccess(Access::Private);
-            else if (mod.isFriendly())
-                funcRef += AbstractMetaFunction::Friendly;
         }
 
         if (mod.isFinal())
@@ -2099,9 +2095,6 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(const Functio
         *metaFunction += AbstractMetaFunction::FinalInTargetLang;
     }
 
-    if (functionItem->isInvokable())
-        *metaFunction += AbstractMetaFunction::Invokable;
-
     if (functionItem->isStatic()) {
         *metaFunction += AbstractMetaFunction::Static;
         *metaFunction += AbstractMetaFunction::FinalInTargetLang;
diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.h b/sources/shiboken6/ApiExtractor/abstractmetafunction.h
index a88197c3b..51f4a1ba7 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetafunction.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.h
@@ -92,8 +92,6 @@ public:
     enum Attribute {
         None                        = 0x00000000,
 
-        Friendly                    = 0x00000001,
-
         Abstract                    = 0x00000002,
         Static                      = 0x00000004,
         ClassMethod                 = 0x00000008,
@@ -108,8 +106,6 @@ public:
         PropertyResetter            = 0x00000400,
         PropertyNotify              = 0x00000800,
 
-        Invokable                   = 0x00001000,
-
         VirtualCppMethod            = 0x00010000,
         OverriddenCppMethod         = 0x00020000,
         FinalCppMethod              = 0x00040000,
@@ -144,7 +140,6 @@ public:
     bool isAbstract() const;
     bool isClassMethod() const;
     bool isStatic() const;
-    bool isInvokable() const;
     bool isPropertyReader() const;
     bool isPropertyWriter() const;
     bool isPropertyResetter() const;
@@ -473,11 +468,6 @@ inline bool AbstractMetaFunction::isClassMethod() const
     return attributes().testFlag(ClassMethod);
 }
 
-inline bool AbstractMetaFunction::isInvokable() const
-{
-    return attributes().testFlag(Invokable);
-}
-
 inline bool AbstractMetaFunction::isPropertyReader() const
 {
     return attributes().testFlag(PropertyReader);
diff --git a/sources/shiboken6/ApiExtractor/modifications.cpp b/sources/shiboken6/ApiExtractor/modifications.cpp
index 4e08d8560..d876e8035 100644
--- a/sources/shiboken6/ApiExtractor/modifications.cpp
+++ b/sources/shiboken6/ApiExtractor/modifications.cpp
@@ -14,20 +14,6 @@
 
 using namespace Qt::StringLiterals;
 
-// ---------------------- Modification
-QString FunctionModification::accessModifierString() const
-{
-    if (isPrivate())
-        return u"private"_s;
-    if (isProtected())
-        return u"protected"_s;
-    if (isPublic())
-        return u"public"_s;
-    if (isFriendly())
-        return u"friendly"_s;
-    return {};
-}
-
 // ---------------------- FieldModification
 
 class FieldModificationData : public QSharedData
diff --git a/sources/shiboken6/ApiExtractor/modifications.h b/sources/shiboken6/ApiExtractor/modifications.h
index 3763f6154..27a38f1aa 100644
--- a/sources/shiboken6/ApiExtractor/modifications.h
+++ b/sources/shiboken6/ApiExtractor/modifications.h
@@ -141,8 +141,7 @@ public:
     enum ModifierFlag {
         Private =               0x0001,
         Protected =             0x0002,
-        Public =                0x0003,
-        Friendly =              0x0004,
+        Public =                0x0004,
         AccessModifierMask =    0x000f,
 
         Final =                 0x0010,
@@ -191,10 +190,6 @@ public:
     {
         return accessModifier() == Public;
     }
-    bool isFriendly() const
-    {
-        return accessModifier() == Friendly;
-    }
     bool isFinal() const
     {
         return modifiers().testFlag(Final);
@@ -203,7 +198,6 @@ public:
     {
         return modifiers().testFlag(NonFinal);
     }
-    QString accessModifierString() const;
 
     bool isDeprecated() const
     {
diff --git a/sources/shiboken6/ApiExtractor/parser/codemodel.cpp b/sources/shiboken6/ApiExtractor/parser/codemodel.cpp
index 20cee3dd2..abee048de 100644
--- a/sources/shiboken6/ApiExtractor/parser/codemodel.cpp
+++ b/sources/shiboken6/ApiExtractor/parser/codemodel.cpp
@@ -1082,17 +1082,6 @@ void _FunctionModelItem::setAbstract(bool isAbstract)
     m_isAbstract = isAbstract;
 }
 
-// Qt
-bool _FunctionModelItem::isInvokable() const
-{
-    return m_isInvokable;
-}
-
-void _FunctionModelItem::setInvokable(bool isInvokable)
-{
-    m_isInvokable = isInvokable;
-}
-
 QString _FunctionModelItem::typeSystemSignature() const  // For dumping out type system files
 {
     QString result;
diff --git a/sources/shiboken6/ApiExtractor/parser/codemodel.h b/sources/shiboken6/ApiExtractor/parser/codemodel.h
index dce594d97..435e57913 100644
--- a/sources/shiboken6/ApiExtractor/parser/codemodel.h
+++ b/sources/shiboken6/ApiExtractor/parser/codemodel.h
@@ -509,9 +509,6 @@ public:
     bool isHiddenFriend() const;
     void setHiddenFriend(bool f);
 
-    bool isInvokable() const; // Qt
-    void setInvokable(bool isInvokable); // Qt
-
     bool isAbstract() const;
     void setAbstract(bool isAbstract);
 
diff --git a/sources/shiboken6/ApiExtractor/typesystemparser.cpp b/sources/shiboken6/ApiExtractor/typesystemparser.cpp
index 71e80cfa8..4e666151d 100644
--- a/sources/shiboken6/ApiExtractor/typesystemparser.cpp
+++ b/sources/shiboken6/ApiExtractor/typesystemparser.cpp
@@ -301,7 +301,6 @@ ENUM_LOOKUP_BEGIN(FunctionModification::ModifierFlag, Qt::CaseSensitive,
         {u"private", FunctionModification::Private},
         {u"public", FunctionModification::Public},
         {u"protected", FunctionModification::Protected},
-        {u"friendly", FunctionModification::Friendly},
         {u"rename", FunctionModification::Rename},
         {u"final", FunctionModification::Final},
         {u"non-final", FunctionModification::NonFinal}