Revision: 6205
Author: nogu.dev
Date: Sun Feb 28 15:01:04 2010
Log: * qt4/immodule/candidatewindow.cpp
* qt4/immodule/qhelpermanager.cpp
* qt4/immodule/qtextutil.cpp
* qt4/immodule/quiminputcontext.cpp
* qt4/immodule/quiminputcontext_compose.cpp
* qt4/immodule/quiminputcontextplugin.pro.in
* qt4/immodule/subwindow.cpp
- Remove dependency on Qt3Support module.
http://code.google.com/p/uim/source/detail?r=6205
Modified:
/trunk/qt4/immodule/candidatewindow.cpp
/trunk/qt4/immodule/qhelpermanager.cpp
/trunk/qt4/immodule/qtextutil.cpp
/trunk/qt4/immodule/quiminputcontext.cpp
/trunk/qt4/immodule/quiminputcontext_compose.cpp
/trunk/qt4/immodule/quiminputcontextplugin.pro.in
/trunk/qt4/immodule/subwindow.cpp
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp Sun Feb 28 15:00:48 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp Sun Feb 28 15:01:04 2010
@@ -82,7 +82,7 @@
this , SLOT( slotHookSubwindow() ) );
//setup NumberLabel
- numLabel = new QLabel( this, "candidateLabel" );
+ numLabel = new QLabel;
numLabel->adjustSize();
stores.clear();
=======================================
--- /trunk/qt4/immodule/qhelpermanager.cpp Sun Feb 28 15:00:48 2010
+++ /trunk/qt4/immodule/qhelpermanager.cpp Sun Feb 28 15:01:04 2010
@@ -119,9 +119,10 @@
QString charset = lines[ 1 ].split( '=' ) [ 1 ];
/* convert to unicode */
- QTextCodec *codec = QTextCodec::codecForName( charset
);
+ QTextCodec *codec
+ = QTextCodec::codecForName( charset.toAscii() );
if ( codec && !lines[ 2 ].isEmpty() )
- commit_str = codec->toUnicode( lines[ 2 ] );
+ commit_str = codec->toUnicode( lines[ 2
].toAscii() );
} else {
commit_str = lines[ 1 ];
}
=======================================
--- /trunk/qt4/immodule/qtextutil.cpp Sun Feb 28 15:00:48 2010
+++ /trunk/qt4/immodule/qtextutil.cpp Sun Feb 28 15:01:04 2010
@@ -171,7 +171,8 @@
if (! ( ~former_req_len & ( ~UTextExtent_Line |
~UTextExtent_Full ) ) )
return -1;
}
- *former = strdup( text.mid( offset, precedence_len - offset
).utf8() );
+ *former
+ = strdup( text.mid( offset, precedence_len - offset ).toUtf8()
);
offset = 0;
if ( latter_req_len >= 0 ) {
@@ -183,7 +184,8 @@
return -1;
}
}
- *latter = strdup( text.mid( precedence_len + preedit_len,
following_len - offset ).utf8() );
+ *latter = strdup( text.mid( precedence_len + preedit_len,
+ following_len - offset ).toUtf8() );
break;
case UTextOrigin_Beginning:
@@ -207,7 +209,7 @@
latter_text = text.mid( precedence_len + preedit_len,
following_len );
text = former_text + latter_text;
}
- *latter = strdup( text.utf8() );
+ *latter = strdup( text.toUtf8() );
break;
case UTextOrigin_End:
@@ -230,7 +232,7 @@
latter_text = text.right( following_len );
text = former_text + latter_text;
}
- *former = strdup( text.utf8() );
+ *former = strdup( text.toUtf8() );
*latter = 0;
break;
@@ -293,7 +295,7 @@
}
}
edit->setSelection( start_para, start_index, para, index -
preedit_cursor_pos, 0 );
- *former = strdup( edit->selectedText().utf8() );
+ *former = strdup( edit->selectedText().toUtf8() );
if ( latter_req_len >= 0 ) {
for ( int i = 0; i < latter_req_len; i++ )
@@ -311,7 +313,7 @@
}
edit->setSelection( para, index - preedit_cursor_pos + preedit_len,
end_para, end_index, 0 );
- *latter = strdup( edit->selectedText().utf8() );
+ *latter = strdup( edit->selectedText().toUtf8() );
break;
case UTextOrigin_Beginning:
@@ -345,7 +347,7 @@
edit->setSelection( para, index - preedit_cursor_pos +
preedit_len, end_para, end_index, 0 );
text += edit->selectedText();
}
- *latter = strdup( text.utf8() );
+ *latter = strdup( text.toUtf8() );
break;
case UTextOrigin_End:
@@ -380,7 +382,7 @@
edit->setSelection( para, index - preedit_cursor_pos +
preedit_len, end_para, end_index, 0 );
text += edit->selectedText();
}
- *former = strdup( text.utf8() );
+ *former = strdup( text.toUtf8() );
*latter = 0;
break;
@@ -464,7 +466,7 @@
if (! ( ~latter_req_len & ( ~UTextExtent_Line |
~UTextExtent_Full ) ) )
return -1;
}
- *latter = strdup( text.left( len - offset ).utf8() );
+ *latter = strdup( text.left( len - offset ).toUtf8() );
} else if ( origin == UTextOrigin_End ||
( origin == UTextOrigin_Cursor && !cursor_at_beginning ) )
{
offset = 0;
@@ -475,7 +477,7 @@
if (! ( ~former_req_len & ( ~UTextExtent_Line |
~UTextExtent_Full ) ) )
return -1;
}
- *former = strdup( text.mid( offset, len - offset ).utf8() );
+ *former = strdup( text.mid( offset, len - offset ).toUtf8() );
*latter = 0;
} else {
return -1;
@@ -530,7 +532,7 @@
if ( latter_req_len == UTextExtent_Line && ( ( newline =
text.find( '\n' ) ) != -1 ) )
offset = len - newline;
}
- *latter = strdup( text.left( len - offset ).utf8() );
+ *latter = strdup( text.left( len - offset ).toUtf8() );
} else if ( origin == UTextOrigin_End ||
( origin == UTextOrigin_Cursor && !cursor_at_beginning ) )
{
offset = 0;
@@ -546,7 +548,7 @@
if ( former_req_len == UTextExtent_Line && ( ( newline =
text.findRev( '\n' ) ) != -1 ) )
offset = newline + 1;
}
- *former = strdup( text.mid( offset, len - offset ).utf8() );
+ *former = strdup( text.mid( offset, len - offset ).toUtf8() );
*latter = 0;
} else {
edit->setTextFormat( format );
@@ -584,10 +586,11 @@
if (! ( ~former_req_len & ( ~UTextExtent_Line |
~UTextExtent_Full ) ) )
return -1;
- if ( former_req_len == UTextExtent_Line && ( ( newline =
text.findRev( '\n' ) ) != -1 ) )
+ if ( former_req_len == UTextExtent_Line
+ && ( ( newline = text.lastIndexOf( '\n' ) ) != -1 ) )
offset = newline + 1;
}
- *former = strdup( text.mid( offset, len - offset ).utf8() );
+ *former = strdup( text.mid( offset, len - offset ).toUtf8() );
*latter = 0;
break;
@@ -601,10 +604,11 @@
if (! ( ~latter_req_len & ( ~UTextExtent_Line |
~UTextExtent_Full ) ) )
return -1;
- if ( latter_req_len == UTextExtent_Line && ( ( newline =
text.find( '\n' ) ) != -1 ) )
+ if ( latter_req_len == UTextExtent_Line
+ && ( ( newline = text.indexOf( '\n' ) ) != -1 ) )
offset = len - newline;
}
- *latter = strdup( text.left( len - offset ).utf8() );
+ *latter = strdup( text.left( len - offset ).toUtf8() );
break;
case UTextOrigin_Unspecified:
=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp Sun Feb 28 15:00:48 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp Sun Feb 28 15:01:04 2010
@@ -116,7 +116,7 @@
{
qDebug( "~QUimInputContext()" );
- contextList.remove( this );
+ contextList.removeAll( this );
if ( m_uc )
uim_release_context( m_uc );
@@ -222,9 +222,9 @@
}
else
{
- if ( keyevent->state() & Qt::ControlButton &&
+ if ( keyevent->modifiers() & Qt::ControlModifier &&
( ascii >= 0x01 && ascii <= 0x1a ) )
- if ( keyevent->state() & Qt::ShiftButton )
+ if ( keyevent->modifiers() & Qt::ShiftModifier )
key = ascii + 0x40;
else
key = ascii + 0x60;
@@ -268,7 +268,7 @@
switch ( qkey )
{
case Qt::Key_Tab: key = UKey_Tab; break;
- case Qt::Key_BackSpace: key = UKey_Backspace; break;
+ case Qt::Key_Backspace: key = UKey_Backspace; break;
case Qt::Key_Escape: key = UKey_Escape; break;
case Qt::Key_Delete: key = UKey_Delete; break;
case Qt::Key_Return: key = UKey_Return; break;
@@ -276,8 +276,8 @@
case Qt::Key_Up: key = UKey_Up; break;
case Qt::Key_Right: key = UKey_Right; break;
case Qt::Key_Down: key = UKey_Down; break;
- case Qt::Key_Prior: key = UKey_Prior; break;
- case Qt::Key_Next: key = UKey_Next; break;
+ case Qt::Key_PageUp: key = UKey_Prior; break;
+ case Qt::Key_PageDown: key = UKey_Next; break;
case Qt::Key_Home: key = UKey_Home; break;
case Qt::Key_End: key = UKey_End; break;
case Qt::Key_Multi_key: key = UKey_Multi_key; break;
@@ -418,7 +418,8 @@
for ( it = contextList.begin(); it != contextList.end(); ++it )
{
- ( *it )->m_uc = ( *it )->createUimContext( ( *it )->m_imname );
+ ( *it )->m_uc
+ = ( *it )->createUimContext( ( *it )->m_imname.toAscii() );
}
}
=======================================
--- /trunk/qt4/immodule/quiminputcontext_compose.cpp Sun Feb 28 15:00:48
2010
+++ /trunk/qt4/immodule/quiminputcontext_compose.cpp Sun Feb 28 15:01:04
2010
@@ -86,30 +86,31 @@
{
int type = event->type();
int qkey = event->key();
- int qstate = event->state();
+ int qstate = event->modifiers();
unsigned int xkeysym, xstate;
bool press = (type == QEvent::KeyPress) ? true : false;
xstate = 0;
- if (qstate & Qt::ShiftButton)
+ if (qstate & Qt::ShiftModifier)
xstate |= ShiftMask;
- if (qstate & Qt::ControlButton)
+ if (qstate & Qt::ControlModifier)
xstate |= ControlMask;
- if (qstate & Qt::AltButton)
+ if (qstate & Qt::AltModifier)
xstate |= Mod1Mask; // XXX
- if (qstate & Qt::MetaButton)
+ if (qstate & Qt::MetaModifier)
xstate |= Mod1Mask; // XXX
if (qkey >= 0x20 && qkey <= 0xff) {
if (isascii(qkey) && isprint(qkey)) {
- int ascii = event->ascii();
+ QString str = event->text();
+ int ascii = str.length() ? str.unicode()->toLatin1() : 0;
if (isalpha(ascii))
xkeysym = ascii;
else
- if ((qstate & Qt::ControlButton) &&
+ if ((qstate & Qt::ControlModifier) &&
(ascii >= 0x01 && ascii <= 0x1a))
- if (qstate & Qt::ShiftButton)
+ if (qstate & Qt::ShiftModifier)
xkeysym = ascii + 0x40;
else
xkeysym = ascii + 0x60;
@@ -124,7 +125,7 @@
switch (qkey) {
case Qt::Key_Escape: xkeysym = XK_Escape; break;
case Qt::Key_Tab: xkeysym = XK_Tab; break;
- case Qt::Key_BackSpace: xkeysym = XK_BackSpace; break;
+ case Qt::Key_Backspace: xkeysym = XK_BackSpace; break;
case Qt::Key_Return: xkeysym = XK_Return; break;
case Qt::Key_Insert: xkeysym = XK_Insert; break;
case Qt::Key_Delete: xkeysym = XK_Delete; break;
@@ -138,8 +139,8 @@
case Qt::Key_Up: xkeysym = XK_Up; break;
case Qt::Key_Right: xkeysym = XK_Right; break;
case Qt::Key_Down: xkeysym = XK_Down; break;
- case Qt::Key_Prior: xkeysym = XK_Prior; break;
- case Qt::Key_Next: xkeysym = XK_Next; break;
+ case Qt::Key_PageUp: xkeysym = XK_Prior; break;
+ case Qt::Key_PageDown: xkeysym = XK_Next; break;
case Qt::Key_Shift: xkeysym = XK_Shift_L; break;
case Qt::Key_Control: xkeysym = XK_Control_L; break;
case Qt::Key_Meta: xkeysym = XK_Meta_L; break;
@@ -620,7 +621,7 @@
ucs = KeySymToUcs4(ks);
QString qs = QString(QChar(ks));
- mb = (const char *)qs.local8Bit();
+ mb = (const char *)qs.toLocal8Bit();
if (!mb)
return 0;
len = strlen(mb);
@@ -795,7 +796,7 @@
}
qs = codec->toUnicode(rhs_string_mb);
- rhs_string_utf8 = strdup((const char *)qs.utf8());
+ rhs_string_utf8 = strdup((const char *)qs.toUtf8());
for (int i = 0; i < n; i++) {
for (p = *top; p; p = p->next) {
=======================================
--- /trunk/qt4/immodule/quiminputcontextplugin.pro.in Sun Oct 25 22:46:03
2009
+++ /trunk/qt4/immodule/quiminputcontextplugin.pro.in Sun Feb 28 15:01:04
2010
@@ -4,7 +4,6 @@
TEMPLATE = lib
CONFIG += qt plugin thread @QT_CONFIG_OPTS@
-QT += qt3support
INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
@top_srcdir@ @top_srcdir@/uim \
=======================================
--- /trunk/qt4/immodule/subwindow.cpp Sun Feb 28 15:00:48 2010
+++ /trunk/qt4/immodule/subwindow.cpp Sun Feb 28 15:01:04 2010
@@ -57,8 +57,10 @@
{
m_titleLabel = new QLabel( this );
m_titleLabel->setAlignment( Qt::AlignHCenter );
- m_titleLabel->setPaletteBackgroundColor( Qt::darkGray );
- m_titleLabel->setPaletteForegroundColor( Qt::white );
+ QPalette palette;
+ palette.setColor( m_titleLabel->backgroundRole(), Qt::darkGray );
+ palette.setColor( m_titleLabel->foregroundRole(), Qt::white );
+ m_titleLabel->setPalette( palette );
m_contentsEdit = new QTextBrowser( this );
@@ -85,7 +87,8 @@
m_titleLabel->setText( title );
m_contentsEdit->setText( contents );
- m_hookTimer->start( TIMER_INTERVAL, true );
+ m_hookTimer->setSingleShot( true );
+ m_hookTimer->start( TIMER_INTERVAL );
}
void SubWindow::popup()
