TDE
/
tqt3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3
0
0
Fork 0
Code Issues Releases Wiki Activity

Renamed QT_IM_* to TQT_IM_*. This relates to bug 3020.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/15/head
Michele Calgaro 5 years ago
parent 1aa221a2bc
commit 632cbaa30a
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

12
ChangeLog.immodule
Unescape View File

@ -633,7 +633,7 @@
- New file - New file
- (QNoneInputContextPlugin, ~QNoneInputContextPlugin, keys, - (QNoneInputContextPlugin, ~QNoneInputContextPlugin, keys,
languages, displayName, description): New function languages, displayName, description): New function
- (create): New function. Read key from QT_IM_MODULE or - (create): New function. Read key from TQT_IM_MODULE or
/qt/DefaultInputMethod of qtrc and creates input context with the /qt/DefaultInputMethod of qtrc and creates input context with the
key key
@ -850,8 +850,8 @@
* src/kernel/qapplication_x11.cpp * src/kernel/qapplication_x11.cpp
- (defaultIM): Replace "xim" with "imsw-multi" - (defaultIM): Replace "xim" with "imsw-multi"
- (x11_apply_settings): - (x11_apply_settings):
* Replace the environment variable name QT_IM_MODULE with * Replace the environment variable name TQT_IM_MODULE with
QT_IM_SWITCHER TQT_IM_SWITCHER
* Replace the qtrc variable name /qt/DefaultInputMethod with * Replace the qtrc variable name /qt/DefaultInputMethod with
/qt/DefaultInputMethodSwitcher /qt/DefaultInputMethodSwitcher
* Replace "xim" with "imsw-multi" for default plugin * Replace "xim" with "imsw-multi" for default plugin
@ -860,12 +860,12 @@
- (lastCreatedIMKey): Remove to rename to currentIMKey - (lastCreatedIMKey): Remove to rename to currentIMKey
- (currentIMKey): New member variable. Renamed from lastCreatedIMKey - (currentIMKey): New member variable. Renamed from lastCreatedIMKey
because the semantics of the variable has been changed by because the semantics of the variable has been changed by
introduction of QT_IM_SWITCHER introduction of TQT_IM_SWITCHER
* src/input/qmultiinputcontext.cpp * src/input/qmultiinputcontext.cpp
- Replace lastCreatedIMKey with currentIMKey - Replace lastCreatedIMKey with currentIMKey
- (QMultiInputContext): Add default input method specification - (QMultiInputContext): Add default input method specification
feature using QT_IM_MODULE and /qt/DefaultInputMethod feature using TQT_IM_MODULE and /qt/DefaultInputMethod
- (createImSelPopup): - (createImSelPopup):
* Add IM-switcher plugin elimination feature using "imsw-" prefix * Add IM-switcher plugin elimination feature using "imsw-" prefix
* Add dispName.isNull() checking * Add dispName.isNull() checking
@ -896,7 +896,7 @@
2004-07-31 LiuCougar <liucougar@gmail.com> 2004-07-31 LiuCougar <liucougar@gmail.com>
new environment variable QT_IM_MODULE to overwrite the default inputmethod plugin new environment variable TQT_IM_MODULE to overwrite the default inputmethod plugin
2004-07-31 LiuCougar <liucougar@gmail.com> 2004-07-31 LiuCougar <liucougar@gmail.com>
"deleteLater" is safer then "delete" QObject directly "deleteLater" is safer then "delete" QObject directly

16
README.immodule
Unescape View File

