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

qelectrotech.pro

@@ -76,6 +76,7 @@ include(sources/QWidgetAnimation/QWidgetAnimation.pri)
 DEFINES += QAPPLICATION_CLASS=QApplication
 DEFINES += QT_MESSAGELOGCONTEXT
 DEFINES += GIT_COMMIT_SHA="\\\"$(shell git -C \""$$_PRO_FILE_PWD_"\" rev-parse --verify HEAD)\\\""
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000
 
 TEMPLATE = app
 DEPENDPATH += .

sources/ElementsCollection/elementscollectionmodel.h

@@ -19,6 +19,7 @@
 #define ELEMENTSCOLLECTIONMODEL2_H
 
 #include <QStandardItemModel>
+#include <QHash>
 #include "elementslocation.h"
 
 class XmlProjectElementCollectionItem;

sources/NameList/ui/namelistwidget.h

@@ -18,8 +18,10 @@
 #ifndef NAMELISTWIDGET_H
 #define NAMELISTWIDGET_H
 
-#include "nameslist.h"
 #include <QWidget>
+#include <QHash>
+
+#include "nameslist.h"
 
 namespace Ui {
 	class NameListWidget;

sources/configpages.cpp

@@ -15,6 +15,12 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include <QFontDialog>
+#include <QFont>
+#include <QSizePolicy>
+#include <utility>
+
 #include "configpages.h"
 #include "borderpropertieswidget.h"
 #include "conductorpropertieswidget.h"
@@ -27,10 +33,7 @@
 #include "qetproject.h"
 #include "reportproperties.h"
 #include "qetapp.h"
-#include <QFontDialog>
-#include <QFont>
-#include <QSizePolicy>
-#include <utility>
+#include "nameslist.h"
 
 /**
 	@brief NewDiagramPage::NewDiagramPage

sources/dataBase/ui/elementquerywidget.h

@@ -20,6 +20,7 @@
 
 #include <QWidget>
 #include <QButtonGroup>
+#include <QHash>
 
 class QListWidgetItem;
 

sources/elementtextsmover.h

@@ -20,6 +20,7 @@
 
 #include <QSet>
 #include <QPointF>
+#include <QHash>
 
 class QGraphicsItem;
 class DiagramTextItem;

sources/properties/xrefproperties.cpp

@@ -15,9 +15,11 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
+#include <QMetaEnum>
+#include <QHash>
+
 #include "xrefproperties.h"
 #include "qetapp.h"
-#include <QMetaEnum>
 
 /**
 	@brief XRefProperties::XRefProperties

sources/properties/xrefproperties.h

@@ -18,8 +18,10 @@
 #ifndef XREFPROPERTIES_H
 #define XREFPROPERTIES_H
 
-#include "propertiesinterface.h"
 #include <QStringList>
+#include <QHash>
+
+#include "propertiesinterface.h"
 
 /**
 	@brief The XRefProperties class

sources/qetgraphicsitem/element.h

@@ -18,6 +18,10 @@
 #ifndef ELEMENT_H
 #define ELEMENT_H
 
+#include <algorithm>
+#include <QPicture>
+#include <QHash>
+
 #include "qet.h"
 #include "qetgraphicsitem.h"
 #include "diagramcontext.h"
@@ -25,9 +29,6 @@
 #include "elementslocation.h"
 #include "nameslist.h"
 
-#include <algorithm>
-#include <QPicture>
-
 class QETProject;
 class Terminal;
 class Conductor;

sources/qetinformation.cpp

@@ -15,11 +15,12 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "qetinformation.h"
 
 #include <QObject>
 #include <QHash>
 
+#include "qetinformation.h"
+
 /**
 	@brief QETInformation::titleblockInfoKeys
 	@return all available key for use with a titleblock

sources/qetinformation.h

@@ -19,6 +19,7 @@
 #define QETINFORMATION_H
 
 #include <QStringList>
+#include <QHash>
 
 namespace QETInformation
 {

sources/qetproject.cpp

@@ -15,6 +15,13 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include <QTimer>
+#include <QStandardPaths>
+#include <utility>
+#include <QtConcurrent>
+#include <QHash>
+
 #include "qetproject.h"
 #include "diagram.h"
 #include "qetapp.h"
@@ -30,11 +37,6 @@
 #include "numerotationcontextcommands.h"
 #include "assignvariables.h"
 
-#include <QTimer>
-#include <QStandardPaths>
-#include <utility>
-#include <QtConcurrent>
-
 static int BACKUP_INTERVAL = 120000; //interval in ms of backup = 2min
 
 /**

sources/qetproject.h

@@ -18,6 +18,9 @@
 #ifndef QET_PROJECT_H
 #define QET_PROJECT_H
 
+#include <KAutoSaveFile>
+#include <QHash>
+
 #include "nameslist.h"
 #include "elementslocation.h"
 #include "borderproperties.h"
@@ -28,8 +31,6 @@
 #include "projectdatabase.h"
 #include "reportproperties.h"
 
-#include <KAutoSaveFile>
-
 class Diagram;
 class ElementsLocation;
 class QETResult;

sources/ui/dynamicelementtextmodel.h

@@ -19,6 +19,8 @@
 #define DYNAMICELEMENTTEXTMODEL_H
 
 #include <QStandardItemModel>
+#include <QHash>
+
 #include <qstyleditemdelegate.h>
 #include "dynamicelementtextitem.h"
 

sources/ui/linksingleelementwidget.h

@@ -18,6 +18,8 @@
 #ifndef LINKSINGLEELEMENTWIDGET_H
 #define LINKSINGLEELEMENTWIDGET_H
 
+#include <QHash>
+
 #include "element.h"
 #include "abstractelementpropertieseditorwidget.h"
 

sources/ui/masterpropertieswidget.h

@@ -20,6 +20,7 @@
 
 #include <QWidget>
 #include <QHash>
+
 #include "abstractelementpropertieseditorwidget.h"
 
 class Element;

sources/ui/multipastedialog.cpp

@@ -15,13 +15,16 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include <QSettings>
+#include <QHash>
+
 #include "multipastedialog.h"
 #include "ui_multipastedialog.h"
 #include "diagram.h"
 #include "diagramcommands.h"
 #include "element.h"
 #include "conductorautonumerotation.h"
-#include <QSettings>
 
 MultiPasteDialog::MultiPasteDialog(Diagram *diagram, QWidget *parent) :
 	QDialog(parent),

sources/ui/potentialselectordialog.cpp

@@ -15,11 +15,14 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include <QRadioButton>
+#include <QHash>
+
 #include "potentialselectordialog.h"
 #include "ui_potentialselectordialog.h"
 #include "conductor.h"
 #include "terminal.h"
-#include <QRadioButton>
 #include "QPropertyUndoCommand/qpropertyundocommand.h"
 #include "diagram.h"
 #include "element.h"

sources/ui/shapegraphicsitempropertieswidget.cpp

@@ -15,6 +15,9 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include <QHash>
+
 #include "shapegraphicsitempropertieswidget.h"
 #include "ui_shapegraphicsitempropertieswidget.h"
 #include "qetshapeitem.h"

sources/ui/xrefpropertieswidget.cpp

@@ -15,12 +15,14 @@
 	You should have received a copy of the GNU General Public License
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "xrefpropertieswidget.h"
 
 #include <utility>
+#include <QHash>
+#include <QMetaEnum>
+
+#include "xrefpropertieswidget.h"
 #include "ui_xrefpropertieswidget.h"
 #include "qdebug.h"
-#include <QMetaEnum>
 
 /**
 	@brief XRefPropertiesWidget::XRefPropertiesWidget

sources/ui/xrefpropertieswidget.h

@@ -19,6 +19,8 @@
 #define XREFPROPERTIESWIDGET_H
 
 #include <QWidget>
+#include <QHash>
+
 #include "properties/xrefproperties.h"
 
 namespace Ui {

sources/undocommand/addelementtextcommand.h

@@ -21,6 +21,7 @@
 #include <QUndoCommand>
 #include <QPointer>
 #include <QDomElement>
+#include <QHash>
 
 class Element;
 class DynamicElementTextItem;

sources/undocommand/deleteqgraphicsitemcommand.h

@@ -19,6 +19,8 @@
 #define DELETEQGRAPHICSITEMCOMMAND_H
 
 #include <QUndoCommand>
+#include <QHash>
+
 #include "diagramcontent.h"
 
 class Diagram;

sources/undocommand/rotateselectioncommand.h

@@ -20,6 +20,7 @@
 
 #include <QUndoCommand>
 #include <QPointer>
+#include <QHash>
 
 class Diagram;
 class ConductorTextItem;

sources/undocommand/rotatetextscommand.h

@@ -20,6 +20,7 @@
 
 #include <QUndoCommand>
 #include <QPointer>
+#include <QHash>
 
 class ConductorTextItem;
 class Diagram;