neurolab/neurolab.patch

   1 diff -aur src/kulibali-neurocogling-4753a4340456/src/griditems/gridedgeitem.cpp src.diff//kulibali-neurocogling-4753a4340456/src/griditems/gridedgeitem.cpp
   2 --- src/kulibali-neurocogling-4753a4340456/src/griditems/gridedgeitem.cpp       2011-04-07 19:19:25.000000000 +0200
   3 +++ src.diff//kulibali-neurocogling-4753a4340456/src/griditems/gridedgeitem.cpp 2011-04-09 18:07:10.000000000 +0200
   4 @@ -350,7 +350,7 @@
   5          QSet<NeuroItem *> toAdd;
   6          foreach (NeuroItem *item, _connections1)
   7          {
   8 -            IdType wanted_id = reinterpret_cast<IdType>(item);
   9 +            IdType wanted_id = (*reinterpret_cast<IdType *>(item));
  10              NeuroItem *wanted_item = idMap[wanted_id];
  11              if (wanted_item)
  12                  toAdd.insert(wanted_item);
  13 @@ -362,7 +362,7 @@
  14          toAdd.clear();
  15          foreach (NeuroItem *item, _connections2)
  16          {
  17 -            IdType wanted_id = reinterpret_cast<IdType>(item);
  18 +            IdType wanted_id = (*reinterpret_cast<IdType *>(item));
  19              NeuroItem *wanted_item = idMap[wanted_id];
  20              if (wanted_item)
  21                  toAdd.insert(wanted_item);
  22 diff -aur src/kulibali-neurocogling-4753a4340456/src/griditems/multigridioitem.cpp src.diff//kulibali-neurocogling-4753a4340456/src/griditems/multigridioitem.cpp
  23 --- src/kulibali-neurocogling-4753a4340456/src/griditems/multigridioitem.cpp    2011-04-07 19:19:25.000000000 +0200
  24 +++ src.diff//kulibali-neurocogling-4753a4340456/src/griditems/multigridioitem.cpp      2011-04-09 18:08:31.000000000 +0200
  25 @@ -255,7 +255,7 @@
  26
  27      void MultiGridIOItem::idsToPointers(const QMap<NeuroItem::IdType, NeuroItem *> &idMap)
  28      {
  29 -        IdType wanted_id = reinterpret_cast<IdType>(_top_item);
  30 +        IdType wanted_id = (*reinterpret_cast<IdType *>(_top_item));
  31          if (wanted_id != 0)
  32          {
  33              NeuroNetworkItem *ni = dynamic_cast<NeuroNetworkItem *>(idMap[wanted_id]);
  34 @@ -263,7 +263,7 @@
  35                  _top_item = ni;
  36          }
  37
  38 -        wanted_id = reinterpret_cast<IdType>(_bottom_item);
  39 +        wanted_id = (*reinterpret_cast<IdType *>(_bottom_item));
  40          if (wanted_id != 0)
  41          {
  42              NeuroNetworkItem *ni = dynamic_cast<NeuroNetworkItem *>(idMap[wanted_id]);
  43 diff -aur src/kulibali-neurocogling-4753a4340456/src/griditems/neurogriditem.cpp src.diff//kulibali-neurocogling-4753a4340456/src/griditems/neurogriditem.cpp
  44 --- src/kulibali-neurocogling-4753a4340456/src/griditems/neurogriditem.cpp      2011-04-07 19:19:25.000000000 +0200
  45 +++ src.diff//kulibali-neurocogling-4753a4340456/src/griditems/neurogriditem.cpp        2011-04-09 18:05:43.000000000 +0200
  46 @@ -860,7 +860,7 @@
  47
  48          foreach (NeuroNetworkItem *ni, _top_connections)
  49          {
  50 -            IdType wanted_id = reinterpret_cast<IdType>(ni);
  51 +            IdType wanted_id = (*reinterpret_cast<IdType *>(ni));
  52              NeuroNetworkItem *wanted_item = dynamic_cast<NeuroNetworkItem *>(idMap[wanted_id]);
  53
  54              if (wanted_item)
  55 @@ -874,7 +874,7 @@
  56          toAdd.clear();
  57          foreach (NeuroNetworkItem *ni, _bottom_connections)
  58          {
  59 -            IdType wanted_id = reinterpret_cast<IdType>(ni);
  60 +            IdType wanted_id = (*reinterpret_cast<IdType *>(ni));
  61              NeuroNetworkItem *wanted_item = dynamic_cast<NeuroNetworkItem *>(idMap[wanted_id]);
  62
  63              if (wanted_item)
  64 @@ -890,7 +890,7 @@
  65          QMap<NeuroNetworkItem *, QMap<Index, Index> >::const_iterator i = _edges.constBegin(), end = _edges.constEnd();
  66          while (i != end)
  67          {
  68 -            IdType wanted_id = reinterpret_cast<IdType>(i.key());
  69 +            IdType wanted_id = (*reinterpret_cast<IdType *>(i.key()));
  70              NeuroNetworkItem *wanted_item = dynamic_cast<NeuroNetworkItem *>(idMap[wanted_id]);
  71              if (wanted_item)
  72                  new_edges[wanted_item] = i.value();
  73 diff -aur src/kulibali-neurocogling-4753a4340456/src/neurogui/compact/compactnodeitem.cpp src.diff//kulibali-neurocogling-4753a4340456/src/neurogui/compact/compactnodeitem.cpp
  74 --- src/kulibali-neurocogling-4753a4340456/src/neurogui/compact/compactnodeitem.cpp     2011-04-07 19:19:25.000000000 +0200
  75 +++ src.diff//kulibali-neurocogling-4753a4340456/src/neurogui/compact/compactnodeitem.cpp       2011-04-09 17:58:41.000000000 +0200
  76 @@ -285,13 +285,13 @@
  77      {
  78          CompactItem::idsToPointers(idMap);
  79
  80 -        IdType wanted_id = reinterpret_cast<IdType>(_tipLinkItem);
  81 +        IdType wanted_id = (*reinterpret_cast<IdType *>(_tipLinkItem));
  82          _tipLinkItem = idMap[wanted_id]; // can be null
  83
  84          QList<NeuroItem *> itemsToAdd;
  85          foreach (NeuroItem *ni, _baseLinkItems)
  86          {
  87 -            wanted_id = reinterpret_cast<IdType>(ni);
  88 +            wanted_id = (*reinterpret_cast<IdType *>(ni));
  89              NeuroItem *wanted_item = idMap[wanted_id];
  90
  91              if (wanted_item)
  92 diff -aur src/kulibali-neurocogling-4753a4340456/src/neurogui/compact/compactoritem.cpp src.diff//kulibali-neurocogling-4753a4340456/src/neurogui/compact/compactoritem.cpp
  93 --- src/kulibali-neurocogling-4753a4340456/src/neurogui/compact/compactoritem.cpp       2011-04-07 19:19:25.000000000 +0200
  94 +++ src.diff//kulibali-neurocogling-4753a4340456/src/neurogui/compact/compactoritem.cpp 2011-04-09 17:59:35.000000000 +0200
  95 @@ -391,7 +391,7 @@
  96          QSet<NeuroItem *> itemsToAdd;
  97          foreach (NeuroItem *ni, _shortcutItems)
  98          {
  99 -            NeuroItem::IdType wanted_id = reinterpret_cast<NeuroItem::IdType>(ni);
 100 +            NeuroItem::IdType wanted_id = (*reinterpret_cast<NeuroItem::IdType *>(ni));
 101              NeuroItem *wanted_item = idMap[wanted_id];
 102
 103              if (wanted_item)
 104 diff -aur src/kulibali-neurocogling-4753a4340456/src/neurogui/mixins/mixinarrow.cpp src.diff//kulibali-neurocogling-4753a4340456/src/neurogui/mixins/mixinarrow.cpp
 105 --- src/kulibali-neurocogling-4753a4340456/src/neurogui/mixins/mixinarrow.cpp   2011-04-07 19:19:25.000000000 +0200
 106 +++ src.diff//kulibali-neurocogling-4753a4340456/src/neurogui/mixins/mixinarrow.cpp     2011-04-09 17:57:35.000000000 +0200
 107 @@ -413,7 +413,7 @@
 108
 109      void MixinArrow::idsToPointers(const QMap<NeuroItem::IdType, NeuroItem *> & idMap)
 110      {
 111 -        NeuroItem::IdType frontId = reinterpret_cast<NeuroItem::IdType>(_frontLinkTarget);
 112 +        NeuroItem::IdType frontId = (*reinterpret_cast<NeuroItem::IdType *>(_frontLinkTarget));
 113          NeuroItem *frontItem = idMap[frontId];
 114
 115          if (frontId && frontItem)
 116 @@ -425,7 +425,7 @@
 117              throw Common::FileFormatError(QObject::tr("Link in file has dangling ID: %1").arg(frontId));
 118          }
 119
 120 -        NeuroItem::IdType backId = reinterpret_cast<NeuroItem::IdType>(_backLinkTarget);
 121 +        NeuroItem::IdType backId = (*reinterpret_cast<NeuroItem::IdType *>(_backLinkTarget));
 122          NeuroItem *backItem = idMap[backId];
 123
 124          if (backId && backItem)
 125 @@ -442,7 +442,7 @@
 126
 127          foreach (NeuroItem *ni, _incoming)
 128          {
 129 -            NeuroItem::IdType wanted_id = reinterpret_cast<NeuroItem::IdType>(ni);
 130 +            NeuroItem::IdType wanted_id = (*reinterpret_cast<NeuroItem::IdType *>(ni));
 131              NeuroItem *wanted_item = idMap[wanted_id];
 132
 133              if (wanted_item)
 134 diff -aur src/kulibali-neurocogling-4753a4340456/src/neurogui/neuroitem.cpp src.diff//kulibali-neurocogling-4753a4340456/src/neurogui/neuroitem.cpp
 135 --- src/kulibali-neurocogling-4753a4340456/src/neurogui/neuroitem.cpp   2011-04-07 19:19:25.000000000 +0200
 136 +++ src.diff//kulibali-neurocogling-4753a4340456/src/neurogui/neuroitem.cpp     2011-04-09 17:21:57.000000000 +0200
 137 @@ -842,7 +842,7 @@
 138
 139          foreach (NeuroItem *ni, _connections)
 140          {
 141 -            IdType wanted_id = reinterpret_cast<IdType>(ni);
 142 +            IdType wanted_id = (*reinterpret_cast<IdType *>(ni));
 143              NeuroItem *wanted_item = idMap[wanted_id];
 144
 145              if (wanted_item)
 146 diff -aur src/kulibali-neurocogling-4753a4340456/src/neurogui/subnetwork/subconnectionitem.cpp src.diff//kulibali-neurocogling-4753a4340456/src/neurogui/subnetwork/subconnectionitem.cpp
 147 --- src/kulibali-neurocogling-4753a4340456/src/neurogui/subnetwork/subconnectionitem.cpp        2011-04-07 19:19:25.000000000 +0200
 148 +++ src.diff//kulibali-neurocogling-4753a4340456/src/neurogui/subnetwork/subconnectionitem.cpp  2011-04-09 17:56:30.000000000 +0200
 149 @@ -358,7 +358,7 @@
 150          NeuroNetworkItem::idsToPointers(idMap);
 151          MixinArrow::idsToPointers(idMap);
 152
 153 -        NeuroItem::IdType governingId = reinterpret_cast<NeuroItem::IdType>(_governingItem);
 154 +        NeuroItem::IdType governingId = (*reinterpret_cast<NeuroItem::IdType *>(_governingItem));
 155          NeuroItem *wanted_item = idMap[governingId];
 156
 157          if (governingId && wanted_item)
 158 @@ -370,7 +370,7 @@
 159              throw Common::FileFormatError(tr("Subconnection item in file has dangling governing item: %1").arg(governingId));
 160          }
 161
 162 -        NeuroItem::IdType parentId = reinterpret_cast<NeuroItem::IdType>(_parentSubnetworkItem);
 163 +        NeuroItem::IdType parentId = (*reinterpret_cast<NeuroItem::IdType *>(_parentSubnetworkItem));
 164          SubNetworkItem *wanted_parent = dynamic_cast<SubNetworkItem *>(idMap[parentId]);
 165
 166          if (parentId && wanted_parent)
 167 diff -aur src/kulibali-neurocogling-4753a4340456/src/neurogui/subnetwork/subnetworkitem.cpp src.diff//kulibali-neurocogling-4753a4340456/src/neurogui/subnetwork/subnetworkitem.cpp
 168 --- src/kulibali-neurocogling-4753a4340456/src/neurogui/subnetwork/subnetworkitem.cpp   2011-04-07 19:19:25.000000000 +0200
 169 +++ src.diff//kulibali-neurocogling-4753a4340456/src/neurogui/subnetwork/subnetworkitem.cpp     2011-04-09 17:33:27.000000000 +0200
 170 @@ -402,8 +402,8 @@
 171          {
 172              SubConnectionItem *val_ptr = _subconnections[key_ptr];
 173
 174 -            NeuroItem::IdType key_id = reinterpret_cast<NeuroItem::IdType>(key_ptr);
 175 -            NeuroItem::IdType val_id = reinterpret_cast<NeuroItem::IdType>(val_ptr);
 176 +            NeuroItem::IdType key_id = (*reinterpret_cast<const NeuroItem::IdType *>(key_ptr));
 177 +            NeuroItem::IdType val_id = (*reinterpret_cast<NeuroItem::IdType *>(val_ptr));
 178
 179              key_ptr = idMap[key_id];
 180              val_ptr = dynamic_cast<SubConnectionItem *>(idMap[val_id]);