From a18bbb98cdcfb6bffeafeef503a884879a54bcf4 Mon Sep 17 00:00:00 2001
From: Antonio SJ Musumeci <trapexit@spawn.link>
Date: Wed, 9 Jul 2014 17:49:58 -0400
Subject: [PATCH] get nandBinCheck to compile with QT5

---
 WiiQt/includes.h              | 4 ++--
 WiiQt/settingtxtdialog.cpp    | 2 +-
 WiiQt/sharedcontentmap.cpp    | 2 +-
 nandBinCheck/main.cpp         | 2 +-
 nandBinCheck/nandBinCheck.pro | 2 ++
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/WiiQt/includes.h b/WiiQt/includes.h
index 29b611d..bc18f51 100644
--- a/WiiQt/includes.h
+++ b/WiiQt/includes.h
@@ -1,7 +1,7 @@
 #ifndef INCLUDES_H
 #define INCLUDES_H
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QAction>
 #include <QBuffer>
 #include <QDialog>
@@ -25,7 +25,7 @@
 #include <QtDebug>
 #include <QTimer>
 #include <QtGui>
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 #include <qpushbutton.h>
diff --git a/WiiQt/settingtxtdialog.cpp b/WiiQt/settingtxtdialog.cpp
index 5713dbf..348a8ea 100644
--- a/WiiQt/settingtxtdialog.cpp
+++ b/WiiQt/settingtxtdialog.cpp
@@ -111,7 +111,7 @@ void SettingTxtDialog::on_buttonBox_accepted()
                 "VIDEO=" + ui->lineEdit_video->text() + "\r\n" +
                 "GAME=" + ui->lineEdit_game->text() + "\r\n";
 
-    ret = s.toAscii();
+    ret = s.toLatin1();
     ret = PaddedByteArray( ret, 0x100 );
     //hexdump( ret );
     ret = LolCrypt( ret );
diff --git a/WiiQt/sharedcontentmap.cpp b/WiiQt/sharedcontentmap.cpp
index 31e56a4..4c2e5c0 100644
--- a/WiiQt/sharedcontentmap.cpp
+++ b/WiiQt/sharedcontentmap.cpp
@@ -121,7 +121,7 @@ void SharedContentMap::AddEntry( const QString &app, const QByteArray &hash )
         qWarning() << "SharedContentMap::AddEntry -> bas size" << hex << app.size() << hash.size();
         return;
     }
-    data += app.toAscii() + hash;
+    data += app.toLatin1() + hash;
 }
 
 const QByteArray SharedContentMap::Hash( quint16 i )
diff --git a/nandBinCheck/main.cpp b/nandBinCheck/main.cpp
index f2f1bec..dab70cb 100644
--- a/nandBinCheck/main.cpp
+++ b/nandBinCheck/main.cpp
@@ -1315,7 +1315,7 @@ int main( int argc, char *argv[] )
     origColor = GetColor();
     hConsole = GetStdHandle( STD_OUTPUT_HANDLE );
 #endif
-    qInstallMsgHandler( DebugHandler );
+// qInstallMessageHandler( DebugHandler );
 
     args = QCoreApplication::arguments();
     if( args.contains( "-nocolor", Qt::CaseInsensitive ) )
diff --git a/nandBinCheck/nandBinCheck.pro b/nandBinCheck/nandBinCheck.pro
index 97514bc..3849a2a 100644
--- a/nandBinCheck/nandBinCheck.pro
+++ b/nandBinCheck/nandBinCheck.pro
@@ -13,6 +13,8 @@ CONFIG   -= app_bundle
 
 TEMPLATE = app
 
+QT += core gui
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 SOURCES += main.cpp \
     ../WiiQt/blocks0to7.cpp \