Commit a7812293 authored by Laurent Montel's avatar Laurent Montel 😁

Remove deprecated methods

parent f801a29a
......@@ -132,7 +132,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule(QGpgME::CryptoConfig *config, Layou
void Kleo::CryptoConfigModule::init(Layout layout)
{
if (QLayout *l = this->layout()) {
l->setMargin(0);
l->setContentsMargins(0, 0, 0, 0);
}
QGpgME::CryptoConfig *const config = mConfig;
......@@ -148,7 +148,7 @@ void Kleo::CryptoConfigModule::init(Layout layout)
if (type == Plain) {
QWidget *w = new QWidget(this);
QVBoxLayout *l = new QVBoxLayout(w);
l->setMargin(0);
l->setContentsMargins(0, 0, 0, 0);
QScrollArea *s = new QScrollArea(w);
s->setFrameStyle(QFrame::NoFrame);
s->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
......@@ -156,7 +156,7 @@ void Kleo::CryptoConfigModule::init(Layout layout)
l->addWidget(s);
vbox = new QWidget(s->viewport());
vlay = new QVBoxLayout(vbox);
vlay->setMargin(0);
vlay->setContentsMargins(0, 0, 0, 0);
s->setWidget(vbox);
addPage(w, configOK ? QString() : i18n("GpgConf Error"));
}
......@@ -182,7 +182,7 @@ void Kleo::CryptoConfigModule::init(Layout layout)
} else {
vbox = new QWidget(this);
vlay = new QVBoxLayout(vbox);
vlay->setMargin(0);
vlay->setContentsMargins(0, 0, 0, 0);
KPageWidgetItem *pageItem = new KPageWidgetItem(vbox, comp->description());
if (type != Tabbed) {
pageItem->setIcon(loadIcon(comp->iconName()));
......
......@@ -81,7 +81,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget(DNAttributeMapp
d->mapper = mapper;
QGridLayout *glay = new QGridLayout(this);
glay->setMargin(0);
glay->setContentsMargins(0, 0, 0, 0);
glay->setColumnStretch(0, 1);
glay->setColumnStretch(2, 1);
......
......@@ -97,7 +97,7 @@ FileNameRequester::Private::Private(FileNameRequester *qq)
lineedit.setCompleter(&completer);
#endif
lineedit.setClearButtonEnabled(true);
hlay.setMargin(0);
hlay.setContentsMargins(0, 0, 0, 0);
hlay.addWidget(&lineedit);
hlay.addWidget(&button);
......
......@@ -124,7 +124,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog(const std::vector<Item> &recipients,
mainLayout->addWidget(page);
mainLayout->addWidget(buttonBox);
QVBoxLayout *vlay = new QVBoxLayout(page);
vlay->setMargin(0);
vlay->setContentsMargins(0, 0, 0, 0);
vlay->addWidget(new QLabel(i18n("The following keys will be used for encryption:"), page));
......
......@@ -103,7 +103,7 @@ Kleo::KeyRequester::KeyRequester(QWidget *parent)
void Kleo::KeyRequester::init()
{
QHBoxLayout *hlay = new QHBoxLayout(this);
hlay->setMargin(0);
hlay->setContentsMargins(0, 0, 0, 0);
// the label where the key id is to be displayed:
mLabel = new QLabel(this);
......
......@@ -435,7 +435,7 @@ void Kleo::KeySelectionDialog::init(bool rememberChoice, bool extendedSelection,
mainLayout->addWidget(buttonBox);
mTopLayout = new QVBoxLayout(page);
mTopLayout->setMargin(0);
mTopLayout->setContentsMargins(0, 0, 0, 0);
if (!text.isEmpty()) {
QLabel *textLabel = new QLabel(text, page);
......
......@@ -211,7 +211,7 @@ public:
mScrollArea->setWidgetResizable(true);
mScrollArea->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContentsOnFirstShow);
mScrollArea->setFrameStyle(QFrame::NoFrame);
mScrollLayout->setMargin(0);
mScrollLayout->setContentsMargins(0, 0, 0, 0);
q->setWindowTitle(i18n("Security approval"));
......
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