Qt6 compatibility patch 1

.gitignore

@@ -17,3 +17,6 @@ Makefile.Release
 *.pdb
 *.user
 *.pro.user.*
+
+/.qtcreator/
+/build/

clamp.h

@@ -2,6 +2,8 @@
 #ifndef CLAMP_H_
 #define CLAMP_H_
 
+#if __cplusplus < 201703L
+
 namespace std {
 
 // will be in STD with C++17
@@ -12,4 +14,7 @@ const T& clamp( const T& value, const T& lower, const T& upper )
 }
 
 }
+
+#endif
+
 #endif  // CLAMP_H_

minutor.cpp

@@ -1,6 +1,6 @@
 /** Copyright (c) 2013, Sean Kasun */
 #include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QAction>
+#include <QAction>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QMenu>

search/searchtextwidget.cpp

@@ -1,6 +1,8 @@
 #include "search/searchtextwidget.h"
 #include "ui_searchtextwidget.h"
 
+#include <QRegExp>
+
 SearchTextWidget::SearchTextWidget(const QString &name, QWidget *parent)
   : QWidget(parent)
   , ui(new Ui::SearchTextWidget)

worldinfo.cpp

@@ -3,9 +3,12 @@
 #include "worldinfo.h"
 
 #include <QtWidgets/QMenu>
+#include <QActionGroup>
 #include <QDirIterator>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QRegExp>
+#include <QStringRef>
 
 #include "nbt/nbt.h"
 #include "zipreader.h"
@@ -210,7 +213,7 @@ bool WorldInfo::parseDatapackNamespace(const QString name_space, const QString p
 
   // test if already there
   if (datapacks.contains(name_space)) {
-    QMap<QString, DatapackInfo>::const_iterator it = datapacks.constFind(name_space);
+    auto it = datapacks.constFind(name_space);
     for (; it != datapacks.constEnd(); ++it) {
       if (it->path == path) return false;
     }