diff options
Diffstat (limited to 'tqtinterface/qt4/plugins')
3 files changed, 9 insertions, 9 deletions
diff --git a/tqtinterface/qt4/plugins/src/accessible/widgets/main.cpp b/tqtinterface/qt4/plugins/src/accessible/widgets/main.cpp index 450bfed..ab961e5 100644 --- a/tqtinterface/qt4/plugins/src/accessible/widgets/main.cpp +++ b/tqtinterface/qt4/plugins/src/accessible/widgets/main.cpp @@ -127,9 +127,9 @@ TQRESULT AccessibleFactory::createAccessibleInterface( const TQString &classname } else if ( classname == "TQButton" ) { *iface = new TQAccessibleButton( object, PushButton ); } else if ( classname == "TQViewportWidget" ) { - *iface = new TQAccessibleViewport( object, object->tqparent() ); + *iface = new TQAccessibleViewport( object, object->parent() ); } else if ( classname == "TQClipperWidget" ) { - *iface = new TQAccessibleViewport( object, object->tqparent()->tqparent() ); + *iface = new TQAccessibleViewport( object, object->parent()->parent() ); } else if ( classname == "TQTextEdit" ) { *iface = new TQAccessibleTextEdit( object ); #ifndef TQT_NO_ICONVIEW diff --git a/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp b/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp index 224ee09..2755949 100644 --- a/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp +++ b/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp @@ -32,8 +32,8 @@ TQString buddyString( TQWidget *widget ) { - TQWidget *tqparent = widget->parentWidget(); - TQObjectList *ol = tqparent->queryList( "TQLabel", 0, FALSE, FALSE ); + TQWidget *parent = widget->parentWidget(); + TQObjectList *ol = parent->queryList( "TQLabel", 0, FALSE, FALSE ); if ( !ol || !ol->count() ) { delete ol; return TQString::null; @@ -54,8 +54,8 @@ TQString buddyString( TQWidget *widget ) if ( !!str ) return str; - if ( tqparent->inherits( "TQGroupBox" ) ) - return ((TQGroupBox*)tqparent)->title(); + if ( parent->inherits( "TQGroupBox" ) ) + return ((TQGroupBox*)parent)->title(); return TQString::null; } @@ -202,8 +202,8 @@ int TQAccessibleWidget::navigate( NavDirection dir, int startControl ) const case NavNext: case NavPrevious: { - TQWidget *tqparent = w->parentWidget(); - TQObjectList *sl = tqparent ? tqparent->queryList( "TQWidget", 0, FALSE, FALSE ) : 0; + TQWidget *parent = w->parentWidget(); + TQObjectList *sl = parent ? parent->queryList( "TQWidget", 0, FALSE, FALSE ) : 0; if ( !sl ) return -1; TQObject *sib; diff --git a/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp b/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp index f0d746c..66e4597 100644 --- a/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp +++ b/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp @@ -495,7 +495,7 @@ void TQXIMInputContext::init_xim() XGetWindowAttributes( dpy, TQPaintDevice::x11AppRootWindow(),&attr ); XRegisterIMInstantiateCallback(dpy, 0, 0, 0, (XIMProc) xim_create_callback, 0); - XSelectInput( dpy, TQPaintDevice::x11AppRootWindow(), attr.your_event_tqmask ); + XSelectInput( dpy, TQPaintDevice::x11AppRootWindow(), attr.your_event_mask ); } #else // !USE_X11R6_XIM else if ( XSetLocaleModifiers ("") == 0 ) |