Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit f03bf406 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/D19362
parent 3db6ac00
......@@ -34,7 +34,7 @@ ConfigurePluginsListWidget::ConfigurePluginsListWidget(QWidget *parent)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setObjectName(QStringLiteral("mainlayout"));
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
mListWidget = new QTreeWidget(this);
mListWidget->setSortingEnabled(true);
......
......@@ -50,7 +50,7 @@ ConfigurePluginsWidget::~ConfigurePluginsWidget()
void ConfigurePluginsWidget::initLayout(ConfigurePluginsListWidget *configurePluginListWidget)
{
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
KMessageWidget *messageWidget = new KMessageWidget(this);
messageWidget->setObjectName(QStringLiteral("messagewidget"));
......
......@@ -27,7 +27,7 @@ LogActivitiesWidget::LogActivitiesWidget(QWidget *parent)
: QWidget(parent)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
mainLayout->setObjectName(QStringLiteral("mainLayout"));
mLog = new KPIMTextEdit::PlainTextEditorWidget(this);
......
......@@ -57,7 +57,7 @@ TemplateEditDialog::TemplateEditDialog(QWidget *parent, bool defaultTemplate)
mainLayout->addWidget(buttonBox);
QVBoxLayout *vbox = new QVBoxLayout;
vbox->setMargin(0);
vbox->setContentsMargins(0, 0, 0, 0);
QHBoxLayout *hbox = new QHBoxLayout;
QLabel *label = new QLabel(i18n("Name:"));
......
......@@ -217,7 +217,7 @@ void TranslatorWidget::init()
connect(d->abstractTranslator, &PimCommon::GoogleTranslator::translateFailed, this, &TranslatorWidget::slotTranslateFailed);
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(2);
layout->setContentsMargins(2, 2, 2, 2);
QHBoxLayout *hboxLayout = new QHBoxLayout;
QToolButton *closeBtn = new QToolButton(this);
closeBtn->setObjectName(QStringLiteral("close-button"));
......
......@@ -75,7 +75,7 @@ SimpleStringListEditor::SimpleStringListEditor(QWidget *parent, ButtonCode butto
setAddDialogLabel(addDialogLabel);
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
QHBoxLayout *hlay = new QHBoxLayout(this);
hlay->setMargin(0);
hlay->setContentsMargins(0, 0, 0, 0);
d->mListBox = new QListWidget(this);
......
......@@ -97,7 +97,7 @@ AclEntryDialog::AclEntryDialog(QWidget *parent)
mainLayout->addWidget(buttonBox);
QGridLayout *layout = new QGridLayout(page);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
QLabel *label = new QLabel(i18n("&User identifier:"), page);
layout->addWidget(label, 0, 0);
......
......@@ -67,7 +67,7 @@ CollectionAclPage::~CollectionAclPage()
void CollectionAclPage::init()
{
QHBoxLayout *layout = new QHBoxLayout(this);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
d->mCollectionAclWidget = new CollectionAclWidget(this);
layout->addWidget(d->mCollectionAclWidget);
}
......
......@@ -99,7 +99,7 @@ CollectionAclWidget::CollectionAclWidget(QWidget *parent)
QWidget *buttonBox = new QWidget;
QVBoxLayout *buttonBoxVBoxLayout = new QVBoxLayout(buttonBox);
buttonBoxVBoxLayout->setMargin(0);
buttonBoxVBoxLayout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(buttonBox);
ActionButton *button = new ActionButton(buttonBox);
......
......@@ -43,7 +43,7 @@ ContentTypeWidget::ContentTypeWidget(QWidget *parent)
, d(new PimCommon::ContentTypeWidgetPrivate)
{
QHBoxLayout *hbox = new QHBoxLayout(this);
hbox->setMargin(0);
hbox->setContentsMargins(0, 0, 0, 0);
QLabel *label = new QLabel(i18n("&Folder contents:"), this);
label->setObjectName(QStringLiteral("contenttypewidgetlabel"));
......
......@@ -39,7 +39,7 @@ IncidencesForWidget::IncidencesForWidget(QWidget *parent)
, d(new PimCommon::IncidencesForWidgetPrivate)
{
QHBoxLayout *hbox = new QHBoxLayout(this);
hbox->setMargin(0);
hbox->setContentsMargins(0, 0, 0, 0);
QLabel *label = new QLabel(i18n("Generate free/&busy and activate alarms for:"), this);
label->setObjectName(QStringLiteral("contentstypelabel"));
......
......@@ -59,7 +59,7 @@ CheckedCollectionWidget::CheckedCollectionWidget(const QString &mimetype, QWidge
, d(new PimCommon::CheckedCollectionWidgetPrivate)
{
QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setMargin(0);
vbox->setContentsMargins(0, 0, 0, 0);
// Create a new change recorder.
Akonadi::Monitor *monitor = new Akonadi::Monitor(this);
......
......@@ -52,7 +52,7 @@ SelectMultiCollectionWidget::~SelectMultiCollectionWidget()
void SelectMultiCollectionWidget::initialize(const QString &mimetype)
{
QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setMargin(0);
vbox->setContentsMargins(0, 0, 0, 0);
mCheckedCollectionWidget = new PimCommon::CheckedCollectionWidget(mimetype);
......
......@@ -86,7 +86,7 @@ AnnotationEditDialog::AnnotationEditDialog(const Akonadi::Item &item, QWidget *p
QLabel *label = new QLabel(i18n("Enter the text that should be stored as a note to the mail:"));
QVBoxLayout *vbox = new QVBoxLayout(mainWidget);
vbox->setMargin(0);
vbox->setContentsMargins(0, 0, 0, 0);
d->mTextEdit = new KPIMTextEdit::PlainTextEditorWidget(this);
vbox->addWidget(label);
vbox->addWidget(d->mTextEdit);
......
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