From 69d87202cb139ffe9e4b3ce92e434523b7b09b64 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 17 Oct 2018 19:46:30 +0900 Subject: QT_NO_* -> TQT_NO_* renaming. Signed-off-by: Michele Calgaro --- src/kernel/qwidget_x11.cpp | 70 +++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'src/kernel/qwidget_x11.cpp') diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp index 8e0fee271..71268a6ab 100644 --- a/src/kernel/qwidget_x11.cpp +++ b/src/kernel/qwidget_x11.cpp @@ -65,7 +65,7 @@ int qt_sip_count( TQWidget* ); bool qt_wstate_iconified( WId ); void qt_updated_rootinfo(); -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "ntqinputcontext.h" #include "ntqinputcontextfactory.h" #endif @@ -89,7 +89,7 @@ static TQWidget *keyboardGrb = 0; extern Time tqt_x_time; extern Time tqt_x_user_time; -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC extern Atom qt_net_wm_sync_request_counter; extern Atom qt_net_wm_sync_request; extern bool qt_use_xsync; @@ -463,7 +463,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) setWinId( id ); // set widget id/handle + hd } -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (rendhd) { XftDrawDestroy( (XftDraw *) rendhd ); rendhd = 0; @@ -472,7 +472,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) if ( tqt_has_xft ) rendhd = (HANDLE) XftDrawCreate( dpy, id, (Visual *) x11Visual(), x11Colormap() ); -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE // NET window states long net_winstates[6] = { 0, 0, 0, 0, 0, 0 }; @@ -683,7 +683,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) protocols[n++] = tqt_wm_delete_window; // support del window protocol protocols[n++] = tqt_wm_take_focus; // support take focus window protocol protocols[n++] = qt_net_wm_ping; // support _NET_WM_PING protocol -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC protocols[n++] = qt_net_wm_sync_request;// support the _NET_WM_SYNC_REQUEST protocol #endif if ( testWFlags( WStyle_ContextHelp ) ) @@ -711,7 +711,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) else XDeleteProperty(dpy, id, qt_net_wm_action); -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC // set _NET_WM_SYNC_COUNTER createSyncCounter(); long counterVal = topData()->syncCounter; @@ -769,7 +769,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) if ( destroyw ) qt_XDestroyWindow( this, dpy, destroyw ); -#if !defined(QT_NO_IM_EXTENSIONS) +#if !defined(TQT_NO_IM_EXTENSIONS) ic = 0; #endif } @@ -813,7 +813,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows ) else if ( testWFlags(WType_Popup) ) tqApp->closePopup( this ); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if ( rendhd) { if ( destroyWindow ) XftDrawDestroy( (XftDraw *) rendhd ); @@ -821,7 +821,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows ) free( (void*) rendhd ); rendhd = 0; } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE if ( testWFlags(WType_Desktop) ) { if ( acceptDrops() ) @@ -830,7 +830,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows ) if ( destroyWindow ) qt_XDestroyWindow( this, x11Display(), winid ); } -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC destroySyncCounter(); #endif setWinId( 0 ); @@ -892,7 +892,7 @@ void TQWidget::reparentSys( TQWidget *parent, WFlags f, const TQPoint &p, bool s destroyInputContext(); } -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC destroySyncCounter(); #endif @@ -1117,7 +1117,7 @@ TQPoint TQWidget::mapFromGlobal( const TQPoint &pos ) const void TQWidget::setMicroFocusHint(int x, int y, int width, int height, bool text, TQFont *f ) { -#ifndef QT_NO_IM +#ifndef TQT_NO_IM if ( text ) { // trigger input context creation if it hasn't happened already createInputContext(); @@ -2607,11 +2607,11 @@ void TQWidget::deleteSysExtra() void TQWidget::createTLSysExtra() { -#if defined(QT_NO_IM_EXTENSIONS) +#if defined(TQT_NO_IM_EXTENSIONS) // created lazily extra->topextra->xic = 0; #endif -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC extra->topextra->syncCounter = 0; extra->topextra->syncRequestValue[0] = 0; extra->topextra->syncRequestValue[1] = 0; @@ -2663,7 +2663,7 @@ void TQWidget::checkChildrenDnd() } -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC // create a window's XSyncCounter void TQWidget::createSyncCounter() { @@ -2704,7 +2704,7 @@ void TQWidget::handleSyncRequest( void* ev ) topData()->syncRequestValue[ 0 ] = xev->xclient.data.l[ 2 ]; topData()->syncRequestValue[ 1 ] = xev->xclient.data.l[ 3 ]; } -#endif // QT_NO_XSYNC +#endif // TQT_NO_XSYNC /*! @@ -2927,9 +2927,9 @@ TQInputContext *TQWidget::getInputContext() { TQInputContext *qic = 0; -// #if !defined(QT_NO_IM_EXTENSIONS) +// #if !defined(TQT_NO_IM_EXTENSIONS) if ( isInputMethodEnabled() ) { -#if !defined(QT_NO_IM_EXTENSIONS) +#if !defined(TQT_NO_IM_EXTENSIONS) qic = icHolderWidget()->ic; #else // { @@ -2951,7 +2951,7 @@ TQInputContext *TQWidget::getInputContext() void TQWidget::changeInputContext( const TQString& identifierName ) { TQWidget *icWidget = icHolderWidget(); -#if !defined(QT_NO_IM_EXTENSIONS) +#if !defined(TQT_NO_IM_EXTENSIONS) TQInputContext **qicp = &icWidget->ic; #else TQInputContext **qicp = (TQInputContext **)&icWidget->topData()->xic; @@ -2978,19 +2978,19 @@ void TQWidget::changeInputContext( const TQString& identifierName ) This function is called to generate an input context according to a configuration for default input method - When QT_NO_IM_EXTENSIONS is not set, input context is + When TQT_NO_IM_EXTENSIONS is not set, input context is generated only when isInputMethodEnabled() returns TRUE. */ void TQWidget::createInputContext() { -// #if !defined(QT_NO_IM_EXTENSIONS) +// #if !defined(TQT_NO_IM_EXTENSIONS) if( !isInputMethodEnabled() || TQApplication::closingDown() ) return; // #endif TQWidget *icWidget = icHolderWidget(); -#ifndef QT_NO_IM -#if !defined(QT_NO_IM_EXTENSIONS) +#ifndef TQT_NO_IM +#if !defined(TQT_NO_IM_EXTENSIONS) TQInputContext **qicp = &icWidget->ic; #else TQInputContext **qicp = (TQInputContext **)&icWidget->topData()->xic; @@ -3008,7 +3008,7 @@ void TQWidget::createInputContext() icWidget, SLOT(destroyInputContext()) ); } } -#endif // QT_NO_IM +#endif // TQT_NO_IM } @@ -3022,8 +3022,8 @@ void TQWidget::createInputContext() */ void TQWidget::destroyInputContext() { -#ifndef QT_NO_IM -#if !defined(QT_NO_IM_EXTENSIONS) +#ifndef TQT_NO_IM +#if !defined(TQT_NO_IM_EXTENSIONS) TQInputContext **qicp = ⁣ #else if ( ! extra || ! extra->topextra ) @@ -3036,7 +3036,7 @@ void TQWidget::destroyInputContext() delete *qicp; *qicp = 0; -#endif // QT_NO_IM +#endif // TQT_NO_IM } @@ -3057,14 +3057,14 @@ void TQWidget::destroyInputContext() */ void TQWidget::resetInputContext() { -#ifndef QT_NO_IM +#ifndef TQT_NO_IM // trigger input context creation if it hasn't happened already createInputContext(); TQInputContext *qic = getInputContext(); if( qic ) qic->reset(); -#endif // QT_NO_IM +#endif // TQT_NO_IM } @@ -3080,7 +3080,7 @@ void TQWidget::resetInputContext() */ void TQWidget::focusInputContext() { -#ifndef QT_NO_IM +#ifndef TQT_NO_IM TQWidget* tlw = topLevelWidget(); if (!tlw->isPopup() || isInputMethodEnabled()) { @@ -3095,7 +3095,7 @@ void TQWidget::focusInputContext() } } } -#endif // QT_NO_IM +#endif // TQT_NO_IM } @@ -3110,7 +3110,7 @@ void TQWidget::focusInputContext() */ void TQWidget::unfocusInputContext() { -#ifndef QT_NO_IM +#ifndef TQT_NO_IM // trigger input context creation if it hasn't happened already createInputContext(); @@ -3120,7 +3120,7 @@ void TQWidget::unfocusInputContext() qic->unsetFocus(); qic->setFocusWidget( 0 ); } -#endif // QT_NO_IM +#endif // TQT_NO_IM } @@ -3136,7 +3136,7 @@ void TQWidget::sendMouseEventToInputContext( int x, TQEvent::Type type, TQt::ButtonState button, TQt::ButtonState state ) { -#ifndef QT_NO_IM +#ifndef TQT_NO_IM // trigger input context creation if it hasn't happened already createInputContext(); @@ -3145,7 +3145,7 @@ void TQWidget::sendMouseEventToInputContext( int x, TQEvent::Type type, // may be causing reset() in some input methods qic->mouseHandler( x, type, button, state ); } -#endif // QT_NO_IM +#endif // TQT_NO_IM } -- cgit v1.2.1