[Lmuse-cvs-traffic] muse/muse/marker Makefile.am,1.2,1.3 marker.cpp,1.2,1.3 marker.h,1.2,1.3 markerview.cpp,1.8,1.9 markerview.h,1.5,1.6

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

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

Modified Files:
	Makefile.am marker.cpp marker.h markerview.cpp markerview.h 
Log Message:
minor update


Index: markerview.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/marker/markerview.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** markerview.cpp	23 Aug 2004 17:54:25 -0000	1.8
--- markerview.cpp	14 Sep 2004 18:17:28 -0000	1.9
***************
*** 15,30 ****
  #include "posedit.h"
  
- #include <qmainwindow.h>
- #include <qtoolbar.h>
- #include <qtoolbutton.h>
- #include <qtooltip.h>
- #include <qlayout.h>
- #include <qsizegrip.h>
- #include <qpopupmenu.h>
- #include <qmenubar.h>
- #include <qaction.h>
- #include <qgroupbox.h>
- #include <qlineedit.h>
- 
  enum { COL_TICK = 0, COL_SMPTE, COL_LOCK, COL_NAME };
  
--- 15,18 ----
***************
*** 249,254 ****
  //---------------------------------------------------------
  
! void MarkerView::readStatus(Xml& xml)
        {
        for (;;) {
              Xml::Token token = xml.parse();
--- 237,243 ----
  //---------------------------------------------------------
  
! void MarkerView::readStatus(QDomNode node)
        {
+ #if 0 //TODO2
        for (;;) {
              Xml::Token token = xml.parse();
***************
*** 267,270 ****
--- 256,260 ----
                    }
              }
+ #endif
        }
  

Index: markerview.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/marker/markerview.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** markerview.h	23 Aug 2004 17:54:25 -0000	1.5
--- markerview.h	14 Sep 2004 18:17:28 -0000	1.6
***************
*** 9,21 ****
  #define __MARKERVIEW_H__
  
- #include <qmainwindow.h>
- #include <qwidget.h>
- #include <qlistview.h>
- 
- class QLineEdit;
  class PosEdit;
- class QToolButton;
  class Marker;
- class QToolBar;
  class Pos;
  class Xml;
--- 9,14 ----
***************
*** 73,77 ****
        MarkerView(QWidget* parent);
        ~MarkerView();
!       void readStatus(Xml&);
        void writeStatus(int, Xml&) const;
        };
--- 66,70 ----
        MarkerView(QWidget* parent);
        ~MarkerView();
!       void readStatus(QDomNode);
        void writeStatus(int, Xml&) const;
        };

Index: marker.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/marker/marker.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** marker.h	15 Dec 2003 11:41:00 -0000	1.2
--- marker.h	14 Sep 2004 18:17:28 -0000	1.3
***************
*** 9,14 ****
  #define __MARKER_H__
  
- #include <map>
- #include <qstring.h>
  #include "xml.h"
  #include "pos.h"
--- 9,12 ----
***************
*** 26,30 ****
        Marker(const QString& s, bool cur = false)
           : _name(s), _current(cur) {}
!       void read(Xml&);
        const QString name() const     { return _name; }
        void setName(const QString& s) { _name = s;    }
--- 24,28 ----
        Marker(const QString& s, bool cur = false)
           : _name(s), _current(cur) {}
!       void read(QDomNode);
        const QString name() const     { return _name; }
        void setName(const QString& s) { _name = s;    }

Index: marker.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/marker/marker.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** marker.cpp	10 Dec 2003 18:34:22 -0000	1.2
--- marker.cpp	14 Sep 2004 18:17:28 -0000	1.3
***************
*** 28,58 ****
  //---------------------------------------------------------
  
! void Marker::read(Xml& xml)
        {
!       for (;;) {
!             Xml::Token token = xml.parse();
!             const QString& tag = xml.s1();
!             switch (token) {
!                   case Xml::Error:
!                   case Xml::End:
!                         return;
!                   case Xml::TagStart:
!                         xml.unknown("Marker");
!                         break;
!                   case Xml::Attribut:
!                         if (tag == "tick")
!                               setTick(xml.s2().toInt());
!                         else if (tag == "lock")
!                               setType(xml.s2().toInt() ? FRAMES:TICKS);
!                         else if (tag == "name")
!                               _name = xml.s2();
!                         break;
!                   case Xml::TagEnd:
!                         if (xml.s1() == "marker")
!                               return;
!                   default:
!                         break;
!                   }
!             }
        }
  
--- 28,37 ----
  //---------------------------------------------------------
  
! void Marker::read(QDomNode node)
        {
!       QDomElement e = node.toElement();
!       setTick(e.attribute("tick").toInt());
!       setType(e.attribute("lock").toInt() ? FRAMES:TICKS);
!       _name = e.attribute("name");
        }
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/marker/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	2 Apr 2004 12:47:30 -0000	1.2
--- Makefile.am	14 Sep 2004 18:17:28 -0000	1.3
***************
*** 1,10 ****
  include $(top_srcdir)/common.am
  
- if PCH
- AM_CXXFLAGS += -include $(top_srcdir)/all.h
- endif
- 
  noinst_LIBRARIES = libmarker.a
  
  dist_libmarker_a_SOURCES = \
  	marker.cpp marker.h \
--- 1,8 ----
  include $(top_srcdir)/common.am
  
  noinst_LIBRARIES = libmarker.a
  
+ AM_CXXFLAGS += -include $(top_srcdir)/all.h
+ 
  dist_libmarker_a_SOURCES = \
  	marker.cpp marker.h \