diff --git a/src/libkdepim/ldap/addhostdialog.cpp b/src/libkdepim/ldap/addhostdialog.cpp --- a/src/libkdepim/ldap/addhostdialog.cpp +++ b/src/libkdepim/ldap/addhostdialog.cpp @@ -90,7 +90,7 @@ mainLayout->addWidget(page); mainLayout->addWidget(buttonBox); QHBoxLayout *layout = new QHBoxLayout(page); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); d->mCfg = new KLDAP::LdapConfigWidget( KLDAP::LdapConfigWidget::W_USER diff --git a/src/libkdepim/ldap/kcmldap.cpp b/src/libkdepim/ldap/kcmldap.cpp --- a/src/libkdepim/ldap/kcmldap.cpp +++ b/src/libkdepim/ldap/kcmldap.cpp @@ -47,7 +47,7 @@ about->addAuthor(i18n("Tobias Koenig"), QString(), QStringLiteral("tokoe@kde.org")); setAboutData(about); QVBoxLayout *layout = new QVBoxLayout(this); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); mLdapConfigureWidget = new KLDAP::LdapConfigureWidget(this); layout->addWidget(mLdapConfigureWidget); diff --git a/src/libkdepim/ldap/ldapconfigurewidget.cpp b/src/libkdepim/ldap/ldapconfigurewidget.cpp --- a/src/libkdepim/ldap/ldapconfigurewidget.cpp +++ b/src/libkdepim/ldap/ldapconfigurewidget.cpp @@ -293,7 +293,7 @@ { QVBoxLayout *layout = new QVBoxLayout(this); layout->setObjectName(QStringLiteral("layout")); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); QGroupBox *groupBox = new QGroupBox(i18n("LDAP Servers")); layout->addWidget(groupBox); @@ -309,16 +309,16 @@ mainLayout->addWidget(hBox); QHBoxLayout *hBoxHBoxLayout = new QHBoxLayout(hBox); - hBoxHBoxLayout->setMargin(0); + hBoxHBoxLayout->setContentsMargins(0, 0, 0, 0); hBoxHBoxLayout->setSpacing(6); // Contents of the hbox: listview and up/down buttons on the right (vbox) mHostListView = new QListWidget(hBox); hBoxHBoxLayout->addWidget(mHostListView); mHostListView->setSortingEnabled(false); QWidget *upDownBox = new QWidget(hBox); QVBoxLayout *upDownBoxVBoxLayout = new QVBoxLayout(upDownBox); - upDownBoxVBoxLayout->setMargin(0); + upDownBoxVBoxLayout->setContentsMargins(0, 0, 0, 0); hBoxHBoxLayout->addWidget(upDownBox); upDownBoxVBoxLayout->setSpacing(6); mUpButton = new QToolButton(upDownBox); diff --git a/src/libkdepim/ldap/ldapsearchdialog.cpp b/src/libkdepim/ldap/ldapsearchdialog.cpp --- a/src/libkdepim/ldap/ldapsearchdialog.cpp +++ b/src/libkdepim/ldap/ldapsearchdialog.cpp @@ -504,7 +504,7 @@ mainLayout->addWidget(buttonBox); QVBoxLayout *topLayout = new QVBoxLayout(page); - topLayout->setMargin(0); + topLayout->setContentsMargins(0, 0, 0, 0); QGroupBox *groupBox = new QGroupBox(i18n("Search for Addresses in Directory"), page); @@ -589,7 +589,7 @@ connect(d->mResultView, &QTableView::customContextMenuRequested, this, &LdapSearchDialog::slotCustomContextMenuRequested); QHBoxLayout *buttonLayout = new QHBoxLayout; - buttonLayout->setMargin(0); + buttonLayout->setContentsMargins(0, 0, 0, 0); topLayout->addLayout(buttonLayout); d->progressIndication = new KPIM::ProgressIndicatorLabel(i18n("Searching...")); diff --git a/src/libkdepim/multiplyingline/multiplyinglineeditor.cpp b/src/libkdepim/multiplyingline/multiplyinglineeditor.cpp --- a/src/libkdepim/multiplyingline/multiplyinglineeditor.cpp +++ b/src/libkdepim/multiplyingline/multiplyinglineeditor.cpp @@ -33,7 +33,7 @@ , mMultiplyingLineFactory(factory) { QBoxLayout *topLayout = new QHBoxLayout(this); - topLayout->setMargin(0); + topLayout->setContentsMargins(0, 0, 0, 0); mView = new MultiplyingLineView(mMultiplyingLineFactory, this); topLayout->addWidget(mView); diff --git a/src/libkdepim/multiplyingline/multiplyinglineview_p.cpp b/src/libkdepim/multiplyingline/multiplyinglineview_p.cpp --- a/src/libkdepim/multiplyingline/multiplyinglineview_p.cpp +++ b/src/libkdepim/multiplyingline/multiplyinglineview_p.cpp @@ -46,7 +46,7 @@ mPage->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); setWidget(mPage); - mTopLayout->setMargin(0); + mTopLayout->setContentsMargins(0, 0, 0, 0); mTopLayout->setSpacing(0); mPage->setLayout(mTopLayout); } diff --git a/src/libkdepim/progresswidget/progressdialog.cpp b/src/libkdepim/progresswidget/progressdialog.cpp --- a/src/libkdepim/progresswidget/progressdialog.cpp +++ b/src/libkdepim/progresswidget/progressdialog.cpp @@ -57,7 +57,7 @@ setFrameStyle(NoFrame); mBigBox = new QWidget(this); QVBoxLayout *mBigBoxVBoxLayout = new QVBoxLayout(mBigBox); - mBigBoxVBoxLayout->setMargin(0); + mBigBoxVBoxLayout->setContentsMargins(0, 0, 0, 0); setWidget(mBigBox); setWidgetResizable(true); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); @@ -139,7 +139,7 @@ { QVBoxLayout *vboxLayout = new QVBoxLayout(this); vboxLayout->setSpacing(2); - vboxLayout->setMargin(2); + vboxLayout->setContentsMargins(2, 2, 2, 2); setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed)); mFrame = new QFrame(this); @@ -150,7 +150,7 @@ QWidget *h = new QWidget(this); QHBoxLayout *hHBoxLayout = new QHBoxLayout(h); - hHBoxLayout->setMargin(0); + hHBoxLayout->setContentsMargins(0, 0, 0, 0); hHBoxLayout->setSpacing(5); layout()->addWidget(h); @@ -176,7 +176,7 @@ h = new QWidget(this); hHBoxLayout = new QHBoxLayout(h); - hHBoxLayout->setMargin(0); + hHBoxLayout->setContentsMargins(0, 0, 0, 0); hHBoxLayout->setSpacing(5); h->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed)); layout()->addWidget(h); diff --git a/src/libkdepim/progresswidget/statusbarprogresswidget.cpp b/src/libkdepim/progresswidget/statusbarprogresswidget.cpp --- a/src/libkdepim/progresswidget/statusbarprogresswidget.cpp +++ b/src/libkdepim/progresswidget/statusbarprogresswidget.cpp @@ -67,7 +67,7 @@ int w = fontMetrics().boundingRect(QStringLiteral(" 999.9 kB/s 00:00:01 ")).width() + 8; QHBoxLayout *boxLayout = new QHBoxLayout(this); boxLayout->setObjectName(QStringLiteral("boxLayout")); - boxLayout->setMargin(0); + boxLayout->setContentsMargins(0, 0, 0, 0); boxLayout->setSpacing(0); mButton = new QPushButton(this); diff --git a/src/libkdepim/widgets/kwidgetlister.cpp b/src/libkdepim/widgets/kwidgetlister.cpp --- a/src/libkdepim/widgets/kwidgetlister.cpp +++ b/src/libkdepim/widgets/kwidgetlister.cpp @@ -103,12 +103,12 @@ { //--------- the button box d->mLayout = new QVBoxLayout(this); - d->mLayout->setMargin(0); + d->mLayout->setContentsMargins(0, 0, 0, 0); d->mLayout->setSpacing(4); d->mButtonBox = new QWidget(this); QHBoxLayout *mButtonBoxHBoxLayout = new QHBoxLayout(d->mButtonBox); - mButtonBoxHBoxLayout->setMargin(0); + mButtonBoxHBoxLayout->setContentsMargins(0, 0, 0, 0); d->mLayout->addWidget(d->mButtonBox); if (fewerMoreButton) { diff --git a/src/libkdepim/widgets/progressindicatorlabel.cpp b/src/libkdepim/widgets/progressindicatorlabel.cpp --- a/src/libkdepim/widgets/progressindicatorlabel.cpp +++ b/src/libkdepim/widgets/progressindicatorlabel.cpp @@ -31,7 +31,7 @@ , q(qq) { QHBoxLayout *lay = new QHBoxLayout(q); - lay->setMargin(0); + lay->setContentsMargins(0, 0, 0, 0); indicator = new ProgressIndicatorWidget; lay->addWidget(indicator); label = new QLabel; diff --git a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp --- a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp +++ b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp @@ -192,7 +192,7 @@ QListWidgetItem *item = new QListWidgetItem(items.at(i), completionBox); if (!items.at(i).startsWith(s_completionItemIndentString)) { item->setFlags(item->flags() & ~Qt::ItemIsSelectable); - item->setBackgroundColor(AddresseeLineEditManager::self()->alternateColor()); + item->setBackground(AddresseeLineEditManager::self()->alternateColor()); } completionBox->addItem(item); } diff --git a/src/libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp b/src/libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp --- a/src/libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp +++ b/src/libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp @@ -120,7 +120,7 @@ searchLineLayout->addWidget(mSearchInResultLineEdit); QHBoxLayout *excludeDomainLayout = new QHBoxLayout; - excludeDomainLayout->setMargin(0); + excludeDomainLayout->setContentsMargins(0, 0, 0, 0); mainLayout->addLayout(excludeDomainLayout); QLabel *excludeDomainLabel = new QLabel(i18n("Exclude domain names:"), this); diff --git a/src/libkdepimakonadi/addressline/completionorder/completionorderwidget.cpp b/src/libkdepimakonadi/addressline/completionorder/completionorderwidget.cpp --- a/src/libkdepimakonadi/addressline/completionorder/completionorderwidget.cpp +++ b/src/libkdepimakonadi/addressline/completionorder/completionorderwidget.cpp @@ -242,7 +242,7 @@ QWidget *page = new QWidget(this); QHBoxLayout *pageHBoxLayout = new QHBoxLayout(page); - pageHBoxLayout->setMargin(0); + pageHBoxLayout->setContentsMargins(0, 0, 0, 0); hbox->addWidget(page); mListView = new QTreeWidget(page); mListView->setObjectName(QStringLiteral("listview")); @@ -257,7 +257,7 @@ QWidget *upDownBox = new QWidget(page); QVBoxLayout *upDownBoxVBoxLayout = new QVBoxLayout(upDownBox); - upDownBoxVBoxLayout->setMargin(0); + upDownBoxVBoxLayout->setContentsMargins(0, 0, 0, 0); pageHBoxLayout->addWidget(upDownBox); mUpButton = new QPushButton(upDownBox); upDownBoxVBoxLayout->addWidget(mUpButton); diff --git a/src/libkdepimakonadi/widgets/tagwidgets.cpp b/src/libkdepimakonadi/widgets/tagwidgets.cpp --- a/src/libkdepimakonadi/widgets/tagwidgets.cpp +++ b/src/libkdepimakonadi/widgets/tagwidgets.cpp @@ -50,7 +50,7 @@ d->mTagWidget = new Akonadi::TagWidget(this); connect(d->mTagWidget, &Akonadi::TagWidget::selectionChanged, this, &TagWidget::onSelectionChanged); QHBoxLayout *l = new QHBoxLayout(this); - l->setMargin(0); + l->setContentsMargins(0, 0, 0, 0); l->setSpacing(0); l->addWidget(d->mTagWidget); }