diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/src/kernel/tqwidget.h')
| -rw-r--r-- | experimental/tqtinterface/qt4/src/kernel/tqwidget.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqwidget.h b/experimental/tqtinterface/qt4/src/kernel/tqwidget.h index 6af93ed35..d5f9cb5ff 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwidget.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqwidget.h @@ -87,7 +87,7 @@ struct TQTLWExtra : public QTLWExtra, virtual public TQt uint ussize : 1; // User defined size #if defined(TQ_WS_X11) - WId parentWinId; // tqparent window Id (valid after reparenting) + WId parentWinId; // parent window Id (valid after reparenting) #endif }; @@ -190,7 +190,7 @@ class TQ_EXPORT TQWidget : public QWidget, virtual public TQt Q_OBJECT TQ_OBJECT public: - TQObject *tqparent() const; + TQObject *parent() const; TQObjectList childrenListObject(); const TQObjectList childrenListObject() const; @@ -207,7 +207,7 @@ public: // TQWidget methods public: - TQWidget( QWidget* tqparent=0, const char* name=0, WFlags f=0 ); + TQWidget( QWidget* parent=0, const char* name=0, WFlags f=0 ); void setWState( uint state ); void clearWState( uint flags ); @@ -592,7 +592,7 @@ public: X11WindowTypePopup }; void x11SetWindowType( X11WindowType type = X11WindowTypeSelect ); - void x11SetWindowTransient( TQWidget* tqparent ); + void x11SetWindowTransient( TQWidget* parent ); #endif }; @@ -676,7 +676,7 @@ class TQ_EXPORT TQWidget : public TQObject, public TQPaintDevice Q_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false ) public: - TQ_EXPLICIT TQWidget( TQWidget* tqparent=0, const char* name=0, WFlags f=0 ); + TQ_EXPLICIT TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0 ); ~TQWidget(); WId winId() const; @@ -946,13 +946,13 @@ public: TQLayout * tqlayout() const { return lay_out; } #endif void updateGeometry(); - virtual void reparent( TQWidget *tqparent, WFlags, const TQPoint &, + virtual void reparent( TQWidget *parent, WFlags, const TQPoint &, bool showIt=FALSE ); - void reparent( TQWidget *tqparent, const TQPoint &, + void reparent( TQWidget *parent, const TQPoint &, bool showIt=FALSE ); #ifndef TQT_NO_COMPAT - void recreate( TQWidget *tqparent, WFlags f, const TQPoint & p, - bool showIt=FALSE ) { reparent(tqparent,f,p,showIt); } + void recreate( TQWidget *parent, WFlags f, const TQPoint & p, + bool showIt=FALSE ) { reparent(parent,f,p,showIt); } #endif void erase(); @@ -1019,7 +1019,7 @@ public: X11WindowTypePopup }; void x11SetWindowType( X11WindowType type = X11WindowTypeSelect ); - void x11SetWindowTransient( TQWidget* tqparent ); + void x11SetWindowTransient( TQWidget* parent ); #endif void setWindowOpacity(double level); double windowOpacity() const; @@ -1180,7 +1180,7 @@ private: void hideWindow(); void showChildren( bool spontaneous ); void hideChildren( bool spontaneous ); - void reparentSys( TQWidget *tqparent, WFlags, const TQPoint &, bool showIt); + void reparentSys( TQWidget *parent, WFlags, const TQPoint &, bool showIt); void createTLExtra(); void createExtra(); void deleteExtra(); @@ -1434,8 +1434,8 @@ inline void TQWidget::drawText( const TQPoint &p, const TQString &s ) inline TQWidget *TQWidget::parentWidget( bool sameWindow ) const { if ( sameWindow ) - return isTopLevel() ? 0 : (TQWidget *)TQObject::tqparent(); - return (TQWidget *)TQObject::tqparent(); + return isTopLevel() ? 0 : (TQWidget *)TQObject::parent(); + return (TQWidget *)TQObject::parent(); } inline TQWidgetMapper *TQWidget::wmapper() @@ -1530,7 +1530,7 @@ struct TQ_EXPORT TQTLWExtra { uint savedFlags; // Save widgetflags while showing fullscreen short basew, baseh; // base sizes #if defined(TQ_WS_X11) - WId parentWinId; // tqparent window Id (valid after reparenting) + WId parentWinId; // parent window Id (valid after reparenting) uint embedded : 1; // window is embedded in another TQt application uint spont_unmapped: 1; // window was spontaneously unmapped uint reserved: 1; // reserved @@ -1600,7 +1600,7 @@ struct TQ_EXPORT TQWExtra { uint compress_events : 1; #endif #if defined(TQ_WS_TQWS) || defined(TQ_WS_MAC) - TQRegion tqmask; // widget tqmask + TQRegion mask; // widget mask #endif char bg_mode; // background mode char bg_mode_visual; // visual background mode |