[Lmuse-cvs-traffic] muse/muse/liste listedit.cpp,1.39,1.40 listedit.h,1.18,1.19

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/muse/liste
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9360/muse/liste

Modified Files:
	listedit.cpp listedit.h 
Log Message:
updates


Index: listedit.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/liste/listedit.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** listedit.cpp	10 Oct 2005 19:34:09 -0000	1.39
--- listedit.cpp	18 Oct 2005 19:41:41 -0000	1.40
***************
*** 10,14 ****
  #include "globals.h"
  #include "icons.h"
- // #include "editevent.h"
  #include "song.h"
  #include "audio.h"
--- 10,13 ----
***************
*** 707,711 ****
                    if (editCol == 3) {
                          QString input = textEditor->text();
!                         const TEvent* t = editItem->tempo();
                          unsigned tick = t->tick;
                          bool conversionOK;
--- 706,710 ----
                    if (editCol == 3) {
                          QString input = textEditor->text();
!                         const AL::TEvent* t = editItem->tempo();
                          unsigned tick = t->tick;
                          bool conversionOK;

Index: listedit.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/liste/listedit.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** listedit.h	28 Sep 2005 20:26:38 -0000	1.18
--- listedit.h	18 Oct 2005 19:41:41 -0000	1.19
***************
*** 18,29 ****
        class SigEdit;
        };
  namespace AL {
        class SigEvent;
        class TEvent;
-       class Xml;
        };
- using AL::Xml;
- using AL::TEvent;
- using AL::SigEvent;
  
  class Event;
--- 18,26 ----
        class SigEdit;
        };
+ 
  namespace AL {
        class SigEvent;
        class TEvent;
        };
  
  class Event;
***************
*** 90,97 ****
        bool* showHex;
  
!       TEvent* _tempo;
        Event _event;
        Part* _part;
!       SigEvent* _sig;
        CVal _val;
        LLItem* _lli;
--- 87,94 ----
        bool* showHex;
  
!       AL::TEvent* _tempo;
        Event _event;
        Part* _part;
!       AL::SigEvent* _sig;
        CVal _val;
        LLItem* _lli;
***************
*** 110,115 ****
        void setPos(Pos p)        { _pos = p; }
        unsigned tick() const     { return _pos.tick(); }
!       void setTempo(TEvent* t)  { _tempo = t; }
!       TEvent* tempo() const     { return _tempo; }
        virtual int compare(Q3ListViewItem* i, int, bool) const {
              return _pos.tick() - ((LItem*)i)->_pos.tick();
--- 107,112 ----
        void setPos(Pos p)        { _pos = p; }
        unsigned tick() const     { return _pos.tick(); }
!       void setTempo(AL::TEvent* t)  { _tempo = t; }
!       AL::TEvent* tempo() const     { return _tempo; }
        virtual int compare(Q3ListViewItem* i, int, bool) const {
              return _pos.tick() - ((LItem*)i)->_pos.tick();
***************
*** 120,125 ****
        CVal val() const              { return _val;   }
        void setZebra(bool v)         { zebra = v;     }
!       void setSigEvent(SigEvent* e) { _sig = e;      }
!       SigEvent* sigEvent() const    { return _sig;   }
        void setPart(Part* p)         { _part = p;     }
        Part* part() const            { return _part;  }
--- 117,122 ----
        CVal val() const              { return _val;   }
        void setZebra(bool v)         { zebra = v;     }
!       void setSigEvent(AL::SigEvent* e) { _sig = e;      }
!       AL::SigEvent* sigEvent() const    { return _sig;   }
        void setPart(Part* p)         { _part = p;     }
        Part* part() const            { return _part;  }