Merge pull request #118 from mojotx/qt6_awesomeness

Qt6 awesomeness
mrkite · Apr 6, 2021 · 06e7344 · 06e7344
2 parents 801e14c + 59f523a
commit 06e7344
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/Terrafirma.pro b/Terrafirma.pro
@@ -1,6 +1,6 @@
 QT       += core gui
 
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets opengl openglwidgets
 
 TARGET = terrafirma
 TEMPLATE = app

diff --git a/findchests.cpp b/findchests.cpp
@@ -78,6 +78,6 @@ void FindChests::chestSelected(QModelIndex const& current, QModelIndex const& pr
 }
 
 void FindChests::searchTextChanged(const QString &newText) {
-  filter->setFilterRegExp(newText);
+  filter->setFilterRegularExpression(newText);
   filter->setFilterCaseSensitivity(Qt::CaseInsensitive);
 }
diff --git a/glmap.cpp b/glmap.cpp
@@ -447,7 +447,7 @@ void GLMap::mouseReleaseEvent(QMouseEvent *event) {
 }
 
 void GLMap::wheelEvent(QWheelEvent *event) {
-  zoom += event->delta() / 90.0;
+  zoom += event->angleDelta().y() / 90.0;
   if (zoom > 32.0) zoom = 32.0;
   else if (zoom < 2.0) zoom = 2.0;
 

diff --git a/hilitedialog.cpp b/hilitedialog.cpp
@@ -63,7 +63,7 @@ void HiliteDialog::addChild(const QSharedPointer<TileInfo> &tile,
 }
 
 void HiliteDialog::searchTextChanged(const QString &newText) {
-  filter.setFilterRegExp(newText);
+  filter.setFilterRegularExpression(newText);
   filter.setFilterCaseSensitivity(Qt::CaseSensitivity::CaseInsensitive);
 }
 

diff --git a/l10n.cpp b/l10n.cpp
@@ -262,7 +262,8 @@ void L10n::setLanguage(QString lang) {
 }
 
 QList<QString> L10n::getLanguages() {
-  return languages.toList();
+  QList<QString> qList(languages.begin(), languages.end());
+  return qList;
 }
 
 QString L10n::xlateItem(const QString &key) {

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -4,6 +4,7 @@
  * The main window for terrafirma
  */
 
+#include <QActionGroup>
 #include <QMessageBox>
 #include <QStandardPaths>
 #include <QDir>
@@ -238,7 +239,7 @@ void MainWindow::scanWorlds() {
           w->setText(name);
           w->setData(it.filePath());
           if (key < 9) {
-            w->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_1 + key++));
+            w->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_1 + key++));
             w->setShortcutContext(Qt::ApplicationShortcut);
           }
           connect(w, &QAction::triggered, this, &MainWindow::openWorld);
@@ -328,7 +329,7 @@ QString MainWindow::playerName(const QString &path) {
 
   QByteArray key;
   for (int i = 0; i < 8; i++) {
-    key.append(keystr.at(i));
+    key.append(keystr.at(i).unicode());
     key.append(static_cast<char>(0));
   }
 

diff --git a/uvrules.cpp b/uvrules.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <QDebug>
+#include <QRandomGenerator>
 #include "./uvrules.h"
 #include "./world.h"
 
@@ -250,7 +251,8 @@ void UVRules::fixWall(const QSharedPointer<World> &world, int x, int y) {
       set = (lazureTiles[x % 2][y % 2] - 1) * 2;
       break;
     default:
-      set = (qrand() % 3) * 2;
+      QRandomGenerator *rp = QRandomGenerator::system();
+      set = (rp->generate() % 3 ) * 2;
       break;
   }
 
@@ -494,7 +496,8 @@ quint8 UVRules::fixTile(const QSharedPointer<World> &world, int x, int y) {
   mask |= (bl == c) ? 0x0c00 : (bl == -2) ? 0x0800 : 0;
   mask |= (br == c) ? 0x0300 : (br == -2) ? 0x0200 : 0;
 
-  int set = (qrand() % 3) * 2;
+  QRandomGenerator *rp = QRandomGenerator::system();
+  int set = (rp->generate() % 3) * 2;
   if (world->info[c]->large)
     set = (phlebasTiles[y % 4][x % 3] - 1) * 2;