Utils: Collapse most of porting,h

Taking the Qt 6 branches, leaving some dummies until downstream
adapted.

Change-Id: Ib9b86568d73c341c8f740ba497c3cbfab830d8a1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

4 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/modeleditor/dragtool.cpp b/src/plugins/modeleditor/dragtool.cpp
index b86a86412f..76bb1094ed 100644
--- a/src/plugins/modeleditor/dragtool.cpp
+++ b/src/plugins/modeleditor/dragtool.cpp
@@ -120,7 +120,7 @@ void DragTool::paintEvent(QPaintEvent *event)
     }
 }
 
-void DragTool::enterEvent(Utils::EnterEvent *event)
+void DragTool::enterEvent(QEnterEvent *event)
 {
     Q_UNUSED(event)
     update();
diff --git a/src/plugins/modeleditor/dragtool.h b/src/plugins/modeleditor/dragtool.h
index 38c66fe296..543874a72f 100644
--- a/src/plugins/modeleditor/dragtool.h
+++ b/src/plugins/modeleditor/dragtool.h
@@ -48,7 +48,7 @@ public:
 
 protected:
     void paintEvent(QPaintEvent *event) override;
-    void enterEvent(Utils::EnterEvent *event) override;
+    void enterEvent(QEnterEvent *event) override;
     void leaveEvent(QEvent *event) override;
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp
index 322a873f86..69756fbdee 100644
--- a/src/plugins/modeleditor/modelindexer.cpp
+++ b/src/plugins/modeleditor/modelindexer.cpp
@@ -62,7 +62,7 @@ namespace Internal {
 
 class ModelIndexer::QueuedFile
 {
-    friend Utils::QHashValueType qHash(const ModelIndexer::QueuedFile &queuedFile);
+    friend size_t qHash(const ModelIndexer::QueuedFile &queuedFile);
     friend bool operator==(const ModelIndexer::QueuedFile &lhs,
                            const ModelIndexer::QueuedFile &rhs);
 
@@ -99,7 +99,7 @@ bool operator==(const ModelIndexer::QueuedFile &lhs, const ModelIndexer::QueuedF
     return lhs.m_file == rhs.m_file && lhs.m_project == rhs.m_project;
 }
 
-Utils::QHashValueType qHash(const ModelIndexer::QueuedFile &queuedFile)
+size_t qHash(const ModelIndexer::QueuedFile &queuedFile)
 {
     return qHash(queuedFile.m_project) + qHash(queuedFile.m_project);
 }
diff --git a/src/plugins/modeleditor/modelindexer.h b/src/plugins/modeleditor/modelindexer.h
index e6df8bdeed..7b81e9b0da 100644
--- a/src/plugins/modeleditor/modelindexer.h
+++ b/src/plugins/modeleditor/modelindexer.h
@@ -52,7 +52,7 @@ class ModelIndexer :
     class DiagramsCollectorVisitor;
     class ModelIndexerPrivate;
 
-    friend Utils::QHashValueType qHash(const ModelIndexer::QueuedFile &queuedFile);
+    friend size_t qHash(const ModelIndexer::QueuedFile &queuedFile);
     friend bool operator==(const ModelIndexer::QueuedFile &lhs,
                            const ModelIndexer::QueuedFile &rhs);