summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tqtinterface/qt4/src/kernel/tqapplication_x11.cpp')
-rw-r--r--tqtinterface/qt4/src/kernel/tqapplication_x11.cpp152
1 files changed, 76 insertions, 76 deletions
diff --git a/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp b/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp
index aaa9faf..64a2704 100644
--- a/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp
+++ b/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp
@@ -513,12 +513,12 @@ void qt_deferred_map_take( TQWidget* w )
deferred_map_list->remove( w );
}
}
-bool qt_deferred_map_tqcontains( TQWidget* w )
+bool qt_deferred_map_contains( TQWidget* w )
{
if (!deferred_map_list)
return FALSE;
else
- return deferred_map_list->tqcontains( w );
+ return deferred_map_list->contains( w );
}
/*****************************************************************************
@@ -902,7 +902,7 @@ void qt_get_net_virtual_roots()
TQApplication::colorSpec() is TQApplication::ManyColor.
*/
-static Visual *tqfind_truecolor_visual( Display *dpy, int scr, int *depth, int *ncols )
+static Visual *find_truecolor_visual( Display *dpy, int scr, int *depth, int *ncols )
{
XVisualInfo *vi, rvi;
int best=0, n, i;
@@ -1028,7 +1028,7 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0,
int resl = res.length();
while (l < resl) {
- r = res.tqfind( '\n', l );
+ r = res.find( '\n', l );
if ( r < 0 )
r = resl;
while ( isspace((uchar) res[l]) )
@@ -1041,20 +1041,20 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0,
// OPTIMIZED, since we only want "*[fbgs].."
TQCString item = res.mid( l, r - l ).simplifyWhiteSpace();
- int i = item.tqfind( ":" );
+ int i = item.find( ":" );
key = item.left( i ).stripWhiteSpace().mid(1).lower();
value = item.right( item.length() - i - 1 ).stripWhiteSpace();
mine = TRUE;
} else if ( res[l] == appName[0] || (appClass && res[l] == appClass[0]) ) {
if (res.mid(l,apnl) == apn && (res[l+apnl] == '.' || res[l+apnl] == '*')) {
TQCString item = res.mid( l, r - l ).simplifyWhiteSpace();
- int i = item.tqfind( ":" );
+ int i = item.find( ":" );
key = item.left( i ).stripWhiteSpace().mid(apnl+1).lower();
value = item.right( item.length() - i - 1 ).stripWhiteSpace();
mine = TRUE;
} else if (res.mid(l,apcl) == apc && (res[l+apcl] == '.' || res[l+apcl] == '*')) {
TQCString item = res.mid( l, r - l ).simplifyWhiteSpace();
- int i = item.tqfind( ":" );
+ int i = item.find( ":" );
key = item.left( i ).stripWhiteSpace().mid(apcl+1).lower();
value = item.right( item.length() - i - 1 ).stripWhiteSpace();
mine = TRUE;
@@ -1063,7 +1063,7 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0,
if ( mine ) {
if ( !font && key == "systemfont")
- sysFont = value.left( value.tqfindRev(':') ).copy();
+ sysFont = value.left( value.findRev(':') ).copy();
if ( !font && key == "font")
resFont = value.copy();
else if ( !fg && key == "foreground" )
@@ -1175,13 +1175,13 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0,
if ( !resEF.isEmpty() ) {
TQStringList effects = TQStringList::split(" ",resEF);
- TQApplication::setEffectEnabled( Qt::UI_General, effects.tqcontains("general") );
- TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, effects.tqcontains("animatemenu") );
- TQApplication::setEffectEnabled( Qt::UI_FadeMenu, effects.tqcontains("fademenu") );
- TQApplication::setEffectEnabled( Qt::UI_AnimateCombo, effects.tqcontains("animatecombo") );
- TQApplication::setEffectEnabled( Qt::UI_AnimateTooltip, effects.tqcontains("animatetooltip") );
- TQApplication::setEffectEnabled( Qt::UI_FadeTooltip, effects.tqcontains("fadetooltip") );
- TQApplication::setEffectEnabled( Qt::UI_AnimateToolBox, effects.tqcontains("animatetoolbox") );
+ TQApplication::setEffectEnabled( Qt::UI_General, effects.contains("general") );
+ TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, effects.contains("animatemenu") );
+ TQApplication::setEffectEnabled( Qt::UI_FadeMenu, effects.contains("fademenu") );
+ TQApplication::setEffectEnabled( Qt::UI_AnimateCombo, effects.contains("animatecombo") );
+ TQApplication::setEffectEnabled( Qt::UI_AnimateTooltip, effects.contains("animatetooltip") );
+ TQApplication::setEffectEnabled( Qt::UI_FadeTooltip, effects.contains("fadetooltip") );
+ TQApplication::setEffectEnabled( Qt::UI_AnimateToolBox, effects.contains("animatetoolbox") );
}
}
@@ -1551,7 +1551,7 @@ void qt_init_internal( int *argcptr, char **argv,
int screen;
TQString serverVendor( ServerVendor( QX11Info::display()) );
- if (serverVendor.tqcontains("XFree86") && VendorRelease(QX11Info::display()) < 40300000)
+ if (serverVendor.contains("XFree86") && VendorRelease(QX11Info::display()) < 40300000)
qt_hebrew_keyboard_hack = TRUE;
for ( screen = 0; screen < appScreenCount; ++screen ) {
@@ -1590,10 +1590,10 @@ void qt_init_internal( int *argcptr, char **argv,
if ( qt_visual_option == TrueColor ||
TQApplication::colorSpec() == TQApplication::ManyColor ) {
- // tqfind custom visual
+ // find custom visual
int d, c;
- vis = tqfind_truecolor_visual( QX11Info::display(), screen, &d, &c );
+ vis = find_truecolor_visual( QX11Info::display(), screen, &d, &c );
TQPaintDevice::x_appdepth_arr[ screen ] = d;
TQPaintDevice::x_appcells_arr[ screen ] = c;
@@ -1638,7 +1638,7 @@ void qt_init_internal( int *argcptr, char **argv,
TQPaintDevice::x_appcolormap_arr[ screen ] = 0;
- if ( ! serverVendor.tqcontains( "Hewlett-Packard" ) ) {
+ if ( ! serverVendor.contains( "Hewlett-Packard" ) ) {
// on HPUX 10.20 local displays, the RGB_DEFAULT_MAP colormap
// doesn't give us correct colors. Why this happens, I have
// no clue, so we disable this for HPUX
@@ -1831,7 +1831,7 @@ void qt_init_internal( int *argcptr, char **argv,
// #endif // TQT_NO_XFTFREETYPE
// look at the modifier mapping, and get the correct masks for alt/meta
- // tqfind the alt/meta masks
+ // find the alt/meta masks
XModifierKeymap *map = XGetModifierMapping(QX11Info::display());
if (map) {
int i, maskIndex = 0, mapIndex = 0;
@@ -2729,7 +2729,7 @@ void qt_enter_modal( TQWidget *widget )
TQApplication::sendEvent(widget->parentWidget(), &e);
}
- qt_dispatchEnterLeave( 0, TQWidget::tqfind((WId)curWin) );
+ qt_dispatchEnterLeave( 0, TQWidget::find((WId)curWin) );
qt_modal_stack->insert( 0, widget );
app_do_modal = TRUE;
curWin = 0;
@@ -2745,7 +2745,7 @@ void qt_leave_modal( TQWidget *widget )
qt_modal_stack = 0;
TQPoint p( TQCursor::pos() );
TQWidget* w = TQApplication::widgetAt( p.x(), p.y(), TRUE );
- qt_dispatchEnterLeave( w, TQWidget::tqfind( curWin ) ); // send synthetic enter event
+ qt_dispatchEnterLeave( w, TQWidget::find( curWin ) ); // send synthetic enter event
curWin = w? w->winId() : 0;
}
}
@@ -3094,12 +3094,12 @@ void qt_deferred_map_take( TQWidget* w )
deferred_map_list->remove( w );
}
}
-bool qt_deferred_map_tqcontains( TQWidget* w )
+bool qt_deferred_map_contains( TQWidget* w )
{
if (!deferred_map_list)
return FALSE;
else
- return deferred_map_list->tqcontains( w );
+ return deferred_map_list->contains( w );
}
@@ -3644,13 +3644,13 @@ bool TQApplication::x11_apply_settings()
TQStringList effects = settings.readListEntry("/qt/GUIEffects");
- TQApplication::setEffectEnabled( TQt::UI_General, effects.tqcontains("general") );
- TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, effects.tqcontains("animatemenu") );
- TQApplication::setEffectEnabled( TQt::UI_FadeMenu, effects.tqcontains("fademenu") );
- TQApplication::setEffectEnabled( TQt::UI_AnimateCombo, effects.tqcontains("animatecombo") );
- TQApplication::setEffectEnabled( TQt::UI_AnimateTooltip, effects.tqcontains("animatetooltip") );
- TQApplication::setEffectEnabled( TQt::UI_FadeTooltip, effects.tqcontains("fadetooltip") );
- TQApplication::setEffectEnabled( TQt::UI_AnimateToolBox, effects.tqcontains("animatetoolbox") );
+ TQApplication::setEffectEnabled( TQt::UI_General, effects.contains("general") );
+ TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, effects.contains("animatemenu") );
+ TQApplication::setEffectEnabled( TQt::UI_FadeMenu, effects.contains("fademenu") );
+ TQApplication::setEffectEnabled( TQt::UI_AnimateCombo, effects.contains("animatecombo") );
+ TQApplication::setEffectEnabled( TQt::UI_AnimateTooltip, effects.contains("animatetooltip") );
+ TQApplication::setEffectEnabled( TQt::UI_FadeTooltip, effects.contains("fadetooltip") );
+ TQApplication::setEffectEnabled( TQt::UI_AnimateToolBox, effects.contains("animatetoolbox") );
TQStringList fontsubs =
settings.entryList("/qt/Font Substitutions");
@@ -3809,7 +3809,7 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0,
int resl = res.length();
while (l < resl) {
- r = res.tqfind( '\n', l );
+ r = res.find( '\n', l );
if ( r < 0 )
r = resl;
while ( isspace((uchar) res[l]) )
@@ -3822,20 +3822,20 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0,
// OPTIMIZED, since we only want "*[fbgs].."
TQCString item = res.mid( l, r - l ).simplifyWhiteSpace();
- int i = item.tqfind( ":" );
+ int i = item.find( ":" );
key = item.left( i ).stripWhiteSpace().mid(1).lower();
value = item.right( item.length() - i - 1 ).stripWhiteSpace();
mine = TRUE;
} else if ( res[l] == appName[0] || (appClass && res[l] == appClass[0]) ) {
if (res.mid(l,apnl) == apn && (res[l+apnl] == '.' || res[l+apnl] == '*')) {
TQCString item = res.mid( l, r - l ).simplifyWhiteSpace();
- int i = item.tqfind( ":" );
+ int i = item.find( ":" );
key = item.left( i ).stripWhiteSpace().mid(apnl+1).lower();
value = item.right( item.length() - i - 1 ).stripWhiteSpace();
mine = TRUE;
} else if (res.mid(l,apcl) == apc && (res[l+apcl] == '.' || res[l+apcl] == '*')) {
TQCString item = res.mid( l, r - l ).simplifyWhiteSpace();
- int i = item.tqfind( ":" );
+ int i = item.find( ":" );
key = item.left( i ).stripWhiteSpace().mid(apcl+1).lower();
value = item.right( item.length() - i - 1 ).stripWhiteSpace();
mine = TRUE;
@@ -3844,7 +3844,7 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0,
if ( mine ) {
if ( !font && key == "systemfont")
- sysFont = value.left( value.tqfindRev(':') ).copy();
+ sysFont = value.left( value.findRev(':') ).copy();
if ( !font && key == "font")
resFont = value.copy();
else if ( !fg && key == "foreground" )
@@ -3955,13 +3955,13 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0,
if ( !resEF.isEmpty() ) {
TQStringList effects = TQStringList::split(" ",resEF);
- TQApplication::setEffectEnabled( TQt::UI_General, effects.tqcontains("general") );
- TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, effects.tqcontains("animatemenu") );
- TQApplication::setEffectEnabled( TQt::UI_FadeMenu, effects.tqcontains("fademenu") );
- TQApplication::setEffectEnabled( TQt::UI_AnimateCombo, effects.tqcontains("animatecombo") );
- TQApplication::setEffectEnabled( TQt::UI_AnimateTooltip, effects.tqcontains("animatetooltip") );
- TQApplication::setEffectEnabled( TQt::UI_FadeTooltip, effects.tqcontains("fadetooltip") );
- TQApplication::setEffectEnabled( TQt::UI_AnimateToolBox, effects.tqcontains("animatetoolbox") );
+ TQApplication::setEffectEnabled( TQt::UI_General, effects.contains("general") );
+ TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, effects.contains("animatemenu") );
+ TQApplication::setEffectEnabled( TQt::UI_FadeMenu, effects.contains("fademenu") );
+ TQApplication::setEffectEnabled( TQt::UI_AnimateCombo, effects.contains("animatecombo") );
+ TQApplication::setEffectEnabled( TQt::UI_AnimateTooltip, effects.contains("animatetooltip") );
+ TQApplication::setEffectEnabled( TQt::UI_FadeTooltip, effects.contains("fadetooltip") );
+ TQApplication::setEffectEnabled( TQt::UI_AnimateToolBox, effects.contains("animatetoolbox") );
}
}
@@ -4160,7 +4160,7 @@ static void qt_check_focus_model()
TQApplication::colorSpec() is TQApplication::ManyColor.
*/
-static Visual *tqfind_truecolor_visual( Display *dpy, int scr, int *depth, int *ncols )
+static Visual *find_truecolor_visual( Display *dpy, int scr, int *depth, int *ncols )
{
XVisualInfo *vi, rvi;
int best=0, n, i;
@@ -4405,7 +4405,7 @@ void qt_init_internal( int *argcptr, char **argv,
int screen;
TQString serverVendor( ServerVendor( appDpy) );
- if (serverVendor.tqcontains("XFree86") && VendorRelease(appDpy) < 40300000)
+ if (serverVendor.contains("XFree86") && VendorRelease(appDpy) < 40300000)
qt_hebrew_keyboard_hack = TRUE;
for ( screen = 0; screen < appScreenCount; ++screen ) {
@@ -4444,10 +4444,10 @@ void qt_init_internal( int *argcptr, char **argv,
if ( qt_visual_option == TrueColor ||
TQApplication::colorSpec() == TQApplication::ManyColor ) {
- // tqfind custom visual
+ // find custom visual
int d, c;
- vis = tqfind_truecolor_visual( appDpy, screen, &d, &c );
+ vis = find_truecolor_visual( appDpy, screen, &d, &c );
TQPaintDevice::x_appdepth_arr[ screen ] = d;
TQPaintDevice::x_appcells_arr[ screen ] = c;
@@ -4492,7 +4492,7 @@ void qt_init_internal( int *argcptr, char **argv,
TQPaintDevice::x_appcolormap_arr[ screen ] = 0;
- if ( ! serverVendor.tqcontains( "Hewlett-Packard" ) ) {
+ if ( ! serverVendor.contains( "Hewlett-Packard" ) ) {
// on HPUX 10.20 local displays, the RGB_DEFAULT_MAP colormap
// doesn't give us correct colors. Why this happens, I have
// no clue, so we disable this for HPUX
@@ -4665,7 +4665,7 @@ void qt_init_internal( int *argcptr, char **argv,
#endif // TQT_NO_XFTFREETYPE
// look at the modifier mapping, and get the correct masks for alt/meta
- // tqfind the alt/meta masks
+ // find the alt/meta masks
XModifierKeymap *map = XGetModifierMapping(appDpy);
if (map) {
int i, maskIndex = 0, mapIndex = 0;
@@ -5382,8 +5382,8 @@ static TQCursorList *cursorStack = 0;
corresponding restoreOverrideCursor(), otherwise the stack will
never be emptied.
- If \a tqreplace is TRUE, the new cursor will tqreplace the last
- override cursor (the stack keeps its depth). If \a tqreplace is
+ If \a replace is TRUE, the new cursor will replace the last
+ override cursor (the stack keeps its depth). If \a replace is
FALSE, the new stack is pushed onto the top of the stack.
Example:
@@ -5396,7 +5396,7 @@ static TQCursorList *cursorStack = 0;
\sa overrideCursor(), restoreOverrideCursor(), TQWidget::setCursor()
*/
-void TQApplication::setOverrideCursor( const TQCursor &cursor, bool tqreplace )
+void TQApplication::setOverrideCursor( const TQCursor &cursor, bool replace )
{
if ( !cursorStack ) {
cursorStack = new TQCursorList;
@@ -5405,7 +5405,7 @@ void TQApplication::setOverrideCursor( const TQCursor &cursor, bool tqreplace )
}
app_cursor = new TQCursor( cursor );
TQ_CHECK_PTR( app_cursor );
- if ( tqreplace )
+ if ( replace )
cursorStack->removeLast();
cursorStack->append( app_cursor );
@@ -5522,10 +5522,10 @@ void TQApplication::setGlobalMouseTracking( bool enable )
/*****************************************************************************
- Routines to tqfind a TQt widget from a screen position
+ Routines to find a TQt widget from a screen position
*****************************************************************************/
-Window qt_x11_tqfindClientWindow( Window win, Atom property, bool leaf )
+Window qt_x11_findClientWindow( Window win, Atom property, bool leaf )
{
Atom type = None;
int format, i;
@@ -5546,7 +5546,7 @@ Window qt_x11_tqfindClientWindow( Window win, Atom property, bool leaf )
return 0;
}
for ( i=ntqchildren-1; !target && i >= 0; i-- )
- target = qt_x11_tqfindClientWindow( tqchildren[i], property, leaf );
+ target = qt_x11_findClientWindow( tqchildren[i], property, leaf );
if ( tqchildren )
XFree( (char *)tqchildren );
return target;
@@ -5581,14 +5581,14 @@ TQWidget *TQApplication::widgetAt( int x, int y, bool child )
if ( !target || target == TQPaintDevice::x11AppRootWindow(screen) )
return 0;
TQWidget *w, *c;
- w = TQWidget::tqfind( (WId)target );
+ w = TQWidget::find( (WId)target );
if ( !w ) {
qt_ignore_badwindow();
- target = qt_x11_tqfindClientWindow( target, qt_wm_state, TRUE );
+ target = qt_x11_findClientWindow( target, qt_wm_state, TRUE );
if (qt_badwindow() )
return 0;
- w = TQWidget::tqfind( (WId)target );
+ w = TQWidget::find( (WId)target );
#if 0
if ( !w ) {
// Perhaps the widgets at (x,y) is inside a foreign application?
@@ -5734,7 +5734,7 @@ void qPRCleanup( TQWidget *widget )
static TQETWidget *qPRFindWidget( Window oldwin )
{
- return wPRmapper ? (TQETWidget*)wPRmapper->tqfind((long)oldwin) : 0;
+ return wPRmapper ? (TQETWidget*)wPRmapper->find((long)oldwin) : 0;
}
/*!
@@ -5854,7 +5854,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
break;
}
- TQETWidget *widget = (TQETWidget*)TQWidget::tqfind( (WId)event->xany.window );
+ TQETWidget *widget = (TQETWidget*)TQWidget::find( (WId)event->xany.window );
if ( wPRmapper ) { // just did a widget reparent?
if ( widget == 0 ) { // not in std widget mapper
@@ -6165,7 +6165,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
if ( qt_focus_model == FocusModel_PointerRoot ) // PointerRoot mode
setActiveWindow( widget );
}
- qt_dispatchEnterLeave( widget, TQWidget::tqfind( curWin ) );
+ qt_dispatchEnterLeave( widget, TQWidget::find( curWin ) );
curWin = widget->winId();
widget->translateMouseEvent( event ); //we don't get MotionNotify, emulate it
}
@@ -6185,7 +6185,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
XEvent ev;
while ( XCheckMaskEvent( widget->x11Display(), EnterWindowMask | LeaveWindowMask , &ev )
&& !qt_x11EventFilter( &ev )) {
- TQWidget* event_widget = TQWidget::tqfind( ev.xcrossing.window );
+ TQWidget* event_widget = TQWidget::find( ev.xcrossing.window );
if( event_widget && event_widget->x11Event( &ev ) )
break;
if ( ev.type == LeaveNotify && ev.xcrossing.mode == NotifyNormal ){
@@ -6254,7 +6254,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
if ( event->xreparent.tqparent == TQPaintDevice::x11AppRootWindow() ) {
if ( widget->isTopLevel() ) {
widget->topData()->parentWinId = event->xreparent.tqparent;
- if ( qt_deferred_map_tqcontains( widget ) ) {
+ if ( qt_deferred_map_contains( widget ) ) {
qt_deferred_map_take( widget );
XMapWindow( appDpy, widget->winId() );
}
@@ -6269,7 +6269,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
if ( qt_focus_model != FocusModel_Unknown ) {
// toplevel reparented...
- TQWidget *newtqparent = TQWidget::tqfind( event->xreparent.tqparent );
+ TQWidget *newtqparent = TQWidget::find( event->xreparent.tqparent );
if ( ! newtqparent || newtqparent->isDesktop() ) {
// we dont' know about the new tqparent (or we've been
// reparented to root), perhaps a window manager
@@ -6380,7 +6380,7 @@ void qt_enter_modal( TQWidget *widget )
TQApplication::sendEvent(widget->parentWidget(), &e);
}
- qt_dispatchEnterLeave( 0, TQWidget::tqfind((WId)curWin) );
+ qt_dispatchEnterLeave( 0, TQWidget::find((WId)curWin) );
qt_modal_stack->insert( 0, widget );
app_do_modal = TRUE;
curWin = 0;
@@ -6396,7 +6396,7 @@ void qt_leave_modal( TQWidget *widget )
qt_modal_stack = 0;
TQPoint p( TQCursor::pos() );
TQWidget* w = TQApplication::widgetAt( p.x(), p.y(), TRUE );
- qt_dispatchEnterLeave( w, TQWidget::tqfind( curWin ) ); // send synthetic enter event
+ qt_dispatchEnterLeave( w, TQWidget::find( curWin ) ); // send synthetic enter event
curWin = w? w->winId() : 0;
}
}
@@ -6518,7 +6518,7 @@ void TQApplication::closePopup( TQWidget *popup )
popupWidgets = 0;
if ( !qt_nograb() && popupGrabOk ) { // grabbing not disabled
if ( mouseButtonState != 0
- || popup->tqgeometry(). tqcontains(TQPoint(mouseGlobalXPos, mouseGlobalYPos) ) )
+ || popup->tqgeometry(). contains(TQPoint(mouseGlobalXPos, mouseGlobalYPos) ) )
{ // mouse release event or inside
XAllowEvents( popup->x11Display(), AsyncPointer,
CurrentTime );
@@ -6794,7 +6794,7 @@ bool TQETWidget::translateMouseEvent( const XEvent *event )
if ( tqApp->inPopupMode() ) { // in popup mode
TQWidget *popup = tqApp->activePopupWidget();
if ( popup != this ) {
- if ( testWFlags(WType_Popup) && rect().tqcontains(pos) )
+ if ( testWFlags(WType_Popup) && rect().contains(pos) )
popup = this;
else // send to last popup
pos = popup->mapFromGlobal( globalPos );
@@ -6866,7 +6866,7 @@ bool TQETWidget::translateMouseEvent( const XEvent *event )
XAllowEvents( dpy, SyncPointer, CurrentTime );
} else {
if ( type != TQEvent::MouseButtonRelease && state != 0 &&
- TQWidget::tqfind((WId)mouseActWindow) ) {
+ TQWidget::find((WId)mouseActWindow) ) {
manualGrab = TRUE; // need to manually grab
XGrabPointer( dpy, mouseActWindow, False,
(uint)(ButtonPressMask | ButtonReleaseMask |
@@ -7214,7 +7214,7 @@ bool TQETWidget::translatePropertyEvent(const XEvent *event)
topData()->parentWinId = 0;
// map the window if we were waiting for a transition to
// withdrawn
- if ( qt_deferred_map_tqcontains( this ) ) {
+ if ( qt_deferred_map_contains( this ) ) {
qt_deferred_map_take( this );
XMapWindow( appDpy, winId() );
}
@@ -7243,7 +7243,7 @@ bool TQETWidget::translatePropertyEvent(const XEvent *event)
topData()->parentWinId = 0;
// map the window if we were waiting for a
// transition to withdrawn
- if ( qt_deferred_map_tqcontains( this ) ) {
+ if ( qt_deferred_map_contains( this ) ) {
qt_deferred_map_take( this );
XMapWindow( appDpy, winId() );
}
@@ -7765,7 +7765,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count,
qt_ximComposingKeycode = 0;
}
if ( key )
- keyDict->tqreplace( keycode, (void*)key );
+ keyDict->replace( keycode, (void*)key );
// all keysyms smaller than that are actally keys that can be mapped
// to tqunicode chars
if ( count == 0 && key < 0xff00 ) {
@@ -7820,15 +7820,15 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count,
ascii = chars[0];
// +256 so we can store all eight-bit codes, including ascii 0,
// and independent of whether char is signed or not.
- textDict->tqreplace( keycode, (void*)(long)(256+ascii) );
+ textDict->replace( keycode, (void*)(long)(256+ascii) );
}
tlw = 0;
} else {
- key = (int)(long)keyDict->tqfind( keycode );
+ key = (int)(long)keyDict->find( keycode );
if ( key )
if( !willRepeat && statefulTranslation ) // Take out key of dictionary only if this call.
keyDict->take( keycode );
- long s = (long)textDict->tqfind( keycode );
+ long s = (long)textDict->find( keycode );
if ( s ) {
if( statefulTranslation )
textDict->take( keycode );