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

Reverted class SpinBox to previous revision.

2 files changed, 21 insertions, 21 deletions

diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index 4a79b1c2..94acca5a 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -311,7 +311,7 @@ Arranger::Arranger(QMainWindow* parent, const char* name)
       //    Editor
       //---------------------------------------------------
 
-      int offset = sigmap.ticksMeasure(0);
+      int offset = AL::sigmap.ticksMeasure(0);
       hscroll = new ScrollScale(-1000, -10, xscale, song->len(), Qt::Horizontal, editor, -offset);
       ib->setFixedHeight(hscroll->sizeHint().height());
 
@@ -394,9 +394,9 @@ Arranger::Arranger(QMainWindow* parent, const char* name)
 //{
 //      int s = 0, e = song->len();
       // Show one more measure.
-//      e += sigmap.ticksMeasure(e);  
+//      e += AL::sigmap.ticksMeasure(e);  
       // Show another quarter measure due to imprecise drawing at canvas end point.
-//      e += sigmap.ticksMeasure(e) / 4;
+//      e += AL::sigmap.ticksMeasure(e) / 4;
       // Compensate for the fixed vscroll width. 
 //      e += canvas->rmapxDev(-vscroll->width()); 
 //      int s1, e1;
@@ -477,7 +477,7 @@ void Arranger::configChanged()
 
 void Arranger::songlenChanged(int n)
       {
-      int newLen = sigmap.bar2tick(n, 0, 0);
+      int newLen = AL::sigmap.bar2tick(n, 0, 0);
       song->setLen(newLen);
       }
 //---------------------------------------------------------
@@ -490,14 +490,14 @@ void Arranger::songChanged(int type)
       if(type != SC_MIDI_CONTROLLER)
       {
         unsigned endTick = song->len();
-        int offset  = sigmap.ticksMeasure(endTick);
+        int offset  = AL::sigmap.ticksMeasure(endTick);
         hscroll->setRange(-offset, endTick + offset);  //DEBUG
         canvas->setOrigin(-offset, 0);
         time->setOrigin(-offset, 0);
   
         int bar, beat;
         unsigned tick;
-        sigmap.tickValues(endTick, &bar, &beat, &tick);
+        AL::sigmap.tickValues(endTick, &bar, &beat, &tick);
         if (tick || beat)
               ++bar;
         lenEntry->blockSignals(true);
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 49d756d9..baa94747 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -555,7 +555,7 @@ QPoint PartCanvas::raster(const QPoint& p) const
       int x = p.x();
       if (x < 0)
             x = 0;
-      x = sigmap.raster(x, *_raster);
+      x = AL::sigmap.raster(x, *_raster);
       if (x < 0)
             x = 0;
       return QPoint(x, y);
@@ -609,11 +609,11 @@ void PartCanvas::resizeItem(CItem* i, bool noSnap)
       int pos = p->tick() + i->width();
       int snappedpos = p->tick();
       if (!noSnap) {
-            snappedpos = sigmap.raster(pos, *_raster);
+            snappedpos = AL::sigmap.raster(pos, *_raster);
             }
       unsigned int newwidth = snappedpos - p->tick();
       if (newwidth == 0)
-            newwidth = sigmap.rasterStep(p->tick(), *_raster);
+            newwidth = AL::sigmap.rasterStep(p->tick(), *_raster);
 
       song->cmdResizePart(t, p, newwidth);
       }
@@ -628,7 +628,7 @@ CItem* PartCanvas::newItem(const QPoint& pos, int)
       int x = pos.x();
       if (x < 0)
             x = 0;
-      x = sigmap.raster(x, *_raster);
+      x = AL::sigmap.raster(x, *_raster);
       unsigned trackIndex = y2pitch(pos.y());
       if (trackIndex >= tracks->size())
             return 0;
@@ -673,9 +673,9 @@ void PartCanvas::newItem(CItem* i, bool noSnap)
 
       int len = i->width();
       if (!noSnap)
