mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-02-04 02:49:59 +01:00
Corrections diverses
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@204 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
@@ -78,8 +78,7 @@ Conductor::~Conductor() {
|
||||
if (!isDestroyed()) destroy();
|
||||
|
||||
// supprime les segments
|
||||
while (segments -> hasNextSegment()) delete segments -> nextSegment();
|
||||
delete segments;
|
||||
deleteSegments();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -780,14 +779,7 @@ QList<QPointF> Conductor::segmentsToPoints() const {
|
||||
*/
|
||||
void Conductor::pointsToSegments(QList<QPointF> points_list) {
|
||||
// supprime les segments actuels
|
||||
if (segments != NULL) {
|
||||
ConductorSegment *segment = segments;
|
||||
while (segment -> hasNextSegment()) {
|
||||
ConductorSegment *nextsegment = segment -> nextSegment();
|
||||
delete segment;
|
||||
segment = nextsegment;
|
||||
}
|
||||
}
|
||||
deleteSegments();
|
||||
|
||||
// cree les segments a partir de la liste de points
|
||||
ConductorSegment *last_segment = NULL;
|
||||
@@ -1243,3 +1235,12 @@ void Conductor::setProfiles(const ConductorProfilesGroup &cpg) {
|
||||
calculateTextItemPosition();
|
||||
}
|
||||
}
|
||||
|
||||
/// Supprime les segments
|
||||
void Conductor::deleteSegments() {
|
||||
if (segments != NULL) {
|
||||
while (segments -> hasNextSegment()) delete segments -> nextSegment();
|
||||
delete segments;
|
||||
segments = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user