diff options
Diffstat (limited to 'kommander/editor/formwindow.cpp')
| -rw-r--r-- | kommander/editor/formwindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 68bfab0f..b8daf492 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -362,7 +362,7 @@ void FormWindow::insertWidget() TQObject *o = it.current(); ++it; if (o->isWidgetType() && ((TQWidget*)o)->isVisibleTo(this) && - insertedWidgets.find((TQWidget*)o) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w)) + insertedWidgets.find((TQWidget*)o) && o != w) { TQRect r2(((TQWidget*)o)->pos(), ((TQWidget*)o)->size()); if (r.contains(r2)) @@ -798,7 +798,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) if (newReceiver && (newReceiver->inherits("TQLayoutWidget") || newReceiver->inherits("Spacer"))) newReceiver = (TQWidget*)connectReceiver; - drawRecRect = TQT_BASE_OBJECT(newReceiver) != TQT_BASE_OBJECT(connectReceiver); + drawRecRect = newReceiver != connectReceiver; currentConnectPos = mapFromGlobal(e->globalPos()); if (newReceiver && (isMainContainer(TQT_TQOBJECT(newReceiver)) || insertedWidgets.find(newReceiver)) && !isCentralWidget(TQT_TQOBJECT(newReceiver))) @@ -2274,7 +2274,7 @@ bool FormWindow::unify(TQObject *w, TQString &s, bool changeIt) int num = 1; TQPtrDictIterator<TQWidget> it(insertedWidgets); for (; it.current();) - if (TQT_BASE_OBJECT(it.current()) != TQT_BASE_OBJECT(w) && !qstrcmp(it.current()->name(), s.latin1())) + if (it.current() != w && !qstrcmp(it.current()->name(), s.latin1())) { found = true; if (!changeIt) @@ -2489,7 +2489,7 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) bool FormWindow::isMainContainer(TQObject *w) const { - return w && w->isWidgetType() && (TQT_BASE_OBJECT(w) == this || TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(mainContainer())); + return w && w->isWidgetType() && (w == this || w == mainContainer()); } void FormWindow::setMainContainer(TQWidget *w) @@ -2497,7 +2497,7 @@ void FormWindow::setMainContainer(TQWidget *w) bool resetPropertyWidget = isMainContainer(propertyWidget); if (mContainer) insertedWidgets.remove(mContainer); - if (TQT_BASE_OBJECT(propertyWidget) == TQT_BASE_OBJECT(mContainer)) + if (propertyWidget == mContainer) propertyWidget = 0; delete mContainer; mContainer = w; @@ -2567,7 +2567,7 @@ bool FormWindow::isCentralWidget(TQObject *w) const { if (!mainContainer()->inherits("TQMainWindow")) return false; - return TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(((TQMainWindow*)mainContainer())->centralWidget()); + return w == ((TQMainWindow*)mainContainer())->centralWidget(); } TQObject *FormWindow::connectableObject(TQObject *w, TQObject *) |