Fix Qt 6 definition of macro ‘Q_DECLARE_MOVABLE_CONTAINER’

adding #include <QHash>

+ code fail to compile if it uses deprecated APIs.
=> see .pro file

sources/undocommand/addelementtextcommand.h

@@ -1,17 +1,17 @@
 /*
 	Copyright 2006-2020 The QElectroTech Team
 	This file is part of QElectroTech.
-	
+
 	QElectroTech is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 2 of the License, or
 	(at your option) any later version.
-	
+
 	QElectroTech is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -21,6 +21,7 @@
 #include <QUndoCommand>
 #include <QPointer>
 #include <QDomElement>
+#include <QHash>
 
 class Element;
 class DynamicElementTextItem;
@@ -37,10 +38,10 @@ class AddElementTextCommand : public QUndoCommand
 				      DynamicElementTextItem *deti,
 				      QUndoCommand *parent = nullptr);
 		~AddElementTextCommand() override;
-		
+
 		void undo() override;
 		void redo() override;
-		
+
 	private:
 		Element *m_element = nullptr;
 		DynamicElementTextItem *m_text = nullptr;
@@ -64,10 +65,10 @@ class AddTextsGroupCommand : public QUndoCommand
 				     QList<DynamicElementTextItem *> texts_list,
 				     QUndoCommand *parent = nullptr);
 		~AddTextsGroupCommand() override;
-		
+
 		void undo() override;
 		void redo() override;
-		
+
 	private:
 		QPointer<Element> m_element;
 		QPointer<ElementTextItemGroup> m_group;
@@ -88,10 +89,10 @@ class RemoveTextsGroupCommand : public QUndoCommand
 					ElementTextItemGroup *group,
 					QUndoCommand *parent = nullptr);
 		~RemoveTextsGroupCommand() override;
-		
+
 		void undo() override;
 		void redo() override;
-		
+
 	private:
 		QPointer<Element> m_element;
 		QPointer<ElementTextItemGroup> m_group;
@@ -108,10 +109,10 @@ class AddTextToGroupCommand : public QUndoCommand
 				      ElementTextItemGroup *group,
 				      QUndoCommand *parent = nullptr);
 		~AddTextToGroupCommand() override;
-		
+
 		void undo() override;
 		void redo() override;
-		
+
 	private:
 		QPointer<DynamicElementTextItem> m_text;
 		QPointer<ElementTextItemGroup> m_group;
@@ -128,10 +129,10 @@ class RemoveTextFromGroupCommand : public QUndoCommand
 					   ElementTextItemGroup *group,
 					   QUndoCommand *parent = nullptr);
 		~RemoveTextFromGroupCommand() override;
-		
+
 		void undo() override;
 		void redo() override;
-		
+
 	private:
 		QPointer<DynamicElementTextItem> m_text;
 		QPointer<ElementTextItemGroup> m_group;
@@ -148,12 +149,12 @@ class AlignmentTextsGroupCommand : public QUndoCommand
 					   Qt::Alignment new_alignment,
 					   QUndoCommand *parent = nullptr);
 		~AlignmentTextsGroupCommand() override;
-		
+
 		int id() const override{return 6;}
 		bool mergeWith(const QUndoCommand *other) override;
 		void undo() override;
 		void redo() override;
-		
+
 	private:
 		QPointer<ElementTextItemGroup> m_group;
 		Qt::Alignment m_previous_alignment,

sources/undocommand/deleteqgraphicsitemcommand.h

@@ -1,17 +1,17 @@
 /*
 	Copyright 2006-2020 The QElectroTech Team
 	This file is part of QElectroTech.
-	
+
 	QElectroTech is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 2 of the License, or
 	(at your option) any later version.
-	
+
 	QElectroTech is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -19,6 +19,8 @@
 #define DELETEQGRAPHICSITEMCOMMAND_H
 
 #include <QUndoCommand>
+#include <QHash>
+
 #include "diagramcontent.h"
 
 class Diagram;
@@ -32,17 +34,17 @@ class DeleteQGraphicsItemCommand : public QUndoCommand
 	public:
 		DeleteQGraphicsItemCommand(Diagram *diagram, const DiagramContent &content, QUndoCommand * parent = nullptr);
 		~DeleteQGraphicsItemCommand() override;
-		
+
 	private:
 		DeleteQGraphicsItemCommand(const DeleteQGraphicsItemCommand &);
-		
+
 		void setPotentialsOfRemovedElements();
 		Terminal *terminalInSamePotential(Terminal *terminal, Conductor *conductor_to_exclude);
 
 	public:
 		void undo() override;
 		void redo() override;
-		
+
 		// attributes
 	private:
 		DiagramContent m_removed_contents;

sources/undocommand/rotateselectioncommand.h

@@ -1,17 +1,17 @@
 /*
 	Copyright 2006-2020 The QElectroTech Team
 	This file is part of QElectroTech.
-	
+
 	QElectroTech is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 2 of the License, or
 	(at your option) any later version.
-	
+
 	QElectroTech is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -20,6 +20,7 @@
 
 #include <QUndoCommand>
 #include <QPointer>
+#include <QHash>
 
 class Diagram;
 class ConductorTextItem;
@@ -35,16 +36,16 @@ class RotateSelectionCommand : public QUndoCommand
 		RotateSelectionCommand(Diagram *diagram, qreal angle=90, QUndoCommand *parent=nullptr);
 		void undo() override;
 		void redo() override;
-		
+
 		bool isValid();
-	
+
 	private:
 		Diagram *m_diagram =nullptr;
-		
+
 		QList<QPointer<ConductorTextItem>> m_cond_text;
 		QHash<ConductorTextItem *, bool> m_rotate_by_user;
 		QList<QPropertyUndoCommand*> m_undo;
-		
+
 };
 
 #endif // ROTATESELECTIONCOMMAND_H

sources/undocommand/rotatetextscommand.h

@@ -20,6 +20,7 @@
 
 #include <QUndoCommand>
 #include <QPointer>
+#include <QHash>
 
 class ConductorTextItem;
 class Diagram;
@@ -34,14 +35,14 @@ class RotateTextsCommand : public QUndoCommand
 {
 	public:
 		RotateTextsCommand(Diagram *diagram, QUndoCommand *parent=nullptr);
-		
+
 		void undo() override;
 		void redo() override;
-		
+
 	private:
 		void openDialog();
 		void setupAnimation(QObject *target, const QByteArray &propertyName, const QVariant& start, const QVariant& end);
-		
+
 	private:
 		QPointer<Diagram> m_diagram;
 		QHash<ConductorTextItem *, bool> m_cond_texts;