Commit cf2410e7 authored by Jan Möbius's avatar Jan Möbius

Removed QLinkedList with std::list

parent 1a2c617b
......@@ -189,7 +189,7 @@ QPolygonF WayFind::findWay(Connection *_conn, QPoint _from, QPoint _to)
if (!map_.contains (QPair<int,int>(x1, y1)))
{
ll_ = new Node (counter_);
nodes_.append (ll_);
nodes_.push_back (ll_);
ll_->pos_ = QPoint (x1, y1);
map_.insert (QPair<int,int>(x1, y1), ll_);
......@@ -248,7 +248,7 @@ QPolygonF WayFind::findWay(Connection *_conn, QPoint _from, QPoint _to)
if (bb.contains (p))
{
Node *nn = new Node (counter_);
nodes_.append (nn);
nodes_.push_back (nn);
n->n_[i] = nn;
......@@ -480,7 +480,7 @@ void VSI::WayFind::cleanup()
if ((counter_ & 0x7f) != 0)
return;
QLinkedList<Node *>::iterator it = nodes_.begin();
std::list<Node *>::iterator it = nodes_.begin();
while (it != nodes_.end ())
{
......
......@@ -48,7 +48,7 @@
#include <QRegion>
#include <QPolygonF>
#include <QPoint>
#include <QLinkedList>
#include <list>
//== NAMESPACES ===============================================================
namespace VSI {
......@@ -135,7 +135,7 @@ class WayFind {
unsigned int counter_;
QLinkedList<Node *> nodes_;
std::list<Node *> nodes_;
QHash<QPair<int, int>, Node*> map_;
Node *ll_;
......
......@@ -150,7 +150,7 @@ void ZoomButton::wheelEvent (QGraphicsSceneWheelEvent *_event)
qreal delta;
if (_event->delta () > 0)
if (_event->delta() > 0)
delta = 1.25;
else
delta = 0.8;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment