Corrections diverses

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@204 bfdf4180-ca20-0410-9c96-a3a8aa849046

conductor.cpp

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

conductor.h

@@ -108,6 +108,7 @@ class Conductor : public QGraphicsPathItem {
 	bool hasClickedOn(QPointF, QPointF) const;
 	void calculateTextItemPosition();
 	Qt::Corner currentPathType() const;
+	void deleteSegments();
 	static int getCoeff(const qreal &, const qreal &);
 	static int getSign(const qreal &);
 	QHash<ConductorSegmentProfile *, qreal> shareOffsetBetweenSegments(const qreal &offset, const QList<ConductorSegmentProfile *> &, const qreal & = 0.01) const;

diagram.cpp

@@ -38,6 +38,8 @@ Diagram::Diagram(QObject *parent) :
 	Destructeur
 */
 Diagram::~Diagram() {
+	if (conductor_setter -> scene()) removeItem(conductor_setter);
+	delete conductor_setter;
 }
 
 /**

editor/qetelementeditor.cpp

@@ -155,11 +155,11 @@ void QETElementEditor::setupActions() {
 }
 
 void QETElementEditor::setupMenus() {
-	file_menu    = new QMenu(tr("Fichier"));
-	edit_menu    = new QMenu(tr("\311dition"));
-	display_menu = new QMenu(tr("Affichage"));
-	tools_menu   = new QMenu(tr("Outils"));
-	help_menu    = new QMenu(tr("Aide"));
+	file_menu    = new QMenu(tr("Fichier"),    this);
+	edit_menu    = new QMenu(tr("\311dition"), this);
+	display_menu = new QMenu(tr("Affichage"),  this);
+	tools_menu   = new QMenu(tr("Outils"),     this);
+	help_menu    = new QMenu(tr("Aide"),       this);
 	
 	file_menu    -> setTearOffEnabled(true);
 	edit_menu    -> setTearOffEnabled(true);

element.h

@@ -28,7 +28,6 @@ class Element : public QGraphicsItem {
 	QSize   dimensions;
 	QPoint  hotspot_coord;
 	QPixmap apercu;
-	QMenu   menu;
 	
 	// methodes
 	public:

elementspanel.cpp

@@ -161,17 +161,17 @@ void ElementsPanel::addFile(QTreeWidgetItem *qtwi_parent, QString fichier) {
 	QString whats_this = tr("Ceci est un \351l\351ment que vous pouvez ins\351rer dans votre sch\351ma par cliquer-d\351placer");
 	QString tool_tip = tr("Cliquer-d\351posez cet \351l\351ment sur le sch\351ma pour ins\351rer un \351l\351ment ");
 	int etat;
-	CustomElement *elmt_perso = new CustomElement(fichier, 0, 0, &etat);
+	CustomElement elmt_perso(fichier, 0, 0, &etat);
 	if (etat != 0) {
 		qDebug() << "Le chargement du composant" << fichier << "a echoue avec le code d'erreur" << etat;
 		return;
 	}
-	QTreeWidgetItem *qtwi = new QTreeWidgetItem(qtwi_parent, QStringList(elmt_perso -> nom()));
-	qtwi -> setStatusTip(0, tool_tip + "\253 " + elmt_perso -> nom() + " \273");
-	qtwi -> setToolTip(0, elmt_perso -> nom());
+	QTreeWidgetItem *qtwi = new QTreeWidgetItem(qtwi_parent, QStringList(elmt_perso.nom()));
+	qtwi -> setStatusTip(0, tool_tip + "\253 " + elmt_perso.nom() + " \273");
+	qtwi -> setToolTip(0, elmt_perso.nom());
 	qtwi -> setWhatsThis(0, whats_this);
 	qtwi -> setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled);
-	qtwi -> setIcon(0, QIcon(elmt_perso -> pixmap()));
+	qtwi -> setIcon(0, QIcon(elmt_perso.pixmap()));
 	qtwi -> setData(0, 42, fichier);
 }
 

nameslist.cpp

@@ -151,16 +151,16 @@ bool NamesList::operator==(const NamesList &nl) const {
 	@param fallback_name Le nom a retourner si aucun nom approprie n'est trouve
 	@return Le nom approprie en fonction de la langue du systeme
 */
-const QString &NamesList::name(const QString &fallback_name) const {
+QString NamesList::name(const QString &fallback_name) const {
 	// recupere les deux premiers caracteres de la locale en cours du systeme
 	QString system_language = QLocale::system().name().left(2);
-	QString *returned_name;
-	if (hash_names[system_language] != QString()) {
-		returned_name = new QString(hash_names[system_language]);
-	} else if (hash_names["en"] != QString()) {
-		returned_name = new QString(hash_names["en"]);
+	QString returned_name;
+	if (!hash_names[system_language].isEmpty()) {
+		returned_name = hash_names[system_language];
+	} else if (!hash_names["en"].isEmpty()) {
+		returned_name = hash_names["en"];
 	} else {
-		returned_name = new QString(fallback_name);
+		returned_name = fallback_name;
 	}
-	return(*returned_name);
+	return(returned_name);
 }

nameslist.h

@@ -33,7 +33,7 @@ class NamesList {
 	const QString operator[](const QString &) const;
 	bool operator!=(const NamesList &) const;
 	bool operator==(const NamesList &) const;
-	const QString &name(const QString & = QString()) const;
+	QString name(const QString & = QString()) const;
 	
 	// methodes relatives a XML
 	void fromXml(const QDomElement &);

qetapp.cpp

@@ -104,6 +104,7 @@ QETApp::QETApp(int &argc, char **argv) : QApplication(argc, argv) {
 
 /// Destructeur
 QETApp::~QETApp() {
+	delete qsti;
 }
 
 /**

qetdiagrameditor.cpp

@@ -395,7 +395,7 @@ void QETDiagramEditor::menus() {
 	menu_edition -> addAction(shrink_diagram);
 	
 	// menu Configurer > Afficher
-	QMenu *menu_aff_aff = new QMenu(tr("Afficher"));
+	QMenu *menu_aff_aff = new QMenu(tr("Afficher"), this);
 	menu_aff_aff -> setIcon(QIcon(":/ico/toolbars.png"));
 	menu_aff_aff -> setTearOffEnabled(true);
 	menu_aff_aff -> addAction(main_bar -> toggleViewAction());