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

9 files changed, 188 insertions, 62 deletions

diff --git a/muse2/muse/master/CMakeLists.txt b/muse2/muse/master/CMakeLists.txt
index ed2bd2db..ffbd4fa3 100644
--- a/muse2/muse/master/CMakeLists.txt
+++ b/muse2/muse/master/CMakeLists.txt
@@ -3,10 +3,12 @@
 #  Linux Music Editor
 #  $Id:$
 #
-#  Copyright (C) 2002-2006 by Werner Schweer and others
+#  Copyright (C) 1999-2011 by Werner Schweer and others
 #
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License version 2.
+#  it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either 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
@@ -14,8 +16,9 @@
 #  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+#  along with this program; if not, write to the
+#  Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #=============================================================================
 
 ##
diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp
index 5370a493..5575b64e 100644
--- a/muse2/muse/master/lmaster.cpp
+++ b/muse2/muse/master/lmaster.cpp
@@ -3,6 +3,21 @@
 //  Linux Music Editor
 //    $Id: lmaster.cpp,v 1.2.2.8 2009/03/09 02:05:18 terminator356 Exp $
 //  (C) Copyright 2000 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.
+//
 //=========================================================
 
 #include "awl/posedit.h"
@@ -144,7 +159,7 @@ LMaster::LMaster()
       //---------Pulldown Menu----------------------------
       menuEdit = menuBar()->addMenu(tr("&Edit"));
       QSignalMapper *signalMapper = new QSignalMapper(this);
-      menuEdit->addActions(undoRedo->actions());
+      menuEdit->addActions(MusEGlobal::undoRedo->actions());
       menuEdit->addSeparator();
       tempoAction = menuEdit->addAction(tr("Insert Tempo"));
       signAction = menuEdit->addAction(tr("Insert Signature"));
@@ -179,7 +194,7 @@ LMaster::LMaster()
       // Toolbars ---------------------------------------------------------
       QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));
       undo_tools->setObjectName("Undo/Redo tools");
-      undo_tools->addActions(undoRedo->actions());
+      undo_tools->addActions(MusEGlobal::undoRedo->actions());
 
       QToolBar* edit = addToolBar(tr("Edit tools"));
       edit->setObjectName("Master List Edit Tools");
@@ -198,11 +213,11 @@ LMaster::LMaster()
       
       QToolBar* panic_toolbar = addToolBar(tr("panic"));         
       panic_toolbar->setObjectName("panic");
-      panic_toolbar->addAction(panicAction);
+      panic_toolbar->addAction(MusEGlobal::panicAction);
 
       QToolBar* transport_toolbar = addToolBar(tr("transport"));
       transport_toolbar->setObjectName("transport");
-      transport_toolbar->addActions(transportAction->actions());
+      transport_toolbar->addActions(MusEGlobal::transportAction->actions());
 
       ///Q3Accel* qa = new Q3Accel(this);
       ///qa->connectItem(qa->insertItem(Qt::CTRL+Qt::Key_Z), song, SLOT(undo()));
