diff --git a/aboutqet.cpp b/aboutqet.cpp
index 35689b23c..455dc7784 100644
--- a/aboutqet.cpp
+++ b/aboutqet.cpp
@@ -15,6 +15,7 @@
You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see .
*/
+#include
#include "aboutqet.h"
#include "qet.h"
diff --git a/aboutqet.h b/aboutqet.h
index f47bba47e..26893b3ac 100644
--- a/aboutqet.h
+++ b/aboutqet.h
@@ -17,7 +17,7 @@
*/
#ifndef ABOUTQET_H
#define ABOUTQET_H
-#include
+#include
/**
Cette classe represente la boite de dialogue
« A propos de QElectroTech »
diff --git a/borderinset.cpp b/borderinset.cpp
index 62410a91e..db435ac5c 100644
--- a/borderinset.cpp
+++ b/borderinset.cpp
@@ -15,6 +15,7 @@
You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see .
*/
+#include
#include "borderinset.h"
#include "qetapp.h"
diff --git a/borderinset.h b/borderinset.h
index 0e17fb8f4..c69d55f84 100644
--- a/borderinset.h
+++ b/borderinset.h
@@ -20,8 +20,8 @@
#include "insetproperties.h"
#include
#include
-#include
#include
+class QPainter;
/**
Cette classe represente l'ensemble bordure + cartouche qui encadre le
schema electrique.
diff --git a/conductor.cpp b/conductor.cpp
index 239dda74b..ed58bcbc5 100644
--- a/conductor.cpp
+++ b/conductor.cpp
@@ -20,6 +20,7 @@
#include "conductor.h"
#include "conductorsegment.h"
#include "conductorsegmentprofile.h"
+#include "diagramtextitem.h"
#include "element.h"
#include "diagram.h"
#include "diagramcommands.h"
diff --git a/conductor.h b/conductor.h
index 6c48d4a3a..1c4014df6 100644
--- a/conductor.h
+++ b/conductor.h
@@ -21,8 +21,8 @@
#include "terminal.h"
#include "conductorprofile.h"
#include "conductorproperties.h"
-#include "diagramtextitem.h"
class ConductorSegment;
+class DiagramTextItem;
class Element;
typedef QPair ConductorBend;
typedef QHash ConductorProfilesGroup;
diff --git a/conductorpropertieswidget.cpp b/conductorpropertieswidget.cpp
index 1b1fa550d..0b97d4cf1 100644
--- a/conductorpropertieswidget.cpp
+++ b/conductorpropertieswidget.cpp
@@ -16,6 +16,7 @@
along with QElectroTech. If not, see .
*/
#include "conductorpropertieswidget.h"
+#include
#include "conductor.h"
/**
diff --git a/conductorpropertieswidget.h b/conductorpropertieswidget.h
index 7ad44d173..49423387b 100644
--- a/conductorpropertieswidget.h
+++ b/conductorpropertieswidget.h
@@ -17,8 +17,9 @@
*/
#ifndef CONDUCTOR_PROPERTIES_WIDGET_H
#define CONDUCTOR_PROPERTIES_WIDGET_H
-#include "conductor.h"
-#include
+#include "conductorproperties.h"
+#include
+
/**
Ce widget permet a l utilisateur d'editer les proprietes d'un conducteur.
Par proprietes, on entend non pas le trajet effectue par le conducteur mais
diff --git a/configpages.cpp b/configpages.cpp
index b9b669bc5..0c23fa8dc 100644
--- a/configpages.cpp
+++ b/configpages.cpp
@@ -16,7 +16,10 @@
along with QElectroTech. If not, see .
*/
#include "configpages.h"
+#include "conductorpropertieswidget.h"
+#include "insetpropertieswidget.h"
#include "qetapp.h"
+#include "qetdiagrameditor.h"
/**
Constructeur
diff --git a/configpages.h b/configpages.h
index d1eda9d3f..083444c19 100644
--- a/configpages.h
+++ b/configpages.h
@@ -18,8 +18,8 @@
#ifndef CONFIG_PAGES_H
#define CONFIG_PAGES_H
#include
-#include "conductorpropertieswidget.h"
-#include "insetpropertieswidget.h"
+class ConductorPropertiesWidget;
+class InsetPropertiesWidget;
/**
Cette classe abstraite contient les methodes que toutes les pages de
diff --git a/diagramcontent.cpp b/diagramcontent.cpp
index 8e32f42ae..cecc2a508 100644
--- a/diagramcontent.cpp
+++ b/diagramcontent.cpp
@@ -119,7 +119,7 @@ QString DiagramContent::sentence(int filter) const {
@param d Object QDebug a utiliser pour l'affichage des informations de debug
@param c Contenu de schema a debugger
*/
-QDebug &operator<<(QDebug d, DiagramContent &c) {
+QDebug &operator<<(QDebug d, DiagramContent &) {
d << "DiagramContent {" << "\n";
/*
FIXME Le double-heritage QObject / QGraphicsItem a casse cet operateur
@@ -127,7 +127,7 @@ QDebug &operator<<(QDebug d, DiagramContent &c) {
d << " conductorsToUpdate :" << c.conductorsToUpdate.keys() << "\n";
d << " conductorsToMove :" << c.conductorsToMove << "\n";
d << " otherConductors :" << c.otherConductors << "\n";
- d << "}";
*/
+ d << "}";
return(d.space());
}
diff --git a/editor/polygoneditor.cpp b/editor/polygoneditor.cpp
index 3636f9211..1788d35d6 100644
--- a/editor/polygoneditor.cpp
+++ b/editor/polygoneditor.cpp
@@ -97,7 +97,7 @@ void PolygonEditor::updatePolygonClosedState() {
*/
void PolygonEditor::updateForm() {
activeConnections(false);
- while(points_list.takeTopLevelItem(0));
+ while(points_list.takeTopLevelItem(0)) {}
foreach(QPointF point, part -> polygon()) {
point = part -> mapToScene(point);
QStringList qsl;
diff --git a/elementscategorieslist.cpp b/elementscategorieslist.cpp
index 6755ae5eb..9f037db59 100644
--- a/elementscategorieslist.cpp
+++ b/elementscategorieslist.cpp
@@ -46,7 +46,7 @@ ElementsCategoriesList::~ElementsCategoriesList() {
*/
void ElementsCategoriesList::reload() {
// vide l'arbre
- while (takeTopLevelItem(0));
+ while (takeTopLevelItem(0)) {};
// chargement des elements de la collection commune si droits d'ecriture
QFileInfo common_collection_info(QETApp::commonElementsDir());
diff --git a/terminal.cpp b/terminal.cpp
index d6a1114d5..00680ec7e 100644
--- a/terminal.cpp
+++ b/terminal.cpp
@@ -145,7 +145,7 @@ bool Terminal::addConductor(Conductor *f) {
if (!f) return(false);
// une seule des deux bornes du conducteur doit etre this
- Q_ASSERT_X((f -> terminal1 == this ^ f -> terminal2 == this), "Terminal::addConductor", "Le conductor devrait etre relie exactement une fois a la terminal en cours");
+ Q_ASSERT_X(((f -> terminal1 == this) ^ (f -> terminal2 == this)), "Terminal::addConductor", "Le conductor devrait etre relie exactement une fois a la terminal en cours");
// determine l'autre borne a laquelle cette borne va etre relie grace au conducteur
Terminal *autre_terminal = (f -> terminal1 == this) ? f -> terminal2 : f -> terminal1;