Use setContentsMargins instead of setMargin

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 );
         }

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 );
 

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 );
 

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 );

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 );

Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.h

@@ -43,13 +43,13 @@
 #include <QLineEdit>
 #include <QPointer>
 #include <QString>
+#include <QStringListModel>
 #include <QToolButton>
 #include <QValidator>
 #include <QWidget>
 
 class QGridLayout;
 class QCompleter;
-class QStringListModel;
 
 namespace caf
 {

Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.h

@@ -38,12 +38,12 @@
 
 #include "cafPdmUiFieldEditorHandle.h"
 
+#include <QStringListModel>
+
 class QItemSelection;
 class QLabel;
 class QListViewHeightHint;
 class QModelIndex;
-class QStringList;
-class QStringListModel;
 
 namespace caf
 {

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 );

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 );

Fwk/AppFwk/cafUserInterface/cafPdmUiTabbedPropertyViewDialog.h

@@ -11,7 +11,6 @@ class PdmUiPropertyView;
 class QDialogButtonBox;
 class QWidget;
 class QString;
-class QStringList;
 
 namespace caf
 {

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 );

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 );

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 );