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 0ccfdb14d8df614ebdc14e5350df8aa3400b764a..3f5154f54e1f682e0ab5f7d4c16a9ad5fbef8ff0 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 2731f0ab34a2cc78ce165b7bed77c09a4b06c1c7..94086274f67adb5fccd25868e564820a66d1c350 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 a88534bc6496bf576b9bcc07862b06012c243cfe..7a99746c6e446ef21a205a47d5a4dfd7f6763f77 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 157f1bf3415dfbdfc34f7fd30dca1968387c32ad..0b7cf2d16e0b76cb0b4a76629b57dbd5993e9a44 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 e90e9089e90239ea289f1c6d0850e3c18a1e84d1..28ac61c3f1f09bc4282829a325f599584a4a4b67 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 0fb0b8f46edc085b187f040c2c34a89a22f51514..3b608bbe5b688953676b92087f0531d678700103 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 2fa544273c733f57f902126a901df96e5782de77..aabd2bba56faa78bc651dc114a6db5359ae085dd 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 9df69b19f2cb78ce6face47c678014af02f47c30..5895ef84560b83a0ad8106453b8a6db5ea67d3b4 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 832e973a5d20682aa2cc624720012d5c90ddc56a..edb0393c6dd4334017439d4d616df856411e2823 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 e4e6edefcbb01b4b985a81f6a2878343380a6387..f555c0f8a4c3c67ae6935e7501dd9ad5906e401d 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 d0bb060dd64a044e99d4a18998fc8384afa8e82e..77ffe2684266ffc91658441e5a895fd4f288fca4 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 198c9e62357cf636e02790a68a5cee38c19b1296..5007e54a8af37a8f05d2d4218daa0d38a55071a1 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 7a5d2a7e3525b0af32ec7073cc67a75452942089..58a3d7c4101f003031d90c5b7df7dcba6edb5ff3 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 9334ff89bd7e329d1ab14b16f301ea41ebf6eeb7..8c24435a2bc57441fe55ab364163fe27e30859e2 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 9d6bb3d593fe84bc854d6244029c99678a122644..c8e9af1510aae4a765181cbf8a3e08f7c2fed98d 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.