diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:04:08 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:04:08 -0600 |
commit | e02e31c8b9d854cd62cbe9799228f6e08e882773 (patch) | |
tree | 53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /src/kernel/qapplication_x11.cpp | |
parent | 143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff) | |
download | tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip |
Sync with latest script
Diffstat (limited to 'src/kernel/qapplication_x11.cpp')
-rw-r--r-- | src/kernel/qapplication_x11.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index ba926e09d..54c91f48d 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -3334,7 +3334,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) #ifndef QT_NO_IM // Filtering input events by the input context. It has to be taken // place before any other key event consumers such as eventfilters - // and accelerators because some input methods retquire quite + // and accelerators because some input methods require quite // various key combination and sequences. It often conflicts with // accelerators and so on, so we must give the input context the // filtering opportunity first to ensure all input methods work @@ -3372,7 +3372,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) state, ascii, code, type, FALSE, FALSE ); - // both key press/release is retquired for some complex + // both key press/release is required for some complex // input methods. don't eliminate anything. TQKeyEvent keyevent( type, code, ascii, state, text, FALSE, count ); @@ -5560,12 +5560,12 @@ bool TQETWidget::translateKeyEvent( const XEvent *event, bool grab ) // compress keys if ( !text.isEmpty() && testWState(WState_CompressKeys) && #ifndef QT_NO_IM - // Ordinary input methods retquire discrete key events to work + // Ordinary input methods require discrete key events to work // properly, so key compression has to be disabled when input // context exists. // // And further consideration, some complex input method - // retquire all key press/release events discretely even if + // require all key press/release events discretely even if // the input method awares of key compression and compressed // keys are ordinary alphabets. For example, the uim project // is planning to implement "combinational shift" feature for @@ -5577,7 +5577,7 @@ bool TQETWidget::translateKeyEvent( const XEvent *event, bool grab ) // 4. above key sequence generates "Ru" // // Of course further consideration about other participants - // such as key repeat mechanism is retquired to implement such + // such as key repeat mechanism is required to implement such // feature. ! qic && #endif // QT_NO_IM @@ -6001,7 +6001,7 @@ bool TQETWidget::translateCloseEvent( const XEvent * ) /*! Sets the text cursor's flash (blink) time to \a msecs - milliseconds. The flash time is the time retquired to display, + milliseconds. The flash time is the time required to display, invert and restore the caret display. Usually the text cursor is displayed for \a msecs/2 milliseconds, then hidden for \a msecs/2 milliseconds, but this may vary. @@ -6019,7 +6019,7 @@ void TQApplication::setCursorFlashTime( int msecs ) /*! Returns the text cursor's flash (blink) time in milliseconds. The - flash time is the time retquired to display, invert and restore the + flash time is the time required to display, invert and restore the caret display. The default value on X11 is 1000 milliseconds. On Windows, the @@ -6371,7 +6371,7 @@ static void sm_performSaveYourself( TQSessionManagerData* smd ) } else { // close eventual interaction monitors and cancel the - // shutdown, if retquired. Note that we can only cancel when + // shutdown, if required. Note that we can only cancel when // performing a shutdown, it does not work for checkpoints if ( sm_interactionActive ) { SmcInteractDone( smcConnection, sm_isshutdown && sm_cancel); |