diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp')
-rw-r--r-- | experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp index 60df4121f..532a372e8 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp @@ -189,7 +189,7 @@ void TQWidget::setMask( const QBitmap bitmap ) fixerUpper.drawLine(0, fixedBitmap.height()-1, fixedBitmap.width()-1, fixedBitmap.height()-1); fixerUpper.drawLine(fixedBitmap.width()-1, 0, fixedBitmap.width()-1, fixedBitmap.height()-1); fixerUpper.end(); - QWidget::setMask(fixedBitmap.mask()); + QWidget::setMask(fixedBitmap.QBitmap::mask()); } /*! @@ -395,9 +395,9 @@ void TQWidget::sendMouseEventToInputContext( int x, TQEvent::Type type, TQt::But #endif } -void TQWidget::x11SetWindowTransient( TQWidget* tqparent ) +void TQWidget::x11SetWindowTransient( TQWidget* parent ) { - XSetTransientForHint( x11Display(), winId(), tqparent->winId()); + XSetTransientForHint( x11Display(), winId(), parent->winId()); } // Sets the EWMH (netwm) window type. Needed as a separate function @@ -551,7 +551,7 @@ extern int qt_curr_events_stylus; extern int qt_curr_events_eraser; #endif -const uint stdWidgetEventMask = // X event tqmask +const uint stdWidgetEventMask = // X event mask (uint)( KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | @@ -564,7 +564,7 @@ const uint stdWidgetEventMask = // X event tqmask StructureNotifyMask ); -const uint stdDesktopEventMask = // X event tqmask +const uint stdDesktopEventMask = // X event mask (uint)( KeymapStateMask | EnterWindowMask | LeaveWindowMask | @@ -577,13 +577,13 @@ const uint stdDesktopEventMask = // X event tqmask */ Window qt_XCreateWindow( const TQWidget *creator, - Display *display, Window tqparent, + Display *display, Window parent, int x, int y, uint w, uint h, int borderwidth, int depth, uint windowclass, Visual *visual, - ulong valuetqmask, XSetWindowAttributes *attributes ); + ulong valuemask, XSetWindowAttributes *attributes ); Window qt_XCreateSimpleWindow( const TQWidget *creator, - Display *display, Window tqparent, + Display *display, Window parent, int x, int y, uint w, uint h, int borderwidth, ulong border, ulong background ); void qt_XDestroyWindow( const TQWidget *destroyer, @@ -743,7 +743,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) xd->x_defvisual = TQPaintDevice::x11AppDefaultVisual( xd->x_screen ); setX11Data( xd ); } else if ( parentWidget() && parentWidget()->x11Screen() != x11Screen() ) { - // if we have a tqparent widget, move to its screen if necessary + // if we have a parent widget, move to its screen if necessary TQPaintDeviceX11Data* xd = getX11Data( TRUE ); xd->x_screen = parentWidget()->x11Screen(); xd->x_depth = TQPaintDevice::x11AppDepth( xd->x_screen ); @@ -955,7 +955,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) &wsa ); x11SetWindowType(); } else if ( topLevel && !desktop ) { // top-level widget - TQWidget *p = parentWidget(); // real tqparent + TQWidget *p = parentWidget(); // real parent if (p) p = p->tqtopLevelWidget(); @@ -966,7 +966,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) XSetTransientForHint( dpy, id, root_win ); } - // find the real client leader, i.e. a toplevel without tqparent + // find the real client leader, i.e. a toplevel without parent while ( p && p->parentWidget()) p = p->parentWidget()->tqtopLevelWidget(); @@ -1064,7 +1064,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) } setWState( WState_MouseTracking ); - setMouseTracking( FALSE ); // also sets event tqmask + setMouseTracking( FALSE ); // also sets event mask if ( desktop ) { setWState( WState_Visible ); } else if ( topLevel ) { // set X cursor @@ -1158,7 +1158,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows ) } } -void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool showIt ) +void TQWidget::reparentSys( TQWidget *parent, WFlags f, const TQPoint &p, bool showIt ) { extern void qPRCreate( const TQWidget *, Window ); @@ -1179,7 +1179,7 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool clearWState(WState_MouseTracking); TQWidget* oldtlw = tqtopLevelWidget(); - TQWidget *oldtqparent = parentWidget(); + TQWidget *oldparent = parentWidget(); WId old_winid = winid; if ( testWFlags(WType_Desktop) ) old_winid = 0; @@ -1203,14 +1203,14 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool destroySyncCounter(); #endif - if ( isTopLevel() || !tqparent ) // we are toplevel, or reparenting to toplevel + if ( isTopLevel() || !parent ) // we are toplevel, or reparenting to toplevel topData()->parentWinId = 0; - if ( tqparent != parentObj ) { - if ( parentObj ) // remove from tqparent + if ( parent != parentObj ) { + if ( parentObj ) // remove from parent parentObj->removeChild( this ); - if ( tqparent ) // insert into new tqparent - tqparent->insertChild( this ); + if ( parent ) // insert into new parent + parent->insertChild( this ); } bool enable = isEnabled(); // remember status FocusPolicy fp = focusPolicy(); @@ -1221,7 +1221,7 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool widget_flags = f; clearWState( WState_Created | WState_Visible | WState_ForceHide ); create(); - if ( isTopLevel() || (!tqparent || tqparent->isVisible() ) ) + if ( isTopLevel() || (!parent || parent->isVisible() ) ) setWState( WState_ForceHide ); // new widgets do not show up in already visible parents const TQObjectList *chlist = childrenListObject(); @@ -1245,7 +1245,7 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool WM_TRANSIENT_FOR information... unfortunately, some window managers don't handle changing WM_TRANSIENT_FOR before the toplevel window is visible, so we unmap and remap all toplevel-transient tqchildren *after* - the toplevel tqparent has been mapped. thankfully, this is easy in TQt :) + the toplevel parent has been mapped. thankfully, this is easy in TQt :) */ XUnmapWindow(w->x11Display(), w->winId()); XSetTransientForHint(w->x11Display(), w->winId(), winId()); @@ -1288,8 +1288,8 @@ void TQWidget::reparentSys( TQWidget *tqparent, WFlags f, const TQPoint &p, bool reparentFocusWidgets( oldtlw ); // re-register dnd - if (oldtqparent) - oldtqparent->checkChildrenDnd(); + if (oldparent) + oldparent->checkChildrenDnd(); if ( accept_drops ) setAcceptDrops( TRUE ); @@ -1358,9 +1358,9 @@ void TQWidget::x11SetWindowType( X11WindowType type ) XDeleteProperty(x11Display(), winId(), qt_net_wm_window_type); } -void TQWidget::x11SetWindowTransient( TQWidget* tqparent ) +void TQWidget::x11SetWindowTransient( TQWidget* parent ) { - XSetTransientForHint( x11Display(), winId(), tqparent->winId()); + XSetTransientForHint( x11Display(), winId(), parent->winId()); } /*! @@ -1621,11 +1621,11 @@ void TQWidget::setIcon( const TQPixmap &pixmap ) if ( !pixmap.isNull() ) { TQPixmap* pm = new TQPixmap( pixmap ); extra->topextra->icon = pm; - if ( !pm->tqmask() ) + if ( !pm->mask() ) pm->setMask( pm->createHeuristicMask() ); // may do detach() icon_pixmap = pm->handle(); - if ( pm->tqmask() ) - mask_pixmap = pm->tqmask()->handle(); + if ( pm->mask() ) + mask_pixmap = pm->mask()->handle(); } XWMHints *h = XGetWMHints( x11Display(), winId() ); XWMHints wm_hints; @@ -2311,7 +2311,7 @@ void TQWidget::hideWindow() } /*! - Raises this widget to the top of the tqparent widget's stack. + Raises this widget to the top of the parent widget's stack. After this call the widget will be visually in front of any overlapping sibling widgets. @@ -2328,7 +2328,7 @@ void TQWidget::raise() } /*! - Lowers the widget to the bottom of the tqparent widget's stack. + Lowers the widget to the bottom of the parent widget's stack. After this call the widget will be visually behind (and therefore obscured by) any overlapping sibling widgets. @@ -2346,7 +2346,7 @@ void TQWidget::lower() /*! - Places the widget under \a w in the tqparent widget's stack. + Places the widget under \a w in the parent widget's stack. To make this work, the widget itself and \a w must be siblings. @@ -2902,7 +2902,7 @@ void TQWidget::deleteTLSysExtra() } /* - examine the tqchildren of our tqparent up the tree and set the + examine the tqchildren of our parent up the tree and set the tqchildren_use_dnd extra data appropriately... this is used to keep DND enabled for widgets that are reparented and don't have DND enabled, BUT *DO* have tqchildren (or tqchildren of tqchildren ...) with DND enabled... @@ -3040,7 +3040,7 @@ void TQWidget::setMask( const TQRegion& region ) /*! Causes only the pixels of the widget for which \a bitmap has a corresponding 1 bit to be visible. Use TQt::color0 to draw - transtqparent regions and TQt::color1 to draw opaque regions of the + transparent regions and TQt::color1 to draw opaque regions of the bitmap. If the region includes pixels outside the rect() of the widget, @@ -3065,7 +3065,7 @@ void TQWidget::setMask( const TQBitmap &bitmap ) } /*! - Removes any tqmask set by setMask(). + Removes any mask set by setMask(). \sa setMask() */ @@ -3106,7 +3106,7 @@ void TQWidget::updateFrameStrut() const } Atom type_ret; - Window l = winId(), w = winId(), p, r; // target window, it's tqparent, root + Window l = winId(), w = winId(), p, r; // target window, it's parent, root Window *c; int i_unused; unsigned int nc; @@ -3118,11 +3118,11 @@ void TQWidget::updateFrameStrut() const XFree(c); if (! p) { - qWarning("TQWidget::updateFrameStrut(): ERROR - no tqparent"); + qWarning("TQWidget::updateFrameStrut(): ERROR - no parent"); return; } - // if the tqparent window is the root window, an Enlightenment virtual root or + // if the parent window is the root window, an Enlightenment virtual root or // a NET WM virtual root window, stop here data_ret = 0; if (p == r || |