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, 20 insertions, 2 deletions

diff --git a/muse2/muse/plugin.h b/muse2/muse/plugin.h
index dec77d2f..2a98760e 100644
--- a/muse2/muse/plugin.h
+++ b/muse2/muse/plugin.h
@@ -4,6 +4,21 @@
 //  $Id: plugin.h,v 1.9.2.13 2009/12/06 01:25:21 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.
+//
 //=========================================================
 
 #ifndef __PLUGIN_H__
@@ -46,8 +61,11 @@ class QToolButton;
 class QTreeWidget;
 
 class Xml;
-class Slider;
+
+namespace MusEWidget {
 class DoubleLabel;
+}
+
 class AudioTrack;
 class MidiController;
 
@@ -250,7 +268,7 @@ struct GuiParam {
       int type;
       int hint;
       
-      DoubleLabel* label;
+      MusEWidget::DoubleLabel* label;
       QWidget* actuator;  // Slider or Toggle Button (SWITCH)
       };