non important change

git-svn-id: svn://localhost/trunk@42 79bd180b-0a32-48ee-ac55-ada8cae9df61

diff --git a/ukengine/convert.cpp b/ukengine/convert.cpp
index 0ccfdb1..3f5154f 100644 (file)
--- a/ukengine/convert.cpp
+++ b/ukengine/convert.cpp
@@ -181,7 +181,7 @@ DllExport int VnFileConvert(int inCharset, int outCharset, const char *inFile, c
 #if !defined(_WIN32)
                        char cmd[256];
                        sprintf(cmd, "mv %s %s", tmpName, outFile);
-                       int tmp = system(cmd);
+                       system(cmd);
 #else
                        if (rename(tmpName, outFile) != 0) {
                                remove(tmpName);
@@ -210,8 +210,6 @@ end:
 //---------------------------------------
 int vnFileStreamConvert(int inCharset, int outCharset, FILE * inf, FILE *outf)
 {
-       int ret = 0;
-
        VnCharset *pInCharset = VnCharsetLibObj.getVnCharset(inCharset);
        VnCharset *pOutCharset = VnCharsetLibObj.getVnCharset(outCharset);
 

diff --git a/ukengine/diff/byteio.cpp.diff b/ukengine/diff/byteio.cpp.diff
index 2731f0a..9408627 100644 (file)
--- a/ukengine/diff/byteio.cpp.diff
+++ b/ukengine/diff/byteio.cpp.diff
@@ -1,5 +1,5 @@
 --- orginal/byteio.cpp 2009-04-14 00:16:33.000000000 +0700
-+++ byteio.cpp 2009-06-12 10:41:04.000000000 +0700
++++ byteio.cpp 2009-06-19 12:03:47.000000000 +0700
 @@ -1,5 +1,5 @@
  // -*- coding:unix; mode:c++; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil -*-
 -#include "prehdr.h"

diff --git a/ukengine/diff/charset.cpp.diff b/ukengine/diff/charset.cpp.diff
index a88534b..7a99746 100644 (file)
--- a/ukengine/diff/charset.cpp.diff
+++ b/ukengine/diff/charset.cpp.diff
@@ -1,5 +1,5 @@
 --- orginal/charset.cpp        2009-04-14 00:16:33.000000000 +0700
-+++ charset.cpp        2009-06-12 10:44:20.000000000 +0700
++++ charset.cpp        2009-06-19 12:03:47.000000000 +0700
 @@ -20,7 +20,6 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  --------------------------------------------------------------------------------*/

diff --git a/ukengine/diff/convert.cpp.diff b/ukengine/diff/convert.cpp.diff
index 157f1bf..0b7cf2d 100644 (file)
--- a/ukengine/diff/convert.cpp.diff
+++ b/ukengine/diff/convert.cpp.diff
@@ -1,5 +1,5 @@
 --- orginal/convert.cpp        2009-04-14 00:16:33.000000000 +0700
-+++ convert.cpp        2009-06-12 14:00:32.000000000 +0700
++++ convert.cpp        2009-07-06 23:17:04.000000000 +0700
 @@ -20,7 +20,6 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  --------------------------------------------------------------------------------*/
@@ -38,12 +38,7 @@
                        ret = VNCONV_ERR_OUTPUT_FILE; 
                        goto end;
                }
-@@ -182,11 +181,10 @@
- #if !defined(_WIN32)
-                       char cmd[256];
-                       sprintf(cmd, "mv %s %s", tmpName, outFile);
--                      system(cmd);
-+                      int tmp = system(cmd);
+@@ -186,7 +185,6 @@
  #else
                        if (rename(tmpName, outFile) != 0) {
                                remove(tmpName);
@@ -59,7 +54,16 @@
        }
  
  end:
-@@ -235,7 +232,7 @@
+@@ -213,8 +210,6 @@
+ //---------------------------------------
+ int vnFileStreamConvert(int inCharset, int outCharset, FILE * inf, FILE *outf)
+ {
+-      int ret = 0;
+-
+       VnCharset *pInCharset = VnCharsetLibObj.getVnCharset(inCharset);
+       VnCharset *pOutCharset = VnCharsetLibObj.getVnCharset(outCharset);
+ 
+@@ -235,7 +230,7 @@
        return genConvert(*pInCharset, *pOutCharset, is, os);
  }
  

diff --git a/ukengine/diff/data.cpp.diff b/ukengine/diff/data.cpp.diff
index e90e908..28ac61c 100644 (file)
--- a/ukengine/diff/data.cpp.diff
+++ b/ukengine/diff/data.cpp.diff
@@ -1,5 +1,5 @@
 --- orginal/data.cpp   2009-04-14 00:16:33.000000000 +0700
-+++ data.cpp   2009-06-12 10:41:59.000000000 +0700
++++ data.cpp   2009-06-19 12:03:47.000000000 +0700
 @@ -20,7 +20,6 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  --------------------------------------------------------------------------------*/

diff --git a/ukengine/diff/inputproc.cpp.diff b/ukengine/diff/inputproc.cpp.diff
index 0fb0b8f..3b608bb 100644 (file)
--- a/ukengine/diff/inputproc.cpp.diff
+++ b/ukengine/diff/inputproc.cpp.diff
@@ -1,5 +1,5 @@
 --- orginal/inputproc.cpp      2009-04-14 00:16:33.000000000 +0700
-+++ inputproc.cpp      2009-06-19 11:45:58.000000000 +0700
++++ inputproc.cpp      2009-06-19 12:03:47.000000000 +0700
 @@ -20,7 +20,7 @@
   * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   * Boston, MA 02111-1307, USA.

diff --git a/ukengine/diff/keycons.h.diff b/ukengine/diff/keycons.h.diff
index 2fa5442..aabd2bb 100644 (file)
--- a/ukengine/diff/keycons.h.diff
+++ b/ukengine/diff/keycons.h.diff
@@ -1,5 +1,5 @@
 --- orginal/keycons.h  2009-04-14 00:16:33.000000000 +0700
-+++ keycons.h  2009-06-19 11:46:22.000000000 +0700
++++ keycons.h  2009-06-19 12:03:47.000000000 +0700
 @@ -34,7 +34,7 @@
  
  #define CP_US_ANSI 1252

diff --git a/ukengine/diff/mactab.cpp.diff b/ukengine/diff/mactab.cpp.diff
index 9df69b1..5895ef8 100644 (file)
--- a/ukengine/diff/mactab.cpp.diff
+++ b/ukengine/diff/mactab.cpp.diff
@@ -1,5 +1,5 @@
 --- orginal/mactab.cpp 2009-04-14 00:16:33.000000000 +0700
-+++ mactab.cpp 2009-06-12 10:45:07.000000000 +0700
++++ mactab.cpp 2009-06-19 12:03:47.000000000 +0700
 @@ -20,7 +20,7 @@
   * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   * Boston, MA 02111-1307, USA.

diff --git a/ukengine/diff/pattern.cpp.diff b/ukengine/diff/pattern.cpp.diff
index 832e973..edb0393 100644 (file)
--- a/ukengine/diff/pattern.cpp.diff
+++ b/ukengine/diff/pattern.cpp.diff
@@ -1,5 +1,5 @@
 --- orginal/pattern.cpp        2009-04-14 00:16:33.000000000 +0700
-+++ pattern.cpp        2009-06-12 10:42:40.000000000 +0700
++++ pattern.cpp        2009-06-19 12:03:47.000000000 +0700
 @@ -19,7 +19,7 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

diff --git a/ukengine/diff/ukengine.cpp.diff b/ukengine/diff/ukengine.cpp.diff
index e4e6ede..f555c0f 100644 (file)
--- a/ukengine/diff/ukengine.cpp.diff
+++ b/ukengine/diff/ukengine.cpp.diff
@@ -1,5 +1,5 @@
 --- orginal/ukengine.cpp       2009-04-14 00:16:33.000000000 +0700
-+++ ukengine.cpp       2009-06-12 10:42:52.000000000 +0700
++++ ukengine.cpp       2009-06-19 12:03:47.000000000 +0700
 @@ -20,7 +20,7 @@
   * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   * Boston, MA 02111-1307, USA.

diff --git a/ukengine/diff/ukengine.h.diff b/ukengine/diff/ukengine.h.diff
index d0bb060..77ffe26 100644 (file)
--- a/ukengine/diff/ukengine.h.diff
+++ b/ukengine/diff/ukengine.h.diff
@@ -1,5 +1,5 @@
 --- orginal/ukengine.h 2009-04-14 00:16:33.000000000 +0700
-+++ ukengine.h 2009-06-12 10:45:23.000000000 +0700
++++ ukengine.h 2009-06-19 12:03:47.000000000 +0700
 @@ -20,6 +20,7 @@
   * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   * Boston, MA 02111-1307, USA.

diff --git a/ukengine/diff/unikey.cpp.diff b/ukengine/diff/unikey.cpp.diff
index 198c9e6..5007e54 100644 (file)
--- a/ukengine/diff/unikey.cpp.diff
+++ b/ukengine/diff/unikey.cpp.diff
@@ -1,5 +1,5 @@
 --- orginal/unikey.cpp 2009-04-14 01:13:02.000000000 +0700
-+++ unikey.cpp 2009-06-19 11:44:56.000000000 +0700
++++ unikey.cpp 2009-06-19 12:03:47.000000000 +0700
 @@ -48,7 +48,7 @@
  //--------------------------------------------
  void UnikeySetInputMethod(UkInputMethod im)

diff --git a/ukengine/diff/unikey.h.diff b/ukengine/diff/unikey.h.diff
index 7a5d2a7..58a3d7c 100644 (file)
--- a/ukengine/diff/unikey.h.diff
+++ b/ukengine/diff/unikey.h.diff
@@ -1,5 +1,5 @@
 --- orginal/unikey.h   2009-04-14 01:14:29.000000000 +0700
-+++ unikey.h   2009-06-12 10:45:38.000000000 +0700
++++ unikey.h   2009-06-19 12:03:47.000000000 +0700
 @@ -109,6 +109,9 @@
    //e.g: GD&DDT,QDDND...
    //The engine will return to normal mode when a word-break occurs.

diff --git a/ukengine/diff/usrkeymap.cpp.diff b/ukengine/diff/usrkeymap.cpp.diff
index 9334ff8..8c24435 100644 (file)
--- a/ukengine/diff/usrkeymap.cpp.diff
+++ b/ukengine/diff/usrkeymap.cpp.diff
@@ -1,5 +1,5 @@
 --- orginal/usrkeymap.cpp      2009-04-14 01:12:54.000000000 +0700
-+++ usrkeymap.cpp      2009-06-12 10:45:46.000000000 +0700
++++ usrkeymap.cpp      2009-06-19 12:03:47.000000000 +0700
 @@ -21,13 +21,15 @@
   * Boston, MA 02111-1307, USA.
   */

diff --git a/ukengine/diff/vnconv.h.diff b/ukengine/diff/vnconv.h.diff
index 9d6bb3d..c8e9af1 100644 (file)
--- a/ukengine/diff/vnconv.h.diff
+++ b/ukengine/diff/vnconv.h.diff
@@ -1,5 +1,5 @@
 --- orginal/vnconv.h   2009-04-14 00:16:33.000000000 +0700
-+++ vnconv.h   2009-06-12 10:45:58.000000000 +0700
++++ vnconv.h   2009-06-29 14:30:59.000000000 +0700
 @@ -19,6 +19,7 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.