Commit 02b1e33c authored by Jonathan Marten's avatar Jonathan Marten

Fix compile with Qt 5.13 and QT_DISABLE_DEPRECATED_BEFORE=0x060000

Differential Revision: https://phabricator.kde.org/D19358
parent c9009352
......@@ -69,7 +69,7 @@ QString SelectConvertParameterWidget::code() const
void SelectConvertParameterWidget::initialize()
{
QBoxLayout *hbox = new QHBoxLayout(this);
hbox->setMargin(0);
hbox->setContentsMargins(0, 0, 0, 0);
mWidth = new QSpinBox(this);
mWidth->setSuffix(i18n(" px"));
mWidth->setMinimum(1);
......
......@@ -35,7 +35,7 @@ QWidget *SieveActionAbstractFlags::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
SelectFlagsWidget *flagsWidget = new SelectFlagsWidget;
connect(flagsWidget, &SelectFlagsWidget::valueChanged, this, &SieveActionAbstractFlags::valueChanged);
......
......@@ -40,7 +40,7 @@ QWidget *SieveActionAddHeader::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
w->setLayout(grid);
SelectAddHeaderPositionCombobox *combo = new SelectAddHeaderPositionCombobox;
......
......@@ -38,7 +38,7 @@ QWidget *SieveActionBreak::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QLabel *lab = new QLabel(i18n("Name (optional):"));
......
......@@ -38,7 +38,7 @@ QWidget *SieveActionConvert::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QGridLayout *lay = new QGridLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QLabel *lab = new QLabel(i18n("From:"));
......
......@@ -41,7 +41,7 @@ QWidget *SieveActionDeleteHeader::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
w->setLayout(grid);
SelectMatchTypeComboBox *matchType = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
......
......@@ -39,7 +39,7 @@ QWidget *SieveActionEnclose::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
w->setLayout(grid);
QLabel *lab = new QLabel(i18n("Subject:"));
......
......@@ -38,7 +38,7 @@ QWidget *SieveActionEReject::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QLabel *lab = new QLabel(i18n("text:"));
lay->addWidget(lab);
......
......@@ -38,7 +38,7 @@ QWidget *SieveActionExtractText::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
w->setLayout(grid);
QLabel *lab = new QLabel(i18n("Number of characters:"));
......
......@@ -108,7 +108,7 @@ QWidget *SieveActionFileInto::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout(w);
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
if (mHasCopySupport) {
QCheckBox *copy = new QCheckBox(i18n("Keep a copy"));
......
......@@ -62,7 +62,7 @@ QWidget *SieveActionKeep::createParamWidget(QWidget *parent) const
if (mHasFlagSupport) {
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QLabel *addFlags = new QLabel(i18n("Add flags:"));
lay->addWidget(addFlags);
......
......@@ -40,7 +40,7 @@ QWidget *SieveActionNotify::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
SelectImportanceCombobox *importanceCombobox = new SelectImportanceCombobox;
......
......@@ -45,7 +45,7 @@ QWidget *SieveActionRedirect::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
if (mHasCopySupport) {
QCheckBox *copy = new QCheckBox(i18n("Keep a copy"));
......
......@@ -38,7 +38,7 @@ QWidget *SieveActionReject::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QLabel *lab = new QLabel(i18n("text:"));
lay->addWidget(lab);
......
......@@ -41,7 +41,7 @@ QWidget *SieveActionReplace::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
w->setLayout(grid);
QLabel *lab = new QLabel(i18n("Subject:"));
......
......@@ -42,7 +42,7 @@ QWidget *SieveActionSetVariable::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
w->setLayout(grid);
SelectVariableModifierComboBox *modifier = new SelectVariableModifierComboBox;
......
......@@ -45,7 +45,7 @@ QWidget *SieveActionVacation::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
w->setLayout(grid);
QLabel *lab = nullptr;
......
......@@ -27,7 +27,7 @@ AddressLineEdit::AddressLineEdit(QWidget *parent)
: AbstractSelectEmailLineEdit(parent)
{
QHBoxLayout *mainLayout = new QHBoxLayout(this);
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
mLineEdit = new QLineEdit(this);
mainLayout->addWidget(mLineEdit);
mLineEdit->setClearButtonEnabled(true);
......
......@@ -141,7 +141,7 @@ SelectFlagsWidget::SelectFlagsWidget(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *lay = new QHBoxLayout(this);
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
mEdit = new QLineEdit(this);
mEdit->setReadOnly(true);
mEdit->setPlaceholderText(i18n("Click on button for selecting flags..."));
......
......@@ -41,7 +41,7 @@ QWidget *SieveConditionAddress::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
SelectAddressPartComboBox *selectAddressPart = new SelectAddressPartComboBox(mSieveGraphicalModeWidget);
......@@ -50,7 +50,7 @@ QWidget *SieveConditionAddress::createParamWidget(QWidget *parent) const
lay->addWidget(selectAddressPart);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
lay->addLayout(grid);
SelectMatchTypeComboBox *selectMatchCombobox = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
connect(selectMatchCombobox, &SelectMatchTypeComboBox::valueChanged, this, &SieveConditionAddress::valueChanged);
......
......@@ -38,7 +38,7 @@ QWidget *SieveConditionBody::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
SelectBodyTypeWidget *bodyType = new SelectBodyTypeWidget;
......
......@@ -38,7 +38,7 @@ QWidget *SieveConditionConvert::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QGridLayout *lay = new QGridLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QLabel *lab = new QLabel(i18n("From:"));
......
......@@ -39,7 +39,7 @@ QWidget *SieveConditionCurrentDate::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
SelectMatchTypeComboBox *matchTypeCombo = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
......
......@@ -40,7 +40,7 @@ QWidget *SieveConditionDate::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
SelectMatchTypeComboBox *matchTypeCombo = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
......@@ -49,7 +49,7 @@ QWidget *SieveConditionDate::createParamWidget(QWidget *parent) const
lay->addWidget(matchTypeCombo);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
lay->addLayout(grid);
QLabel *lab = new QLabel(i18n("header:"));
grid->addWidget(lab, 0, 0);
......
......@@ -42,7 +42,7 @@ QWidget *SieveConditionEnvelope::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
SelectAddressPartComboBox *selectAddressPart = new SelectAddressPartComboBox(mSieveGraphicalModeWidget);
......@@ -51,7 +51,7 @@ QWidget *SieveConditionEnvelope::createParamWidget(QWidget *parent) const
lay->addWidget(selectAddressPart);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
lay->addLayout(grid);
SelectMatchTypeComboBox *selectMatchCombobox = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
......
......@@ -40,7 +40,7 @@ QWidget *SieveConditionEnvironment::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
w->setLayout(grid);
QLabel *lab = new QLabel(i18n("Item:"));
grid->addWidget(lab, 0, 0);
......
......@@ -40,7 +40,7 @@ QWidget *SieveConditionExists::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QComboBox *combo = new QComboBox;
......
......@@ -38,7 +38,7 @@ QWidget *SieveConditionFalse::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QLabel *label = new QLabel(i18n("false"));
......
......@@ -42,7 +42,7 @@ QWidget *SieveConditionHasFlag::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
SelectMatchTypeComboBox *selecttype = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
selecttype->setObjectName(QStringLiteral("matchtype"));
......@@ -50,7 +50,7 @@ QWidget *SieveConditionHasFlag::createParamWidget(QWidget *parent) const
lay->addWidget(selecttype);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
lay->addLayout(grid);
int row = 0;
......
......@@ -40,7 +40,7 @@ QWidget *SieveConditionHeader::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
SelectMatchTypeComboBox *matchTypeCombo = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
......
......@@ -38,7 +38,7 @@ QWidget *SieveConditionIhave::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QLineEdit *edit = new QLineEdit;
......
......@@ -37,7 +37,7 @@ QWidget *SieveConditionMailboxExists::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QLineEdit *edit = new QLineEdit;
......
......@@ -40,7 +40,7 @@ QWidget *SieveConditionMetaData::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
SelectMatchTypeComboBox *selectType = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
......@@ -49,7 +49,7 @@ QWidget *SieveConditionMetaData::createParamWidget(QWidget *parent) const
lay->addWidget(selectType);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
lay->addLayout(grid);
QLabel *lab = new QLabel(i18n("Mailbox:"));
......
......@@ -38,7 +38,7 @@ QWidget *SieveConditionMetaDataExists::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
w->setLayout(grid);
QLabel *lab = new QLabel(i18n("Mailbox:"));
......
......@@ -40,7 +40,7 @@ QWidget *SieveConditionServerMetaData::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
SelectMatchTypeComboBox *selectType = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
......@@ -49,7 +49,7 @@ QWidget *SieveConditionServerMetaData::createParamWidget(QWidget *parent) const
lay->addWidget(selectType);
QGridLayout *grid = new QGridLayout;
grid->setMargin(0);
grid->setContentsMargins(0, 0, 0, 0);
lay->addLayout(grid);
QLabel *lab = new QLabel(i18n("Mailbox:"));
......
......@@ -37,7 +37,7 @@ QWidget *SieveConditionServerMetaDataExists::createParamWidget(QWidget *parent)
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QLabel *lab = new QLabel(i18n("Annotation:"));
......
......@@ -38,7 +38,7 @@ QWidget *SieveConditionSize::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QComboBox *combo = new QComboBox;
......
......@@ -43,7 +43,7 @@ QWidget *SieveConditionSpamTest::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QVBoxLayout *lay = new QVBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
if (mHasSpamTestPlusSupport) {
......
......@@ -38,7 +38,7 @@ QWidget *SieveConditionTrue::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QHBoxLayout *lay = new QHBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
QLabel *label = new QLabel(i18n("true"));
......
......@@ -40,7 +40,7 @@ QWidget *SieveConditionVirusTest::createParamWidget(QWidget *parent) const
{
QWidget *w = new QWidget(parent);
QVBoxLayout *lay = new QVBoxLayout;
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
w->setLayout(lay);
SelectRelationalMatchType *relation = new SelectRelationalMatchType;
......
......@@ -27,7 +27,7 @@ RegexpEditorLineEdit::RegexpEditorLineEdit(QWidget *parent)
{
QHBoxLayout *mainLayout = new QHBoxLayout(this);
mainLayout->setObjectName(QStringLiteral("mainlayout"));
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
mLineEdit = new QLineEdit(this);
mLineEdit->setObjectName(QStringLiteral("lineedit"));
connect(mLineEdit, &QLineEdit::textChanged, this, &RegexpEditorLineEdit::textChanged);
......
......@@ -40,7 +40,7 @@ SelectBodyTypeWidget::~SelectBodyTypeWidget()
void SelectBodyTypeWidget::initialize()
{
QHBoxLayout *lay = new QHBoxLayout(this);
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
mBodyCombobox = new KComboBox(this);
lay->addWidget(mBodyCombobox);
......
......@@ -46,7 +46,7 @@ SelectDateWidget::~SelectDateWidget()
void SelectDateWidget::initialize()
{
QHBoxLayout *lay = new QHBoxLayout(this);
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
mDateType = new KComboBox;
connect(mDateType, QOverload<int>::of(&KComboBox::activated), this, &SelectDateWidget::slotDateTypeActivated);
......
......@@ -52,7 +52,7 @@ SelectHeadersDialog::SelectHeadersDialog(QWidget *parent)
QVBoxLayout *lay = new QVBoxLayout;
lay->setObjectName(QStringLiteral("widgetlayout"));
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
mainLayout->addLayout(lay);
mListWidget = new SelectHeadersWidget(this);
mListWidget->setObjectName(QStringLiteral("listwidget"));
......
......@@ -63,7 +63,7 @@ QString SelectRelationalMatchType::code() const
void SelectRelationalMatchType::initialize()
{
QHBoxLayout *lay = new QHBoxLayout(this);
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
mType = new KComboBox(this);
mType->addItem(i18n("Value"), QStringLiteral(":value"));
......
......@@ -29,7 +29,7 @@ SelectSizeWidget::SelectSizeWidget(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout(this);
hbox->setMargin(0);
hbox->setContentsMargins(0, 0, 0, 0);
mSpinBoxSize = new QSpinBox(this);
mSpinBoxSize->setMinimum(1);
......
......@@ -40,7 +40,7 @@ SieveEditorGraphicalModeWidget::SieveEditorGraphicalModeWidget(QWidget *parent)
: SieveEditorGraphicalModeWidgetAbstract::SieveEditorGraphicalModeWidgetAbstract(parent)
{
QVBoxLayout *vlay = new QVBoxLayout(this);
vlay->setMargin(0);
vlay->setContentsMargins(0, 0, 0, 0);
mSplitter = new QSplitter;
mSplitter->setChildrenCollapsible(false);
......
......@@ -43,7 +43,7 @@ SieveScriptBlockWidget::SieveScriptBlockWidget(SieveEditorGraphicalModeWidget *g
, mSieveGraphicalModeWidget(graphicalModeWidget)
{
QVBoxLayout *topLayout = new QVBoxLayout(this);
topLayout->setMargin(0);
topLayout->setContentsMargins(0, 0, 0, 0);
mConditions = new QGroupBox(i18n("Conditions"));
QVBoxLayout *vbox = new QVBoxLayout;
......
......@@ -105,7 +105,7 @@ SieveScriptListBox::SieveScriptListBox(const QString &title, QWidget *parent)
//----------- the first row of buttons
QWidget *hb = new QWidget(this);
QHBoxLayout *hbHBoxLayout = new QHBoxLayout(hb);
hbHBoxLayout->setMargin(0);
hbHBoxLayout->setContentsMargins(0, 0, 0, 0);
hbHBoxLayout->setSpacing(4);
mBtnTop = new QPushButton(hb);
......@@ -142,7 +142,7 @@ SieveScriptListBox::SieveScriptListBox(const QString &title, QWidget *parent)
hb = new QWidget(this);
hbHBoxLayout = new QHBoxLayout(hb);
hbHBoxLayout->setMargin(0);
hbHBoxLayout->setContentsMargins(0, 0, 0, 0);
hbHBoxLayout->setSpacing(4);
mBtnNew = new QPushButton(hb);
......
......@@ -39,7 +39,7 @@ SieveScriptPage::SieveScriptPage(SieveEditorGraphicalModeWidget *sieveEditorGrap
, mSieveGraphicalModeWidget(sieveEditorGraphicalWidget)
{
QVBoxLayout *topLayout = new QVBoxLayout(this);
topLayout->setMargin(0);
topLayout->setContentsMargins(0, 0, 0, 0);
mTabWidget = new SieveScriptTabWidget(this);
connect(mTabWidget, &SieveScriptTabWidget::tabCloseRequested, this, &SieveScriptPage::slotCloseTab);
......
......@@ -63,7 +63,7 @@ SieveEditorTextModeWidget::SieveEditorTextModeWidget(QWidget *parent)
: SieveEditorAbstractWidget(parent)
{
QVBoxLayout *lay = new QVBoxLayout(this);
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
mMainSplitter = new QSplitter;
mMainSplitter->setOrientation(Qt::Vertical);
......@@ -85,11 +85,11 @@ SieveEditorTextModeWidget::SieveEditorTextModeWidget(QWidget *parent)
QWidget *textEditWidget = new QWidget;
QVBoxLayout *textEditLayout = new QVBoxLayout;
textEditLayout->setMargin(0);
textEditLayout->setContentsMargins(0, 0, 0, 0);
mEditorWidget = new QWidget;
QVBoxLayout *editorWidgetLayout = new QVBoxLayout;
editorWidgetLayout->setMargin(0);
editorWidgetLayout->setContentsMargins(0, 0, 0, 0);
mEditorWidget->setLayout(editorWidgetLayout);
mTabWidget = new SieveEditorTabWidget;
......
......@@ -152,7 +152,7 @@ SieveEditorWidget::SieveEditorWidget(bool useMenuBar, QWidget *parent)
nameLayout->addWidget(mScriptName);
lay->addLayout(nameLayout);
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
mStackedWidget = new QStackedWidget;
mTextModeWidget = new SieveEditorTextModeWidget;
......
......@@ -27,7 +27,7 @@ SieveInfoWidget::SieveInfoWidget(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *lay = new QHBoxLayout(this);
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
mInfo = new QTextEdit(this);
mInfo->setReadOnly(true);
mInfo->setAcceptRichText(true);
......
......@@ -57,7 +57,7 @@ SieveTextEditWidget::~SieveTextEditWidget()
void SieveTextEditWidget::initialize(KSieveUi::SieveTextEdit *custom)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);