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

5 files changed, 87 insertions, 21 deletions

diff --git a/muse2/muse/liste/CMakeLists.txt b/muse2/muse/liste/CMakeLists.txt
index d25a2077..c846d665 100644
--- a/muse2/muse/liste/CMakeLists.txt
+++ b/muse2/muse/liste/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/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp
index fd74d5d3..e211e7f7 100644
--- a/muse2/muse/liste/editevent.cpp
+++ b/muse2/muse/liste/editevent.cpp
@@ -3,6 +3,21 @@
 //  Linux Music Editor
 //    $Id: editevent.cpp,v 1.12.2.6 2009/02/02 21:38:00 terminator356 Exp $
 //  (C) Copyright 1999-2004 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>
@@ -297,7 +312,7 @@ EditMetaDialog::EditMetaDialog(int tick, const Event& ev,
       epos = new Awl::PosEdit;
 
       QLabel* l2 = new QLabel(tr("Meta Type"));
-      il2 = new IntLabel(-1, 0, 127, this, -1);
+      il2 = new MusEWidget::IntLabel(-1, 0, 127, this, -1);
       il2->setFixedWidth(100);
       il2->setFrame(true);
       il2->setDark();
@@ -313,7 +328,7 @@ EditMetaDialog::EditMetaDialog(int tick, const Event& ev,
       connect(hexButton, SIGNAL(toggled(bool)), SLOT(toggled(bool)));
 
       edit = new QTextEdit;
-      edit->setFont(config.fonts[5]);
+      edit->setFont(MusEConfig::config.fonts[5]);
 
       if (!ev.empty()) {
             epos->setValue(tick);
@@ -432,7 +447,7 @@ EditCAfterDialog::EditCAfterDialog(int tick, const Event& event,
       epos = new Awl::PosEdit;
 
       QLabel* l2 = new QLabel(tr("Pressure"));
-      il2  = new IntLabel(-1, 0, 127, this, -1);
+      il2  = new MusEWidget::IntLabel(-1, 0, 127, this, -1);
       il2->setFrame(true);
       il2->setDark();
 
@@ -491,9 +506,9 @@ EditPAfterDialog::EditPAfterDialog(int tick, const Event& event,
       epos = new Awl::PosEdit;
 
       QLabel* l2 = new QLabel(tr("Pitch"));
-      pl = new PitchEdit;
+      pl = new MusEWidget::PitchEdit;
       QLabel* l3 = new QLabel(tr("Pressure"));
-      il2  = new IntLabel(-1, 0, 127, this, -1);
+      il2  = new MusEWidget::IntLabel(-1, 0, 127, this, -1);
       il2->setFrame(true);
       il2->setDark();
 
@@ -681,7 +696,7 @@ EditCtrlDialog::EditCtrlDialog(int tick, const Event& event,
 void EditCtrlDialog::newController()
       {
       //QMenu* pup = new QMenu(this);
-      PopupMenu* pup = new PopupMenu(this);
+      MusEWidget::PopupMenu* pup = new MusEWidget::PopupMenu(this);
       //pup->setCheckable(this);//not necessary in Qt4
       //
       // populate popup with all controllers available for
@@ -856,7 +871,7 @@ void EditCtrlDialog::instrPopup()
       
       ///instr->populatePatchPopup(pop, channel, song->mtype(), track->type() == Track::DRUM);
       //QMenu* pup = new QMenu(this);
-      PopupMenu* pup = new PopupMenu(this);
+      MusEWidget::PopupMenu* pup = new MusEWidget::PopupMenu(this);
       instr->populatePatchPopup(pup, channel, song->mtype(), track->type() == Track::DRUM);
 
       ///if(pop->actions().count() == 0)
diff --git a/muse2/muse/liste/editevent.h b/muse2/muse/liste/editevent.h
index 454e6a69..02befe7e 100644
--- a/muse2/muse/liste/editevent.h
+++ b/muse2/muse/liste/editevent.h
@@ -3,6 +3,21 @@
 //  Linux Music Editor
 //    $Id: editevent.h,v 1.6.2.1 2008/05/21 00:28:53 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 __EDIT_EVENT_H__
@@ -18,8 +33,11 @@ namespace Awl {
       };
 
 ///class PosEdit;
+namespace MusEWidget {
 class IntLabel;
 class PitchEdit;
+}
+
 class QDialog;
 class QLabel;
 class QGridLayout;
@@ -128,7 +146,7 @@ class EditMetaDialog : public EditEventDialog {
       ///PosEdit* epos;
       Awl::PosEdit* epos;
       QTextEdit* edit;
-      IntLabel* il2;
+      MusEWidget::IntLabel* il2;
       QRadioButton* hexButton;
       QLabel* typeLabel;
 
@@ -158,7 +176,7 @@ class EditCAfterDialog : public EditEventDialog {
 
       ///PosEdit* epos;
       Awl::PosEdit* epos;
-      IntLabel* il2;
+      MusEWidget::IntLabel* il2;
 
    protected:
       QGridLayout* layout;
@@ -180,8 +198,8 @@ class EditPAfterDialog : public EditEventDialog {
 
       ///PosEdit* epos;
       Awl::PosEdit* epos;
-      PitchEdit* pl;
-      IntLabel* il2;
+      MusEWidget::PitchEdit* pl;
+      MusEWidget::IntLabel* il2;
 
    protected:
       QGridLayout* layout;
diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp
index bc90433d..e76f68e5 100644
--- a/muse2/muse/liste/listedit.cpp
+++ b/muse2/muse/liste/listedit.cpp
@@ -3,6 +3,21 @@
 //  Linux Music Editor
 //    $Id: listedit.cpp,v 1.11.2.11 2009/05/24 21:43:44 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.
+//
 //=========================================================
 
 #include <QAction>
@@ -366,7 +381,7 @@ QString EventListItem::text(int col) const
                   break;
             case 4:
                   if (event.isNote() || event.type() == PAfter)
-                        s = pitch2string(event.dataA());
+                        s =  pitch2string(event.dataA());
                   else if (event.type() == Controller)
                         s.setNum(event.dataA() & 0xffff);  // mask off type bits
                   else
@@ -468,7 +483,7 @@ ListEdit::ListEdit(PartList* pl)
       QSignalMapper *editSignalMapper = new QSignalMapper(this);
     
       menuEdit = menuBar()->addMenu(tr("&Edit"));
-      menuEdit->addActions(undoRedo->actions());
+      menuEdit->addActions(MusEGlobal::undoRedo->actions());
 
       menuEdit->addSeparator();
 #if 0
@@ -505,7 +520,7 @@ ListEdit::ListEdit(PartList* pl)
       // 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* insertTools = addToolBar(tr("Insert tools"));
       insertTools->setObjectName("list insert tools");
@@ -513,11 +528,11 @@ ListEdit::ListEdit(PartList* pl)
 
       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());
       
       //
       //---------------------------------------------------
@@ -601,7 +616,7 @@ ListEdit::ListEdit(PartList* pl)
 
 ListEdit::~ListEdit()
       {
-      // undoRedo->removeFrom(listTools);  // p4.0.6 Removed
+      // MusEGlobal::undoRedo->removeFrom(listTools);  // p4.0.6 Removed
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/liste/listedit.h b/muse2/muse/liste/listedit.h
index 1b1a8ece..ba26b6b6 100644
--- a/muse2/muse/liste/listedit.h
+++ b/muse2/muse/liste/listedit.h
@@ -3,6 +3,21 @@
 //  Linux Music Editor
 //    $Id: listedit.h,v 1.3.2.3 2006/09/19 22:03:33 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.
+//
 //=========================================================
 
 #ifndef __LIST_EDIT_H__