From bddebfceebd1b8e4c57ac300c4deddb526cdea08 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Sun, 22 Jun 2014 11:17:03 +0200
Subject: [PATCH] Blackberry and mobile Qt buildfixes

---
 base/BlackberryMain.cpp | 6 +++---
 base/PCMain.cpp         | 1 +
 base/QtMain.h           | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/base/BlackberryMain.cpp b/base/BlackberryMain.cpp
index 5f7de616c..03d7567f9 100644
--- a/base/BlackberryMain.cpp
+++ b/base/BlackberryMain.cpp
@@ -15,6 +15,7 @@
 #include "base/NKCodeFromBlackberry.h"
 
 // Bad: PPSSPP includes from native
+#include "Core/System.h"
 #include "Core/Config.h"
 #include "UI/MiscScreens.h"
 
@@ -303,15 +304,14 @@ void BlackberryMain::runMain() {
 		// Work in Progress
 		// Currently: Render to HDMI port (eg. 1080p) when in game. Render to device when in menu.
 		// Idea: Render to all displays. Controls go to internal, game goes to external(s).
-		if (globalUIState == UISTATE_INGAME && !emulating)
-		{
+		if (GetUIState() == UISTATE_INGAME && !emulating) {
 			emulating = true;
 			switchDisplay(screen_emu);
 			if (g_Config.iShowFPSCounter == 4) {
 				int options = SCREEN_DEBUG_STATISTICS;
 				screen_set_window_property_iv(screen_win[0], SCREEN_PROPERTY_DEBUG, &options);
 			}
-		} else if (globalUIState != UISTATE_INGAME && emulating) {
+		} else if (GetUIState() != UISTATE_INGAME && emulating) {
 			emulating = false;
 			switchDisplay(screen_ui);
 		}
diff --git a/base/PCMain.cpp b/base/PCMain.cpp
index 7b1e6da6a..c8e43b126 100644
--- a/base/PCMain.cpp
+++ b/base/PCMain.cpp
@@ -42,6 +42,7 @@ SDLJoystick *joystick = NULL;
 
 #ifdef PPSSPP
 // Bad: PPSSPP includes from native
+#include "Core/System.h"
 #include "Core/Core.h"
 #include "Core/Config.h"
 
diff --git a/base/QtMain.h b/base/QtMain.h
index 8361af7ea..a12730b81 100644
--- a/base/QtMain.h
+++ b/base/QtMain.h
@@ -28,6 +28,7 @@ QTM_USE_NAMESPACE
 #include "base/NKCodeFromQt.h"
 
 // Bad: PPSSPP includes from native
+#include "Core/System.h"
 #include "Core/Core.h"
 #include "Core/Config.h"
 
@@ -132,7 +133,7 @@ protected:
 			}
 			break;
 		case QEvent::MouseButtonDblClick:
-			if (!g_Config.bShowTouchControls || globalUIState != UISTATE_INGAME)
+			if (!g_Config.bShowTouchControls || GetUIState() != UISTATE_INGAME)
 				emit doubleClick();
 			break;
 		case QEvent::MouseButtonPress: