Remove obsolete things; change type to auto

Author: YuriUfimtsev

generator/parser/codemodel.h

@@ -44,7 +44,6 @@
 #define CODEMODEL_H
 
 #include "codemodel_fwd.h"
-#include <codemodel_pointer.h>
 
 #include <QtCore/QHash>
 #include <QtCore/QList>
@@ -56,16 +55,6 @@
 
 #define DECLARE_MODEL_NODE(k) \
     enum { __node_kind = Kind_##k }; \
-    typedef CodeModelPointer<k##ModelItem> Pointer;
-
-template <class _Target, class _Source>
-_Target model_static_cast(_Source item)
-{
-  typedef typename _Target::Type * _Target_pointer;
-
-  _Target ptr (static_cast<_Target_pointer>(item.data()));
-  return ptr;
-}
 
 class CodeModel
 {
@@ -196,7 +185,7 @@ struct TypeInfo
   bool m_rvalue_reference { false };
 };
 
-class _CodeModelItem: public QSharedData
+class _CodeModelItem
 {
 public:
   enum Kind
@@ -750,41 +739,6 @@ class _TemplateParameterModelItem: public _CodeModelItem
   _TemplateParameterModelItem(const _TemplateParameterModelItem &other);
   void operator = (const _TemplateParameterModelItem &other);
 };
-
-template <class _Target, class _Source>
-_Target model_safe_cast(_Source item)
-{
-  typedef typename _Target::Type * _Target_pointer;
-  typedef typename _Source::Type * _Source_pointer;
-
-  _Source_pointer source = item.data();
-  if (source && source->kind() == _Target_pointer(0)->__node_kind)
-    {
-      _Target ptr(static_cast<_Target_pointer>(source));
-      return ptr;
-    }
-
-  return _Target();
-}
-
-template <typename _Target, typename _Source>
-_Target model_dynamic_cast(_Source item)
-{
-  typedef typename _Target::Type * _Target_pointer;
-  typedef typename _Source::Type * _Source_pointer;
-
-  _Source_pointer source = item.data();
-  if (source && (source->kind() == _Target_pointer(0)->__node_kind
-         || (int(_Target_pointer(0)->__node_kind) <= int(_CodeModelItem::KindMask)
-             && ((source->kind() & _Target_pointer(0)->__node_kind)
-                  == _Target_pointer(0)->__node_kind))))
-    {
-      _Target ptr(static_cast<_Target_pointer>(source));
-      return ptr;
-    }
-
-  return _Target();
-}
 #endif // CODEMODEL_H
 
 // kate: space-indent on; indent-width 2; replace-tabs on;

generator/parser/codemodel_pointer.h

@@ -176,9 +176,9 @@ static QSet<QString> _builtinListTypes = QSet<QString>() << "QByteArray"
 << "QMatrix4x4"
 << "QVariant";
 
-static void addListRegistration(AbstractMetaType* type, QSet<QString>& output) {
+static void addListRegistration(AbstractMetaType::shared_pointer type, QSet<QString>& output) {
   if (type->instantiations().size() > 0) {
-    QList<AbstractMetaType::shared_pointer> args = type->instantiations();
+    auto &args = type->instantiations();
 
     /*
     QString debugStr;