-            len = sigmap.raster(len, *_raster);
+            len = AL::sigmap.raster(len, *_raster);
       if (len == 0)
-            len = sigmap.rasterStep(p->tick(), *_raster);
+            len = AL::sigmap.rasterStep(p->tick(), *_raster);
       p->setLenTick(len);
       p->setSelected(true);
       audio->msgAddPart(p);
@@ -704,7 +704,7 @@ void PartCanvas::splitItem(CItem* item, const QPoint& pt)
       int x = pt.x();
       if (x < 0)
             x = 0;
-      song->cmdSplitPart(t, p, sigmap.raster(x, *_raster));
+      song->cmdSplitPart(t, p, AL::sigmap.raster(x, *_raster));
       }
 
 //---------------------------------------------------------
@@ -1051,7 +1051,7 @@ void PartCanvas::mouseMove(const QPoint& pos)
       int x = pos.x();
       if (x < 0)
             x = 0;
-      emit timeChanged(sigmap.raster(x, *_raster));
+      emit timeChanged(AL::sigmap.raster(x, *_raster));
       }
 
 //---------------------------------------------------------
@@ -1102,7 +1102,7 @@ void PartCanvas::keyPress(QKeyEvent* event)
             return;
             }
       else if (key == shortcuts[SHRT_POS_DEC].key) {
-            int frames = pos[0] - sigmap.rasterStep(pos[0], *_raster);
+            int frames = pos[0] - AL::sigmap.rasterStep(pos[0], *_raster);
             if (frames < 0)
                   frames = 0;
             Pos p(frames,true);
@@ -1110,7 +1110,7 @@ void PartCanvas::keyPress(QKeyEvent* event)
             return;
             }
       else if (key == shortcuts[SHRT_POS_INC].key) {
-            Pos p(pos[0] + sigmap.rasterStep(pos[0], *_raster), true);
+            Pos p(pos[0] + AL::sigmap.rasterStep(pos[0], *_raster), true);
             song->setPos(0, p, true, true, true); //CDW
             return;
             }
@@ -1758,7 +1758,7 @@ void PartCanvas::cmd(int cmd)
             case CMD_INSERT_EMPTYMEAS:
                   song->startUndo();
                   int startPos=song->vcpos();
-                  int oneMeas=sigmap.ticksMeasure(startPos);
+                  int oneMeas=AL::sigmap.ticksMeasure(startPos);
                   movePartsTotheRight(startPos,oneMeas);
                   song->endUndo(SC_PART_INSERTED);
                   break;
@@ -2621,7 +2621,7 @@ void PartCanvas::viewDropEvent(QDropEvent* event)
       {
             text = QString(event->mimeData()->data("text/partlist"));
             
-            int x = sigmap.raster(event->pos().x(), *_raster);
+            int x = AL::sigmap.raster(event->pos().x(), *_raster);
             if (x < 0)
                   x = 0;
             unsigned trackNo = y2pitch(event->pos().y());
@@ -2643,7 +2643,7 @@ void PartCanvas::viewDropEvent(QDropEvent* event)
                 text.endsWith(".ogg",Qt::CaseInsensitive) || 
                 text.endsWith(".mpt", Qt::CaseInsensitive) )
             {
-                int x = sigmap.raster(event->pos().x(), *_raster);
+                int x = AL::sigmap.raster(event->pos().x(), *_raster);
                 if (x < 0)
                       x = 0;
                 unsigned trackNo = y2pitch(event->pos().y());
@@ -2712,9 +2712,9 @@ void PartCanvas::drawCanvas(QPainter& p, const QRect& rect)
           int bar, beat;
           unsigned tick;
 
-          sigmap.tickValues(x, &bar, &beat, &tick);
+          AL::sigmap.tickValues(x, &bar, &beat, &tick);
           for (;;) {
-            int xt = sigmap.bar2tick(bar++, 0, 0);
+            int xt = AL::sigmap.bar2tick(bar++, 0, 0);
             if (xt >= x + w)
                   break;
             if (!((bar-1) % 4))