[Lmuse-cvs-traffic] muse/muse/master masteredit.cpp,1.15,1.16 masteredit.h,1.12,1.13

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

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

Modified Files:
	masteredit.cpp masteredit.h 
Log Message:
more updates


Index: masteredit.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/master/masteredit.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** masteredit.h	13 Jan 2005 21:16:04 -0000	1.12
--- masteredit.h	23 Sep 2005 14:29:36 -0000	1.13
***************
*** 18,22 ****
  class SigScale;
  class TScale;
- class LabelCombo;
  
  namespace Awl {
--- 18,21 ----
***************
*** 44,48 ****
        TempoEdit* curTempo;
        SigEdit* curSig;
!       LabelCombo* rasterLabel;
        QToolBar* tools;
        PosLabel* cursorPos;
--- 43,47 ----
        TempoEdit* curTempo;
        SigEdit* curSig;
!       QComboBox* rasterLabel;
        QToolBar* tools;
        PosLabel* cursorPos;

Index: masteredit.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/master/masteredit.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** masteredit.cpp	22 Sep 2005 20:13:00 -0000	1.15
--- masteredit.cpp	23 Sep 2005 14:29:36 -0000	1.16
***************
*** 17,21 ****
  #include "awl/tempolabel.h"
  #include "al/xml.h"
- #include "widgets/lcombo.h"
  #include "widgets/doublelabel.h"
  #include "awl/sigedit.h"
--- 17,20 ----
***************
*** 23,29 ****
  #include "esettings.h"
  #include "al/tempo.h"
- //Added by qt3to4:
- #include <QLabel>
- #include <QCloseEvent>
  
  //---------------------------------------------------------
--- 22,25 ----
***************
*** 95,99 ****
              QT_TR_NOOP("Off"), "Bar", "1/2", "1/4", "1/8", "1/16"
              };
!       rasterLabel = new LabelCombo(tr("Snap"), info);
        for (int i = 0; i < 6; i++)
              rasterLabel->insertItem(tr(rastval[i]), i);
--- 91,97 ----
              QT_TR_NOOP("Off"), "Bar", "1/2", "1/4", "1/8", "1/16"
              };
!       info->addWidget(new QLabel(tr("Snap")));
!       rasterLabel = new QComboBox;
!       info->addWidget(rasterLabel);
        for (int i = 0; i < 6; i++)
              rasterLabel->insertItem(tr(rastval[i]), i);