diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-02-10 12:28:58 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-02-11 18:59:40 +0000 |
commit | 2055c451f8ff2b2f5e7de105454790d7b240a6b3 (patch) | |
tree | fadcf53b118e7584e4f4828f2aa57a9bc26b53ed | |
parent | cc8b01240f54048ca16ace963bf205e813728bfb (diff) | |
download | qttools-2055c451f8ff2b2f5e7de105454790d7b240a6b3.tar.gz |
QtTools: replace deprecated QLayout::margin() with contentsMargins()
QLayout::margin()/setMargin() is deprecated - replace it with it's
successors contentsMargins()/setContentsMargins()
Change-Id: I8b6a36f3e0d0e00186a7d9cdf4827cf06f302235
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
34 files changed, 49 insertions, 49 deletions
diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp index 31f8b1e0a..eeb1e9e17 100644 --- a/src/assistant/assistant/centralwidget.cpp +++ b/src/assistant/assistant/centralwidget.cpp @@ -193,7 +193,7 @@ CentralWidget::CentralWidget(QWidget *parent) staticCentralWidget = this; QVBoxLayout *vboxLayout = new QVBoxLayout(this); - vboxLayout->setMargin(0); + vboxLayout->setContentsMargins(QMargins()); vboxLayout->setSpacing(0); vboxLayout->addWidget(m_tabBar); m_tabBar->setVisible(HelpEngineWrapper::instance().showTabs()); diff --git a/src/assistant/assistant/contentwindow.cpp b/src/assistant/assistant/contentwindow.cpp index 57bd51261..c932c06b7 100644 --- a/src/assistant/assistant/contentwindow.cpp +++ b/src/assistant/assistant/contentwindow.cpp @@ -51,7 +51,7 @@ ContentWindow::ContentWindow() m_contentWidget->setContextMenuPolicy(Qt::CustomContextMenu); QVBoxLayout *layout = new QVBoxLayout(this); - layout->setMargin(4); + layout->setContentsMargins(4, 4, 4, 4); layout->addWidget(m_contentWidget); connect(m_contentWidget, &QWidget::customContextMenuRequested, diff --git a/src/assistant/assistant/findwidget.cpp b/src/assistant/assistant/findwidget.cpp index b9607b703..2bbbbf6b0 100644 --- a/src/assistant/assistant/findwidget.cpp +++ b/src/assistant/assistant/findwidget.cpp @@ -49,7 +49,7 @@ FindWidget::FindWidget(QWidget *parent) QString resourcePath = QLatin1String(":/qt-project.org/assistant/images/"); #ifndef Q_OS_MAC - hboxLayout->setMargin(0); + hboxLayout->setContentsMargins(QMargins()); hboxLayout->setSpacing(6); resourcePath.append(QLatin1String("win")); #else diff --git a/src/assistant/assistant/indexwindow.cpp b/src/assistant/assistant/indexwindow.cpp index 44ad56fad..d49d05f5d 100644 --- a/src/assistant/assistant/indexwindow.cpp +++ b/src/assistant/assistant/indexwindow.cpp @@ -61,7 +61,7 @@ IndexWindow::IndexWindow(QWidget *parent) connect(m_searchLineEdit, &QLineEdit::textChanged, this, &IndexWindow::filterIndices); m_searchLineEdit->installEventFilter(this); - layout->setMargin(4); + layout->setContentsMargins(4, 4, 4, 4); layout->addWidget(m_searchLineEdit); HelpEngineWrapper &helpEngine = HelpEngineWrapper::instance(); diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp index 677968c49..2b9c87bbf 100644 --- a/src/assistant/assistant/mainwindow.cpp +++ b/src/assistant/assistant/mainwindow.cpp @@ -1099,7 +1099,7 @@ void MainWindow::indexingStarted() progressBar->setSizePolicy(sizePolicy); hlayout->setSpacing(6); - hlayout->setMargin(0); + hlayout->setContentsMargins(QMargins()); hlayout->addWidget(progressBar); statusBar()->addPermanentWidget(m_progressWidget); diff --git a/src/assistant/assistant/openpagesswitcher.cpp b/src/assistant/assistant/openpagesswitcher.cpp index 25ab24f0e..ee932def9 100644 --- a/src/assistant/assistant/openpagesswitcher.cpp +++ b/src/assistant/assistant/openpagesswitcher.cpp @@ -63,7 +63,7 @@ OpenPagesSwitcher::OpenPagesSwitcher(OpenPagesModel *model) m_openPagesWidget->installEventFilter(this); QVBoxLayout *layout = new QVBoxLayout(this); - layout->setMargin(0); + layout->setContentsMargins(QMargins()); layout->addWidget(m_openPagesWidget); connect(m_openPagesWidget, &OpenPagesWidget::closePage, diff --git a/src/assistant/assistant/optionswidget.cpp b/src/assistant/assistant/optionswidget.cpp index 93ea42ee3..c2deb46f1 100644 --- a/src/assistant/assistant/optionswidget.cpp +++ b/src/assistant/assistant/optionswidget.cpp @@ -96,7 +96,7 @@ OptionsWidget::OptionsWidget(QWidget *parent) m_listWidget->setItemDelegate(new ListWidgetDelegate(m_listWidget)); QVBoxLayout *layout = new QVBoxLayout(this); layout->addWidget(m_listWidget); - layout->setMargin(0); + layout->setContentsMargins(QMargins()); connect(m_listWidget, &QListWidget::itemChanged, this, &OptionsWidget::itemChanged); } diff --git a/src/assistant/help/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp index 3cf640489..bb7a61cc5 100644 --- a/src/assistant/help/qhelpsearchquerywidget.cpp +++ b/src/assistant/help/qhelpsearchquerywidget.cpp @@ -229,7 +229,7 @@ QHelpSearchQueryWidget::QHelpSearchQueryWidget(QWidget *parent) d = new QHelpSearchQueryWidgetPrivate(); QVBoxLayout *vLayout = new QVBoxLayout(this); - vLayout->setMargin(0); + vLayout->setContentsMargins(QMargins()); QHBoxLayout* hBoxLayout = new QHBoxLayout(); d->m_searchLabel = new QLabel(this); diff --git a/src/assistant/help/qhelpsearchresultwidget.cpp b/src/assistant/help/qhelpsearchresultwidget.cpp index 103b9e811..86e56b733 100644 --- a/src/assistant/help/qhelpsearchresultwidget.cpp +++ b/src/assistant/help/qhelpsearchresultwidget.cpp @@ -253,12 +253,12 @@ QHelpSearchResultWidget::QHelpSearchResultWidget(QHelpSearchEngine *engine) , d(new QHelpSearchResultWidgetPrivate(engine)) { QVBoxLayout *vLayout = new QVBoxLayout(this); - vLayout->setMargin(0); + vLayout->setContentsMargins(QMargins()); vLayout->setSpacing(0); QHBoxLayout *hBoxLayout = new QHBoxLayout(); #ifndef Q_OS_MAC - hBoxLayout->setMargin(0); + hBoxLayout->setContentsMargins(QMargins()); hBoxLayout->setSpacing(0); #endif hBoxLayout->addWidget(d->firstResultPage = d->setupToolButton( diff --git a/src/designer/src/components/formeditor/dpi_chooser.cpp b/src/designer/src/components/formeditor/dpi_chooser.cpp index 20e8f02fc..915623f40 100644 --- a/src/designer/src/components/formeditor/dpi_chooser.cpp +++ b/src/designer/src/components/formeditor/dpi_chooser.cpp @@ -100,11 +100,11 @@ DPI_Chooser::DPI_Chooser(QWidget *parent) : this, &DPI_Chooser::syncSpinBoxes); // top row with predefined settings QVBoxLayout *vBoxLayout = new QVBoxLayout; - vBoxLayout->setMargin(0); + vBoxLayout->setContentsMargins(QMargins()); vBoxLayout->addWidget(m_predefinedCombo); // Spin box row QHBoxLayout *hBoxLayout = new QHBoxLayout; - hBoxLayout->setMargin(0); + hBoxLayout->setContentsMargins(QMargins()); m_dpiXSpinBox->setMinimum(minDPI); m_dpiXSpinBox->setMaximum(maxDPI); diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp index a7e77eecf..c9fc88f04 100644 --- a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp +++ b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp @@ -47,14 +47,14 @@ FormWindowWidgetStack::FormWindowWidgetStack(QObject *parent) : m_formContainerLayout(new QStackedLayout), m_layout(new QStackedLayout) { - m_layout->setMargin(0); + m_layout->setContentsMargins(QMargins()); m_layout->setSpacing(0); m_layout->setStackingMode(QStackedLayout::StackAll); // We choose a QStackedLayout as immediate layout for // the form windows as it ignores the sizePolicy of // its child (for example, Fixed would cause undesired side effects). - m_formContainerLayout->setMargin(0); + m_formContainerLayout->setContentsMargins(QMargins()); m_formContainer->setObjectName(QStringLiteral("formContainer")); m_formContainer->setLayout(m_formContainerLayout); m_formContainerLayout->setStackingMode(QStackedLayout::StackAll); diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp index 5fe5aed29..c74b2110f 100644 --- a/src/designer/src/components/objectinspector/objectinspector.cpp +++ b/src/designer/src/components/objectinspector/objectinspector.cpp @@ -758,7 +758,7 @@ ObjectInspector::ObjectInspector(QDesignerFormEditorInterface *core, QWidget *pa m_impl(new ObjectInspectorPrivate(core)) { QVBoxLayout *vbox = new QVBoxLayout(this); - vbox->setMargin(0); + vbox->setContentsMargins(QMargins()); vbox->addWidget(m_impl->filterLineEdit()); QTreeView *treeView = m_impl->treeView(); diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp index 68d394f08..06fbb42c9 100644 --- a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp +++ b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp @@ -341,7 +341,7 @@ TextEditor::TextEditor(QDesignerFormEditorInterface *core, QWidget *parent) : m_button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Ignored); m_button->setFixedWidth(20); m_layout->addWidget(m_button); - m_layout->setMargin(0); + m_layout->setContentsMargins(QMargins()); m_layout->setSpacing(0); connect(m_resourceAction, &QAction::triggered, this, &TextEditor::resourceActionActivated); @@ -597,7 +597,7 @@ PixmapEditor::PixmapEditor(QDesignerFormEditorInterface *core, QWidget *parent) m_button->setFixedWidth(30); m_button->setPopupMode(QToolButton::MenuButtonPopup); m_layout->addWidget(m_button); - m_layout->setMargin(0); + m_layout->setContentsMargins(QMargins()); m_layout->setSpacing(0); m_pixmapLabel->setFixedWidth(16); m_pixmapLabel->setAlignment(Qt::AlignCenter); @@ -829,7 +829,7 @@ ResetWidget::ResetWidget(QtProperty *property, QWidget *parent) : m_button->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding)); connect(m_button, &QAbstractButton::clicked, this, &ResetWidget::slotClicked); QLayout *layout = new QHBoxLayout(this); - layout->setMargin(0); + layout->setContentsMargins(QMargins()); layout->setSpacing(m_spacing); layout->addWidget(m_iconLabel); layout->addWidget(m_textLabel); @@ -856,7 +856,7 @@ void ResetWidget::setWidget(QWidget *widget) } delete layout(); QLayout *layout = new QHBoxLayout(this); - layout->setMargin(0); + layout->setContentsMargins(QMargins()); layout->setSpacing(m_spacing); layout->addWidget(widget); layout->addWidget(m_button); diff --git a/src/designer/src/components/propertyeditor/paletteeditor.cpp b/src/designer/src/components/propertyeditor/paletteeditor.cpp index c701c5369..6cfb5e41c 100644 --- a/src/designer/src/components/propertyeditor/paletteeditor.cpp +++ b/src/designer/src/components/propertyeditor/paletteeditor.cpp @@ -407,7 +407,7 @@ BrushEditor::BrushEditor(QDesignerFormEditorInterface *core, QWidget *parent) : m_core(core) { QLayout *layout = new QHBoxLayout(this); - layout->setMargin(0); + layout->setContentsMargins(QMargins()); layout->addWidget(m_button); connect(m_button, &QtColorButton::colorChanged, this, &BrushEditor::brushChanged); setFocusProxy(m_button); @@ -443,7 +443,7 @@ RoleEditor::RoleEditor(QWidget *parent) : m_edited(false) { QHBoxLayout *layout = new QHBoxLayout(this); - layout->setMargin(0); + layout->setContentsMargins(QMargins()); layout->setSpacing(0); layout->addWidget(m_label); diff --git a/src/designer/src/components/propertyeditor/previewframe.cpp b/src/designer/src/components/propertyeditor/previewframe.cpp index 5a5393f4b..f4f391583 100644 --- a/src/designer/src/components/propertyeditor/previewframe.cpp +++ b/src/designer/src/components/propertyeditor/previewframe.cpp @@ -70,7 +70,7 @@ PreviewFrame::PreviewFrame(QWidget *parent) : setLineWidth(1); QVBoxLayout *vbox = new QVBoxLayout(this); - vbox->setMargin(0); + vbox->setContentsMargins(QMargins()); vbox->addWidget(m_mdiArea); setMinimumSize(ensureMdiSubWindow()->minimumSizeHint()); diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp index d393caee5..486e7c202 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.cpp +++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp @@ -325,7 +325,7 @@ PropertyEditor::PropertyEditor(QDesignerFormEditorInterface *core, QWidget *pare layout->addWidget(m_classLabel); layout->addSpacerItem(new QSpacerItem(0,1)); layout->addWidget(m_stackedWidget); - layout->setMargin(0); + layout->setContentsMargins(QMargins()); layout->setSpacing(0); m_treeFactory = new DesignerEditorFactory(m_core, this); diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp index 4358007c0..2b7ba45b8 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp +++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp @@ -704,7 +704,7 @@ SignalSlotEditorWindow::SignalSlotEditorWindow(QDesignerFormEditorInterface *cor m_view, &QTreeView::resizeColumnToContents); QVBoxLayout *layout = new QVBoxLayout(this); - layout->setMargin(0); + layout->setContentsMargins(QMargins()); layout->setSpacing(0); QToolBar *toolBar = new QToolBar; diff --git a/src/designer/src/components/taskmenu/listwidgeteditor.cpp b/src/designer/src/components/taskmenu/listwidgeteditor.cpp index 42e533dc3..337f9ea46 100644 --- a/src/designer/src/components/taskmenu/listwidgeteditor.cpp +++ b/src/designer/src/components/taskmenu/listwidgeteditor.cpp @@ -52,7 +52,7 @@ ListWidgetEditor::ListWidgetEditor(QDesignerFormWindowInterface *form, connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); m_itemsEditor = new ItemListEditor(form, 0); - m_itemsEditor->layout()->setMargin(0); + m_itemsEditor->layout()->setContentsMargins(QMargins()); m_itemsEditor->setNewItemText(tr("New Item")); QFrame *sep = new QFrame; diff --git a/src/designer/src/components/widgetbox/widgetbox.cpp b/src/designer/src/components/widgetbox/widgetbox.cpp index 38452f9dc..bb602b0c2 100644 --- a/src/designer/src/components/widgetbox/widgetbox.cpp +++ b/src/designer/src/components/widgetbox/widgetbox.cpp @@ -97,7 +97,7 @@ WidgetBox::WidgetBox(QDesignerFormEditorInterface *core, QWidget *parent, Qt::Wi { QVBoxLayout *l = new QVBoxLayout(this); - l->setMargin(0); + l->setContentsMargins(QMargins()); l->setSpacing(0); // Prevent the filter from grabbing focus since Our view has Qt::NoFocus diff --git a/src/designer/src/designer/qdesigner_formwindow.cpp b/src/designer/src/designer/qdesigner_formwindow.cpp index 9453115d1..da2324eca 100644 --- a/src/designer/src/designer/qdesigner_formwindow.cpp +++ b/src/designer/src/designer/qdesigner_formwindow.cpp @@ -72,7 +72,7 @@ QDesignerFormWindow::QDesignerFormWindow(QDesignerFormWindowInterface *editor, Q } QVBoxLayout *l = new QVBoxLayout(this); - l->setMargin(0); + l->setContentsMargins(QMargins()); l->addWidget(m_editor); m_action->setCheckable(true); diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp index 85d54a767..4297065b5 100644 --- a/src/designer/src/lib/shared/actioneditor.cpp +++ b/src/designer/src/lib/shared/actioneditor.cpp @@ -128,7 +128,7 @@ ActionEditor::ActionEditor(QDesignerFormEditorInterface *core, QWidget *parent, setWindowTitle(tr("Actions")); QVBoxLayout *l = new QVBoxLayout(this); - l->setMargin(0); + l->setContentsMargins(QMargins()); l->setSpacing(0); QToolBar *toolbar = new QToolBar; diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp index 919937dc6..139d61b90 100644 --- a/src/designer/src/lib/shared/iconselector.cpp +++ b/src/designer/src/lib/shared/iconselector.cpp @@ -430,7 +430,7 @@ IconSelector::IconSelector(QWidget *parent) : d_ptr->m_iconButton->setPopupMode(QToolButton::MenuButtonPopup); l->addWidget(d_ptr->m_stateComboBox); l->addWidget(d_ptr->m_iconButton); - l->setMargin(0); + l->setContentsMargins(QMargins()); d_ptr->m_stateToName << qMakePair(qMakePair(QIcon::Normal, QIcon::Off), tr("Normal Off") ); d_ptr->m_stateToName << qMakePair(qMakePair(QIcon::Normal, QIcon::On), tr("Normal On") ); @@ -556,14 +556,14 @@ IconThemeEditor::IconThemeEditor(QWidget *parent, bool wantResetButton) : QWidget (parent), d(new IconThemeEditorPrivate) { QHBoxLayout *mainHLayout = new QHBoxLayout; - mainHLayout->setMargin(0); + mainHLayout->setContentsMargins(QMargins()); // Vertically center theme preview label d->m_themeLabel->setPixmap(d->m_emptyPixmap); QVBoxLayout *themeLabelVLayout = new QVBoxLayout; d->m_themeLabel->setMargin(1); - themeLabelVLayout->setMargin(0); + themeLabelVLayout->setContentsMargins(QMargins()); themeLabelVLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding)); themeLabelVLayout->addWidget(d->m_themeLabel); themeLabelVLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding)); diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp index 701ad6e5b..f79926d88 100644 --- a/src/designer/src/lib/shared/qtresourceview.cpp +++ b/src/designer/src/lib/shared/qtresourceview.cpp @@ -598,7 +598,7 @@ QtResourceView::QtResourceView(QDesignerFormEditorInterface *core, QWidget *pare d_ptr->m_splitter->addWidget(d_ptr->m_listWidget); QLayout *layout = new QVBoxLayout(this); - layout->setMargin(0); + layout->setContentsMargins(QMargins()); layout->setSpacing(0); layout->addWidget(d_ptr->m_toolBar); layout->addWidget(d_ptr->m_splitter); diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp index 3cf2e047b..1511d709c 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp @@ -671,7 +671,7 @@ QLayout *QAbstractFormBuilder::create(DomLayout *ui_layout, QLayout *parentLayou layoutInfo(ui_layout, p, &margin, &spacing); if (margin != INT_MIN) { - layout->setMargin(margin); + layout->setContentsMargins(margin, margin, margin, margin); } else { const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); int left, top, right, bottom; diff --git a/src/designer/src/plugins/tools/view3d/view3d.cpp b/src/designer/src/plugins/tools/view3d/view3d.cpp index 8c10a176b..91700f650 100644 --- a/src/designer/src/plugins/tools/view3d/view3d.cpp +++ b/src/designer/src/plugins/tools/view3d/view3d.cpp @@ -461,7 +461,7 @@ QView3D::QView3D(QDesignerFormWindowInterface *form_window, QWidget *parent) connect(m_3d_widget, SIGNAL(updateForm()), this, SLOT(updateForm())); QGridLayout *layout = new QGridLayout(this); - layout->setMargin(0); + layout->setContentsMargins(QMargins()); layout->addWidget(m_3d_widget, 0, 0, 1, 1); updateForm(); diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp index fa064beb7..e93bf5610 100644 --- a/src/linguist/linguist/mainwindow.cpp +++ b/src/linguist/linguist/mainwindow.cpp @@ -359,7 +359,7 @@ MainWindow::MainWindow() // We can't call setCentralWidget(m_messageEditor), since it is already called in m_ui.setupUi() QBoxLayout *lout = new QBoxLayout(QBoxLayout::TopToBottom, m_ui.centralwidget); lout->addWidget(m_messageEditor); - lout->setMargin(0); + lout->setContentsMargins(QMargins()); m_ui.centralwidget->setLayout(lout); // Set up the phrases & guesses dock widget diff --git a/src/linguist/linguist/messageeditor.cpp b/src/linguist/linguist/messageeditor.cpp index 58ad47088..5dad19f21 100644 --- a/src/linguist/linguist/messageeditor.cpp +++ b/src/linguist/linguist/messageeditor.cpp @@ -134,14 +134,14 @@ void MessageEditor::setupEditorPage() QBoxLayout *subLayout = new QVBoxLayout; - subLayout->setMargin(5); + subLayout->setContentsMargins(5, 5, 5, 5); subLayout->addWidget(m_source); subLayout->addWidget(m_pluralSource); subLayout->addWidget(m_commentText); m_layout = new QVBoxLayout; m_layout->setSpacing(2); - m_layout->setMargin(2); + m_layout->setContentsMargins(2, 2, 2, 2); m_layout->addLayout(subLayout); m_layout->addStretch(1); editorPage->setLayout(m_layout); @@ -199,7 +199,7 @@ void MessageEditor::messageModelAppended() connect(ed.transCommentText, SIGNAL(cursorPositionChanged()), SLOT(resetHoverSelection())); fixTabOrder(); QBoxLayout *box = new QVBoxLayout(ed.container); - box->setMargin(5); + box->setContentsMargins(5, 5, 5, 5); box->addWidget(ed.transCommentText); box->addSpacing(ed.transCommentText->getEditor()->fontMetrics().height() / 2); m_layout->addWidget(ed.container); diff --git a/src/linguist/linguist/messageeditorwidgets.cpp b/src/linguist/linguist/messageeditorwidgets.cpp index 658b8a0fe..6c16b36fd 100644 --- a/src/linguist/linguist/messageeditorwidgets.cpp +++ b/src/linguist/linguist/messageeditorwidgets.cpp @@ -171,7 +171,7 @@ FormWidget::FormWidget(const QString &label, bool isEditable, QWidget *parent) m_hideWhenEmpty(false) { QVBoxLayout *layout = new QVBoxLayout; - layout->setMargin(0); + layout->setContentsMargins(QMargins()); m_label = new QLabel(this); QFont fnt; @@ -225,7 +225,7 @@ public: ButtonWrapper(QWidget *wrapee, QWidget *relator) { QBoxLayout *box = new QVBoxLayout; - box->setMargin(0); + box->setContentsMargins(QMargins()); setLayout(box); box->addWidget(wrapee, 0, Qt::AlignBottom); if (relator) @@ -323,7 +323,7 @@ void FormMultiWidget::updateLayout() delete layout(); QGridLayout *layout = new QGridLayout; - layout->setMargin(0); + layout->setContentsMargins(QMargins()); setLayout(layout); bool variants = m_multiEnabled && m_label->isEnabled(); @@ -332,14 +332,14 @@ void FormMultiWidget::updateLayout() if (variants) { QVBoxLayout *layoutForPlusButtons = new QVBoxLayout; - layoutForPlusButtons->setMargin(0); + layoutForPlusButtons->setContentsMargins(QMargins()); for (int i = 0; i < m_plusButtons.count(); ++i) layoutForPlusButtons->addWidget(m_plusButtons.at(i), Qt::AlignTop); layout->addLayout(layoutForPlusButtons, 1, 0, Qt::AlignTop); const int minimumRowHeight = m_plusButtons.at(0)->sizeHint().height() / 2.0; QGridLayout *layoutForLabels = new QGridLayout; - layoutForLabels->setMargin(0); + layoutForLabels->setContentsMargins(QMargins()); layoutForLabels->setRowMinimumHeight(0, minimumRowHeight); for (int j = 0; j < m_editors.count(); ++j) { layoutForLabels->addWidget(m_editors.at(j), 1 + j, 0, Qt::AlignVCenter); diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp index f554e935f..79cd1ccd0 100644 --- a/src/shared/findwidget/abstractfindwidget.cpp +++ b/src/shared/findwidget/abstractfindwidget.cpp @@ -109,7 +109,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent) } #ifndef Q_OS_MAC topLayOut->setSpacing(6); - topLayOut->setMargin(0); + topLayOut->setContentsMargins(QMargins()); #endif m_toolClose = new QToolButton(this); diff --git a/src/shared/qtpropertybrowser/qteditorfactory.cpp b/src/shared/qtpropertybrowser/qteditorfactory.cpp index de852a740..664667c65 100644 --- a/src/shared/qtpropertybrowser/qteditorfactory.cpp +++ b/src/shared/qtpropertybrowser/qteditorfactory.cpp @@ -1530,7 +1530,7 @@ QtCharEdit::QtCharEdit(QWidget *parent) { QHBoxLayout *layout = new QHBoxLayout(this); layout->addWidget(m_lineEdit); - layout->setMargin(0); + layout->setContentsMargins(QMargins()); m_lineEdit->installEventFilter(this); m_lineEdit->setReadOnly(true); m_lineEdit->setFocusProxy(this); diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp index 14d1301a7..d8f38cd12 100644 --- a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp @@ -428,7 +428,7 @@ static QIcon drawIndicatorIcon(const QPalette &palette, QStyle *style) void QtTreePropertyBrowserPrivate::init(QWidget *parent) { QHBoxLayout *layout = new QHBoxLayout(parent); - layout->setMargin(0); + layout->setContentsMargins(QMargins()); m_treeWidget = new QtPropertyEditorView(parent); m_treeWidget->setEditorPrivate(this); m_treeWidget->setIconSize(QSize(18, 18)); diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp index 10ad9c41e..1e2de849e 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp @@ -58,7 +58,7 @@ FindDialog::FindDialog(MainWindow *parent) ui.comboFind->setModel(new CaseSensitiveModel(0, 1, ui.comboFind)); QVBoxLayout *l = new QVBoxLayout(this); - l->setMargin(0); + l->setContentsMargins(QMargins()); l->setSpacing(0); l->addWidget(contentsWidget); diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp index ae6d89705..dd5888043 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp @@ -58,7 +58,7 @@ FindDialog::FindDialog(MainWindow *parent) ui.comboFind->setModel(new CaseSensitiveModel(0, 1, ui.comboFind)); QVBoxLayout *l = new QVBoxLayout(this); - l->setMargin(0); + l->setContentsMargins(QMargins()); l->setSpacing(0); l->addWidget(contentsWidget); diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp index fd659db5a..47dda61d6 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp @@ -58,7 +58,7 @@ FindDialog::FindDialog(MainWindow *parent) ui.comboFind->setModel(new CaseSensitiveModel(0, 1, ui.comboFind)); QVBoxLayout *l = new QVBoxLayout(this); - l->setMargin(0); + l->setContentsMargins(QMargins()); l->setSpacing(0); l->addWidget(contentsWidget); |