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

Reverted class SpinBox to previous revision.

4 files changed, 25 insertions, 16 deletions

diff --git a/muse2/muse/liste/editctrlbase.ui b/muse2/muse/liste/editctrlbase.ui
index e3b28a69..2af3d884 100644
--- a/muse2/muse/liste/editctrlbase.ui
+++ b/muse2/muse/liste/editctrlbase.ui
@@ -54,7 +54,7 @@
     </widget>
    </item>
    <item row="0" column="4">
-    <widget class="PosEdit" name="timePos" native="true"/>
+    <widget class="Awl::PosEdit" name="timePos"/>
    </item>
    <item row="1" column="3" rowspan="2" colspan="2">
     <widget class="QStackedWidget" name="widgetStack">
@@ -800,14 +800,12 @@
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
-   <class>PosEdit</class>
+   <class>Awl::PosEdit</class>
    <extends>QWidget</extends>
-   <header location="global">posedit.h</header>
+   <header>awl/posedit.h</header>
+   <container>0</container>
   </customwidget>
  </customwidgets>
- <includes>
-  <include location="local">../widgets/posedit.h</include>
- </includes>
  <resources/>
  <connections>
   <connection>
diff --git a/muse2/muse/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp
index 8d8318c9..99c1ed1d 100644
--- a/muse2/muse/liste/editevent.cpp
+++ b/muse2/muse/liste/editevent.cpp
@@ -21,6 +21,8 @@
 #include <QTextEdit>
 #include <QVBoxLayout>
 
+#include "awl/posedit.h"
+
 #include "song.h"
 #include "event.h"
 #include "midictrl.h"
@@ -28,7 +30,7 @@
 #include "pitchedit.h"
 #include "intlabel.h"
 #include "globals.h"
-#include "posedit.h"
+///#include "posedit.h"
 #include "gconfig.h"
 #include "midiport.h"
 #include "midiedit/drummap.h"
@@ -287,7 +289,8 @@ EditMetaDialog::EditMetaDialog(int tick, const Event& ev,
       setCaption(tr("MusE: Enter Meta Event"));
 
       QLabel* l1 = new QLabel(tr("Time Position"));
-      epos = new PosEdit;
+      ///epos = new PosEdit;
+      epos = new Awl::PosEdit;
 
       QLabel* l2 = new QLabel(tr("Meta Type"));
       il2 = new IntLabel(-1, 0, 127, this, -1);
@@ -417,7 +420,8 @@ EditCAfterDialog::EditCAfterDialog(int tick, const Event& event,
       setCaption(tr("MusE: Enter Channel Aftertouch"));
 
       QLabel* l1 = new QLabel(tr("Time Position"));
-      epos = new PosEdit;
+      ///epos = new PosEdit;
+      epos = new Awl::PosEdit;
 
       QLabel* l2 = new QLabel(tr("Pressure"));
       il2  = new IntLabel(-1, 0, 127, this, -1);
@@ -469,7 +473,8 @@ EditPAfterDialog::EditPAfterDialog(int tick, const Event& event,
       setCaption(tr("MusE: Enter Poly Aftertouch"));
 
       QLabel* l1 = new QLabel(tr("Time Position"));
-      epos = new PosEdit;
+      ///epos = new PosEdit;
+      epos = new Awl::PosEdit;
 
       QLabel* l2 = new QLabel(tr("Pitch"));
       pl = new PitchEdit;
diff --git a/muse2/muse/liste/editevent.h b/muse2/muse/liste/editevent.h
index 076ba4eb..bff39181 100644
--- a/muse2/muse/liste/editevent.h
+++ b/muse2/muse/liste/editevent.h
@@ -13,7 +13,11 @@
 #include "ui_editctrlbase.h"
 #include "event.h"
 
-class PosEdit;
+namespace Awl {
+      class PosEdit;
+      };
+
+///class PosEdit;
 class IntLabel;
 class PitchEdit;
 class QDialog;
@@ -21,7 +25,6 @@ class QLabel;
 class QGridLayout;
 class QTextEdit;
 class QRadioButton;
-class PosEdit;
 class MidiPart;
 class QListWidgetItem;
 class QMenu;
@@ -122,7 +125,8 @@ class EditMetaDialog : public EditEventDialog {
 
       unsigned char* meta;
       int len;
-      PosEdit* epos;
+      ///PosEdit* epos;
+      Awl::PosEdit* epos;
       QTextEdit* edit;
       IntLabel* il2;
       QRadioButton* hexButton;
@@ -152,7 +156,8 @@ class EditMetaDialog : public EditEventDialog {
 class EditCAfterDialog : public EditEventDialog {
       Q_OBJECT
 
-      PosEdit* epos;
+      ///PosEdit* epos;
+      Awl::PosEdit* epos;
       IntLabel* il2;
 
    protected:
@@ -173,7 +178,8 @@ class EditCAfterDialog : public EditEventDialog {
 class EditPAfterDialog : public EditEventDialog {
       Q_OBJECT
 
-      PosEdit* epos;
+      ///PosEdit* epos;
+      Awl::PosEdit* epos;
       PitchEdit* pl;
       IntLabel* il2;
 
diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp
index 4c0bd982..44cab35a 100644
--- a/muse2/muse/liste/listedit.cpp
+++ b/muse2/muse/liste/listedit.cpp
@@ -261,7 +261,7 @@ QString EventListItem::text(int col) const
                   int t = event.tick() + part->tick();
                   int bar, beat;
                   unsigned tick;
-                  sigmap.tickValues(t, &bar, &beat, &tick);
+                  AL::sigmap.tickValues(t, &bar, &beat, &tick);
                   s.sprintf("%04d.%02d.%03d", bar+1, beat+1, tick);
                   }
                   break;