Remove FunctionDefinitionModelItem

FunctionDefinitionModelItem (as opposed to FunctionModelItem)
is not needed by the meta builder.

Change-Id: Ib2236ffeee286d72019876e7341f66cef85c7831
Reviewed-by: Christian Tismer <tismer@stackless.com>

5 files changed, 6 insertions, 52 deletions

diff --git a/ApiExtractor/parser/binder.cpp b/ApiExtractor/parser/binder.cpp
index e2b648733..709f86c56 100644
--- a/ApiExtractor/parser/binder.cpp
+++ b/ApiExtractor/parser/binder.cpp
@@ -123,9 +123,9 @@ ClassModelItem Binder::changeCurrentClass(ClassModelItem item)
     return old;
 }
 
-FunctionDefinitionModelItem Binder::changeCurrentFunction(FunctionDefinitionModelItem item)
+FunctionModelItem Binder::changeCurrentFunction(FunctionModelItem item)
 {
-    FunctionDefinitionModelItem old = _M_current_function;
+    FunctionModelItem old = _M_current_function;
     _M_current_function = item;
     return old;
 }
@@ -352,8 +352,8 @@ void Binder::visitFunctionDefinition(FunctionDefinitionAST *node)
 
     Q_ASSERT(!decl_cc.id().isEmpty());
 
-    FunctionDefinitionModelItem
-    old = changeCurrentFunction(FunctionDefinitionModelItem(new _FunctionDefinitionModelItem(_M_model)));
+    FunctionModelItem
+    old = changeCurrentFunction(FunctionModelItem(new _FunctionModelItem(_M_model)));
     _M_current_function->setScope(functionScope->qualifiedName());
     updateItemPosition(_M_current_function, node);
 
@@ -387,8 +387,6 @@ void Binder::visitFunctionDefinition(FunctionDefinitionAST *node)
         _M_current_function->addArgument(arg);
     }
 
-    functionScope->addFunctionDefinition(_M_current_function);
-
     FunctionModelItem prototype = _M_current_function;
     FunctionModelItem declared = functionScope->declaredFunction(prototype);
 
diff --git a/ApiExtractor/parser/binder.h b/ApiExtractor/parser/binder.h
index 1f2db38e4..cd8d93a95 100644
--- a/ApiExtractor/parser/binder.h
+++ b/ApiExtractor/parser/binder.h
@@ -93,7 +93,7 @@ private:
     CodeModel::AccessPolicy changeCurrentAccess(CodeModel::AccessPolicy accessPolicy);
     NamespaceModelItem changeCurrentNamespace(NamespaceModelItem item);
     ClassModelItem changeCurrentClass(ClassModelItem item);
-    FunctionDefinitionModelItem changeCurrentFunction(FunctionDefinitionModelItem item);
+    FunctionModelItem changeCurrentFunction(FunctionModelItem item);
     TemplateParameterList changeTemplateParameters(TemplateParameterList templateParameters);
 
     void declare_symbol(SimpleDeclarationAST *node, InitDeclaratorAST *init_declarator);
@@ -114,7 +114,7 @@ private:
     FileModelItem _M_current_file;
     NamespaceModelItem _M_current_namespace;
     ClassModelItem _M_current_class;
-    FunctionDefinitionModelItem _M_current_function;
+    FunctionModelItem _M_current_function;
     EnumModelItem _M_current_enum;
     QStringList _M_context;
     TemplateParameterList _M_current_template_parameters; // ### check me
diff --git a/ApiExtractor/parser/codemodel.cpp b/ApiExtractor/parser/codemodel.cpp
index df1a5fbf8..c0ecf8b73 100644
--- a/ApiExtractor/parser/codemodel.cpp
+++ b/ApiExtractor/parser/codemodel.cpp
@@ -446,9 +446,6 @@ void _CodeModelItem::formatKind(QDebug &d, int k)
     case Kind_Function:
         d << "FunctionModelItem";
         break;
-    case Kind_FunctionDefinition:
-        d << "FunctionDefinitionModelItem";
-        break;
     case Kind_Member:
         d << "MemberModelItem";
         break;
@@ -615,11 +612,6 @@ void _ScopeModelItem::addEnumsDeclaration(const QString &enumsDeclaration)
     m_enumsDeclarations << enumsDeclaration;
 }
 
-FunctionDefinitionList _ScopeModelItem::functionDefinitions() const
-{
-    return m_functionDefinitions.values();
-}
-
 void _ScopeModelItem::addClass(ClassModelItem item)
 {
     m_classes.append(item);
@@ -630,11 +622,6 @@ void _ScopeModelItem::addFunction(FunctionModelItem item)
     m_functions.insert(item->name(), item);
 }
 
-void _ScopeModelItem::addFunctionDefinition(FunctionDefinitionModelItem item)
-{
-    m_functionDefinitions.insert(item->name(), item);
-}
-
 void _ScopeModelItem::addVariable(VariableModelItem item)
 {
     m_variables.append(item);
@@ -691,7 +678,6 @@ void _ScopeModelItem::formatScopeItemsDebug(QDebug &d) const
     formatScopeList(d, ", classes=", m_classes, "\n", true);
     formatScopeList(d, ", enums=", m_enums, "\n", true);
     formatScopeList(d, ", aliases=", m_typeDefs, "\n", true);
-    formatScopeHash(d, ", functionDefs=", m_functionDefinitions, "\n", true);
     formatScopeHash(d, ", functions=", m_functions, "\n", true);
     formatScopeList(d, ", variables=", m_variables);
 }
@@ -753,11 +739,6 @@ FunctionList _ScopeModelItem::findFunctions(const QString &name) const
     return m_functions.values(name);
 }
 
