QLayout::setMargin -> setContentsMargins

Was apparently obsolete since at least Qt 5.6 already, but was never
marked with a warning or exclusion macro...

src/tiled/consoledock.cpp

@@ -72,7 +72,7 @@ ConsoleDock::ConsoleDock(QWidget *parent)
 
     QWidget *widget = new QWidget(this);
     QVBoxLayout *layout = new QVBoxLayout(widget);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
 
     mPlainTextEdit->setReadOnly(true);

src/tiled/documentmanager.cpp

@@ -121,7 +121,7 @@ DocumentManager::DocumentManager(QObject *parent)
     vertical->addWidget(mTabBar);
     vertical->addWidget(mFileChangedWarning);
     vertical->addWidget(mBrokenLinksWidget);
-    vertical->setMargin(0);
+    vertical->setContentsMargins(0, 0, 0, 0);
     vertical->setSpacing(0);
 
     mEditorStack = new QStackedLayout;

src/tiled/fileedit.cpp

@@ -36,7 +36,7 @@ FileEdit::FileEdit(QWidget *parent)
     , mErrorTextColor(Qt::red)
 {
     QHBoxLayout *layout = new QHBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
 
     mLineEdit = new QLineEdit(this);

src/tiled/issuescounter.cpp

@@ -40,7 +40,8 @@ IssuesCounter::IssuesCounter(QWidget *parent)
     , mWarningCount(new QLabel)
 {
     auto layout = new QHBoxLayout;
-    layout->setMargin(Utils::dpiScaled(2));
+    const int margin = Utils::dpiScaled(2);
+    layout->setContentsMargins(margin, margin, margin, margin);
 
     int spacing = Utils::dpiScaled(5);
     layout->addSpacing(spacing);

src/tiled/issuesdock.cpp

@@ -190,7 +190,7 @@ IssuesDock::IssuesDock(QWidget *parent)
     auto widget = new QWidget(this);
     auto layout = new QVBoxLayout(widget);
 
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addLayout(toolBarLayout);
     layout->addWidget(mIssuesView);

src/tiled/layerdock.cpp

@@ -65,7 +65,7 @@ LayerDock::LayerDock(QWidget *parent):
 
     QWidget *widget = new QWidget(this);
     QVBoxLayout *layout = new QVBoxLayout(widget);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     QHBoxLayout *opacityLayout = new QHBoxLayout;
     mOpacitySlider->setRange(0, 100);

src/tiled/locatorwidget.cpp

@@ -333,7 +333,7 @@ LocatorWidget::LocatorWidget(QWidget *parent)
 
     auto margin = Utils::dpiScaled(4);
     auto verticalLayout = new QVBoxLayout;
-    verticalLayout->setMargin(margin);
+    verticalLayout->setContentsMargins(margin, margin, margin, margin);
     verticalLayout->setSpacing(margin);
     verticalLayout->addWidget(mFilterEdit);
     verticalLayout->addWidget(mResultsView);

src/tiled/objectrefedit.cpp

@@ -62,7 +62,7 @@ ObjectRefEdit::ObjectRefEdit(QWidget *parent)
     mPickObjectButton->setIcon(QIcon(QStringLiteral("://images/scalable/select-object.svg")));
     mPickObjectButton->setToolTip(tr("Select Object on Map"));
 
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(mLineEdit);
     layout->addWidget(mObjectDialogButton);

src/tiled/objectsdock.cpp

@@ -60,7 +60,7 @@ ObjectsDock::ObjectsDock(QWidget *parent)
 
     QWidget *widget = new QWidget(this);
     QVBoxLayout *layout = new QVBoxLayout(widget);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(mFilterEdit);
     layout->addWidget(mObjectsView);

src/tiled/projectdock.cpp

@@ -93,7 +93,7 @@ ProjectDock::ProjectDock(QWidget *parent)
 
     auto widget = new QWidget(this);
     auto layout = new QVBoxLayout(widget);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
 
     layout->addWidget(mProjectView);

src/tiled/propertiesdock.cpp

@@ -85,7 +85,7 @@ PropertiesDock::PropertiesDock(QWidget *parent)
 
     QWidget *widget = new QWidget(this);
     QVBoxLayout *layout = new QVBoxLayout(widget);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(mPropertyBrowser);
     layout->addWidget(toolBar);

src/tiled/shortcutsettingspage.cpp

@@ -386,7 +386,7 @@ ShortcutEditor::ShortcutEditor(QWidget *parent)
     mResetButton->setIcon(QIcon(QLatin1String("://images/scalable/edit-undo-symbolic.svg")));
 
     auto layout = new QHBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(mKeySequenceEdit);
     layout->addWidget(clearButton);

src/tiled/templatesdock.cpp

@@ -127,7 +127,7 @@ TemplatesDock::TemplatesDock(QWidget *parent)
     editorLayout->addLayout(toolsLayout);
     editorLayout->addWidget(mDescriptionLabel);
     editorLayout->addWidget(mMapView);
-    editorLayout->setMargin(0);
+    editorLayout->setContentsMargins(0, 0, 0, 0);
     editorLayout->setSpacing(0);
 
     auto *widget = new QWidget;

src/tiled/textpropertyedit.cpp

@@ -135,7 +135,7 @@ TextPropertyEdit::TextPropertyEdit(QWidget *parent)
                                                      QStringLiteral("\n"),
                                                      QStringLiteral("\\n")));
 
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(mLineEdit);
     layout->addWidget(button);

