Revision: 6981
Author: nogu.dev
Date: Sat Mar 19 21:05:25 2011
Log: * qt4/immodule/qtextutil.cpp
* qt4/immodule/qtextutil.h
- (acquirePrimaryTextInQTextEdit):
Rename to acquirePrimaryTextInQ3TextEdit.
- (acquireSelectionTextInQTextEdit):
Rename to acquireSelectionTextInQ3TextEdit.
- (deletePrimaryTextInQTextEdit): Rename to deletePrimaryTextInQ3TextEdit.
- (deleteSelectionTextInQTextEdit):
Rename to deleteSelectionTextInQ3TextEdit.
- (QTextEditPositionBackward): Rename to Q3TextEditPositionBackward.
- (QTextEditPositionForward): Rename to Q3TextEditPositionForward.
http://code.google.com/p/uim/source/detail?r=6981
Modified:
/trunk/qt4/immodule/qtextutil.cpp
/trunk/qt4/immodule/qtextutil.h
=======================================
--- /trunk/qt4/immodule/qtextutil.cpp Thu Jan 6 18:09:56 2011
+++ /trunk/qt4/immodule/qtextutil.cpp Sat Mar 19 21:05:25 2011
@@ -130,8 +130,8 @@
latter_req_len, former,
latter );
#ifdef ENABLE_QT4_QT3SUPPORT
else if ( qobject_cast<Q3TextEdit *>( mWidget ) )
- err = acquirePrimaryTextInQTextEdit( origin, former_req_len,
- latter_req_len, former,
latter );
+ err = acquirePrimaryTextInQ3TextEdit( origin, former_req_len,
+ latter_req_len, former,
latter );
#endif
else
// FIXME other widgets?
@@ -246,10 +246,10 @@
#ifdef ENABLE_QT4_QT3SUPPORT
int
-QUimTextUtil::acquirePrimaryTextInQTextEdit( enum UTextOrigin origin,
- int former_req_len,
- int latter_req_len,
- char **former, char **latter )
+QUimTextUtil::acquirePrimaryTextInQ3TextEdit( enum UTextOrigin origin,
+ int former_req_len,
+ int latter_req_len,
+ char **former, char **latter
)
{
Q3TextEdit *edit = static_cast<Q3TextEdit *>( mWidget );
QString text;
@@ -282,7 +282,7 @@
if ( former_req_len >= 0 ) {
for ( int i = 0; i < former_req_len; i++ )
- QTextEditPositionBackward( &start_para, &start_index );
+ Q3TextEditPositionBackward( &start_para, &start_index );
} else {
if ( former_req_len == UTextExtent_Line )
start_index = 0;
@@ -299,7 +299,7 @@
if ( latter_req_len >= 0 ) {
for ( int i = 0; i < latter_req_len; i++ )
- QTextEditPositionForward( &end_para, &end_index );
+ Q3TextEditPositionForward( &end_para, &end_index );
} else {
if ( latter_req_len == UTextExtent_Line ) {
end_index = edit->paragraphLength( end_para );
@@ -326,7 +326,7 @@
if ( latter_req_len >= 0 ) {
for ( int i = 0; i < latter_req_len; i++ )
- QTextEditPositionForward( &end_para, &end_index );
+ Q3TextEditPositionForward( &end_para, &end_index );
} else {
if ( latter_req_len == UTextExtent_Line )
end_index = edit->paragraphLength( end_para );
@@ -359,7 +359,7 @@
if ( former_req_len >= 0 ) {
for ( int i = 0; i < former_req_len; i++ )
- QTextEditPositionBackward( &start_para, &start_index );
+ Q3TextEditPositionBackward( &start_para, &start_index );
} else {
if ( former_req_len == UTextExtent_Line )
start_index = 0;
@@ -422,8 +422,9 @@
latter_req_len, former,
latter );
#ifdef ENABLE_QT4_QT3SUPPORT
else if ( qobject_cast<Q3TextEdit *>( mWidget ) )
- err = acquireSelectionTextInQTextEdit( origin, former_req_len,
- latter_req_len, former,
latter );
+ err = acquireSelectionTextInQ3TextEdit( origin, former_req_len,
+ latter_req_len, former,
+ latter );
#endif
else
// FIXME other widgets?
@@ -488,10 +489,10 @@
#ifdef ENABLE_QT4_QT3SUPPORT
int
-QUimTextUtil::acquireSelectionTextInQTextEdit( enum UTextOrigin origin,
- int former_req_len,
- int latter_req_len,
- char **former, char
**latter )
+QUimTextUtil::acquireSelectionTextInQ3TextEdit( enum UTextOrigin origin,
+ int former_req_len,
+ int latter_req_len,
+ char **former, char
**latter )
{
Q3TextEdit *edit = static_cast<Q3TextEdit *>( mWidget );
QString text;
@@ -635,8 +636,8 @@
latter_req_len );
#ifdef ENABLE_QT4_QT3SUPPORT
else if ( qobject_cast<Q3TextEdit *>( mWidget ) )
- err = deletePrimaryTextInQTextEdit( origin, former_req_len,
- latter_req_len );
+ err = deletePrimaryTextInQ3TextEdit( origin, former_req_len,
+ latter_req_len );
#endif
else
// FIXME other widgets?
@@ -728,9 +729,9 @@
#ifdef ENABLE_QT4_QT3SUPPORT
int
-QUimTextUtil::deletePrimaryTextInQTextEdit( enum UTextOrigin origin,
- int former_req_len,
- int latter_req_len )
+QUimTextUtil::deletePrimaryTextInQ3TextEdit( enum UTextOrigin origin,
+ int former_req_len,
+ int latter_req_len )
{
Q3TextEdit *edit = static_cast<Q3TextEdit *>( mWidget );
int start_para, start_index, end_para, end_index, para, index;
@@ -750,7 +751,7 @@
if ( former_req_len >= 0 ) {
for ( int i = 0; i < former_req_len; i++ )
- QTextEditPositionBackward( &start_para, &start_index );
+ Q3TextEditPositionBackward( &start_para, &start_index );
} else {
if ( former_req_len == UTextExtent_Line ) {
start_index = 0;
@@ -764,7 +765,7 @@
}
if ( latter_req_len >= 0 ) {
for ( int i = 0; i < latter_req_len; i++ )
- QTextEditPositionForward( &end_para, &end_index );
+ Q3TextEditPositionForward( &end_para, &end_index );
} else {
if ( latter_req_len == UTextExtent_Line ) {
end_index = edit->paragraphLength( end_para );
@@ -786,7 +787,7 @@
if ( latter_req_len >= 0 ) {
for ( int i = 0; i < latter_req_len; i++ )
- QTextEditPositionForward( &end_para, &end_index );
+ Q3TextEditPositionForward( &end_para, &end_index );
} else {
if ( latter_req_len == UTextExtent_Line ) {
end_index = edit->paragraphLength( end_para );
@@ -808,7 +809,7 @@
if ( former_req_len >= 0 ) {
for ( int i = 0; i < former_req_len; i++ )
- QTextEditPositionBackward( &start_para, &start_index );
+ Q3TextEditPositionBackward( &start_para, &start_index );
} else {
if ( former_req_len == UTextExtent_Line )
start_index = 0;
@@ -852,8 +853,8 @@
latter_req_len );
#ifdef ENABLE_QT4_QT3SUPPORT
else if ( qobject_cast<Q3TextEdit *>( mWidget ) )
- err = deleteSelectionTextInQTextEdit( origin, former_req_len,
- latter_req_len );
+ err = deleteSelectionTextInQ3TextEdit( origin, former_req_len,
+ latter_req_len );
#endif
else
// FIXME other widgets?
@@ -913,9 +914,9 @@
#ifdef ENABLE_QT4_QT3SUPPORT
int
-QUimTextUtil::deleteSelectionTextInQTextEdit( enum UTextOrigin origin,
- int former_req_len,
- int latter_req_len )
+QUimTextUtil::deleteSelectionTextInQ3TextEdit( enum UTextOrigin origin,
+ int former_req_len,
+ int latter_req_len )
{
Q3TextEdit *edit = static_cast<Q3TextEdit *>( mWidget );
QString text;
@@ -950,7 +951,7 @@
end_para = sel_para_from;
end_index = sel_index_from;
for ( int i = 0; i < latter_req_len; i++)
- QTextEditPositionForward( &end_para, &end_index );
+ Q3TextEditPositionForward( &end_para, &end_index );
}
} else {
if (! ( ~latter_req_len & ( ~UTextExtent_Line |
~UTextExtent_Full ) ) )
@@ -968,7 +969,7 @@
start_para = sel_para_to;
start_index = sel_index_to;
for ( int i = 0; i < former_req_len; i++)
- QTextEditPositionBackward( &start_para, &start_index );
+ Q3TextEditPositionBackward( &start_para, &start_index
);
}
} else {
if (! ( ~former_req_len & ( ~UTextExtent_Line |
~UTextExtent_Full ) ) )
@@ -989,7 +990,7 @@
}
void
-QUimTextUtil::QTextEditPositionBackward( int *cursor_para, int
*cursor_index )
+QUimTextUtil::Q3TextEditPositionBackward( int *cursor_para, int
*cursor_index )
{
Q3TextEdit *edit = static_cast<Q3TextEdit *>( mWidget );
int preedit_len, preedit_cursor_pos;
@@ -1025,7 +1026,7 @@
}
void
-QUimTextUtil::QTextEditPositionForward( int *cursor_para, int
*cursor_index )
+QUimTextUtil::Q3TextEditPositionForward( int *cursor_para, int
*cursor_index )
{
Q3TextEdit *edit = static_cast<Q3TextEdit *>( mWidget );
int n_para = edit->paragraphs();
=======================================
--- /trunk/qt4/immodule/qtextutil.h Thu Jan 6 18:09:56 2011
+++ /trunk/qt4/immodule/qtextutil.h Sat Mar 19 21:05:25 2011
@@ -62,9 +62,9 @@
int acquirePrimaryTextInQLineEdit( enum UTextOrigin origin,
int former_req_len, int
latter_req_len,
char **former, char **latter );
- int acquirePrimaryTextInQTextEdit( enum UTextOrigin origin,
- int former_req_len, int
latter_req_len,
- char **former, char **latter );
+ int acquirePrimaryTextInQ3TextEdit( enum UTextOrigin origin,
+ int former_req_len, int
latter_req_len,
+ char **former, char **latter );
int acquireSelectionText( enum UTextOrigin origin,
int former_req_len, int latter_req_len,
@@ -73,10 +73,10 @@
int former_req_len,
int latter_req_len,
char **former, char **latter );
- int acquireSelectionTextInQTextEdit( enum UTextOrigin origin,
- int former_req_len,
- int latter_req_len,
- char **former, char **latter );
+ int acquireSelectionTextInQ3TextEdit( enum UTextOrigin origin,
+ int former_req_len,
+ int latter_req_len,
+ char **former, char **latter );
int acquireClipboardText( enum UTextOrigin origin,
int former_req_len, int latter_req_len,
@@ -86,19 +86,21 @@
int former_req_len, int latter_req_len );
int deletePrimaryTextInQLineEdit( enum UTextOrigin origin,
int former_req_len, int
latter_req_len );
- int deletePrimaryTextInQTextEdit( enum UTextOrigin origin,
- int former_req_len, int
latter_req_len );
+ int deletePrimaryTextInQ3TextEdit( enum UTextOrigin origin,
+ int former_req_len,
+ int latter_req_len );
int deleteSelectionText( enum UTextOrigin origin,
int former_req_len, int latter_req_len );
int deleteSelectionTextInQLineEdit( enum UTextOrigin origin,
int former_req_len, int
latter_req_len );
- int deleteSelectionTextInQTextEdit( enum UTextOrigin origin,
- int former_req_len, int
latter_req_len );
-
- void QTextEditPositionBackward( int *para, int *index );
-
- void QTextEditPositionForward( int *para, int *index );
+ int deleteSelectionTextInQ3TextEdit( enum UTextOrigin origin,
+ int former_req_len,
+ int latter_req_len );
+
+ void Q3TextEditPositionBackward( int *para, int *index );
+
+ void Q3TextEditPositionForward( int *para, int *index );
void savePreedit();
void restorePreedit();
