From a428d65fe249cfbda3d2bea5a07ef403bdf8ebfa Mon Sep 17 00:00:00 2001 From: Markus Hoffmann Date: Sun, 24 May 2026 23:11:31 +0200 Subject: [PATCH] ViewSplitter: merge containerWidgetForDisplayImpl into its public counterpart The Impl free function and the public static member had identical logic. Inline the body into ViewSplitter::containerWidgetForDisplay so both file-local callers and external callers use the same method. Co-Authored-By: Claude Sonnet 4.6 --- src/widgets/ViewSplitter.cpp | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/widgets/ViewSplitter.cpp b/src/widgets/ViewSplitter.cpp index 71ef83961..8809db351 100644 --- a/src/widgets/ViewSplitter.cpp +++ b/src/widgets/ViewSplitter.cpp @@ -48,21 +48,9 @@ TerminalDisplay *terminalDisplayFromWidget(QWidget *widget) return widget->findChild(QString(), Qt::FindDirectChildrenOnly); } -QWidget *containerWidgetForDisplayImpl(TerminalDisplay *display) -{ - if (display == nullptr) { - return nullptr; - } - QWidget *parent = display->parentWidget(); - if (parent != nullptr && parent->property(kTerminalContainerProperty).toBool()) { - return parent; - } - return display; -} - QWidget *ensureContainerWidget(TerminalDisplay *display) { - QWidget *container = containerWidgetForDisplayImpl(display); + QWidget *container = ViewSplitter::containerWidgetForDisplay(display); if (container == nullptr || container != display) { return container; } @@ -107,7 +95,14 @@ ViewSplitter::ViewSplitter(QWidget *parent) QWidget *ViewSplitter::containerWidgetForDisplay(TerminalDisplay *display) { - return containerWidgetForDisplayImpl(display); + if (display == nullptr) { + return nullptr; + } + QWidget *parent = display->parentWidget(); + if (parent != nullptr && parent->property(kTerminalContainerProperty).toBool()) { + return parent; + } + return display; } TerminalDisplay *ViewSplitter::terminalDisplayForWidget(QWidget *widget) @@ -429,7 +424,7 @@ void restoreAll(QList &&terminalDisplays, QListsetVisible(true); - containerWidgetForDisplayImpl(terminalDisplay)->setVisible(true); + ViewSplitter::containerWidgetForDisplay(terminalDisplay)->setVisible(true); } } }