From e23560d9a0bf76b9ebc66c822e67271f89229522 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 5 Jan 2024 13:11:08 +0100 Subject: [PATCH] Use setContentsMargins instead of setMargin --- Fwk/AppFwk/cafUserInterface/QMinimizePanel.cpp | 1 - .../cafUserInterface/cafPdmUiActionPushButtonEditor.cpp | 2 +- Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxAndTextEditor.cpp | 2 +- Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp | 2 +- Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp | 2 +- Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.h | 2 +- Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.h | 4 ++-- Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp | 2 +- Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp | 2 +- .../cafUserInterface/cafPdmUiTabbedPropertyViewDialog.h | 3 +-- Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp | 2 +- Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp | 2 +- Fwk/AppFwk/cafUserInterface/cafPdmUiValueRangeEditor.cpp | 2 +- 13 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Fwk/AppFwk/cafUserInterface/QMinimizePanel.cpp b/Fwk/AppFwk/cafUserInterface/QMinimizePanel.cpp index d4df416646..a9635a7e92 100644 --- a/Fwk/AppFwk/cafUserInterface/QMinimizePanel.cpp +++ b/Fwk/AppFwk/cafUserInterface/QMinimizePanel.cpp @@ -403,7 +403,6 @@ void QMinimizePanel::initialize( const QString& title ) { m_titleLabel = new QLabel( title ); QPalette titleLabelPalette = m_titleLabel->palette(); - titleLabelPalette.setBrush( QPalette::WindowText, titleLabelPalette.windowText() ); m_titleLabel->setPalette( titleLabelPalette ); titleLayout->addWidget( m_titleLabel, 1, Qt::AlignLeft ); } diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiActionPushButtonEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiActionPushButtonEditor.cpp index df19a94742..d1ba0976bd 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiActionPushButtonEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiActionPushButtonEditor.cpp @@ -117,7 +117,7 @@ QWidget* PdmUiActionPushButtonEditor::createEditorWidget( QWidget* parent ) m_buttonLayout = new QHBoxLayout( containerWidget ); m_buttonLayout->addWidget( m_pushButton ); - m_buttonLayout->setMargin( 0 ); + m_buttonLayout->setContentsMargins( 0, 0, 0, 0 ); m_buttonLayout->setSpacing( 0 ); containerWidget->setLayout( m_buttonLayout ); diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxAndTextEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxAndTextEditor.cpp index 51aae11d98..b50f347bc0 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxAndTextEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxAndTextEditor.cpp @@ -110,7 +110,7 @@ QWidget* PdmUiCheckBoxAndTextEditor::createEditorWidget( QWidget* parent ) layout->addWidget( m_checkBox ); layout->addWidget( m_lineEdit ); - layout->setMargin( 0 ); + layout->setContentsMargins( 0, 0, 0, 0 ); containerWidget->setLayout( layout ); diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp index 890e8a7005..d5edbf88c8 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp @@ -107,7 +107,7 @@ QWidget* PdmUiDoubleSliderEditor::createEditorWidget( QWidget* parent ) QWidget* containerWidget = new QWidget( parent ); QHBoxLayout* layout = new QHBoxLayout(); - layout->setMargin( 0 ); + layout->setContentsMargins( 0, 0, 0, 0 ); containerWidget->setLayout( layout ); m_lineEdit = new QLineEdit( containerWidget ); diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp index e668bf9298..0d44160155 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp @@ -116,7 +116,7 @@ QWidget* PdmUiDoubleValueEditor::createEditorWidget( QWidget* parent ) QWidget* containerWidget = new QWidget( parent ); QHBoxLayout* layout = new QHBoxLayout(); - layout->setMargin( 0 ); + layout->setContentsMargins( 0, 0, 0, 0 ); containerWidget->setLayout( layout ); m_lineEdit = new QLineEdit( containerWidget ); diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.h index 0dccd8c03c..5f9c8811b5 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.h @@ -43,13 +43,13 @@ #include #include #include +#include #include #include #include class QGridLayout; class QCompleter; -class QStringListModel; namespace caf { diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.h index 744922fdc6..d343c106e4 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.h @@ -38,12 +38,12 @@ #include "cafPdmUiFieldEditorHandle.h" +#include + class QItemSelection; class QLabel; class QListViewHeightHint; class QModelIndex; -class QStringList; -class QStringListModel; namespace caf { diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp index 6248680233..70de460ee1 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp @@ -143,7 +143,7 @@ QWidget* PdmUiPushButtonEditor::createEditorWidget( QWidget* parent ) m_buttonLayout = new QHBoxLayout( containerWidget ); m_buttonLayout->addWidget( m_pushButton ); - m_buttonLayout->setMargin( 0 ); + m_buttonLayout->setContentsMargins( 0, 0, 0, 0 ); m_buttonLayout->setSpacing( 0 ); containerWidget->setLayout( m_buttonLayout ); diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp index 1caf05af05..d34aaf9a9f 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp @@ -104,7 +104,7 @@ QWidget* PdmUiSliderEditor::createEditorWidget( QWidget* parent ) QWidget* containerWidget = new QWidget( parent ); QHBoxLayout* layout = new QHBoxLayout(); - layout->setMargin( 0 ); + layout->setContentsMargins( 0, 0, 0, 0 ); containerWidget->setLayout( layout ); m_spinBox = new QSpinBox( containerWidget ); diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTabbedPropertyViewDialog.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTabbedPropertyViewDialog.h index f67986502e..e0a13976d6 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTabbedPropertyViewDialog.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTabbedPropertyViewDialog.h @@ -11,7 +11,6 @@ class PdmUiPropertyView; class QDialogButtonBox; class QWidget; class QString; -class QStringList; namespace caf { @@ -35,4 +34,4 @@ private: QDialogButtonBox* m_dialogButtonBox; }; -} // namespace caf \ No newline at end of file +} // namespace caf diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp index c369dbf64b..71ee591f97 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp @@ -160,7 +160,7 @@ QWidget* PdmUiTableViewEditor::createLabelWidget( QWidget* parent ) } QHBoxLayout* layoutForIconLabel = new QHBoxLayout(); - layoutForIconLabel->setMargin( 0 ); + layoutForIconLabel->setContentsMargins( 0, 0, 0, 0 ); layoutForIconLabel->addWidget( m_tableHeadingIcon ); layoutForIconLabel->addSpacing( 3 ); layoutForIconLabel->addWidget( m_tableHeading ); diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp index 781dce3f9b..adeea776c1 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp @@ -184,7 +184,7 @@ QWidget* PdmUiTextEditor::createEditorWidget( QWidget* parent ) QVBoxLayout* layout = new QVBoxLayout; layout->addWidget( m_textEdit ); - layout->setMargin( 0 ); + layout->setContentsMargins( 0, 0, 0, 0 ); QHBoxLayout* buttonLayout = new QHBoxLayout; buttonLayout->insertStretch( 0, 10 ); diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiValueRangeEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiValueRangeEditor.cpp index bf3743ff6b..ecdfd99f75 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiValueRangeEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiValueRangeEditor.cpp @@ -259,7 +259,7 @@ QWidget* PdmUiValueRangeEditor::createEditorWidget( QWidget* parent ) auto containerWidget = new QWidget( parent ); auto layout = new QGridLayout(); - layout->setMargin( 0 ); + layout->setContentsMargins( 0, 0, 0, 0 ); containerWidget->setLayout( layout ); m_lineEditMin = new QLineEdit( containerWidget );