merged the first bunch of orcans changes

STILL WAIT WITH COMMITTING NEW STUFF! i have to merge the rest as well!

this is a bit buggy (connect errors, not tested much), but doesn't
segfault immediately

1 files changed, 34 insertions, 16 deletions

diff --git a/muse2/muse/master/masteredit.h b/muse2/muse/master/masteredit.h
index 4e66f70e..4f188813 100644
--- a/muse2/muse/master/masteredit.h
+++ b/muse2/muse/master/masteredit.h
@@ -3,6 +3,21 @@
 //  Linux Music Editor
 //    $Id: masteredit.h,v 1.3.2.2 2009/04/01 01:37:11 terminator356 Exp $
 //  (C) Copyright 1999 Werner Schweer (ws@seh.de)
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; version 2 of
+//  the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
 //=========================================================
 
 #ifndef __MASTER_EDIT_H__
@@ -25,15 +40,18 @@ class QToolBar;
 class QToolButton;
 
 class Master;
-class ScrollScale;
-class MTScale;
-class SigScale;
-class HitScale;
 class TScale;
-class TempoEdit;
+
+namespace MusEWidget {
+class HitScale;
 class LabelCombo;
+class MTScale;
 class PosLabel;
+class ScrollScale;
+class SigScale;
+class TempoEdit;
 class TempoLabel;
+}
 
 //---------------------------------------------------------
 //   MasterEdit
@@ -43,21 +61,21 @@ class MasterEdit : public MidiEditor {
       Q_OBJECT
     
       Master* canvas;
-      ScrollScale* hscroll;
-      ScrollScale* vscroll;
-      MTScale* time1;
-      MTScale* time2;
-      SigScale* sign;
-      HitScale* thits;
-      HitScale* zhits;
+      MusEWidget::ScrollScale* hscroll;
+      MusEWidget::ScrollScale* vscroll;
+      MusEWidget::MTScale* time1;
+      MusEWidget::MTScale* time2;
+      MusEWidget::SigScale* sign;
+      MusEWidget::HitScale* thits;
+      MusEWidget::HitScale* zhits;
       TScale* tscale;
 
-      TempoEdit* curTempo;
+      MusEWidget::TempoEdit* curTempo;
       SigEdit* curSig;
-      LabelCombo* rasterLabel;
+      MusEWidget::LabelCombo* rasterLabel;
       QToolBar* tools;
-      PosLabel* cursorPos;
-      TempoLabel* tempo;
+      MusEWidget::PosLabel* cursorPos;
+      MusEWidget::TempoLabel* tempo;
       QToolButton* enableButton;
       
       static int _rasterInit;