From 83e7f7102a7d36ff5a3b1b6255d681b9644b6c65 Mon Sep 17 00:00:00 2001
From: Shamus Hammons <jlhamm@acm.org>
Date: Fri, 26 Dec 2014 10:00:15 -0600
Subject: [PATCH] Converted from Qt4 to Qt5.

---
 src/app.h              |  2 +-
 src/editorwidget.h     |  2 +-
 src/editorwindow.cpp   |  2 +-
 src/editorwindow.h     |  2 +-
 src/gamewidget.h       |  2 +-
 src/mainwin.cpp        |  2 +-
 src/mainwin.h          |  2 +-
 warehousemandeluxe.pro | 29 +++++++++++++++--------------
 8 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/app.h b/src/app.h
index 68bc82d..dc55148 100644
--- 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 01781fa..6bd9c7b 100644
--- 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 ab49a8c..4b32ca2 100644
--- 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 f018a2e..c2af4ec 100644
--- 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 bc35b8d..93606c1 100644
--- 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 c71e897..18f78b3 100644
--- 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 2deb6e6..3769d7f 100644
--- 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 0c5c402..f0b1d99 100644
--- 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
 
-- 
2.37.2