mirror of
https://github.com/KDE/konsole.git
synced 2026-06-08 14:05:16 -04:00
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 <noreply@anthropic.com>
This commit is contained in:
@@ -48,21 +48,9 @@ TerminalDisplay *terminalDisplayFromWidget(QWidget *widget)
|
||||
return widget->findChild<TerminalDisplay *>(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<TerminalDisplay *> &&terminalDisplays, QList<ViewSplitter
|
||||
}
|
||||
for (auto terminalDisplay : terminalDisplays) {
|
||||
terminalDisplay->setVisible(true);
|
||||
containerWidgetForDisplayImpl(terminalDisplay)->setVisible(true);
|
||||
ViewSplitter::containerWidgetForDisplay(terminalDisplay)->setVisible(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user