Remove conflict between namespace and class name

Change-Id: I2ff6aae518c57bfcaf005f3a246bf1bdb90f1bf5
Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>

diff --git a/Tizen.Uix/Interop/Interop.Stt.cs b/Tizen.Uix/Interop/Interop.Stt.cs
index a1ae9d6..cbf6f0d 100755 (executable)
--- a/Tizen.Uix/Interop/Interop.Stt.cs
+++ b/Tizen.Uix/Interop/Interop.Stt.cs
@@ -63,7 +63,7 @@ internal static partial class Interop
         internal delegate void RecognitionResultCallback(IntPtr handle, Tizen.Uix.Stt.ResultEvent e, IntPtr data, int dataCount, IntPtr msg, IntPtr userData);
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        internal delegate bool ResultTimeCallback(IntPtr handle, int index, Tizen.Uix.Stt.TimeEvent e, IntPtr text, long startTime, long endTime, IntPtr userData);
+        internal delegate bool ResultTimeCallback(IntPtr handle, int index, Tizen.Uix.Stt.TimeEvent e, IntPtr text, IntPtr startTime, IntPtr endTime, IntPtr userData);
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         internal delegate void StateChangedCallback(IntPtr handle, Tizen.Uix.Stt.State previous, Tizen.Uix.Stt.State current, IntPtr userData);

diff --git a/Tizen.Uix/Tizen.Uix-Stt.csproj b/Tizen.Uix/Tizen.Uix-Stt.csproj
index 91eaa7c..e971ebc 100755 (executable)
--- a/Tizen.Uix/Tizen.Uix-Stt.csproj
+++ b/Tizen.Uix/Tizen.Uix-Stt.csproj
@@ -57,11 +57,10 @@
     <Compile Include="Tizen.Uix.Stt\RecognitionResultEventArgs.cs" />
     <Compile Include="Tizen.Uix.Stt\ResultTime.cs" />
     <Compile Include="Tizen.Uix.Stt\StateChangedEventArgs.cs" />
-    <Compile Include="Tizen.Uix.Stt\Stt.cs" />
+    <Compile Include="Tizen.Uix.Stt\SttClient.cs" />
     <Compile Include="Tizen.Uix.Stt\SupportedEngine.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Settings.StyleCop" />
     <None Include="Tizen.Uix-Stt.nuspec" />
     <None Include="Tizen.Uix-Stt.project.json" />
     <None Include="Tizen.Uix-Stt.snk" />

diff --git a/Tizen.Uix/Tizen.Uix-SttNet45.csproj b/Tizen.Uix/Tizen.Uix-SttNet45.csproj
index 3b8ba60..32f540d 100755 (executable)
--- a/Tizen.Uix/Tizen.Uix-SttNet45.csproj
+++ b/Tizen.Uix/Tizen.Uix-SttNet45.csproj
@@ -57,11 +57,10 @@
     <Compile Include="Tizen.Uix.Stt\RecognitionResultEventArgs.cs" />
     <Compile Include="Tizen.Uix.Stt\ResultTime.cs" />
     <Compile Include="Tizen.Uix.Stt\StateChangedEventArgs.cs" />
-    <Compile Include="Tizen.Uix.Stt\Stt.cs" />
+    <Compile Include="Tizen.Uix.Stt\SttClient.cs" />
     <Compile Include="Tizen.Uix.Stt\SupportedEngine.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Settings.StyleCop" />
     <None Include="Tizen.Uix-Stt.nuspec" />
     <None Include="Tizen.Uix-Stt.Net45.project.json" />
     <None Include="Tizen.Uix-Stt.snk" />

diff --git a/Tizen.Uix/Tizen.Uix.Stt/Stt.cs b/Tizen.Uix/Tizen.Uix.Stt/SttClient.cs
similarity index 99%
rename from Tizen.Uix/Tizen.Uix.Stt/Stt.cs
rename to Tizen.Uix/Tizen.Uix.Stt/SttClient.cs
index f07b546..6fdaf52 100755 (executable)
--- a/Tizen.Uix/Tizen.Uix.Stt/Stt.cs
+++ b/Tizen.Uix/Tizen.Uix.Stt/SttClient.cs
@@ -263,7 +263,7 @@ namespace Tizen.Uix.Stt
     /// The STT service always works in the background as a server. If the service is not working, client library will invoke it and client will communicate with it.
     /// The service has engines and the recorder so client does not have the recorder itself. Only the client request commands to the STT service for using STT.
     /// </summary>
-    public class Stt : IDisposable
+    public class SttClient : IDisposable
     {
         private IntPtr _handle;
         private Object thisLock = new Object();
@@ -294,7 +294,7 @@ namespace Tizen.Uix.Stt
         /// 3. STT Not Supported
         /// 4. Permission Denied
         /// </exception>
-        public Stt()
+        public SttClient()
         {
             IntPtr handle;
             SttError error = SttCreate(out handle);
@@ -365,7 +365,7 @@ namespace Tizen.Uix.Stt
             {
                 lock (thisLock)
                 {
-                    Stt obj = this;
+                    SttClient obj = this;
                     _stateDelegate = (IntPtr handle, State previous, State current, IntPtr userData) =>
                     {
                         StateChangedEventArgs args = new StateChangedEventArgs(previous, current);
@@ -688,9 +688,9 @@ namespace Tizen.Uix.Stt
         public IEnumerable<ResultTime> GetDetailedResult()
         {
             List<ResultTime> list = new List<ResultTime>();
-            _resultTimeDelegate = (IntPtr handle, int index, TimeEvent e, IntPtr text, long startTime, long endTime, IntPtr userData) =>
+            _resultTimeDelegate = (IntPtr handle, int index, TimeEvent e, IntPtr text, IntPtr startTime, IntPtr endTime, IntPtr userData) =>
             {
-                _result = new ResultTime(index, e, Marshal.PtrToStringAnsi(text), startTime, endTime);
+                _result = new ResultTime(index, e, Marshal.PtrToStringAnsi(text), (long)startTime, (long)endTime);
                 list.Add(_result);
                 return true;
             };