From: sungwook79.park Date: Fri, 22 Sep 2017 06:24:42 +0000 (+0900) Subject: Change variable name and class name X-Git-Tag: preview1-00241^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F44%2F151844%2F1;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git Change variable name and class name Change-Id: I4cdd824ff5e6110e3840112e28a6e735cbf0f6bb Signed-off-by: sungwook79.park --- diff --git a/src/Tizen.Uix.InputMethod/Interop/Interop.InputMethod.cs b/src/Tizen.Uix.InputMethod/Interop/Interop.InputMethod.cs index 4b5ccb3..5c7d227 100755 --- a/src/Tizen.Uix.InputMethod/Interop/Interop.InputMethod.cs +++ b/src/Tizen.Uix.InputMethod/Interop/Interop.InputMethod.cs @@ -120,7 +120,7 @@ internal static partial class Interop internal static extern ErrorCode ImeEventSetInputContextResetCb(ImeInputContextResetCb callbackFunction, IntPtr userData); [DllImport(Libraries.InputMethod, EntryPoint = "ime_event_set_cursor_position_updated_cb")] - internal static extern ErrorCode ImeEventSetCursorPositionitionUpdatedCb(ImeCursorPositionitionUpdatedCb callbackFunction, IntPtr userData); + internal static extern ErrorCode ImeEventSetCursorPositionUpdatedCb(ImeCursorPositionUpdatedCb callbackFunction, IntPtr userData); [DllImport(Libraries.InputMethod, EntryPoint = "ime_event_set_language_requested_cb")] internal static extern ErrorCode ImeEventSetLanguageRequestedCallbackCb(ImeLanguageRequestedCb callbackFunction, IntPtr userData); @@ -207,7 +207,7 @@ internal static partial class Interop internal static extern ErrorCode ImeContextGetLayoutVariation(IntPtr context, out LayoutVariation layoutVariation); [DllImport(Libraries.InputMethod, EntryPoint = "ime_context_get_cursor_position")] - internal static extern ErrorCode ImeContextGetCursorPositionition(IntPtr context, out int cursorPos); + internal static extern ErrorCode ImeContextGetCursorPosition(IntPtr context, out int cursorPos); [DllImport(Libraries.InputMethod, EntryPoint = "ime_context_get_autocapital_type")] internal static extern ErrorCode ImeContextGetAutocapitalType(IntPtr context, out AutoCapitalization autocapitalType); @@ -268,7 +268,7 @@ internal static partial class Interop internal delegate void ImeInputContextResetCb(IntPtr userData); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - internal delegate void ImeCursorPositionitionUpdatedCb(int cursorPos, IntPtr userData); + internal delegate void ImeCursorPositionUpdatedCb(int cursorPos, IntPtr userData); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate void ImeLanguageRequestedCb(IntPtr userData, out IntPtr langCode); diff --git a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/CursorPositionUpdatedEventArgs.cs b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/CursorPositionUpdatedEventArgs.cs index afbf445..55e818e 100755 --- a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/CursorPositionUpdatedEventArgs.cs +++ b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/CursorPositionUpdatedEventArgs.cs @@ -17,11 +17,11 @@ namespace Tizen.Uix.InputMethod { /// - /// This Class contains data related to CursorPositionitionUpdated Event + /// This Class contains data related to CursorPositionUpdated Event /// - public class CursorPositionitionUpdatedEventArgs + public class CursorPositionUpdatedEventArgs { - internal CursorPositionitionUpdatedEventArgs(int cursorPos) + internal CursorPositionUpdatedEventArgs(int cursorPos) { CursorPosition = cursorPos; } @@ -35,4 +35,4 @@ namespace Tizen.Uix.InputMethod internal set; } } -} \ No newline at end of file +} diff --git a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodContext.cs b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodContext.cs index d5e4ba0..6b573c7 100755 --- a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodContext.cs +++ b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodContext.cs @@ -331,15 +331,15 @@ namespace Tizen.Uix.InputMethod /// /// Gets the cursor position information. /// - public int CursorPositionition + public int CursorPosition { get { int cursorPosition; - ErrorCode error = ImeContextGetCursorPositionition(_handle, out cursorPosition); + ErrorCode error = ImeContextGetCursorPosition(_handle, out cursorPosition); if (error != ErrorCode.None) { - Log.Error(LogTag, "GetCursorPositionition Failed with error " + error); + Log.Error(LogTag, "GetCursorPosition Failed with error " + error); return -1; } return cursorPosition; diff --git a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodDeviceInformation.cs b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodDeviceInformation.cs index 6f3d788..242e291 100755 --- a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodDeviceInformation.cs +++ b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodDeviceInformation.cs @@ -122,10 +122,10 @@ namespace Tizen.Uix.InputMethod /// /// this class gives the device information, like the name, class and subclass /// - public class VoiceControlDeviceInformation + public class InputMethodDeviceInformation { private IntPtr _handle; - internal VoiceControlDeviceInformation(IntPtr handle) + internal InputMethodDeviceInformation(IntPtr handle) { _handle = handle; } diff --git a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodEditor.cs b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodEditor.cs index 1d0967b..dc48ce4 100755 --- a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodEditor.cs +++ b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodEditor.cs @@ -966,8 +966,8 @@ namespace Tizen.Uix.InputMethod private static ImeSurroundingTextUpdatedCb _imeSurroundingTextUpdatedDelegate; private static event EventHandler _inputContextReset; private static ImeInputContextResetCb _imeInputContextResetDelegate; - private static event EventHandler _cursorPositionUpdated; - private static ImeCursorPositionitionUpdatedCb _imeCursorPositionitionUpdatedDelegate; + private static event EventHandler _cursorPositionUpdated; + private static ImeCursorPositionUpdatedCb _imeCursorPositionUpdatedDelegate; private static event EventHandler _langaugeSet; private static ImeLanguageSetCb _imeLanguageSetDelegate; private static event EventHandler _imDataSet; @@ -987,7 +987,7 @@ namespace Tizen.Uix.InputMethod private static ImeAccessibilityStateChangedCb _imeAccessibilityStateChangedDelegate; private static ImeLanguageRequestedCb _imeLanguageRequestedDelegate; private static OutAction _languageRequestedDelegate; - private static BoolAction _processKeyDelagate; + private static BoolAction _processKeyDelagate; private static ImeImdataRequestedCb _imeImDataRequestedDelegate; private static OutArrayAction _imDataRequestedDelegate; private static ImeGeometryRequestedCb _imeGeometryRequestedDelegate; @@ -1230,21 +1230,21 @@ namespace Tizen.Uix.InputMethod /// /// Called when the position of the cursor in an associated text input UI control changes. /// - public static event EventHandler CursorPositionitionUpdated + public static event EventHandler CursorPositionUpdated { add { lock (thisLock) { - _imeCursorPositionitionUpdatedDelegate = (int cursorPos, IntPtr userData) => + _imeCursorPositionUpdatedDelegate = (int cursorPos, IntPtr userData) => { - CursorPositionitionUpdatedEventArgs args = new CursorPositionitionUpdatedEventArgs(cursorPos); + CursorPositionUpdatedEventArgs args = new CursorPositionUpdatedEventArgs(cursorPos); _cursorPositionUpdated?.Invoke(null, args); }; - ErrorCode error = ImeEventSetCursorPositionitionUpdatedCb(_imeCursorPositionitionUpdatedDelegate, IntPtr.Zero); + ErrorCode error = ImeEventSetCursorPositionUpdatedCb(_imeCursorPositionUpdatedDelegate, IntPtr.Zero); if (error != ErrorCode.None) { - Log.Error(LogTag, "Add CursorPositionitionUpdated Failed with error " + error); + Log.Error(LogTag, "Add CursorPositionUpdated Failed with error " + error); } else { @@ -1570,11 +1570,11 @@ namespace Tizen.Uix.InputMethod /// The Action is alled when the key event is received from the external devices or SendKey function. /// This Event processes the key event before an associated text input UI control does. /// - public static void SetProcessKeyCallback(BoolAction processKey) + public static void SetProcessKeyCallback(BoolAction processKey) { _imeProcessKeyDelegate = (KeyCode keyCode, KeyMask keyMask, IntPtr devInfo, IntPtr userData) => { - return _processKeyDelagate(keyCode, keyMask, new VoiceControlDeviceInformation(devInfo)); + return _processKeyDelagate(keyCode, keyMask, new InputMethodDeviceInformation(devInfo)); }; ErrorCode error = ImeEventSetProcessKeyEventCb(_imeProcessKeyDelegate, IntPtr.Zero); if (error != ErrorCode.None)