aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-01-31 15:12:15 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-02-01 12:01:27 +0000
commitf1191ecdb60b37d97e39617469b622818d4c4044 (patch)
tree53791dc10f1f37ad924bb6f4fb2f526daad4a8ac
parent3498ce1f922fa09491ea0050c98ca1ad17d9d74f (diff)
Code model: Remove unused functions
Remove unused remove() functions and setters and other left-overs. Task-number: PYSIDE-323 Change-Id: Icb815da21422c8989de0103631633b63c1d65f4a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r--ApiExtractor/parser/codemodel.cpp108
-rw-r--r--ApiExtractor/parser/codemodel.h21
2 files changed, 0 insertions, 129 deletions
diff --git a/ApiExtractor/parser/codemodel.cpp b/ApiExtractor/parser/codemodel.cpp
index d143eac6f..5c6cc0aea 100644
--- a/ApiExtractor/parser/codemodel.cpp
+++ b/ApiExtractor/parser/codemodel.cpp
@@ -43,12 +43,6 @@ CodeModel::~CodeModel()
{
}
-void CodeModel::wipeout()
-{
- _M_globalNamespace.reset(new _NamespaceModelItem(this));
- _M_files.clear();
-}
-
FileList CodeModel::files() const
{
return _M_files.values();
@@ -64,24 +58,11 @@ void CodeModel::addFile(FileModelItem item)
_M_files.insert(item->name(), item);
}
-void CodeModel::removeFile(FileModelItem item)
-{
- QHash<QString, FileModelItem>::Iterator it = _M_files.find(item->name());
-
- if (it != _M_files.end() && it.value() == item)
- _M_files.erase(it);
-}
-
FileModelItem CodeModel::findFile(const QString &name) const
{
return _M_files.value(name);
}
-QHash<QString, FileModelItem> CodeModel::fileMap() const
-{
- return _M_files;
-}
-
CodeModelItem CodeModel::findItem(const QStringList &qualifiedName, CodeModelItem scope) const
{
for (int i = 0; i < qualifiedName.size(); ++i) {
@@ -295,11 +276,6 @@ int _CodeModelItem::kind() const
return _M_kind;
}
-void _CodeModelItem::setKind(int kind)
-{
- _M_kind = kind;
-}
-
QStringList _CodeModelItem::qualifiedName() const
{
QStringList q = scope();
@@ -471,11 +447,6 @@ void _ClassModelItem::addBaseClass(const QString &baseClass)
_M_baseClasses.append(baseClass);
}
-void _ClassModelItem::removeBaseClass(const QString &baseClass)
-{
- _M_baseClasses.removeAt(_M_baseClasses.indexOf(baseClass));
-}
-
bool _ClassModelItem::extendsClass(const QString &name) const
{
return _M_baseClasses.contains(name);
@@ -616,68 +587,6 @@ void _ScopeModelItem::addEnum(EnumModelItem item)
_M_enumNames.append(item->name());
}
-void _ScopeModelItem::removeClass(ClassModelItem item)
-{
- QHash<QString, ClassModelItem>::Iterator it = _M_classes.find(item->name());
-
- if (it != _M_classes.end() && it.value() == item)
- _M_classes.erase(it);
-}
-
-void _ScopeModelItem::removeFunction(FunctionModelItem item)
-{
- QMultiHash<QString, FunctionModelItem>::Iterator it = _M_functions.find(item->name());
-
- while (it != _M_functions.end() && it.key() == item->name()
- && it.value() != item) {
- ++it;
- }
-
- if (it != _M_functions.end() && it.value() == item) {
- _M_functions.erase(it);
- }
-}
-
-void _ScopeModelItem::removeFunctionDefinition(FunctionDefinitionModelItem item)
-{
- QMultiHash<QString, FunctionDefinitionModelItem>::Iterator it = _M_functionDefinitions.find(item->name());
-
- while (it != _M_functionDefinitions.end() && it.key() == item->name()
- && it.value() != item) {
- ++it;
- }
-
- if (it != _M_functionDefinitions.end() && it.value() == item) {
- _M_functionDefinitions.erase(it);
- }
-}
-
-void _ScopeModelItem::removeVariable(VariableModelItem item)
-{
- QHash<QString, VariableModelItem>::Iterator it = _M_variables.find(item->name());
-
- if (it != _M_variables.end() && it.value() == item)
- _M_variables.erase(it);
-}
-
-void _ScopeModelItem::removeTypeDef(TypeDefModelItem item)
-{
- QHash<QString, TypeDefModelItem>::Iterator it = _M_typeDefs.find(item->name());
-
- if (it != _M_typeDefs.end() && it.value() == item)
- _M_typeDefs.erase(it);
-}
-
-void _ScopeModelItem::removeEnum(EnumModelItem item)
-{
- QHash<QString, EnumModelItem>::Iterator it = _M_enums.find(item->name());
-
- if (it != _M_enums.end() && it.value() == item) {
- _M_enumNames.removeOne(item->name());
- _M_enums.erase(it);
- }
-}
-
#ifndef QT_NO_DEBUG_STREAM
template <class Hash>
static void formatScopeHash(QDebug &d, const char *prefix, const Hash &h)
@@ -755,13 +664,6 @@ void _NamespaceModelItem::addNamespace(NamespaceModelItem item)
{
_M_namespaces.insert(item->name(), item);
}
-void _NamespaceModelItem::removeNamespace(NamespaceModelItem item)
-{
- QHash<QString, NamespaceModelItem>::Iterator it = _M_namespaces.find(item->name());
-
- if (it != _M_namespaces.end() && it.value() == item)
- _M_namespaces.erase(it);
-}
NamespaceModelItem _NamespaceModelItem::findNamespace(const QString &name) const
{
@@ -856,11 +758,6 @@ void _FunctionModelItem::addArgument(ArgumentModelItem item)
_M_arguments.append(item);
}
-void _FunctionModelItem::removeArgument(ArgumentModelItem item)
-{
- _M_arguments.removeAt(_M_arguments.indexOf(item));
-}
-
CodeModel::FunctionType _FunctionModelItem::functionType() const
{
return _M_functionType;
@@ -999,11 +896,6 @@ void _EnumModelItem::addEnumerator(EnumeratorModelItem item)
_M_enumerators.append(item);
}
-void _EnumModelItem::removeEnumerator(EnumeratorModelItem item)
-{
- _M_enumerators.removeAt(_M_enumerators.indexOf(item));
-}
-
bool _EnumModelItem::isAnonymous() const
{
return _M_anonymous;
diff --git a/ApiExtractor/parser/codemodel.h b/ApiExtractor/parser/codemodel.h
index 9b945db6e..2d5875927 100644
--- a/ApiExtractor/parser/codemodel.h
+++ b/ApiExtractor/parser/codemodel.h
@@ -73,14 +73,10 @@ public:
NamespaceModelItem globalNamespace() const;
void addFile(FileModelItem item);
- void removeFile(FileModelItem item);
FileModelItem findFile(const QString &name) const;
- QHash<QString, FileModelItem> fileMap() const;
CodeModelItem findItem(const QStringList &qualifiedName, CodeModelItem scope) const;
- void wipeout();
-
private:
QHash<QString, FileModelItem> _M_files;
NamespaceModelItem _M_globalNamespace;
@@ -280,7 +276,6 @@ public:
protected:
explicit _CodeModelItem(CodeModel *model, int kind);
explicit _CodeModelItem(CodeModel *model, const QString &name, int kind);
- void setKind(int kind);
private:
CodeModel *_M_model;
@@ -289,7 +284,6 @@ private:
int _M_startColumn;
int _M_endLine;
int _M_endColumn;
- std::size_t _M_creation_id;
QString _M_name;
QString _M_fileName;
QStringList _M_scope;
@@ -320,13 +314,6 @@ public:
void addTypeDef(TypeDefModelItem item);
void addVariable(VariableModelItem item);
- void removeClass(ClassModelItem item);
- void removeEnum(EnumModelItem item);
- void removeFunction(FunctionModelItem item);
- void removeFunctionDefinition(FunctionDefinitionModelItem item);
- void removeTypeDef(TypeDefModelItem item);
- void removeVariable(VariableModelItem item);
-
ClassModelItem findClass(const QString &name) const;
EnumModelItem findEnum(const QString &name) const;
FunctionDefinitionList findFunctionDefinitions(const QString &name) const;
@@ -409,7 +396,6 @@ public:
void setBaseClasses(const QStringList &baseClasses);
void addBaseClass(const QString &baseClass);
- void removeBaseClass(const QString &baseClass);
TemplateParameterList templateParameters() const;
void setTemplateParameters(const TemplateParameterList &templateParameters);
@@ -451,7 +437,6 @@ public:
NamespaceList namespaces() const;
void addNamespace(NamespaceModelItem item);
- void removeNamespace(NamespaceModelItem item);
NamespaceModelItem findNamespace(const QString &name) const;
@@ -478,10 +463,6 @@ public:
explicit _FileModelItem(CodeModel *model, const QString &name, int kind = __node_kind)
: _NamespaceModelItem(model, name, kind) {}
~_FileModelItem();
-
-private:
- _FileModelItem(const _FileModelItem &other);
- void operator = (const _FileModelItem &other);
};
class _ArgumentModelItem: public _CodeModelItem
@@ -610,7 +591,6 @@ public:
ArgumentList arguments() const;
void addArgument(ArgumentModelItem item);
- void removeArgument(ArgumentModelItem item);
CodeModel::FunctionType functionType() const;
void setFunctionType(CodeModel::FunctionType functionType);
@@ -715,7 +695,6 @@ public:
EnumeratorList enumerators() const;
void addEnumerator(EnumeratorModelItem item);
- void removeEnumerator(EnumeratorModelItem item);
bool isAnonymous() const;
void setAnonymous(bool anonymous);