Built Awl::posedit and Awl::sigedit, and replaced /widget versions and all usages.

Reverted class SpinBox to previous revision.

1 files changed, 11 insertions, 7 deletions

diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index 2736808e..d4fd3e0d 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -5,6 +5,8 @@
 //  (C) Copyright 1999 Werner Schweer (ws@seh.de)
 //=========================================================
 
+#include "awl/sigedit.h"
+
 #include "masteredit.h"
 #include "mtscale.h"
 #include "hitscale.h"
@@ -18,7 +20,7 @@
 #include "xml.h"
 #include "lcombo.h"
 #include "doublelabel.h"
-#include "sigedit.h"
+///#include "sigedit.h"
 #include "globals.h"
 
 #include <values.h>
@@ -55,9 +57,9 @@ void MasterEdit::songChanged(int type)
             }
       if (type & SC_SIG) {
             int z, n;
-            sigmap.timesig(song->cpos(), z, n);
+            AL::sigmap.timesig(song->cpos(), z, n);
             curSig->blockSignals(true);
-            curSig->setValue(Sig(z, n));
+            curSig->setValue(AL::TimeSignature(z, n));
             curSig->blockSignals(false);
             sign->redraw();
             }
@@ -131,12 +133,14 @@ MasterEdit::MasterEdit()
       info->addWidget(new QLabel(tr("CurPos ")));
       curTempo = new TempoEdit(0);
       curSig   = new SigEdit(0);
-      curSig->setValue(Sig(4, 4));
+      curSig->setValue(AL::TimeSignature(4, 4));
       curTempo->setToolTip(tr("tempo at current position"));
       curSig->setToolTip(tr("time signature at current position"));
       info->addWidget(curTempo);
       info->addWidget(curSig);
-      connect(curSig, SIGNAL(valueChanged(int,int)), song, SLOT(setSig(int,int)));
+      ///connect(curSig, SIGNAL(valueChanged(int,int)), song, SLOT(setSig(int,int)));
+      connect(curSig, SIGNAL(valueChanged(const AL::TimeSignature&)), song, SLOT(setSig(const AL::TimeSignature&)));
+      
       ///connect(curTempo, SIGNAL(valueChanged(double)), song, SLOT(setTempo(double)));
       connect(curTempo, SIGNAL(tempoChanged(double)), song, SLOT(setTempo(double)));
                                                                                     
@@ -354,12 +358,12 @@ void MasterEdit::posChanged(int idx, unsigned val, bool)
       if (idx == 0) {
             int z, n;
             int tempo = tempomap.tempo(val);
-            sigmap.timesig(val, z, n);
+            AL::sigmap.timesig(val, z, n);
             curTempo->blockSignals(true);
             curSig->blockSignals(true);
 
             curTempo->setValue(double(60000000.0/tempo));
-            curSig->setValue(Sig(z, n));
+            curSig->setValue(AL::TimeSignature(z, n));
 
             curTempo->blockSignals(false);
             curSig->blockSignals(false);