From 190419b985e1867e1c176dda2de7deecca245a05 Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Thu, 30 Aug 2012 16:39:11 +0000
Subject: compile fixes

---
 muse2/muse/ctrl.cpp               | 18 +++++++++---------
 muse2/muse/midiedit/scoreedit.cpp |  3 +++
 muse2/muse/widgets/poslabel.cpp   |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'muse2/muse')

diff --git a/muse2/muse/ctrl.cpp b/muse2/muse/ctrl.cpp
index 23cbb489..5ffaf99f 100644
--- a/muse2/muse/ctrl.cpp
+++ b/muse2/muse/ctrl.cpp
@@ -382,7 +382,7 @@ void CtrlList::assign(const CtrlList& l, int flags)
   
   if(flags & ASSIGN_VALUES)
   {
-    map::operator=(l); // Let map copy the items.
+    std::map<int, CtrlVal, std::less<int> >::operator=(l); // Let map copy the items.
     _guiUpdatePending = true;
   }
 }
@@ -523,7 +523,7 @@ CtrlList& CtrlList::operator=(const CtrlList& cl)
   _visible       = cl._visible;
   
   // Let map copy the items.
-  map::operator=(cl);
+  std::map<int, CtrlVal, std::less<int> >::operator=(cl);
   _guiUpdatePending = true;
   return *this;
 }
@@ -533,7 +533,7 @@ void CtrlList::swap(CtrlList& cl)
 #ifdef _CTRL_DEBUG_
   printf("CtrlList::swap id:%d\n", cl.id());  
 #endif
-  map::swap(cl);
+  std::map<int, CtrlVal, std::less<int> >::swap(cl);
   cl.setGuiUpdatePending(true);
   _guiUpdatePending = true;
 }
@@ -543,7 +543,7 @@ std::pair<iCtrl, bool> CtrlList::insert(const std::pair<int, CtrlVal>& p)
 #ifdef _CTRL_DEBUG_
   printf("CtrlList::insert frame:%d val:%f\n", p.first, p.second.val);  
 #endif
-  std::pair<iCtrl, bool> res = map::insert(p);
+  std::pair<iCtrl, bool> res = std::map<int, CtrlVal, std::less<int> >::insert(p);
   _guiUpdatePending = true;
   return res;
 }
@@ -553,7 +553,7 @@ iCtrl CtrlList::insert(iCtrl ic, const std::pair<int, CtrlVal>& p)
 #ifdef _CTRL_DEBUG_
   printf("CtrlList::insert2 frame:%d val:%f\n", p.first, p.second.val); 
 #endif
-  iCtrl res = map::insert(ic, p);
+  iCtrl res = std::map<int, CtrlVal, std::less<int> >::insert(ic, p);
   _guiUpdatePending = true;
   return res;
 }
@@ -563,7 +563,7 @@ void CtrlList::erase(iCtrl ictl)
 #ifdef _CTRL_DEBUG_
   printf("CtrlList::erase iCtrl frame:%d val:%f\n", ictl->second.frame, ictl->second.val);  
 #endif
-  map::erase(ictl);
+  std::map<int, CtrlVal, std::less<int> >::erase(ictl);
   _guiUpdatePending = true;
 }
 
@@ -572,7 +572,7 @@ std::map<int, CtrlVal, std::less<int> >::size_type CtrlList::erase(int frame)
 #ifdef _CTRL_DEBUG_
   printf("CtrlList::erase frame:%d\n", frame);  
 #endif
-  size_type res = map::erase(frame);
+  size_type res = std::map<int, CtrlVal, std::less<int> >::erase(frame);
   _guiUpdatePending = true;
   return res;
 }
@@ -584,7 +584,7 @@ void CtrlList::erase(iCtrl first, iCtrl last)
          first->second.frame, first->second.val,
          last->second.frame, last->second.val);  
 #endif
-  map::erase(first, last);
+  std::map<int, CtrlVal, std::less<int> >::erase(first, last);
   _guiUpdatePending = true;
 }
 
@@ -593,7 +593,7 @@ void CtrlList::clear()
 #ifdef _CTRL_DEBUG_
   printf("CtrlList::clear\n");  
 #endif
-  map::clear();
+  std::map<int, CtrlVal, std::less<int> >::clear();
   _guiUpdatePending = true;
 }
 
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index 8f4b9d3c..737a705b 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -4698,6 +4698,9 @@ void ScoreCanvas::add_new_parts(const std::map< MusECore::Part*, std::set<MusECo
  *   o velo-controller doesn't work in new-style drum tracks
  *
  * CURRENT TODO
+ *   o group plugins into user definable categories
+ *   o better and visual means for fading etc
+ *   o rename E- and A-note to I- and O-
  *   o storing <no_toplevels /> into a template file seems to ignore
  *     the arranger's "MDI-ness", sets is at subwin all the time!
  * 
diff --git a/muse2/muse/widgets/poslabel.cpp b/muse2/muse/widgets/poslabel.cpp
index 5687089c..a706a313 100644
--- a/muse2/muse/widgets/poslabel.cpp
+++ b/muse2/muse/widgets/poslabel.cpp
@@ -26,7 +26,7 @@
 #include <QApplication>
 #include <QStyle>
 
-
+#include <limits.h>
 #include "poslabel.h"
 ///#include "sig.h"
 #include "al/sig.h"
-- 
cgit v1.2.3