From: werner s. <wsc...@us...> - 2004-10-11 18:24:08
|
Update of /cvsroot/lmuse/muse/muse/waveedit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25169/muse/waveedit Modified Files: waveedit.cpp waveedit.h Log Message: use namespace for awl library Index: waveedit.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/waveedit/waveedit.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** waveedit.h 7 Oct 2004 22:36:04 -0000 1.11 --- waveedit.h 11 Oct 2004 18:23:53 -0000 1.12 *************** *** 14,20 **** class WaveView; class ScrollScale; - class AwlPosLabel; class SNode; //--------------------------------------------------------- // WaveEdit --- 14,24 ---- class WaveView; class ScrollScale; class SNode; + namespace Awl { + class PosLabel; + }; + using Awl::PosLabel; + //--------------------------------------------------------- // WaveEdit *************** *** 27,32 **** QToolBar* tb1; QToolButton* solo; ! AwlPosLabel* pos1; ! AwlPosLabel* pos2; static int _widthInit, _heightInit; --- 31,36 ---- QToolBar* tb1; QToolButton* solo; ! PosLabel* pos1; ! PosLabel* pos2; static int _widthInit, _heightInit; Index: waveedit.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/waveedit/waveedit.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** waveedit.cpp 7 Oct 2004 22:36:04 -0000 1.14 --- waveedit.cpp 11 Oct 2004 18:23:52 -0000 1.15 *************** *** 80,85 **** label->setAlignment(AlignRight|AlignVCenter); label->setIndent(3); ! pos1 = new AwlPosLabel(tb1); ! pos2 = new AwlPosLabel(tb1); pos2->setSmpte(true); --- 80,85 ---- label->setAlignment(AlignRight|AlignVCenter); label->setIndent(3); ! pos1 = new PosLabel(tb1); ! pos2 = new PosLabel(tb1); pos2->setSmpte(true); |