From 699c3504814300415ca983fbef2ed172fa9020de Mon Sep 17 00:00:00 2001
From: Vincent Bénony
Date: Mon, 7 Dec 2015 11:34:11 +0100
Subject: IOS: Renames iOS7 classes to avoid confusion

---
 backends/platform/ios7/ios7_keyboard.h | 44 ++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 backends/platform/ios7/ios7_keyboard.h

(limited to 'backends/platform/ios7/ios7_keyboard.h')

diff --git a/backends/platform/ios7/ios7_keyboard.h b/backends/platform/ios7/ios7_keyboard.h
new file mode 100644
index 0000000000..ddd8f436e5
--- /dev/null
+++ b/backends/platform/ios7/ios7_keyboard.h
@@ -0,0 +1,44 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_KEYBOARD_H
+#define BACKENDS_PLATFORM_IPHONE_IPHONE_KEYBOARD_H
+
+#include <UIKit/UIKit.h>
+#include <UIKit/UITextView.h>
+
+@interface SoftKeyboard : UIView<UITextViewDelegate> {
+	id inputDelegate;
+	UITextView *inputView;
+}
+
+- (id)initWithFrame:(CGRect)frame;
+- (UITextView *)inputView;
+- (void)setInputDelegate:(id)delegate;
+- (void)handleKeyPress:(unichar)c;
+
+- (void)showKeyboard;
+- (void)hideKeyboard;
+
+@end
+
+#endif
-- 
cgit v1.2.3


From 17a57443aea26bf51cc7992049f2503e6cecb672 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 7 Jan 2016 12:30:19 +0100
Subject: IOS7: Use standard include guard names.

---
 backends/platform/ios7/ios7_keyboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'backends/platform/ios7/ios7_keyboard.h')

diff --git a/backends/platform/ios7/ios7_keyboard.h b/backends/platform/ios7/ios7_keyboard.h
index ddd8f436e5..1f917cc8c5 100644
--- a/backends/platform/ios7/ios7_keyboard.h
+++ b/backends/platform/ios7/ios7_keyboard.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_KEYBOARD_H
-#define BACKENDS_PLATFORM_IPHONE_IPHONE_KEYBOARD_H
+#ifndef BACKENDS_PLATFORM_IOS7_IOS7_KEYBOARD_H
+#define BACKENDS_PLATFORM_IOS7_IOS7_KEYBOARD_H
 
 #include <UIKit/UIKit.h>
 #include <UIKit/UITextView.h>
-- 
cgit v1.2.3