Revision: 6250
Author: nogu.dev
Date: Sat Mar 13 04:38:19 2010
Log: * qt4/immodule/qhelpermanager.cpp
* qt4/immodule/qtextutil.cpp
* qt4/immodule/quiminputcontext.cpp
* qt4/immodule/quiminputcontext_compose.cpp
* qt4/immodule/quiminputcontext_compose.h
* qt4/pref/customwidgets.h
* qt4/pref/qt4.cpp
- Use static_cast instead of C style casts. Using static_cast is safer
because it can't convert between incompatible types and can't cast
away constness. In fact, one of the C style casts in the codes had
removed constness.
http://code.google.com/p/uim/source/detail?r=6250
Modified:
/trunk/qt4/immodule/qhelpermanager.cpp
/trunk/qt4/immodule/qtextutil.cpp
/trunk/qt4/immodule/quiminputcontext.cpp
/trunk/qt4/immodule/quiminputcontext_compose.cpp
/trunk/qt4/immodule/quiminputcontext_compose.h
/trunk/qt4/pref/customwidgets.h
/trunk/qt4/pref/qt4.cpp
=======================================
--- /trunk/qt4/immodule/qhelpermanager.cpp Sat Mar 13 04:38:05 2010
+++ /trunk/qt4/immodule/qhelpermanager.cpp Sat Mar 13 04:38:19 2010
@@ -272,7 +272,7 @@
void QUimHelperManager::update_prop_list_cb( void *ptr, const char *str )
{
- QUimInputContext *ic = ( QUimInputContext* ) ptr;
+ QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
if ( ic != focusedInputContext || disableFocusedContext )
return;
@@ -285,7 +285,7 @@
void QUimHelperManager::update_prop_label_cb( void *ptr, const char *str )
{
- QUimInputContext *ic = ( QUimInputContext* ) ptr;
+ QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
if ( ic != focusedInputContext || disableFocusedContext )
return;
=======================================
--- /trunk/qt4/immodule/qtextutil.cpp Sat Mar 13 04:38:05 2010
+++ /trunk/qt4/immodule/qtextutil.cpp Sat Mar 13 04:38:19 2010
@@ -48,7 +48,7 @@
QUimTextUtil::QUimTextUtil( QObject *parent )
: QObject( parent )
{
- mIc = (QUimInputContext *)parent;
+ mIc = static_cast<QUimInputContext *>( parent );
mPreeditSaved = false;
}
@@ -63,7 +63,7 @@
char **former, char **latter )
{
int err;
- QUimInputContext *ic = (QUimInputContext *)ptr;
+ QUimInputContext *ic = static_cast<QUimInputContext *>( ptr );
QUimTextUtil *tu = ic->textUtil();
switch ( text_id ) {
@@ -93,7 +93,7 @@
int former_req_len, int latter_req_len )
{
int err;
- QUimInputContext *ic = (QUimInputContext *)ptr;
+ QUimInputContext *ic = static_cast<QUimInputContext *>( ptr );
QUimTextUtil *tu = ic->textUtil();
switch ( text_id ) {
@@ -146,7 +146,7 @@
int latter_req_len,
char **former, char **latter )
{
- QLineEdit *edit = (QLineEdit *)mWidget;
+ QLineEdit *edit = static_cast<QLineEdit *>( mWidget );
QString text, former_text, latter_text;
int cursor_index, len, precedence_len, following_len, offset;
int preedit_len, preedit_cursor_pos;
@@ -251,7 +251,7 @@
int latter_req_len,
char **former, char **latter )
{
- Q3TextEdit *edit = (Q3TextEdit *)mWidget;
+ Q3TextEdit *edit = static_cast<Q3TextEdit *>( mWidget );
QString text;
int start_para, start_index, end_para, end_index, para, index;
@@ -438,7 +438,7 @@
int latter_req_len,
char **former, char
**latter )
{
- QLineEdit *edit = (QLineEdit *)mWidget;
+ QLineEdit *edit = static_cast<QLineEdit *>( mWidget );
QString text;
int len, offset, start, current;
bool cursor_at_beginning = false;
@@ -493,7 +493,7 @@
int latter_req_len,
char **former, char
**latter )
{
- Q3TextEdit *edit = (Q3TextEdit *)mWidget;
+ Q3TextEdit *edit = static_cast<Q3TextEdit *>( mWidget );
QString text;
int len, offset, newline;
int start_para, start_index, end_para, end_index;
@@ -650,7 +650,7 @@
int former_req_len,
int latter_req_len )
{
- QLineEdit *edit = (QLineEdit *)mWidget;
+ QLineEdit *edit = static_cast<QLineEdit *>( mWidget );
QString text;
int cursor_index, len, precedence_len, following_len;
int preedit_len, preedit_cursor_pos;
@@ -732,7 +732,7 @@
int former_req_len,
int latter_req_len )
{
- Q3TextEdit *edit = (Q3TextEdit *)mWidget;
+ Q3TextEdit *edit = static_cast<Q3TextEdit *>( mWidget );
int start_para, start_index, end_para, end_index, para, index;
int n_para;
@@ -867,7 +867,7 @@
int former_req_len,
int latter_req_len )
{
- QLineEdit *edit = (QLineEdit *)mWidget;
+ QLineEdit *edit = static_cast<QLineEdit *>( mWidget );
QString text;
int len, start, end, current;
bool cursor_at_beginning = false;
@@ -917,7 +917,7 @@
int former_req_len,
int latter_req_len )
{
- Q3TextEdit *edit = (Q3TextEdit *)mWidget;
+ Q3TextEdit *edit = static_cast<Q3TextEdit *>( mWidget );
QString text;
int len, newline;
int para, index;
@@ -991,7 +991,7 @@
void
QUimTextUtil::QTextEditPositionBackward( int *cursor_para, int
*cursor_index )
{
- Q3TextEdit *edit = (Q3TextEdit *)mWidget;
+ Q3TextEdit *edit = static_cast<Q3TextEdit *>( mWidget );
int preedit_len, preedit_cursor_pos;
int para, index;
int current_para, current_index;
@@ -1027,7 +1027,7 @@
void
QUimTextUtil::QTextEditPositionForward( int *cursor_para, int
*cursor_index )
{
- Q3TextEdit *edit = (Q3TextEdit *)mWidget;
+ Q3TextEdit *edit = static_cast<Q3TextEdit *>( mWidget );
int n_para = edit->paragraphs();
int preedit_len, preedit_cursor_pos;
int current_para_len;
=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp Sat Mar 13 04:38:05 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp Sat Mar 13 04:38:19 2010
@@ -138,7 +138,7 @@
m_imname = imname;
uim_context uc = uim_create_context( this, "UTF-8",
- 0, ( char * ) imname,
+ 0, imname,
0,
QUimInputContext::commit_cb );
@@ -197,7 +197,7 @@
type != QEvent::KeyRelease )
return false;
- QKeyEvent *keyevent = ( QKeyEvent * ) event;
+ const QKeyEvent *keyevent = static_cast<const QKeyEvent *>( event );
int qkey = keyevent->key();
int modifier = 0;
@@ -490,7 +490,7 @@
QString qs = QString::fromUtf8( str );
qDebug( "commit_cb : str = |%s|", qs.toLocal8Bit().data() );
- QUimInputContext *ic = ( QUimInputContext * ) ptr;
+ QUimInputContext *ic = static_cast<QUimInputContext *>( ptr );
ic->commitString( qs );
}
@@ -498,7 +498,7 @@
{
qDebug( "clear_cb" );
- QUimInputContext* ic = ( QUimInputContext* ) ptr;
+ QUimInputContext* ic = static_cast<QUimInputContext*>( ptr );
ic->clearPreedit();
}
@@ -515,7 +515,7 @@
if ( !strcmp( str, "" ) && !( attr & ( UPreeditAttr_Cursor |
UPreeditAttr_Separator ) ) )
return ;
- QUimInputContext* ic = ( QUimInputContext* ) ptr;
+ QUimInputContext* ic = static_cast<QUimInputContext*>( ptr );
ic->pushbackPreeditString( attr, qs );
}
@@ -523,7 +523,7 @@
{
qDebug( "update_cb" );
- QUimInputContext *ic = ( QUimInputContext* ) ptr;
+ QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
ic->updatePreedit();
}
@@ -531,7 +531,7 @@
{
qDebug( "cand_activate_cb" );
- QUimInputContext *ic = ( QUimInputContext* ) ptr;
+ QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
ic->candidateActivate( nr, displayLimit );
}
@@ -539,7 +539,7 @@
{
qDebug( "cand_select_cb" );
- QUimInputContext *ic = ( QUimInputContext* ) ptr;
+ QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
ic->candidateSelect( index );
}
@@ -547,7 +547,7 @@
{
qDebug( "cand_shift_page_cb" );
- QUimInputContext *ic = ( QUimInputContext* ) ptr;
+ QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
ic->candidateShiftPage( (bool)forward );
}
@@ -555,19 +555,19 @@
{
qDebug( "cand_deactivate_cb" );
- QUimInputContext *ic = ( QUimInputContext* ) ptr;
+ QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
ic->candidateDeactivate();
}
void QUimInputContext::switch_app_global_im_cb( void *ptr, const char
*name )
{
- QUimInputContext *ic = ( QUimInputContext* ) ptr;
+ QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
ic->switch_app_global_im( name );
}
void QUimInputContext::switch_system_global_im_cb( void *ptr, const char
*name )
{
- QUimInputContext *ic = ( QUimInputContext* ) ptr;
+ QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
ic->switch_system_global_im( name );
}
=======================================
--- /trunk/qt4/immodule/quiminputcontext_compose.cpp Sat Mar 13 04:38:05
2010
+++ /trunk/qt4/immodule/quiminputcontext_compose.cpp Sat Mar 13 04:38:19
2010
@@ -82,7 +82,7 @@
{
}
-bool Compose::handle_qkey(QKeyEvent *event)
+bool Compose::handle_qkey(const QKeyEvent *event)
{
int type = event->type();
int qkey = event->key();
@@ -373,7 +373,7 @@
switch (c) {
case '\\':
case '"':
- *p++ = (char)c;
+ *p++ = static_cast<char>(c);
len++;
break;
case 'n':
@@ -404,7 +404,7 @@
c = nextch(fp, lastch);
}
putbackch(c, lastch);
- *p++ = (char)i;
+ *p++ = static_cast<char>(i);
len++;
break;
case 'X':
@@ -430,7 +430,7 @@
token = ERROR;
goto string_error;
}
- *p++ = (char)i;
+ *p++ = static_cast<char>(i);
len++;
break;
case EOF:
@@ -438,12 +438,12 @@
token = ERROR;
goto string_error;
default:
- *p++ = (char)c;
+ *p++ = static_cast<char>(c);
len++;
break;
}
} else {
- *p++ = (char)c;
+ *p++ = static_cast<char>(c);
len++;
}
}
@@ -466,7 +466,7 @@
*tokenbuf = (char *)realloc(*tokenbuf, *buflen);
}
p = *tokenbuf;
- *p++ = (char)c;
+ *p++ = static_cast<char>(c);
len++;
c = nextch(fp, lastch);
while (isalnum(c) || c == '_' || c == '-') {
@@ -475,7 +475,7 @@
*tokenbuf = (char *)realloc(*tokenbuf, *buflen);
p = *tokenbuf + len;
}
- *p++ = (char)c;
+ *p++ = static_cast<char>(c);
len++;
c = nextch(fp, lastch);
}
@@ -959,7 +959,7 @@
int n;
char *args[2], *from, *to;
// isspace for tab doesn't seem to work with Qt4...
- while ((unsigned char)isspace(*p) || *p == '\t') {
+ while (static_cast<unsigned char>(isspace(*p)) || *p == '\t') {
++p;
}
if (iscomment(*p)) {
@@ -993,7 +993,7 @@
while (argc < argsize) {
// isspace for tab doesn't seem to work with Qt4...
- while ((unsigned char)isspace(*p) || *p == '\t') {
+ while (static_cast<unsigned char>(isspace(*p)) || *p == '\t') {
++p;
}
if (*p == '\0') {
=======================================
--- /trunk/qt4/immodule/quiminputcontext_compose.h Sun Feb 28 15:00:48 2010
+++ /trunk/qt4/immodule/quiminputcontext_compose.h Sat Mar 13 04:38:19 2010
@@ -64,7 +64,7 @@
public:
Compose(DefTree *, QUimInputContext *);
~Compose();
- bool handle_qkey(QKeyEvent *event);
+ bool handle_qkey(const QKeyEvent *event);
void reset();
private:
bool handleKey(KeySym xkeysym, int xstate, bool is_push);
=======================================
--- /trunk/qt4/pref/customwidgets.h Fri Sep 25 08:52:02 2009
+++ /trunk/qt4/pref/customwidgets.h Sat Mar 13 04:38:19 2010
@@ -69,7 +69,7 @@
/* Custom Update Callback */
static void update_cb( void *ptr, const char *custom_sym )
{
- UimCustomItemIface *iface = (UimCustomItemIface*)ptr;
+ UimCustomItemIface *iface = static_cast<UimCustomItemIface*>( ptr
);
iface->updateItem( custom_sym );
iface->update();
}
=======================================
--- /trunk/qt4/pref/qt4.cpp Fri Sep 25 08:52:02 2009
+++ /trunk/qt4/pref/qt4.cpp Sat Mar 13 04:38:19 2010
@@ -294,7 +294,7 @@
QWidget *w = m_groupWidgetStack->currentWidget();
if( w )
{
- ((GroupPageWidget*)w)->setDefault();
+ (static_cast<GroupPageWidget*>(w))->setDefault();
}
}
