diff options
Diffstat (limited to 'kexi/formeditor/container.cpp')
| -rw-r--r-- | kexi/formeditor/container.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index a68e34d2..a9942d1c 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -299,7 +299,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) { if(!m_toplevel && m_moving == m_container) // no effect for form return false; - if((!m_moving) || (!m_moving->tqparentWidget()))// || (m_moving->tqparentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))) + if((!m_moving) || (!m_moving->parentWidget()))// || (m_moving->parentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))) return true; moveSelectedWidgetsBy(mev->x() - m_grab.x(), mev->y() - m_grab.y()); @@ -915,7 +915,7 @@ Container::createGridLayout(bool testOnly) } TQString -Container::tqlayoutTypeToString(int type) +Container::layoutTypeToString(int type) { switch(type) { @@ -1110,24 +1110,24 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev) if(!w || !w->tqparent() || w->tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->tqparent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING)) continue; - if(w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)) + if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)) { - w = w->tqparentWidget(); // widget is WidgetStack page - if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page - w = w->tqparentWidget(); + w = w->parentWidget(); // widget is WidgetStack page + if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page + w = w->parentWidget(); } int tmpx = w->x() + realdx; int tmpy = w->y() + realdy; if(tmpx < 0) dx = TQMAX(0 - w->x(), dx); // because dx is <0 - else if(tmpx > w->tqparentWidget()->width() - gridX) - dx = TQMIN(w->tqparentWidget()->width() - gridX - w->x(), dx); + else if(tmpx > w->parentWidget()->width() - gridX) + dx = TQMIN(w->parentWidget()->width() - gridX - w->x(), dx); if(tmpy < 0) dy = TQMAX(0 - w->y(), dy); // because dy is <0 - else if(tmpy > w->tqparentWidget()->height() - gridY) - dy = TQMIN(w->tqparentWidget()->height() - gridY - w->y(), dy); + else if(tmpy > w->parentWidget()->height() - gridY) + dy = TQMIN(w->parentWidget()->height() - gridY - w->y(), dy); } for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next()) @@ -1136,11 +1136,11 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev) if(!w || !w->tqparent() || w->tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->tqparent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING)) continue; - if(w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)) + if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)) { - w = w->tqparentWidget(); // widget is WidgetStack page - if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page - w = w->tqparentWidget(); + w = w->parentWidget(); // widget is WidgetStack page + if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page + w = w->parentWidget(); } int tmpx, tmpy; |