-FunctionDefinitionList _ScopeModelItem::findFunctionDefinitions(const QString &name) const
-{
-    return m_functionDefinitions.values(name);
-}
-
 // ---------------------------------------------------------------------------
 _NamespaceModelItem::~_NamespaceModelItem()
 {
@@ -932,10 +913,6 @@ void _FunctionModelItem::setInvokable(bool isInvokable)
     m_isInvokable = isInvokable;
 }
 
-_FunctionDefinitionModelItem::~_FunctionDefinitionModelItem()
-{
-}
-
 #ifndef QT_NO_DEBUG_STREAM
 void _FunctionModelItem::formatDebug(QDebug &d) const
 {
diff --git a/ApiExtractor/parser/codemodel.h b/ApiExtractor/parser/codemodel.h
index d32bdd1cd..66a107ab9 100644
--- a/ApiExtractor/parser/codemodel.h
+++ b/ApiExtractor/parser/codemodel.h
@@ -233,7 +233,6 @@ public:
         Kind_Enum = 3 << FirstKind,
         Kind_Enumerator = 4 << FirstKind,
         Kind_File = 5 << FirstKind | Kind_Namespace,
-        Kind_FunctionDefinition = 6 << FirstKind | Kind_Function,
         Kind_TemplateParameter = 7 << FirstKind,
         Kind_TypeDef = 8 << FirstKind,
         Kind_Variable = 9 << FirstKind | Kind_Member
@@ -299,7 +298,6 @@ public:
 
     ClassList classes() const { return m_classes; }
     EnumList enums() const { return m_enums; }
-    FunctionDefinitionList functionDefinitions() const;
     FunctionList functions() const;
     TypeDefList typeDefs() const { return m_typeDefs; }
     VariableList variables() const { return m_variables; }
@@ -307,13 +305,11 @@ public:
     void addClass(ClassModelItem item);
     void addEnum(EnumModelItem item);
     void addFunction(FunctionModelItem item);
-    void addFunctionDefinition(FunctionDefinitionModelItem item);
     void addTypeDef(TypeDefModelItem item);
     void addVariable(VariableModelItem item);
 
     ClassModelItem findClass(const QString &name) const;
     EnumModelItem findEnum(const QString &name) const;
-    FunctionDefinitionList findFunctionDefinitions(const QString &name) const;
     FunctionList findFunctions(const QString &name) const;
     TypeDefModelItem findTypeDef(const QString &name) const;
     VariableModelItem findVariable(const QString &name) const;
@@ -321,7 +317,6 @@ public:
     void addEnumsDeclaration(const QString &enumsDeclaration);
     QStringList enumsDeclarations() const { return m_enumsDeclarations; }
 
-    inline QMultiHash<QString, FunctionDefinitionModelItem> functionDefinitionMap() const { return m_functionDefinitions; }
     inline QMultiHash<QString, FunctionModelItem> functionMap() const { return m_functions; }
 
     FunctionModelItem declaredFunction(FunctionModelItem item);
@@ -345,7 +340,6 @@ private:
     EnumList m_enums;
     TypeDefList m_typeDefs;
     VariableList m_variables;
-    QMultiHash<QString, FunctionDefinitionModelItem> m_functionDefinitions;
     QMultiHash<QString, FunctionModelItem> m_functions;
 
 private:
@@ -585,18 +579,6 @@ private:
     };
 };
 
-class _FunctionDefinitionModelItem: public _FunctionModelItem
-{
-public:
-    DECLARE_MODEL_NODE(FunctionDefinition)
-
-    explicit _FunctionDefinitionModelItem(CodeModel *model, int kind = __node_kind)
-        : _FunctionModelItem(model, kind) {}
-    explicit _FunctionDefinitionModelItem(CodeModel *model, const QString &name, int kind = __node_kind)
-        : _FunctionModelItem(model, name, kind) {}
-    ~_FunctionDefinitionModelItem();
-};
-
 class _VariableModelItem: public _MemberModelItem
 {
 public:
diff --git a/ApiExtractor/parser/codemodel_fwd.h b/ApiExtractor/parser/codemodel_fwd.h
index 087e06ce5..676bda872 100644
--- a/ApiExtractor/parser/codemodel_fwd.h
+++ b/ApiExtractor/parser/codemodel_fwd.h
@@ -42,7 +42,6 @@ class _CodeModelItem;
 class _EnumModelItem;
 class _EnumeratorModelItem;
 class _FileModelItem;
-class _FunctionDefinitionModelItem;
 class _FunctionModelItem;
 class _NamespaceModelItem;
 class _ScopeModelItem;
@@ -58,7 +57,6 @@ typedef QSharedPointer<_CodeModelItem> CodeModelItem;
 typedef QSharedPointer<_EnumModelItem> EnumModelItem;
 typedef QSharedPointer<_EnumeratorModelItem> EnumeratorModelItem;
 typedef QSharedPointer<_FileModelItem> FileModelItem;
-typedef QSharedPointer<_FunctionDefinitionModelItem> FunctionDefinitionModelItem;
 typedef QSharedPointer<_FunctionModelItem> FunctionModelItem;
 typedef QSharedPointer<_NamespaceModelItem> NamespaceModelItem;
 typedef QSharedPointer<_ScopeModelItem> ScopeModelItem;
@@ -73,7 +71,6 @@ typedef QList<CodeModelItem> ItemList;
 typedef QList<EnumModelItem> EnumList;
 typedef QList<EnumeratorModelItem> EnumeratorList;
 typedef QList<FileModelItem> FileList;
-typedef QList<FunctionDefinitionModelItem> FunctionDefinitionList;
 typedef QList<FunctionModelItem> FunctionList;
 typedef QList<NamespaceModelItem> NamespaceList;
 typedef QList<ScopeModelItem> ScopeList;