comparison panner.cpp @ 136:d66fcf2e0342

* Avoid null pointer dereference
author Chris Cannam
date Tue, 30 Nov 2010 13:50:58 +0000
parents aaeab914f2a3
children a6d336837ebe
comparison
equal deleted inserted replaced
135:908a1fdeed6a 136:d66fcf2e0342
70 this, SLOT(slotSceneChanged(const QList<QRectF> &))); 70 this, SLOT(slotSceneChanged(const QList<QRectF> &)));
71 disconnect(scene(), SIGNAL(sceneRectChanged(const QRectF &)), 71 disconnect(scene(), SIGNAL(sceneRectChanged(const QRectF &)),
72 this, SLOT(slotSceneRectChanged(const QRectF &))); 72 this, SLOT(slotSceneRectChanged(const QRectF &)));
73 } 73 }
74 QGraphicsView::setScene(s); 74 QGraphicsView::setScene(s);
75 m_cache = QPixmap();
75 if (scene()) { 76 if (scene()) {
76 QRectF r = sceneRect(); 77 QRectF r = sceneRect();
77 DEBUG << "scene rect: " << r << ", my rect " << rect() << endl; 78 DEBUG << "scene rect: " << r << ", my rect " << rect() << endl;
78 fit(r); 79 fit(r);
79 } 80 connect(scene(), SIGNAL(changed(const QList<QRectF> &)),
80 m_cache = QPixmap(); 81 this, SLOT(slotSceneChanged(const QList<QRectF> &)));
81 connect(scene(), SIGNAL(changed(const QList<QRectF> &)), 82 connect(scene(), SIGNAL(sceneRectChanged(const QRectF &)),
82 this, SLOT(slotSceneChanged(const QList<QRectF> &))); 83 this, SLOT(slotSceneRectChanged(const QRectF &)));
83 connect(scene(), SIGNAL(sceneRectChanged(const QRectF &)), 84 }
84 this, SLOT(slotSceneRectChanged(const QRectF &)));
85 } 85 }
86 86
87 void 87 void
88 Panner::connectToPanned(Panned *p) 88 Panner::connectToPanned(Panned *p)
89 { 89 {