[ios] Move keyboard and keyboardview to ios-common

common keyboard related code moved to ios-common remove XBMCDebugHelpers.h and use common NSLogDebugHelpers.h in platform/darwin
xbmc · Apr 30, 2019 · d88a377 · d88a377
1 parent 657785a
commit d88a377
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 52 deletions.
diff --git a/xbmc/dialogs/GUIDialogKeyboardTouch.cpp b/xbmc/dialogs/GUIDialogKeyboardTouch.cpp
@@ -8,7 +8,7 @@
 
 #include "GUIDialogKeyboardTouch.h"
 #if defined(TARGET_DARWIN_IOS)
-#include "platform/darwin/ios/IOSKeyboard.h"
+#include "platform/darwin/ios-common/IOSKeyboard.h"
 #endif
 
 CGUIDialogKeyboardTouch::CGUIDialogKeyboardTouch()

diff --git a/xbmc/platform/darwin/ios-common/CMakeLists.txt b/xbmc/platform/darwin/ios-common/CMakeLists.txt
@@ -1,5 +1,9 @@
-set(SOURCES AnnounceReceiver.mm)
+set(SOURCES AnnounceReceiver.mm
+            IOSKeyboard.mm
+            IOSKeyboardView.mm)
 
-set(HEADERS AnnounceReceiver.h)
+set(HEADERS AnnounceReceiver.h
+            IOSKeyboard.h
+            IOSKeyboardView.h)
 
 core_add_library(platform_ios-common)
diff --git a/xbmc/platform/darwin/ios/IOSKeyboard.h → .../platform/darwin/ios-common/IOSKeyboard.h b/xbmc/platform/darwin/ios/IOSKeyboard.h → .../platform/darwin/ios-common/IOSKeyboard.h
@@ -13,11 +13,11 @@
 class CIOSKeyboard : public CGUIKeyboard
 {
   public:
-    CIOSKeyboard():m_pCharCallback(NULL),m_bCanceled(false){}
+    CIOSKeyboard():m_pCharCallback(nullptr),m_bCanceled(false){}
     virtual bool ShowAndGetInput(char_callback_t pCallback, const std::string &initialString, std::string &typedString, const std::string &heading, bool bHiddenInput);
     virtual void Cancel();
     void fireCallback(const std::string &str);
-    void invalidateCallback() {m_pCharCallback = NULL;}
+    void invalidateCallback() {m_pCharCallback = nullptr;}
     virtual bool SetTextToKeyboard(const std::string &text, bool closeKeyboard = false);
 
   private:

diff --git a/xbmc/platform/darwin/ios/IOSKeyboard.mm → ...platform/darwin/ios-common/IOSKeyboard.mm b/xbmc/platform/darwin/ios/IOSKeyboard.mm → ...platform/darwin/ios-common/IOSKeyboard.mm
@@ -6,11 +6,12 @@
  *  See LICENSES/README.md for more information.
  */
 
-#include "XBMCController.h"
-#include "IOSKeyboard.h"
-#include "IOSKeyboardView.h"
-#include "XBMCDebugHelpers.h"
 #include "platform/darwin/DarwinUtils.h"
+#include "platform/darwin/NSLogDebugHelpers.h"
+#include "platform/darwin/ios/XBMCController.h"
+#include "platform/darwin/ios-common/IOSKeyboard.h"
+#include "platform/darwin/ios-common/IOSKeyboardView.h"
+
 
 #import "platform/darwin/AutoPool.h"
 

diff --git a/xbmc/platform/darwin/ios/IOSKeyboardView.h → ...tform/darwin/ios-common/IOSKeyboardView.h b/xbmc/platform/darwin/ios/IOSKeyboardView.h → ...tform/darwin/ios-common/IOSKeyboardView.h
@@ -7,7 +7,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#include "IOSKeyboard.h"
+#include "platform/darwin/ios-common/IOSKeyboard.h"
 
 @interface KeyboardView : UIView <UITextFieldDelegate>
 {

diff --git a/xbmc/platform/darwin/ios/IOSKeyboardView.mm → ...form/darwin/ios-common/IOSKeyboardView.mm b/xbmc/platform/darwin/ios/IOSKeyboardView.mm → ...form/darwin/ios-common/IOSKeyboardView.mm
@@ -10,11 +10,11 @@
 #include "threads/Event.h"
 #include "Application.h"
 
-#import "IOSKeyboardView.h"
-#import "IOSScreenManager.h"
-#import "XBMCController.h"
-#import "XBMCDebugHelpers.h"
-#include "IOSKeyboard.h"
+#import "platform/darwin/NSLogDebugHelpers.h"
+#import "platform/darwin/ios/IOSScreenManager.h"
+#import "platform/darwin/ios/XBMCController.h"
+#import "platform/darwin/ios-common/IOSKeyboard.h"
+#import "platform/darwin/ios-common/IOSKeyboardView.h"
 
 static CEvent keyboardFinishedEvent;
 

diff --git a/xbmc/platform/darwin/ios/CMakeLists.txt b/xbmc/platform/darwin/ios/CMakeLists.txt
@@ -1,17 +1,12 @@
 set(SOURCES IOSEAGLView.mm
             IOSExternalTouchController.mm
-            IOSKeyboard.mm
-            IOSKeyboardView.mm
             IOSScreenManager.mm
             XBMCController.mm)
 
 set(HEADERS IOSEAGLView.h
             IOSExternalTouchController.h
-            IOSKeyboard.h
-            IOSKeyboardView.h
             IOSScreenManager.h
             XBMCApplication.h
-            XBMCController.h
-            XBMCDebugHelpers.h)
+            XBMCController.h)
 
 core_add_library(platform_ios)
diff --git a/xbmc/platform/darwin/ios/IOSEAGLView.mm b/xbmc/platform/darwin/ios/IOSEAGLView.mm
@@ -31,7 +31,7 @@
 #import "platform/darwin/AutoPool.h"
 #import "platform/darwin/DarwinUtils.h"
 #import "platform/darwin/ios-common/AnnounceReceiver.h"
-#import "XBMCDebugHelpers.h"
+#import "platform/darwin/NSLogDebugHelpers.h"
 
 using namespace KODI::MESSAGING;
 

diff --git a/xbmc/platform/darwin/ios/XBMCApplication.mm b/xbmc/platform/darwin/ios/XBMCApplication.mm
@@ -12,7 +12,7 @@
 #import "XBMCApplication.h"
 #import "XBMCController.h"
 #import "IOSScreenManager.h"
-#import "XBMCDebugHelpers.h"
+#import "platform/darwin/NSLogDebugHelpers.h"
 #import <objc/runtime.h>
 
 @implementation XBMCApplicationDelegate

diff --git a/xbmc/platform/darwin/ios/XBMCController.mm b/xbmc/platform/darwin/ios/XBMCController.mm
@@ -48,7 +48,7 @@
 #import "XBMCController.h"
 #import "IOSScreenManager.h"
 #import "XBMCApplication.h"
-#import "XBMCDebugHelpers.h"
+#import "platform/darwin/NSLogDebugHelpers.h"
 #import "platform/darwin/AutoPool.h"
 
 XBMCController *g_xbmcController;

diff --git a/xbmc/platform/darwin/ios/XBMCDebugHelpers.h b/xbmc/platform/darwin/ios/XBMCDebugHelpers.h