From 4bcd333cfd23e3fbc7fb6f6ba11343555cf64247 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 23 Aug 2018 21:56:14 +1000
Subject: Fix build with qt5


diff --git a/About.cpp b/About.cpp
index 4112ad3..4443ded 100644
--- a/About.cpp
+++ b/About.cpp
@@ -17,11 +17,11 @@
 */
 
 #include "About.h"
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QPixmap>
-#include <QtGui/QLabel>
-#include <QtGui/QDialogButtonBox>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QPixmap>
+#include <QLabel>
+#include <QDialogButtonBox>
 ////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////
 About::About(QWidget * pParent)
diff --git a/About.h b/About.h
index 39fce3e..e49a6ea 100644
--- a/About.h
+++ b/About.h
@@ -18,7 +18,7 @@
 
 #ifndef ABOUT_H
 #define ABOUT_H
-#include <QtGui/QDialog>
+#include <QDialog>
 
 class About: public QDialog
 {
diff --git a/CardStack.cpp b/CardStack.cpp
index 0e4e363..bc0a5e4 100644
--- a/CardStack.cpp
+++ b/CardStack.cpp
@@ -17,12 +17,12 @@
 */
 
 #include "CardStack.h"
-#include <QtGui/QPainter>
-#include <QtCore/QTimer>
-#include <QtGui/QCursor>
-#include <QtGui/QGraphicsSceneHoverEvent>
-#include <QtGui/QGraphicsSceneMouseEvent>
-#include <QtGui/QApplication>
+#include <QPainter>
+#include <QTimer>
+#include <QCursor>
+#include <QGraphicsSceneHoverEvent>
+#include <QGraphicsSceneMouseEvent>
+#include <QApplication>
 #include "CardPixmaps.h"
 #include "CardAnimationLock.h"
 
diff --git a/CardStack.h b/CardStack.h
index 6e07cdf..5a3c46a 100644
--- a/CardStack.h
+++ b/CardStack.h
@@ -19,8 +19,8 @@
 #ifndef CARDSTACK_H
 #define CARDSTACK_H
 
-#include <QtCore/QObject>
-#include <QtGui/QGraphicsPixmapItem>
+#include <QObject>
+#include <QGraphicsPixmapItem>
 
 #include "CardMoveRecord.h"
 
diff --git a/DealAnimation.cpp b/DealAnimation.cpp
index b4ef55e..b9e3af5 100644
--- a/DealAnimation.cpp
+++ b/DealAnimation.cpp
@@ -20,10 +20,10 @@
 #include "CardAnimationLock.h"
 
 
-#include <QtGui/QPixmap>
-#include <QtGui/QGraphicsScene>
-#include <QtCore/QTimeLine>
-#include <QtCore/QTimer>
+#include <QPixmap>
+#include <QGraphicsScene>
+#include <QTimeLine>
+#include <QTimer>
 
 #include <iostream>
 
diff --git a/DealAnimation.h b/DealAnimation.h
index 1f5ae29..43d5fcb 100644
--- a/DealAnimation.h
+++ b/DealAnimation.h
@@ -19,16 +19,16 @@
 #ifndef __DEALANIMATION_H__
 #define __DEALANIMATION_H__
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "CardStack.h"
 #include "CardMoveRecord.h"
 #include <list>
 #include <vector>
 
-#include <QtCore/QTimer>
-#include <QtGui/QGraphicsPixmapItem>
-#include <QtGui/QGraphicsItemAnimation>
+#include <QTimer>
+#include <QGraphicsPixmapItem>
+#include <QGraphicsItemAnimation>
 
 // DealItems can be used to define the cards that will be dealt to a stack.
 // The DealItem can then be added to the DealItemVector which is the overall
diff --git a/DragCardStack.cpp b/DragCardStack.cpp
index d4d0460..0950cec 100644
--- a/DragCardStack.cpp
+++ b/DragCardStack.cpp
@@ -19,10 +19,10 @@
 #include "DragCardStack.h"
 #include "CardStack.h"
 
-#include <QtGui/QCursor>
-#include <QtGui/QGraphicsScene>
-#include <QtGui/QPixmap>
-#include <QtGui/QGraphicsSceneMouseEvent>
+#include <QCursor>
+#include <QGraphicsScene>
+#include <QPixmap>
+#include <QGraphicsSceneMouseEvent>
 
 //////////////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/DragCardStack.h b/DragCardStack.h
index be4d7d4..658d117 100644
--- a/DragCardStack.h
+++ b/DragCardStack.h
@@ -18,8 +18,8 @@
 #ifndef __DRAGCARDSTACK_H__
 #define __DRAGCARDSTACK_H__
 
-#include <QtCore/QObject>
-#include <QtGui/QGraphicsPixmapItem>
+#include <QObject>
+#include <QGraphicsPixmapItem>
 #include "CardDeck.h"
 #include "CardMoveRecord.h"
 
diff --git a/FlipAnimation.cpp b/FlipAnimation.cpp
index 679d8f0..63d13b9 100644
--- a/FlipAnimation.cpp
+++ b/FlipAnimation.cpp
@@ -20,7 +20,7 @@
 #include "CardStack.h"
 #include "CardAnimationLock.h"
 
-#include <QtGui/QGraphicsScene>
+#include <QGraphicsScene>
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/FlipAnimation.h b/FlipAnimation.h
index 5d13b05..7fa391d 100644
--- a/FlipAnimation.h
+++ b/FlipAnimation.h
@@ -20,11 +20,11 @@
 
 #include "CardMoveRecord.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QTimeLine>
-#include <QtGui/QGraphicsItemAnimation>
-#include <QtGui/QGraphicsPixmapItem>
-#include <QtGui/QPixmap>
+#include <QObject>
+#include <QTimeLine>
+#include <QGraphicsItemAnimation>
+#include <QGraphicsPixmapItem>
+#include <QPixmap>
 
 class CardStack;
 
diff --git a/FreeCellBoard.cpp b/FreeCellBoard.cpp
index 32fc04d..5890c50 100644
--- a/FreeCellBoard.cpp
+++ b/FreeCellBoard.cpp
@@ -23,7 +23,7 @@
 
 #include <iostream>
 
-#include <QtGui/QMessageBox>
+#include <QMessageBox>
 
 ////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////
diff --git a/GameBoard.cpp b/GameBoard.cpp
index d438b7c..cdc0f6b 100644
--- a/GameBoard.cpp
+++ b/GameBoard.cpp
@@ -19,9 +19,9 @@
 #include "GameBoard.h"
 #include <QtGui/QImage>
 #include "CardPixmaps.h"
-#include <QtGui/QResizeEvent>
-#include <QtGui/QCursor>
-#include <QtGui/QMessageBox>
+#include <QResizeEvent>
+#include <QCursor>
+#include <QMessageBox>
 
 #include "CardAnimationLock.h"
 
diff --git a/GameBoard.h b/GameBoard.h
index 3b68acb..ba32ea6 100644
--- a/GameBoard.h
+++ b/GameBoard.h
@@ -19,12 +19,12 @@
 #ifndef GAMEBOARD_H
 #define GAMEBOARD_H
 
-#include <QtGui/QGraphicsView>
-#include <QtCore/QString>
-#include <QtGui/QPixmap>
-#include <QtGui/QMenu>
-#include <QtCore/QSettings>
-#include <QtGui/QGraphicsScene>
+#include <QGraphicsView>
+#include <QString>
+#include <QPixmap>
+#include <QMenu>
+#include <QSettings>
+#include <QGraphicsScene>
 
 #include <stack>
 
diff --git a/GameMgr.cpp b/GameMgr.cpp
index aedd5b1..f76f0c6 100644
--- a/GameMgr.cpp
+++ b/GameMgr.cpp
@@ -23,7 +23,7 @@
 #include "KlondikeBoard.h"
 #include "FreeCellBoard.h"
 #include "YukonBoard.h"
-#include <QtGui/QActionGroup>
+#include <QActionGroup>
 
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////
diff --git a/GameMgr.h b/GameMgr.h
index a2d4081..51b06f7 100644
--- a/GameMgr.h
+++ b/GameMgr.h
@@ -20,8 +20,8 @@
 #define GAMEMGR_H
 
 #include "GameBoard.h"
-#include <QtGui/QMenu>
-#include <QtCore/QStringList>
+#include <QMenu>
+#include <QStringList>
 
 class GameMgr
 {
diff --git a/Help.cpp b/Help.cpp
index 77675f8..e5cd859 100644
--- a/Help.cpp
+++ b/Help.cpp
@@ -18,9 +18,9 @@
 
 #include "Help.h"
 
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-#include <QtGui/QHBoxLayout>
+#include <QFile>
+#include <QTextStream>
+#include <QHBoxLayout>
 
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
diff --git a/Help.h b/Help.h
index 18f349d..b3c24d3 100644
--- a/Help.h
+++ b/Help.h
@@ -19,9 +19,9 @@
 #ifndef HELP_H
 #define HELP_H
 
-#include <QtGui/QDialog>
-#include <QtCore/QString>
-#include <QtGui/QTextBrowser>
+#include <QDialog>
+#include <QString>
+#include <QTextBrowser>
 
 class Help: public QDialog
 {
diff --git a/KlondikeBoard.cpp b/KlondikeBoard.cpp
index ef6c7ee..2b03f15 100644
--- a/KlondikeBoard.cpp
+++ b/KlondikeBoard.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "KlondikeBoard.h"
-#include <QtGui/QMessageBox>
+#include <QMessageBox>
 
 #include "CardDeck.h"
 #include "CardPixmaps.h"
diff --git a/SpiderBoard.cpp b/SpiderBoard.cpp
index ae7a58b..0989d29 100644
--- a/SpiderBoard.cpp
+++ b/SpiderBoard.cpp
@@ -17,11 +17,11 @@
 */
 
 #include "SpiderBoard.h"
-#include <QtGui/QMessageBox>
-#include <QtGui/QAction>
-#include <QtGui/QActionGroup>
-#include <QtGui/QResizeEvent>
-#include <QtCore/QDateTime>
+#include <QMessageBox>
+#include <QAction>
+#include <QActionGroup>
+#include <QResizeEvent>
+#include <QDateTime>
 
 #include "CardPixmaps.h"
 #include "CardDeck.h"
diff --git a/StackToStackAniMove.cpp b/StackToStackAniMove.cpp
index c00049f..f9c1c2a 100644
--- a/StackToStackAniMove.cpp
+++ b/StackToStackAniMove.cpp
@@ -19,7 +19,7 @@
 #include "StackToStackAniMove.h"
 #include "CardAnimationLock.h"
 
-#include <QtGui/QGraphicsScene>
+#include <QGraphicsScene>
 
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
diff --git a/StackToStackAniMove.h b/StackToStackAniMove.h
index 3e6da68..7c34194 100644
--- a/StackToStackAniMove.h
+++ b/StackToStackAniMove.h
@@ -22,11 +22,11 @@
 #include "CardStack.h"
 #include "CardMoveRecord.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QTimeLine>
-#include <QtCore/QTimer>
-#include <QtGui/QGraphicsItemAnimation>
-#include <QtGui/QGraphicsPixmapItem>
+#include <QObject>
+#include <QTimeLine>
+#include <QTimer>
+#include <QGraphicsItemAnimation>
+#include <QGraphicsPixmapItem>
 
 /*
   StackToStackAniMove is just for moving one set of cards to another stack.  Normal usage is
diff --git a/StackToStackFlipAni.cpp b/StackToStackFlipAni.cpp
index 6ec4565..19bc665 100644
--- a/StackToStackFlipAni.cpp
+++ b/StackToStackFlipAni.cpp
@@ -20,8 +20,8 @@
 #include "CardAnimationLock.h"
 #include "CardPixmaps.h"
 
-#include <QtGui/QGraphicsScene>
-#include <QtGui/QPainter>
+#include <QGraphicsScene>
+#include <QPainter>
 
 #include <iostream>
 
diff --git a/StackToStackFlipAni.h b/StackToStackFlipAni.h
index f4065c8..93ab694 100644
--- a/StackToStackFlipAni.h
+++ b/StackToStackFlipAni.h
@@ -22,11 +22,11 @@
 #include "CardStack.h"
 #include "CardMoveRecord.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QTimeLine>
-#include <QtGui/QGraphicsItemAnimation>
-#include <QtGui/QGraphicsPixmapItem>
-#include <QtGui/QPixmap>
+#include <QObject>
+#include <QTimeLine>
+#include <QGraphicsItemAnimation>
+#include <QGraphicsPixmapItem>
+#include <QPixmap>
 
 class StackToStackFlipAni: public QObject
 {
diff --git a/VCardStack.cpp b/VCardStack.cpp
index 3f4a21c..aae8de6 100644
--- a/VCardStack.cpp
+++ b/VCardStack.cpp
@@ -18,8 +18,8 @@
 
 #include "VCardStack.h"
 #include "CardPixmaps.h"
-#include <QtGui/QPainter>
-#include <QtGui/QGraphicsScene>
+#include <QPainter>
+#include <QGraphicsScene>
 
 #include <iostream>
 
diff --git a/main.cpp b/main.cpp
index 7746402..0162bea 100644
--- a/main.cpp
+++ b/main.cpp
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "mainwindow.h"
 
 int main(int argc, char *argv[])
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9456b26..9cecaf0 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -18,12 +18,12 @@
 
 #include "mainwindow.h"
 
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QMessageBox>
-#include <QtCore/QTimer>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QMenu>
+#include <QAction>
+#include <QMessageBox>
+#include <QTimer>
 
 #include "CardAnimationLock.h"
 
diff --git a/mainwindow.h b/mainwindow.h
index 9e4d874..034d1fc 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -19,13 +19,13 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtGui/QMainWindow>
-#include <QtGui/QMenuBar>
-#include <QtGui/QMenu>
-#include <QtCore/QSettings>
-#include <QtGui/QStatusBar>
-#include <QtGui/QLabel>
-#include <QtCore/QPointer>
+#include <QMainWindow>
+#include <QMenuBar>
+#include <QMenu>
+#include <QSettings>
+#include <QStatusBar>
+#include <QLabel>
+#include <QPointer>
 
 #include "GameBoard.h"
 #include "Help.h"
-- 
2.16.4

