Commit b1e7c39d authored by Sascha Peilicke's avatar Sascha Peilicke

Replaced deprecated calls to QLayout::setMargin and replaced it with...

Replaced deprecated calls to QLayout::setMargin and replaced it with QLayout::setContentsMargins for several Konsole classes.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=1088845
parent 934c7e23
......@@ -145,7 +145,7 @@ IncrementalSearchBar::IncrementalSearchBar(Features features , QWidget* parent)
layout->addWidget(_continueLabel);
layout->addStretch();
layout->setMargin(4);
layout->setContentsMargins(4, 4, 4, 4);
setLayout(layout);
}
......
......@@ -369,7 +369,7 @@ TerminalDisplay::TerminalDisplay(QWidget *parent)
setAttribute(Qt::WA_OpaquePaintEvent);
_gridLayout = new QGridLayout(this);
_gridLayout->setMargin(0);
_gridLayout->setContentsMargins(0, 0, 0, 0);
setLayout( _gridLayout );
......@@ -2888,7 +2888,7 @@ void TerminalDisplay::outputSuspended(bool suspended)
_outputSuspendedLabel->setAutoFillBackground(true);
_outputSuspendedLabel->setBackgroundRole(QPalette::Base);
_outputSuspendedLabel->setFont(QApplication::font());
_outputSuspendedLabel->setMargin(5);
_outputSuspendedLabel->setContentsMargins(5, 5, 5, 5);
//enable activation of "Xon/Xoff" link in label
_outputSuspendedLabel->setTextInteractionFlags(Qt::LinksAccessibleByMouse |
......
......@@ -455,10 +455,10 @@ TabbedViewContainer::TabbedViewContainer(NavigationPosition position , QObject*
_layout = new TabbedViewContainerLayout;
_layout->setSpacing(0);
_layout->setMargin(0);
_layout->setContentsMargins(0, 0, 0, 0);
_tabBarLayout = new QHBoxLayout;
_tabBarLayout->setSpacing(0);
_tabBarLayout->setMargin(0);
_tabBarLayout->setContentsMargins(0, 0, 0, 0);
_tabBarLayout->addWidget(_newTabButton);
_tabBarLayout->addWidget(_tabBar);
_tabBarLayout->addWidget(_closeTabButton);
......@@ -783,7 +783,7 @@ StackedViewContainer::StackedViewContainer(QObject* parent)
searchBar()->setParent(_containerWidget);
layout->addWidget(searchBar());
layout->addWidget(_stackWidget);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
}
StackedViewContainer::~StackedViewContainer()
{
......@@ -830,7 +830,7 @@ ListViewContainer::ListViewContainer(NavigationPosition position,QObject* parent
searchBar()->setParent(contentArea);
layout->addWidget(_stackWidget);
layout->addWidget(searchBar());
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
// elide left is used because the most informative part of the session name is often
// the rightmost part
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment