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:
xavierqet
2007-11-04 17:37:10 +00:00
parent 6c4a7ace87
commit 317256b134
10 changed files with 35 additions and 31 deletions

View File

@@ -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;
}
}