Converted from Qt4 to Qt5.

diff --git a/src/app.h b/src/app.h
index 68bc82dd4256cfccb1511423f80ef3fb81c444bf..dc551486c4fb794357d22ad028690e9de263e999 100644 (file)
--- a/src/app.h
+++ b/src/app.h
@@ -1,7 +1,7 @@
 #ifndef __APP_H__
 #define __APP_H__
 
-#include <QtGui>
+#include <QtWidgets>
 
 // Forward declarations
 class MainWin;

diff --git a/src/editorwidget.h b/src/editorwidget.h
index 01781fa201cae89c6c5570629108f77537d2804c..6bd9c7bf9550c4c60317b5110d5ea25404e6002e 100644 (file)
--- a/src/editorwidget.h
+++ b/src/editorwidget.h
@@ -1,7 +1,7 @@
 #ifndef __EDITORWIDGET_H__
 #define __EDITORWIDGET_H__
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdint.h>
 #include "boards.h"
 

diff --git a/src/editorwindow.cpp b/src/editorwindow.cpp
index ab49a8c22642948a66e73d57d597324067d6a90c..4b32ca2f89d186f40e5bfb5207b25870fc8384e6 100644 (file)
--- a/src/editorwindow.cpp
+++ b/src/editorwindow.cpp
@@ -106,7 +106,7 @@ void EditorWindow::SetEditorLevel(int level)
 void EditorWindow::SetNewName(QWidget * widget, QAbstractItemDelegate::EndEditHint)
 {
        QString newName = reinterpret_cast<QLineEdit *>(widget)->text();
-       editor->SetNameOnCurrentLevel(newName.toAscii().data());
+       editor->SetNameOnCurrentLevel(newName.toUtf8().data());
 }
 
 

diff --git a/src/editorwindow.h b/src/editorwindow.h
index f018a2ea91e56ac37321beed1dbb95fb3f895766..c2af4eca78789362acae903f36f1e49797d3e2ce 100644 (file)
--- a/src/editorwindow.h
+++ b/src/editorwindow.h
@@ -1,7 +1,7 @@
 #ifndef __EDITORWINDOW_H__
 #define __EDITORWINDOW_H__
 
-#include <QtGui>
+#include <QtWidgets>
 
 class EditorWidget;
 class Level;

diff --git a/src/gamewidget.h b/src/gamewidget.h
index bc35b8d53ade734d74e5eb716100511f1afd8672..93606c1e008bf77e6a06755caa628073227efc53 100644 (file)
--- a/src/gamewidget.h
+++ b/src/gamewidget.h
@@ -1,7 +1,7 @@
 #ifndef __GAMEWIDGET_H__
 #define __GAMEWIDGET_H__
 
-#include <QtGui>
+#include <QtWidgets>
 
 class GameBoard;
 class Level;

diff --git a/src/mainwin.cpp b/src/mainwin.cpp
index c71e89728d8b0fd3557d52d452219c7aa9aeee29..18f78b3ca9bb7146dfe198103213339aed28e314 100644 (file)
--- a/src/mainwin.cpp
+++ b/src/mainwin.cpp
@@ -223,7 +223,7 @@ void MainWin::OnUpdateScore(int n)
                s = QString(tr("Score: %1")).arg(n);
 
        gameBoard->score->setText(s);
-printf("OUS: n=%i, s=%s\n", n, s.toAscii().data());
+printf("OUS: n=%i, s=%s\n", n, s.toUtf8().data());
 }
 */
 

diff --git a/src/mainwin.h b/src/mainwin.h
index 2deb6e6ebbacc8ab198725c3697ae0f36330ded6..3769d7fcc01b1754a5f7f3b7a2b512ac433a0b29 100644 (file)
--- a/src/mainwin.h
+++ b/src/mainwin.h
@@ -1,7 +1,7 @@
 #ifndef __MAINWIN_H__
 #define __MAINWIN_H__
 
-#include <QtGui>
+#include <QtWidgets>
 
 class GameWidget;
 class EditorWindow;

diff --git a/warehousemandeluxe.pro b/warehousemandeluxe.pro
index 0c5c402fb32b086e37a66641c6e2436263b00d4b..f0b1d99c21897ba9b3b1ecbc3ed5aba2e3ba56c4 100644 (file)
--- a/warehousemandeluxe.pro
+++ b/warehousemandeluxe.pro
@@ -4,6 +4,7 @@ CONFIG    += qt warn_on release debug
 RESOURCES += res/resources.qrc
 #LIBS      += -Ldxflib/lib -ldxf
 #LIBS      += -lao
+QT        += widgets
 
 # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-)
 OBJECTS_DIR = obj
@@ -18,20 +19,20 @@ DEPENDPATH = \
        src
 
 HEADERS = \
-       app.h \
-       boards.h \
-       editorwidget.h \
-       editorwindow.h \
-       gameboard.h \
-       gamewidget.h \
-       mainwin.h
+       src/app.h \
+       src/boards.h \
+       src/editorwidget.h \
+       src/editorwindow.h \
+       src/gameboard.h \
+       src/gamewidget.h \
+       src/mainwin.h
 
 SOURCES = \
-       app.cpp \
-       boards.cpp \
-       editorwidget.cpp \
-       editorwindow.cpp \
-       gameboard.cpp \
-       gamewidget.cpp \
-       mainwin.cpp
+       src/app.cpp \
+       src/boards.cpp \
+       src/editorwidget.cpp \
+       src/editorwindow.cpp \
+       src/gameboard.cpp \
+       src/gamewidget.cpp \
+       src/mainwin.cpp