diff --git a/src/DockWidgetBase.cpp b/src/DockWidgetBase.cpp index 4fc401f7..120d5155 100644 --- a/src/DockWidgetBase.cpp +++ b/src/DockWidgetBase.cpp @@ -801,13 +801,13 @@ int DockWidgetBase::userType() const void DockWidgetBase::setMDIPosition(QPoint pos) { if (MDILayoutWidget *layout = d->mdiLayout()) - layout->move(this, pos); + layout->moveDockWidget(this, pos); } void DockWidgetBase::setMDISize(QSize size) { if (MDILayoutWidget *layout = d->mdiLayout()) - layout->resize(this, size); + layout->resizeDockWidget(this, size); } void DockWidgetBase::setMDIZ(int z) diff --git a/src/private/DragController.cpp b/src/private/DragController.cpp index b20e3600..2eda64f2 100644 --- a/src/private/DragController.cpp +++ b/src/private/DragController.cpp @@ -448,7 +448,7 @@ bool StateInternalMDIDragging::handleMouseMove(QPoint globalPos) auto layout = frame->mdiLayoutWidget(); Q_ASSERT(layout); - layout->move(frame, newLocalPosBounded); + layout->moveDockWidget(frame, newLocalPosBounded); // Check if we need to pop out the MDI window (make it float) // If we drag the window against an edge, and move behind the edge some threshold, we float it diff --git a/src/private/MDILayoutWidget.cpp b/src/private/MDILayoutWidget.cpp index b26ff778..3123d085 100644 --- a/src/private/MDILayoutWidget.cpp +++ b/src/private/MDILayoutWidget.cpp @@ -60,12 +60,12 @@ void MDILayoutWidget::addDockWidget(DockWidgetBase *dw, QPoint localPt, InitialO } } -void MDILayoutWidget::move(DockWidgetBase *dw, QPoint pos) +void MDILayoutWidget::moveDockWidget(DockWidgetBase *dw, QPoint pos) { - move(dw->d->frame(), pos); + moveDockWidget(dw->d->frame(), pos); } -void MDILayoutWidget::move(Frame *frame, QPoint pos) +void MDILayoutWidget::moveDockWidget(Frame *frame, QPoint pos) { if (!frame) return; @@ -81,12 +81,12 @@ void MDILayoutWidget::move(Frame *frame, QPoint pos) item->setGeometry(geo); } -void MDILayoutWidget::resize(DockWidgetBase *dw, QSize size) +void MDILayoutWidget::resizeDockWidget(DockWidgetBase *dw, QSize size) { - resize(dw->d->frame(), size); + resizeDockWidget(dw->d->frame(), size); } -void MDILayoutWidget::resize(Frame *frame, QSize size) +void MDILayoutWidget::resizeDockWidget(Frame *frame, QSize size) { if (!frame) return; diff --git a/src/private/MDILayoutWidget_p.h b/src/private/MDILayoutWidget_p.h index 581f529e..360e49f4 100644 --- a/src/private/MDILayoutWidget_p.h +++ b/src/private/MDILayoutWidget_p.h @@ -39,18 +39,18 @@ public: void addDockWidget(DockWidgetBase *dw, QPoint localPt, InitialOption addingOption); /// @brief Moves a dock widget @p dw to point @p pos - void move(DockWidgetBase *dw, QPoint pos); + void moveDockWidget(DockWidgetBase *dw, QPoint pos); /// @brief Moves a dock widget @p f to point @p pos /// Convenience overload. - void move(Frame *f, QPoint pos); + void moveDockWidget(Frame *f, QPoint pos); /// @brief Sets the size of dock widget @p dw to @p size - void resize(DockWidgetBase *dw, QSize size); + void resizeDockWidget(DockWidgetBase *dw, QSize size); /// @brief Sets the size of dock widget @p f to @p size /// Convenience overload. - void resize(Frame *f, QSize size); + void resizeDockWidget(Frame *f, QSize size); private: Layouting::ItemFreeContainer *const m_rootItem;