From 39b48f2357b0b783815be88031b738376fa228e0 Mon Sep 17 00:00:00 2001
From: Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au>
Date: Thu, 19 Feb 2015 02:51:00 +1100
Subject: Upgrade Heimdall Frontend to Qt5 and build with cmake

---
 heimdall-frontend/Source/aboutform.cpp  | 2 ++
 heimdall-frontend/Source/aboutform.h    | 6 ++++++
 heimdall-frontend/Source/main.cpp       | 7 +++++--
 heimdall-frontend/Source/mainwindow.cpp | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'heimdall-frontend/Source')

diff --git a/heimdall-frontend/Source/aboutform.cpp b/heimdall-frontend/Source/aboutform.cpp
index 9f04c6b..fbb3fb1 100644
--- a/heimdall-frontend/Source/aboutform.cpp
+++ b/heimdall-frontend/Source/aboutform.cpp
@@ -25,6 +25,8 @@
 // Heimdall Frontend
 #include "aboutform.h"
 
+#include <QStringList>
+
 #define UNUSED(x) (void)(x)
 
 using namespace HeimdallFrontend;
diff --git a/heimdall-frontend/Source/aboutform.h b/heimdall-frontend/Source/aboutform.h
index 0c02f08..4b6a8e3 100644
--- a/heimdall-frontend/Source/aboutform.h
+++ b/heimdall-frontend/Source/aboutform.h
@@ -18,6 +18,9 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.*/
 
+#ifndef ABOUTFORM_H
+#define ABOUTFORM_H
+
 // Qt
 #include <QProcess>
 #include <QWidget>
@@ -50,3 +53,6 @@ namespace HeimdallFrontend
 			void HandleHeimdallError(QProcess::ProcessError error);
 	};
 }
+
+#endif
+
diff --git a/heimdall-frontend/Source/main.cpp b/heimdall-frontend/Source/main.cpp
index 41e018d..c327b63 100644
--- a/heimdall-frontend/Source/main.cpp
+++ b/heimdall-frontend/Source/main.cpp
@@ -19,17 +19,20 @@
  THE SOFTWARE.*/
 
 // Qt
-#include <QtGui/QApplication>
+#include <QApplication>
+#include <QtPlugin>
 
 // Heimdall Frontend
 #include "mainwindow.h"
 
+Q_IMPORT_PLUGIN (QWindowsIntegrationPlugin);
+
 using namespace HeimdallFrontend;
 
 int main(int argc, char *argv[])
 {
 	QApplication application(argc, argv);
-	
+
 	MainWindow window;
 	window.show();
 
diff --git a/heimdall-frontend/Source/mainwindow.cpp b/heimdall-frontend/Source/mainwindow.cpp
index f122034..74d9500 100644
--- a/heimdall-frontend/Source/mainwindow.cpp
+++ b/heimdall-frontend/Source/mainwindow.cpp
@@ -836,7 +836,7 @@ void MainWindow::SelectPit(void)
 
 			for (int i = 0; i < partitionNamesCount; i++)
 			{
-				const PitEntry *pitEntry = currentPitData.FindEntry(partitionNames[i].toAscii().constData());
+				const PitEntry *pitEntry = currentPitData.FindEntry(partitionNames[i].toLatin1().constData());
 				
 				if (pitEntry)
 				{
-- 
cgit v1.2.3