diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 20:16:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 20:16:47 +0000 |
commit | 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch) | |
tree | daabcb652c07b9a17cad88ca50b63a2d91ead4a3 /nsplugins/viewer/kxt.cpp | |
parent | 50001f1757f97510e80cb1990e2f2d5b00144c2a (diff) | |
download | tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'nsplugins/viewer/kxt.cpp')
-rw-r--r-- | nsplugins/viewer/kxt.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp index 9f5f43d51..2443ce739 100644 --- a/nsplugins/viewer/kxt.cpp +++ b/nsplugins/viewer/kxt.cpp @@ -159,11 +159,11 @@ void reparentChildrenOf(TQWidget* parent) void qwidget_realize( Widget widget, - XtValueMask* mask, + XtValueMask* tqmask, XSetWindowAttributes* attributes ) { - widgetClassRec.core_class.realize(widget, mask, attributes); + widgetClassRec.core_class.realize(widget, tqmask, attributes); KXtWidget* qxtw = ((QWidgetRec*)widget)->qwidget.qxtwidget; if (XtWindow(widget) != qxtw->winId()) { qxtw->create(XtWindow(widget), FALSE, FALSE); @@ -205,7 +205,7 @@ QWidgetClassRec qwidgetClassRec = { /* version */ XtVersion, /* callback_private */ 0, /* tm_table */ XtInheritTranslations, - /* query_geometry */ XtInheritQueryGeometry, + /* query_tqgeometry */ XtInheritQueryGeometry, /* display_accelerator */ XtInheritDisplayAccelerator, /* extension */ 0 }, @@ -255,7 +255,7 @@ static void np_event_proc( XEvent* e ) { Widget xtw = XtWindowToWidget( e->xany.display, e->xany.window ); - if ( xtw && qApp->loopLevel() > 0 ) { + if ( xtw && tqApp->loopLevel() > 0 ) { // Allow Xt to process the event qt_np_cascade_event_handler[e->type]( e ); } @@ -442,7 +442,7 @@ void KXtWidget::init(const char* name, WidgetClass widget_class, Use this constructor to utilize Qt widgets in an Xt/Motif application. The KXtWidget is a TQWidget, so you can create - subwidgets, layouts, etc. using Qt functionality. + subwidgets, tqlayouts, etc. using Qt functionality. */ KXtWidget::KXtWidget(const char* name, Widget parent, bool managed) : TQWidget( 0, name, WResizeNoErase ) @@ -505,7 +505,7 @@ KXtWidget::~KXtWidget() if ( need_reroot ) { hide(); - XReparentWindow(qt_xdisplay(), winId(), qApp->desktop()->winId(), + XReparentWindow(qt_xdisplay(), winId(), tqApp->desktop()->winId(), x(), y()); } @@ -567,7 +567,7 @@ bool KXtWidget::isActiveWindow() const TQWidget *w = find( (WId)win ); if ( w ) { // We know that window - return w->topLevelWidget() == topLevelWidget(); + return w->tqtopLevelWidget() == tqtopLevelWidget(); } else { // Window still may be a parent (if top-level is foreign window) Window root, parent; |