@@ -844,7 +859,7 @@ LMasterKeyEventItem::LMasterKeyEventItem(QTreeWidget* parent, const KeyEvent& ev
       AL::sigmap.tickValues(t, &bar, &beat, &tick);
       c1.sprintf("%04d.%02d.%03d", bar+1, beat+1, tick);
 
-      double time = double(tempomap.tick2frame(t)) / double(sampleRate);
+      double time = double(tempomap.tick2frame(t)) / double(MusEGlobal::sampleRate);
       int min = int(time) / 60;
       int sec = int(time) % 60;
       int msec = int((time - (min*60 + sec)) * 1000.0);
@@ -875,7 +890,7 @@ LMasterTempoItem::LMasterTempoItem(QTreeWidget* parent, const TEvent* ev)
       AL::sigmap.tickValues(t, &bar, &beat, &tick);
       c1.sprintf("%04d.%02d.%03d", bar+1, beat+1, tick);
 
-      double time = double(tempomap.tick2frame(t) /*ev->frame*/) / double(sampleRate);
+      double time = double(tempomap.tick2frame(t) /*ev->frame*/) / double(MusEGlobal::sampleRate);
       int min = int(time) / 60;
       int sec = int(time) % 60;
       int msec = int((time - (min*60 + sec)) * 1000.0);
@@ -903,7 +918,7 @@ LMasterSigEventItem::LMasterSigEventItem(QTreeWidget* parent, const AL::SigEvent
       AL::sigmap.tickValues(t, &bar, &beat, &tick);
       c1.sprintf("%04d.%02d.%03d", bar+1, beat+1, tick);
 
-      double time = double(tempomap.tick2frame(t)) / double (sampleRate);
+      double time = double(tempomap.tick2frame(t)) / double (MusEGlobal::sampleRate);
       int min = int(time) / 60;
       int sec = int(time) % 60;
       int msec = int((time - (min*60 + sec)) * 1000.0);
diff --git a/muse2/muse/master/lmaster.h b/muse2/muse/master/lmaster.h
index 9372d1b2..4d2c03e9 100644
--- a/muse2/muse/master/lmaster.h
+++ b/muse2/muse/master/lmaster.h
@@ -3,6 +3,21 @@
 //  Linux Music Editor
 //    $Id: lmaster.h,v 1.1.1.1.2.5 2005/12/11 21:29:23 spamatica Exp $
 //  (C) Copyright 2000 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 __LMASTER_EDIT_H__
diff --git a/muse2/muse/master/master.cpp b/muse2/muse/master/master.cpp
index 6293e64c..e9212be9 100644
--- a/muse2/muse/master/master.cpp
+++ b/muse2/muse/master/master.cpp
@@ -3,6 +3,21 @@
 //  Linux Music Editor
 //    $Id: master.cpp,v 1.3 2004/04/11 13:03:32 wschweer Exp $
 //  (C) Copyright 2000 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.
+//
 //=========================================================
 
 #include <stdio.h>
@@ -191,21 +206,21 @@ void Master::draw(QPainter& p, const QRect& rect)
 void Master::viewMousePressEvent(QMouseEvent* event)
       {
       start = event->pos();
-      Tool activeTool = tool;
+      MusEWidget::Tool activeTool = tool;
 //      bool shift = event->state() & ShiftButton;
 
       switch (activeTool) {
-            case PointerTool:
+            case MusEWidget::PointerTool:
                   drag = DRAG_LASSO_START;
                   break;
 
-            case PencilTool:
+            case MusEWidget::PencilTool:
                   drag = DRAG_NEW;
                   song->startUndo();
                   newVal(start.x(), start.x(), start.y());
                   break;
 
-            case RubberTool:
+            case MusEWidget::RubberTool:
                   drag = DRAG_DELETE;
                   song->startUndo();
                   deleteVal(start.x(), start.x());
@@ -302,11 +317,11 @@ void Master::deleteVal(int x1, int x2)
 
 void Master::setTool(int t)
       {
-      if (tool == Tool(t))
+      if (tool == MusEWidget::Tool(t))
             return;
-      tool = Tool(t);
+      tool = MusEWidget::Tool(t);
       switch(tool) {
-            case PencilTool:
+            case MusEWidget::PencilTool:
                   setCursor(QCursor(*pencilIcon, 4, 15));
                   break;
             default:
diff --git a/muse2/muse/master/master.h b/muse2/muse/master/master.h
index 2415b15e..4f181755 100644
--- a/muse2/muse/master/master.h
+++ b/muse2/muse/master/master.h
@@ -3,6 +3,21 @@
 //  Linux Music Editor
 //    $Id: master.h,v 1.3 2004/04/11 13:03:32 wschweer 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_H__
@@ -25,7 +40,7 @@ class ScrollScale;
 //   Master
 //---------------------------------------------------------
 
-class Master : public View {
+class Master : public MusEWidget::View {
       Q_OBJECT
       enum DragMode { DRAG_OFF, DRAG_NEW, DRAG_MOVE_START, DRAG_MOVE,
             DRAG_DELETE, DRAG_COPY_START, DRAG_COPY,
@@ -34,7 +49,7 @@ class Master : public View {
       ScrollScale* vscroll;
       unsigned pos[3];
       QPoint start;
-      Tool tool;
+      MusEWidget::Tool tool;
       DragMode drag;
       MidiEditor* editor;
 
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index 1eb2d071..976d90b9 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -3,6 +3,21 @@
 //  Linux Music Editor
 //    $Id: masteredit.cpp,v 1.4.2.5 2009/07/01 22:14:56 spamatica 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.
+//
 //=========================================================
 
 #include "awl/sigedit.h"
@@ -96,18 +111,18 @@ MasterEdit::MasterEdit()
       // Toolbars ---------------------------------------------------------
       QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));
       undo_tools->setObjectName("Undo/Redo tools");
-      undo_tools->addActions(undoRedo->actions());
+      undo_tools->addActions(MusEGlobal::undoRedo->actions());
 
 
       QToolBar* panic_toolbar = addToolBar(tr("panic"));         
       panic_toolbar->setObjectName("panic");
-      panic_toolbar->addAction(panicAction);
+      panic_toolbar->addAction(MusEGlobal::panicAction);
 
       QToolBar* transport_toolbar = addToolBar(tr("transport"));
       transport_toolbar->setObjectName("transport");
-      transport_toolbar->addActions(transportAction->actions());
+      transport_toolbar->addActions(MusEGlobal::transportAction->actions());
 
-      EditToolBar* tools2 = new EditToolBar(this, PointerTool | PencilTool | RubberTool);
+      MusEWidget::EditToolBar* tools2 = new MusEWidget::EditToolBar(this, MusEWidget::PointerTool | MusEWidget::PencilTool | MusEWidget::RubberTool);
       addToolBar(tools2);
 
       QToolBar* enableMaster = addToolBar(tr("Enable master"));
@@ -127,11 +142,11 @@ MasterEdit::MasterEdit()
       label->setIndent(3);
       info->addWidget(label);
 
-      cursorPos = new PosLabel(0);
+      cursorPos = new MusEWidget::PosLabel(0);
       cursorPos->setFixedHeight(22);
       cursorPos->setToolTip(tr("time at cursor position"));
       info->addWidget(cursorPos);
-      tempo = new TempoLabel(0);
+      tempo = new MusEWidget::TempoLabel(0);
       tempo->setFixedHeight(22);
       tempo->setToolTip(tr("tempo at cursor position"));
       info->addWidget(tempo);
@@ -139,7 +154,7 @@ MasterEdit::MasterEdit()
       const char* rastval[] = {
             QT_TRANSLATE_NOOP("@default", "Off"), "Bar", "1/2", "1/4", "1/8", "1/16"
             };
-      rasterLabel = new LabelCombo(tr("Snap"), 0);
+      rasterLabel = new MusEWidget::LabelCombo(tr("Snap"), 0);
       rasterLabel->setFocusPolicy(Qt::NoFocus);
       for (int i = 0; i < 6; i++)
             rasterLabel->insertItem(i, tr(rastval[i]));
@@ -149,7 +164,7 @@ MasterEdit::MasterEdit()
 
       //---------values for current position---------------
       info->addWidget(new QLabel(tr("CurPos ")));
-      curTempo = new TempoEdit(0);
+      curTempo = new MusEWidget::TempoEdit(0);
       curSig   = new SigEdit(0);
       curSig->setValue(AL::TimeSignature(4, 4));
       curTempo->setToolTip(tr("tempo at current position"));
@@ -168,17 +183,17 @@ MasterEdit::MasterEdit()
 
       int xscale = -20;
       int yscale = -500;
-      hscroll   = new ScrollScale(-100, -2, xscale, song->len(), Qt::Horizontal, mainw);
-      vscroll   = new ScrollScale(-1000, -100, yscale, 120000, Qt::Vertical, mainw);
+      hscroll   = new MusEWidget::ScrollScale(-100, -2, xscale, song->len(), Qt::Horizontal, mainw);
+      vscroll   = new MusEWidget::ScrollScale(-1000, -100, yscale, 120000, Qt::Vertical, mainw);
       vscroll->setRange(30000, 250000);
-      time1     = new MTScale(&_raster, mainw, xscale);
-      sign      = new SigScale(&_raster, mainw, xscale);
-//      thits     = new HitScale(&_raster, mainw, xscale);
+      time1     = new MusEWidget::MTScale(&_raster, mainw, xscale);
+      sign      = new MusEWidget::SigScale(&_raster, mainw, xscale);
+//      thits     = new MusEWidget::HitScale(&_raster, mainw, xscale);
 
       canvas    = new Master(this, mainw, xscale, yscale);
 
-//      zhits     = new HitScale(&_raster, mainw, xscale);
-      time2     = new MTScale(&_raster, mainw, xscale);
+//      zhits     = new MusEWidget::HitScale(&_raster, mainw, xscale);
+      time2     = new MusEWidget::MTScale(&_raster, mainw, xscale);
       tscale    = new TScale(mainw, yscale);
       time2->setBarLocator(true);
 
@@ -191,18 +206,18 @@ MasterEdit::MasterEdit()
       mainGrid->setRowStretch(5, 100);
       mainGrid->setColumnStretch(1, 100);
 
-      mainGrid->addWidget(hLine(mainw),  0, 1);
+      mainGrid->addWidget(MusEUtil::hLine(mainw),  0, 1);
       mainGrid->addWidget(time1,         1, 1);
-      mainGrid->addWidget(hLine(mainw),  2, 1);
+      mainGrid->addWidget(MusEUtil::hLine(mainw),  2, 1);
       mainGrid->addWidget(sign,          3, 1);
-      mainGrid->addWidget(hLine(mainw),  4, 1);
+      mainGrid->addWidget(MusEUtil::hLine(mainw),  4, 1);
 //    mainGrid->addWidget(thits,         5, 1);
-//    mainGrid->addWidget(hLine(mainw),  6, 1);
+//    mainGrid->addWidget(MusEUtil::hLine(mainw),  6, 1);
       mainGrid->addWidget(canvas,        5, 1);
       mainGrid->addWidget(tscale,        5, 0);
-      mainGrid->addWidget(hLine(mainw),  6, 1);
+      mainGrid->addWidget(MusEUtil::hLine(mainw),  6, 1);
 //    mainGrid->addWidget(zhits,         9, 1);
-//    mainGrid->addWidget(hLine(mainw),  7, 1);
+//    mainGrid->addWidget(MusEUtil::hLine(mainw),  7, 1);
       mainGrid->addWidget(time2,         7, 1);
       mainGrid->addWidget(hscroll,       8, 1);
       mainGrid->addWidget(vscroll, 0, 2, 10, 1);
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;
diff --git a/muse2/muse/master/tscale.cpp b/muse2/muse/master/tscale.cpp
index 9ea34fba..e25c3454 100644
--- a/muse2/muse/master/tscale.cpp
+++ b/muse2/muse/master/tscale.cpp
@@ -3,6 +3,21 @@
 //  Linux Music Editor
 //    $Id: tscale.cpp,v 1.2 2003/12/17 11:04:14 wschweer 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.
+//
 //=========================================================
 
 #include <stdio.h>
@@ -20,8 +35,8 @@
 TScale::TScale(QWidget* parent, int ymag)
    : View(parent, 1, ymag)
       {
-      setFont(config.fonts[4]);
-      //int w = 4 * QFontMetrics(config.fonts[4]).width('0');
+      setFont(MusEConfig::config.fonts[4]);
+      //int w = 4 * QFontMetrics(MusEConfig::config.fonts[4]).width('0');
       int w = 4 * fontMetrics().width('0');
       setFixedWidth(w);
       setMouseTracking(true);
@@ -35,7 +50,7 @@ void TScale::pdraw(QPainter& p, const QRect& r)
       {
       int y = r.y();
       int h = r.height();
-      //p.setFont(config.fonts[4]);
+      //p.setFont(MusEConfig::config.fonts[4]);
       QString s;
       for (int i = 30000; i <= 250000; i += 10000) {
             int yy =  mapy(280000 - i);
@@ -45,7 +60,7 @@ void TScale::pdraw(QPainter& p, const QRect& r)
                   continue;
             p.drawLine(0, yy, width(), yy);
             s.setNum(i/1000);
-            //QFontMetrics fm(config.fonts[4]);
+            //QFontMetrics fm(MusEConfig::config.fonts[4]);
             //p.drawText(width() - fm.width(s) - 1, yy-2, s);
             p.drawText(width() - fontMetrics().width(s) - 1, yy-2, s);  // Use the window font. Tim p4.0.31
             }
diff --git a/muse2/muse/master/tscale.h b/muse2/muse/master/tscale.h
index d7ce86c9..2c03839f 100644
--- a/muse2/muse/master/tscale.h
+++ b/muse2/muse/master/tscale.h
@@ -3,6 +3,21 @@
 //  Linux Music Editor
 //    $Id: tscale.h,v 1.1.1.1 2003/10/27 18:52:36 wschweer 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 __TSCALE_H__
@@ -14,7 +29,7 @@
 //   Tscale
 //---------------------------------------------------------
 
-class TScale : public View {
+class TScale : public MusEWidget::View {
       Q_OBJECT
         
       double curTempo;