Revision: 6982
Author: nogu.dev
Date: Sat Mar 19 21:05:41 2011
Log: * qt4/immodule/qtextutil.h
- (QUimTextUtil::acquirePrimaryTextInQTextEdit,
QUimTextUtil::acquireSelectionTextInQTextEdit,
QUimTextUtil::deletePrimaryTextInQTextEdit,
QUimTextUtil::deleteSelectionTextInQTextEdit): Add stubs for QTextEdit.
* qt4/immodule/qtextutil.cpp
- Ditto.
- (QUimTextUtil::acquirePrimaryText, QUimTextUtil::acquireSelectionText,
QUimTextUtil::deletePrimaryText, QUimTextUtil::deleteSelectionText):
Call stub.
* scm/tutcode.scm
- Change comment.
http://code.google.com/p/uim/source/detail?r=6982
Modified:
/trunk/qt4/immodule/qtextutil.cpp
/trunk/qt4/immodule/qtextutil.h
/trunk/scm/tutcode.scm
=======================================
--- /trunk/qt4/immodule/qtextutil.cpp Sat Mar 19 21:05:25 2011
+++ /trunk/qt4/immodule/qtextutil.cpp Sat Mar 19 21:05:41 2011
@@ -39,6 +39,7 @@
#include <QtGui/QApplication>
#include <QtGui/QClipboard>
#include <QtGui/QLineEdit>
+#include <QtGui/QTextEdit>
#ifdef ENABLE_QT4_QT3SUPPORT
# include <Qt3Support/Q3TextEdit>
#endif
@@ -128,6 +129,9 @@
if ( qobject_cast<QLineEdit *>( mWidget ) )
err = acquirePrimaryTextInQLineEdit( origin, former_req_len,
latter_req_len, former,
latter );
+ else if ( qobject_cast<QTextEdit *>( mWidget ) )
+ err = acquirePrimaryTextInQTextEdit( origin, former_req_len,
+ latter_req_len, former,
latter );
#ifdef ENABLE_QT4_QT3SUPPORT
else if ( qobject_cast<Q3TextEdit *>( mWidget ) )
err = acquirePrimaryTextInQ3TextEdit( origin, former_req_len,
@@ -243,6 +247,21 @@
return 0;
}
+
+int
+QUimTextUtil::acquirePrimaryTextInQTextEdit( enum UTextOrigin origin,
+ int former_req_len,
+ int latter_req_len,
+ char **former, char **latter )
+{
+ // FIXME: Implement this
+ Q_UNUSED( origin )
+ Q_UNUSED( former_req_len )
+ Q_UNUSED( latter_req_len )
+ Q_UNUSED( former )
+ Q_UNUSED( latter )
+ return -1;
+}
#ifdef ENABLE_QT4_QT3SUPPORT
int
@@ -420,6 +439,9 @@
if ( qobject_cast<QLineEdit *>( mWidget ) )
err = acquireSelectionTextInQLineEdit( origin, former_req_len,
latter_req_len, former,
latter );
+ else if ( qobject_cast<QTextEdit *>( mWidget ) )
+ err = acquireSelectionTextInQTextEdit( origin, former_req_len,
+ latter_req_len, former,
latter );
#ifdef ENABLE_QT4_QT3SUPPORT
else if ( qobject_cast<Q3TextEdit *>( mWidget ) )
err = acquireSelectionTextInQ3TextEdit( origin, former_req_len,
@@ -486,6 +508,21 @@
return 0;
}
+
+int
+QUimTextUtil::acquireSelectionTextInQTextEdit( enum UTextOrigin origin,
+ int former_req_len,
+ int latter_req_len,
+ char **former, char
**latter )
+{
+ // FIXME: Implement this
+ Q_UNUSED( origin )
+ Q_UNUSED( former_req_len )
+ Q_UNUSED( latter_req_len )
+ Q_UNUSED( former )
+ Q_UNUSED( latter )
+ return -1;
+}
#ifdef ENABLE_QT4_QT3SUPPORT
int
@@ -634,6 +671,9 @@
if ( qobject_cast<QLineEdit *>( mWidget ) )
err = deletePrimaryTextInQLineEdit( origin, former_req_len,
latter_req_len );
+ else if ( qobject_cast<QTextEdit *>( mWidget ) )
+ err = deletePrimaryTextInQTextEdit( origin, former_req_len,
+ latter_req_len );
#ifdef ENABLE_QT4_QT3SUPPORT
else if ( qobject_cast<Q3TextEdit *>( mWidget ) )
err = deletePrimaryTextInQ3TextEdit( origin, former_req_len,
@@ -726,6 +766,18 @@
return 0;
}
+
+int
+QUimTextUtil::deletePrimaryTextInQTextEdit( enum UTextOrigin origin,
+ int former_req_len,
+ int latter_req_len )
+{
+ // FIXME: Implement this
+ Q_UNUSED( origin )
+ Q_UNUSED( former_req_len )
+ Q_UNUSED( latter_req_len )
+ return -1;
+}
#ifdef ENABLE_QT4_QT3SUPPORT
int
@@ -851,6 +903,9 @@
if ( qobject_cast<QLineEdit *>( mWidget ) )
err = deleteSelectionTextInQLineEdit( origin, former_req_len,
latter_req_len );
+ else if ( qobject_cast<QTextEdit *>( mWidget ) )
+ err = deleteSelectionTextInQTextEdit( origin, former_req_len,
+ latter_req_len );
#ifdef ENABLE_QT4_QT3SUPPORT
else if ( qobject_cast<Q3TextEdit *>( mWidget ) )
err = deleteSelectionTextInQ3TextEdit( origin, former_req_len,
@@ -911,6 +966,18 @@
return 0;
}
+
+int
+QUimTextUtil::deleteSelectionTextInQTextEdit( enum UTextOrigin origin,
+ int former_req_len,
+ int latter_req_len )
+{
+ // FIXME: Implement this
+ Q_UNUSED( origin )
+ Q_UNUSED( former_req_len )
+ Q_UNUSED( latter_req_len )
+ return -1;
+}
#ifdef ENABLE_QT4_QT3SUPPORT
int
=======================================
--- /trunk/qt4/immodule/qtextutil.h Sat Mar 19 21:05:25 2011
+++ /trunk/qt4/immodule/qtextutil.h Sat Mar 19 21:05:41 2011
@@ -62,6 +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 );
@@ -72,6 +75,10 @@
int acquireSelectionTextInQLineEdit( enum UTextOrigin origin,
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,
@@ -86,6 +93,8 @@
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 );
@@ -94,6 +103,9 @@
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 );
int deleteSelectionTextInQ3TextEdit( enum UTextOrigin origin,
int former_req_len,
int latter_req_len );
=======================================
--- /trunk/scm/tutcode.scm Thu Feb 24 03:17:36 2011
+++ /trunk/scm/tutcode.scm Sat Mar 19 21:05:41 2011
@@ -87,7 +87,7 @@
;;; uim¤Îsurrounding text´Ø·¸¤ÎAPI¤ò»È¤Ã¤Æ¡¢
;;; ¥«¡¼¥½¥ëÁ°¤Îʸ»úÎó¤Î¼èÆÀ¡¦ºï½ü¤ò¹Ô¤¤¤Þ¤¹¡£
;;; ¤½¤Î¤¿¤á¡¢uim¤Îsurrounding text API¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥Ö¥ê¥Ã¥¸
-;;; (uim-gtk, uim-qt, uim-qt4(lineedit¤Î¤ß?))¤Ç¤Î¤ß¸åÃÖ·¿ÊÑ´¹¤¬²Äǽ¤Ç¤¹¡£
+;;; (uim-gtk, uim-qt, uim-qt4(lineedit¤Î¤ß))¤Ç¤Î¤ß¸åÃÖ·¿ÊÑ´¹¤¬²Äǽ¤Ç¤¹¡£
;;;
;;; ¤³¤ì¤é°Ê³°¤Î¥Ö¥ê¥Ã¥¸¤Ç¤â¸åÃÖ·¿ÊÑ´¹¤ò»È¤¤¤¿¤¤¾ì¹ç¡¢
;;; tutcode-enable-fallback-surrounding-text?¤ò#t¤ËÀßÄꤹ¤ë¤È¡¢