src/tiled/tilecollisiondock.cpp

@@ -151,7 +151,7 @@ TileCollisionDock::TileCollisionDock(QWidget *parent)
     mObjectsWidget->setVisible(false);
     auto objectsVertical = new QVBoxLayout(mObjectsWidget);
     objectsVertical->setSpacing(0);
-    objectsVertical->setMargin(0);
+    objectsVertical->setContentsMargins(0, 0, 0, 0);
     objectsVertical->addWidget(mObjectsView);
     objectsVertical->addWidget(objectsToolBar);
 
@@ -214,7 +214,7 @@ TileCollisionDock::TileCollisionDock(QWidget *parent)
     auto widget = new QWidget(this);
     auto vertical = new QVBoxLayout(widget);
     vertical->setSpacing(0);
-    vertical->setMargin(0);
+    vertical->setContentsMargins(0, 0, 0, 0);
     vertical->addLayout(horizontal);
     vertical->addWidget(mObjectsViewSplitter);
 

src/tiled/tilesetdock.cpp

@@ -209,7 +209,7 @@ TilesetDock::TilesetDock(QWidget *parent)
 
     QVBoxLayout *vertical = new QVBoxLayout(w);
     vertical->setSpacing(0);
-    vertical->setMargin(0);
+    vertical->setContentsMargins(0, 0, 0, 0);
     vertical->addLayout(horizontal);
     vertical->addWidget(mSuperViewStack);
 

src/tiled/tilesetparametersedit.cpp

@@ -36,7 +36,7 @@ TilesetParametersEdit::TilesetParametersEdit(QWidget *parent)
     : QWidget(parent)
 {
     QHBoxLayout *layout = new QHBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
 
     mLabel = new QLabel(this);

src/tiled/tilestampsdock.cpp

@@ -106,7 +106,7 @@ TileStampsDock::TileStampsDock(TileStampManager *stampManager, QWidget *parent)
 
     QWidget *widget = new QWidget(this);
     QVBoxLayout *layout = new QVBoxLayout(widget);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     QToolBar *buttonContainer = new QToolBar;
     buttonContainer->setFloatable(false);

src/tiled/undodock.cpp

@@ -39,7 +39,7 @@ UndoDock::UndoDock(QWidget *parent)
 
     QWidget *widget = new QWidget(this);
     QVBoxLayout *layout = new QVBoxLayout(widget);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(mUndoView);
 
     setWidget(widget);

src/tiled/varianteditorfactory.cpp

@@ -66,7 +66,7 @@ ResetWidget::ResetWidget(QtProperty *property, QWidget *editor, QWidget *parent)
     resetButton->setToolTip(tr("Reset"));
     Utils::setThemeIcon(resetButton, "edit-clear");
 
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(editor);
     layout->addWidget(resetButton);

src/tiled/wangdock.cpp

@@ -199,7 +199,7 @@ WangDock::WangDock(QWidget *parent)
     wangSetHorizontal->addWidget(mWangSetToolBar);
 
     QVBoxLayout *wangSetVertical = new QVBoxLayout(wangSetWidget);
-    wangSetVertical->setMargin(0);
+    wangSetVertical->setContentsMargins(0, 0, 0, 0);
     wangSetVertical->addWidget(mWangSetView);
     wangSetVertical->addLayout(wangSetHorizontal);
 
@@ -211,7 +211,7 @@ WangDock::WangDock(QWidget *parent)
     colorViewHorizontal->addWidget(mWangColorToolBar);
 
     QVBoxLayout *colorViewVertical = new QVBoxLayout(mWangColorWidget);
-    colorViewVertical->setMargin(0);
+    colorViewVertical->setContentsMargins(0, 0, 0, 0);
     colorViewVertical->addWidget(mWangColorView);
     colorViewVertical->addLayout(colorViewHorizontal);
 
@@ -227,7 +227,7 @@ WangDock::WangDock(QWidget *parent)
     templateAndColorHorizontal->addWidget(mEraseWangIdsButton);
 
     QVBoxLayout *templateAndColorVertical = new QVBoxLayout(mTemplateAndColorWidget);
-    templateAndColorVertical->setMargin(0);
+    templateAndColorVertical->setContentsMargins(0, 0, 0, 0);
     templateAndColorVertical->addWidget(mTemplateAndColorView);
     templateAndColorVertical->addLayout(templateAndColorHorizontal);
 
@@ -238,7 +238,7 @@ WangDock::WangDock(QWidget *parent)
     wangViews->addWidget(mTemplateAndColorWidget);
 
     QVBoxLayout *vertical = new QVBoxLayout(w);
-    vertical->setMargin(0);
+    vertical->setContentsMargins(0, 0, 0, 0);
     vertical->addWidget(wangViews);
 
     hideTemplateColorView();