[uim commit] r5435 - in trunk: gtk qt qt4/immodule xim

[codesite-noreply]

Author: ek.kato
Date: Sun Apr 20 20:01:44 2008
New Revision: 5435
Modified:
  trunk/gtk/compose.c
  trunk/qt/immodule-quiminputcontext_compose.cpp
  trunk/qt4/immodule/quiminputcontext_compose.cpp
  trunk/xim/compose.cpp

Log:
* qt/immodule-quiminputcontext_compose.cpp
* gtk/compose.c
* qt4/immodule/quiminputcontext_compose.cpp
* xim/compose.cpp
 - Just Cosmetic changes (no code is changed).


Modified: trunk/gtk/compose.c
==============================================================================
--- trunk/gtk/compose.c (original)
+++ trunk/gtk/compose.c Sun Apr 20 20:01:44 2008
@@ -423,6 +423,7 @@
        *j = '\0';
    }
    strlcpy(transname, ret, len);
+
    return 1;
}

@@ -830,6 +831,7 @@
        return 0;

    snprintf(filename, len, "%s/%s/%s", xlib_dir, XLOCALE_DIR, name);
+
    return 1;
}


Modified: trunk/qt/immodule-quiminputcontext_compose.cpp
==============================================================================
--- trunk/qt/immodule-quiminputcontext_compose.cpp      (original)
+++ trunk/qt/immodule-quiminputcontext_compose.cpp      Sun Apr 20 20:01:44 2008
@@ -563,9 +563,9 @@
const char *
QUimInputContext::get_encoding()
{
-   QTextCodec *codec = QTextCodec::codecForLocale();
+    QTextCodec *codec = QTextCodec::codecForLocale();

-   return codec->name();
+    return codec->name();
}

int
@@ -582,7 +582,7 @@
    if (p)
        *p = '\0';

-    return 1;
+    return 1;
}

int
@@ -653,7 +653,7 @@
            if (token != KEY && token != STRING)
                goto error;

-	    if ((!TransFileName(filename, *tokenbuf, sizeof(filename))) || 
filename[0] == '\0')
+	    if (!TransFileName(filename, *tokenbuf, sizeof(filename)) || 
filename[0] == '\0')
                goto error;
            infp = fopen(filename, "r");
            if (infp == NULL)

Modified: trunk/qt4/immodule/quiminputcontext_compose.cpp
==============================================================================
--- trunk/qt4/immodule/quiminputcontext_compose.cpp     (original)
+++ trunk/qt4/immodule/quiminputcontext_compose.cpp     Sun Apr 20 20:01:44 2008
@@ -674,7 +674,7 @@
            if (token != KEY && token != STRING)
                goto error;

-	    if ((!TransFileName(filename, *tokenbuf, sizeof(filename))) || 
filename[0] == '\0')
+	    if (!TransFileName(filename, *tokenbuf, sizeof(filename)) || 
filename[0] == '\0')
                goto error;
            infp = fopen(filename, "r");
            if (infp == NULL)
@@ -895,9 +895,8 @@
        }
    }

-    if (name[0] == '\0' && !get_compose_filename(name, sizeof(name))) {
+    if (name[0] == '\0' && !get_compose_filename(name, sizeof(name)))
        return;
-    }

    if (fp == NULL && ((fp = fopen(name, "r")) == NULL))
        return;

Modified: trunk/xim/compose.cpp
==============================================================================
--- trunk/xim/compose.cpp       (original)
+++ trunk/xim/compose.cpp       Sun Apr 20 20:01:44 2008
@@ -464,7 +464,7 @@

    struct DefBuffer buf[SEQUENCE_MAX];
    int i, n;
-    const char *encoding = get_encoding();;
+    const char *encoding = get_encoding();

    do {
        token = nexttoken(fp, tokenbuf, &lastch, buflen);
@@ -775,6 +775,7 @@

    if (name[0] == '\0')
        return 0;
+
    snprintf(filename, len, "%s/%s/%s", xlib_dir, XLOCALE_DIR, name);

    return 1;