@ -75,26 +75,26 @@ immodule for Qt
- set "xim" input method as default - set "xim" input method as default
export QT_IM_MODULE=xim export TQT_IM_MODULE=xim
- set "simple" composing input method as default - set "simple" composing input method as default
export QT_IM_MODULE=simple export TQT_IM_MODULE=simple
- set "xim" input method as default, and disable input method - set "xim" input method as default, and disable input method
selection menu in the context menu selection menu in the context menu
export QT_IM_SWITCHER=imsw-none export TQT_IM_SWITCHER=imsw-none
export QT_IM_MODULE=xim export TQT_IM_MODULE=xim
- set "xim" input method as default, and enable input method - set "xim" input method as default, and enable input method
selection menu in the context menu (default configuration) selection menu in the context menu (default configuration)
export QT_IM_SWITCHER=imsw-multi export TQT_IM_SWITCHER=imsw-multi
export QT_IM_MODULE=xim export TQT_IM_MODULE=xim
- set "iiimqcf" that has its own input method switching framework as - set "iiimqcf" that has its own input method switching framework as
@ -103,5 +103,5 @@ immodule for Qt
provide unified user interface for global input method switching provide unified user interface for global input method switching
over the desktop over the desktop
export QT_IM_SWITCHER=imsw-none export TQT_IM_SWITCHER=imsw-none
export QT_IM_MODULE=iiimqcf export TQT_IM_MODULE=iiimqcf

2
changes.immodule
Unescape View File

@ -41,7 +41,7 @@ Configuration
http://freedesktop.org/pipermail/immodule-qt/2004-August/000416.html http://freedesktop.org/pipermail/immodule-qt/2004-August/000416.html
- Added new environment variables QT_IM_SWITCHER and QT_IM_MODULE to - Added new environment variables TQT_IM_SWITCHER and TQT_IM_MODULE to
set user's favorite input method as default. See README.immodule for set user's favorite input method as default. See README.immodule for
examples. examples.

4
plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
Unescape View File

@ -61,8 +61,8 @@ TQMultiInputContext::TQMultiInputContext()
keyDict.setAutoDelete( true ); keyDict.setAutoDelete( true );
keyDict.clear(); keyDict.clear();
if ( getenv( "QT_IM_MODULE" ) ) { if ( getenv( "TQT_IM_MODULE" ) ) {
currentIMKey = getenv( "QT_IM_MODULE" ); currentIMKey = getenv( "TQT_IM_MODULE" );
} else { } else {
#ifndef TQT_NO_IM_EXTENSIONS #ifndef TQT_NO_IM_EXTENSIONS
TQSettings settings; TQSettings settings;

4
plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp
Unescape View File

@ -70,8 +70,8 @@ TQInputContext *TQNoneInputContextPlugin::create( const TQString &key )
if ( ! isIMSwitcher ) if ( ! isIMSwitcher )
return 0; return 0;
if ( getenv( "QT_IM_MODULE" ) ) { if ( getenv( "TQT_IM_MODULE" ) ) {
actuallySpecifiedKey = getenv( "QT_IM_MODULE" ); actuallySpecifiedKey = getenv( "TQT_IM_MODULE" );
} else { } else {
TQSettings settings; TQSettings settings;
actuallySpecifiedKey = settings.readEntry( "/qt/DefaultInputMethod", "xim" ); actuallySpecifiedKey = settings.readEntry( "/qt/DefaultInputMethod", "xim" );

6
src/kernel/qapplication_x11.cpp
Unescape View File

@ -1128,12 +1128,12 @@ bool TQApplication::x11_apply_settings()
/* /*
The identifier name of an input method is acquired from the The identifier name of an input method is acquired from the
configuration file as a default. If a environment variable configuration file as a default. If a environment variable
"QT_IM_SWITCHER" is not empty it will overwrite the "TQT_IM_SWITCHER" is not empty it will overwrite the
configuration file. The "imsw-multi" becomes the default if the entry configuration file. The "imsw-multi" becomes the default if the entry
is not configured. is not configured.
*/ */
if ( getenv( "QT_IM_SWITCHER" ) ) if ( getenv( "TQT_IM_SWITCHER" ) )
defaultIM = getenv( "QT_IM_SWITCHER" ); defaultIM = getenv( "TQT_IM_SWITCHER" );
#ifndef TQT_NO_IM_EXTENSIONS #ifndef TQT_NO_IM_EXTENSIONS
else else
defaultIM = settings.readEntry( "/qt/DefaultInputMethodSwitcher", "imsw-multi" ); defaultIM = settings.readEntry( "/qt/DefaultInputMethodSwitcher", "imsw-multi" );

Write Preview
Loading…
Cancel
Save