Revision: 6188
Author: nogu.dev
Date: Sun Feb 28 14:56:41 2010
Log: * qt4/immodule/candidatewindow.cpp
- (CandidateWindow::setPageCandidates): Make scope of variables narrower.
* qt4/immodule/qtextutil.cpp
- (QUimTextUtil::acquirePrimaryTextInQTextEdit,
QUimTextUtil::deletePrimaryTextInQTextEdit,
QUimTextUtil::deleteSelectionTextInQTextEdit): Ditto.
* qt4/immodule/quiminputcontext_compose.cpp
- (nexttoken, modmask, QUimInputContext::parse_compose_line): Ditto.
http://code.google.com/p/uim/source/detail?r=6188
Modified:
/trunk/qt4/immodule/candidatewindow.cpp
/trunk/qt4/immodule/qtextutil.cpp
/trunk/qt4/immodule/quiminputcontext_compose.cpp
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp Sun Feb 28 14:56:29 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp Sun Feb 28 14:56:41 2010
@@ -222,7 +222,7 @@
return;
// set candidates
- int i, start, pageNr;
+ int start, pageNr;
start = page * displayLimit;
if ( displayLimit && ( nrCandidates - start ) > displayLimit )
@@ -230,7 +230,7 @@
else
pageNr = nrCandidates - start;
- for ( i = 0; i < pageNr; i++ )
+ for ( int i = 0; i < pageNr; i++ )
stores[ start + i ] = candidates[ i ];
}
#endif /* UIM_QT_USE_NEW_PAGE_HANDLING */
=======================================
--- /trunk/qt4/immodule/qtextutil.cpp Tue Jan 20 18:11:15 2009
+++ /trunk/qt4/immodule/qtextutil.cpp Sun Feb 28 14:56:41 2010
@@ -254,7 +254,6 @@
Q3TextEdit *edit = (Q3TextEdit *)mWidget;
QString text;
- int i;
int start_para, start_index, end_para, end_index, para, index;
int n_para;
int preedit_len, preedit_cursor_pos;
@@ -282,7 +281,7 @@
end_para = para;
if ( former_req_len >= 0 ) {
- for ( i = 0; i < former_req_len; i++ )
+ for ( int i = 0; i < former_req_len; i++ )
QTextEditPositionBackward( &start_para, &start_index );
} else {
if ( former_req_len == UTextExtent_Line )
@@ -299,7 +298,7 @@
*former = strdup( edit->selectedText().utf8() );
if ( latter_req_len >= 0 ) {
- for ( i = 0; i < latter_req_len; i++ )
+ for ( int i = 0; i < latter_req_len; i++ )
QTextEditPositionForward( &end_para, &end_index );
} else {
if ( latter_req_len == UTextExtent_Line ) {
@@ -326,7 +325,7 @@
end_index = start_index;
if ( latter_req_len >= 0 ) {
- for ( i = 0; i < latter_req_len; i++ )
+ for ( int i = 0; i < latter_req_len; i++ )
QTextEditPositionForward( &end_para, &end_index );
} else {
if ( latter_req_len == UTextExtent_Line )
@@ -359,7 +358,7 @@
start_index = end_index;
if ( former_req_len >= 0 ) {
- for ( i = 0; i < former_req_len; i++ )
+ for ( int i = 0; i < former_req_len; i++ )
QTextEditPositionBackward( &start_para, &start_index );
} else {
if ( former_req_len == UTextExtent_Line )
@@ -724,7 +723,6 @@
int latter_req_len )
{
Q3TextEdit *edit = (Q3TextEdit *)mWidget;
- int i;
int start_para, start_index, end_para, end_index, para, index;
int n_para;
@@ -741,7 +739,7 @@
end_para = para;
if ( former_req_len >= 0 ) {
- for ( i = 0; i < former_req_len; i++ )
+ for ( int i = 0; i < former_req_len; i++ )
QTextEditPositionBackward( &start_para, &start_index );
} else {
if ( former_req_len == UTextExtent_Line ) {
@@ -755,7 +753,7 @@
}
}
if ( latter_req_len >= 0 ) {
- for ( i = 0; i < latter_req_len; i++ )
+ for ( int i = 0; i < latter_req_len; i++ )
QTextEditPositionForward( &end_para, &end_index );
} else {
if ( latter_req_len == UTextExtent_Line ) {
@@ -777,7 +775,7 @@
end_index = start_index;
if ( latter_req_len >= 0 ) {
- for ( i = 0; i < latter_req_len; i++ )
+ for ( int i = 0; i < latter_req_len; i++ )
QTextEditPositionForward( &end_para, &end_index );
} else {
if ( latter_req_len == UTextExtent_Line ) {
@@ -799,7 +797,7 @@
start_index = end_index;
if ( former_req_len >= 0 ) {
- for ( i = 0; i < former_req_len; i++ )
+ for ( int i = 0; i < former_req_len; i++ )
QTextEditPositionBackward( &start_para, &start_index );
} else {
if ( former_req_len == UTextExtent_Line )
@@ -907,7 +905,7 @@
{
Q3TextEdit *edit = (Q3TextEdit *)mWidget;
QString text;
- int len, newline, i;
+ int len, newline;
int para, index;
int sel_para_from, sel_index_from, sel_para_to, sel_index_to;
int start_para, start_index, end_para, end_index;
@@ -937,7 +935,7 @@
if ( len > latter_req_len ) {
end_para = sel_para_from;
end_index = sel_index_from;
- for ( i = 0; i < latter_req_len; i++)
+ for ( int i = 0; i < latter_req_len; i++)
QTextEditPositionForward( &end_para, &end_index );
}
} else {
@@ -955,7 +953,7 @@
if ( len > former_req_len ) {
start_para = sel_para_to;
start_index = sel_index_to;
- for ( i = 0; i < former_req_len; i++)
+ for ( int i = 0; i < former_req_len; i++)
QTextEditPositionBackward( &start_para, &start_index );
}
} else {
=======================================
--- /trunk/qt4/immodule/quiminputcontext_compose.cpp Sun Feb 28 14:55:40
2010
+++ /trunk/qt4/immodule/quiminputcontext_compose.cpp Sun Feb 28 14:56:41
2010
@@ -322,7 +322,7 @@
int c;
int token;
char *p;
- int i, j;
+ int i;
size_t len = 0;
while ((c = nextch(fp, lastch)) == ' ' || c == '\t') {
@@ -391,7 +391,7 @@
case '7':
i = c - '0';
c = nextch(fp, lastch);
- for (j = 0; j < 2 && c >= '0' && c <= '7'; j++) {
+ for (int j = 0; j < 2 && c >= '0' && c <= '7'; j++) {
i <<= 3;
i += c - '0';
c = nextch(fp, lastch);
@@ -403,6 +403,7 @@
case 'X':
case 'x':
i = 0;
+ int j;
for (j = 0; j < 2; j++) {
c = nextch(fp, lastch);
i <<= 4;
@@ -492,7 +493,6 @@
const char *name;
long mask;
};
- struct _modtbl *p;
static struct _modtbl tbl[] = {
{ "Ctrl", ControlMask },
@@ -503,9 +503,8 @@
{ "Meta", Mod1Mask },
{ NULL, 0 }};
- p = tbl;
mask = 0;
- for (p = tbl; p->name != NULL; p++) {
+ for (struct _modtbl *p = tbl; p->name != NULL; p++) {
if (strcmp(name, p->name) == 0) {
mask = p->mask;
break;
@@ -653,7 +652,7 @@
};
struct DefBuffer buf[SEQUENCE_MAX];
- int i, n;
+ int n;
QTextCodec *codec = QTextCodec::codecForLocale();
QString qs;
@@ -793,7 +792,7 @@
qs = codec->toUnicode(rhs_string_mb);
rhs_string_utf8 = strdup((const char *)qs.utf8());
- for (i = 0; i < n; i++) {
+ for (int i = 0; i < n; i++) {
for (p = *top; p; p = p->next) {
if (buf[i].keysym == p->keysym &&
buf[i].modifier == p->modifier &&
