[Lmuse-cvs-traffic] muse/muse/master masteredit.cpp,1.11,1.12 masteredit.h,1.9,1.10

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

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

Modified Files:
	masteredit.cpp masteredit.h 
Log Message:
use namespace for awl library


Index: masteredit.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/master/masteredit.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** masteredit.h	20 Sep 2004 15:10:45 -0000	1.9
--- masteredit.h	11 Oct 2004 18:23:51 -0000	1.10
***************
*** 18,26 ****
  class SigScale;
  class TScale;
- class AwlTempoEdit;
- class AwlSigEdit;
  class LabelCombo;
! class AwlPosLabel;
! class AwlTempoLabel;
  
  //---------------------------------------------------------
--- 18,33 ----
  class SigScale;
  class TScale;
  class LabelCombo;
! 
! namespace Awl {
!       class TempoEdit;
!       class SigEdit;
!       class PosLabel;
!       class TempoLabel;
!       };
! using Awl::TempoEdit;
! using Awl::SigEdit;
! using Awl::PosLabel;
! using Awl::TempoLabel;
  
  //---------------------------------------------------------
***************
*** 35,44 ****
        TScale* tscale;
  
!       AwlTempoEdit* curTempo;
!       AwlSigEdit* curSig;
        LabelCombo* rasterLabel;
        QToolBar* tools;
!       AwlPosLabel* cursorPos;
!       AwlTempoLabel* tempo;
  
        Q_OBJECT
--- 42,51 ----
        TScale* tscale;
  
!       TempoEdit* curTempo;
!       SigEdit* curSig;
        LabelCombo* rasterLabel;
        QToolBar* tools;
!       PosLabel* cursorPos;
!       TempoLabel* tempo;
  
        Q_OBJECT

Index: masteredit.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/master/masteredit.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** masteredit.cpp	4 Oct 2004 19:48:35 -0000	1.11
--- masteredit.cpp	11 Oct 2004 18:23:51 -0000	1.12
***************
*** 87,92 ****
        label->setIndent(3);
  
!       cursorPos = new AwlPosLabel(info);
!       tempo = new AwlTempoLabel(info);
  
        const char* rastval[] = {
--- 87,92 ----
        label->setIndent(3);
  
!       cursorPos = new PosLabel(info);
!       tempo = new TempoLabel(info);
  
        const char* rastval[] = {
***************
*** 104,110 ****
        //---------values for current position---------------
        new QLabel(tr("CurPos "), info);
!       curTempo = new AwlTempoEdit(info);
!       curSig   = new AwlSigEdit(info);
!       curSig->setValue(Sig(4, 4));
        QToolTip::add(curTempo, tr("tempo at current position"));
        QToolTip::add(curSig, tr("time signature at current position"));
--- 104,110 ----
        //---------values for current position---------------
        new QLabel(tr("CurPos "), info);
!       curTempo = new TempoEdit(info);
!       curSig   = new SigEdit(info);
!       curSig->setValue(Awl::Sig(4, 4));
        QToolTip::add(curTempo, tr("tempo at current position"));
        QToolTip::add(curSig, tr("time signature at current position"));
***************
*** 247,251 ****
  
              curTempo->setValue(double(60000000.0/tempo));
!             curSig->setValue(Sig(z, n));
  
              curTempo->blockSignals(false);
--- 247,251 ----
  
              curTempo->setValue(double(60000000.0/tempo));
!             curSig->setValue(Awl::Sig(z, n));
  
              curTempo->blockSignals(false);