From 64c818b2c3b92c16049c5705b1c808b237697e02 Mon Sep 17 00:00:00 2001
From: "Tim E. Real" <termtech@rogers.com>
Date: Sun, 14 Nov 2010 19:18:55 +0000
Subject: Applied patch by Orcan converting populateAddSynth(). Changed all
 obsoleted setMargin() calls to setContentsMargins().

---
 muse2/muse/mixer/amixer.cpp | 2 +-
 muse2/muse/mixer/astrip.cpp | 2 +-
 muse2/muse/mixer/strip.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'muse2/muse/mixer')

diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index ca805f35..dccdb53b 100644
--- a/muse2/muse/mixer/amixer.cpp
+++ b/muse2/muse/mixer/amixer.cpp
@@ -106,7 +106,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c)
       layout = new QHBoxLayout();
       central->setLayout(layout);
       layout->setSpacing(0);
-      layout->setMargin(0);
+      layout->setContentsMargins(0, 0, 0, 0);
       view->setWidget(central);
       view->setWidgetResizable(true);
       
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index 2b1b53cf..9c42f18c 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -755,7 +755,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
 
       sliderGrid = new QGridLayout(); 
       sliderGrid->setRowStretch(0, 100);
-      sliderGrid->setMargin(0);
+      sliderGrid->setContentsMargins(0, 0, 0, 0);
       
       slider = new Slider(this, "vol", Qt::Vertical, Slider::None,
          Slider::BgTrough | Slider::BgSlot);
diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp
index cef793d0..2f32270b 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -184,7 +184,7 @@ Strip::Strip(QWidget* parent, Track* t)
       setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding)); // TESTING Tim.
       
       grid = new QGridLayout();
-      grid->setMargin(0);
+      grid->setContentsMargins(0, 0, 0, 0);
       grid->setSpacing(0);
       setLayout(grid);
 
-- 
cgit v1.2.3