From 6db855e1c0508f75f975363c8a3edf41cda2b30d Mon Sep 17 00:00:00 2001
From: that <github@that.at>
Date: Sat, 14 Mar 2015 21:31:43 +0100
Subject: gui: keyboard doesn't need its own action

This was questionable design and is unused anyway.
Also reduced a few redundant #includes.

Change-Id: I65bb01120e6072c5695755920242f6f9d73c816e
---
 gui/keyboard.cpp | 30 ++----------------------------
 gui/objects.hpp  |  1 -
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/gui/keyboard.cpp b/gui/keyboard.cpp
index d0262aac2..f193a1245 100644
--- a/gui/keyboard.cpp
+++ b/gui/keyboard.cpp
@@ -16,20 +16,8 @@
         along with TWRP.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
-#include <sys/reboot.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <time.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include "../data.hpp"
 
 #include <string>
@@ -61,18 +49,10 @@ GUIKeyboard::GUIKeyboard(xml_node<>* node)
 
 	mRendered = false;
 	currentLayout = 1;
-	mAction = NULL;
 	KeyboardHeight = KeyboardWidth = 0;
 
 	if (!node)  return;
 
-	// Load the action
-	child = FindNode(node, "action");
-	if (child)
-	{
-		mAction = new GUIAction(node);
-	}
-
 	mHighlightColor = LoadAttrColor(FindNode(node, "highlight"), "color", &hasHighlight);
 	mCapsHighlightColor = LoadAttrColor(FindNode(node, "capshighlight"), "color", &hasCapsHighlight);
 
@@ -330,7 +310,6 @@ int GUIKeyboard::SetRenderPos(int x, int y, int w, int h)
 		mRenderH = KeyboardHeight;
 	}
 
-	if (mAction)		mAction->SetActionPos(mRenderX, mRenderY, mRenderW, mRenderH);
 	SetActionPos(mRenderX, mRenderY, mRenderW, mRenderH);
 	return 0;
 }
@@ -468,13 +447,8 @@ int GUIKeyboard::NotifyTouch(TOUCH_STATE state, int x, int y)
 					} else if ((int)key.key == KEYBOARD_ACTION) {
 						// Action
 						highlightRenderCount = 0;
-						if (mAction) {
-							// Keyboard has its own action defined
-							return (mAction ? mAction->NotifyTouch(state, x, y) : 1);
-						} else {
-							// Send action notification
-							PageManager::NotifyKeyboard(key.key);
-						}
+						// Send action notification
+						PageManager::NotifyKeyboard(key.key);
 					}
 				} else if (state == TOUCH_HOLD) {
 					was_held = 1;
diff --git a/gui/objects.hpp b/gui/objects.hpp
index d26b0c2ed..b5675d9aa 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -872,7 +872,6 @@ protected:
 	unsigned int KeyboardWidth, KeyboardHeight;
 	int rowY, colX, highlightRenderCount;
 	bool hasHighlight, hasCapsHighlight;
-	GUIAction* mAction;
 	COLOR mHighlightColor;
 	COLOR mCapsHighlightColor;
 };
-- 
cgit v1.2.3