merged namespace changes. HOPEFULLY the last one.

1 files changed, 21 insertions, 16 deletions

diff --git a/muse2/muse/waveedit/waveedit.h b/muse2/muse/waveedit/waveedit.h
index 64929555..b40aa93a 100644
--- a/muse2/muse/waveedit/waveedit.h
+++ b/muse2/muse/waveedit/waveedit.h
@@ -33,18 +33,21 @@
 
 #include "midieditor.h"
 
+class QAction;
+class QResizeEvent;
+class QSlider;
 class QToolButton;
+
+namespace MusECore {
 class PartList;
-class WaveView;
-class ScrollScale;
-class QSlider;
-class QResizeEvent;
-class SNode;
-class QAction;
+}
+
+namespace MusEGui {
 
-namespace MusEWidget {
 class PosLabel;
-}
+class ScrollScale;
+class SNode;
+class WaveView;
 
 //---------------------------------------------------------
 //   WaveEdit
@@ -58,8 +61,8 @@ class WaveEdit : public MidiEditor {
       QToolBar* tools;
       QToolBar* tb1;
       QToolButton* solo;
-      MusEWidget::PosLabel* pos1;
-      MusEWidget::PosLabel* pos2;
+      MusEGui::PosLabel* pos1;
+      MusEGui::PosLabel* pos2;
       QAction* selectAllAction;
       QAction* selectNoneAction;
       QAction* cutAction;
@@ -91,15 +94,15 @@ class WaveEdit : public MidiEditor {
 
 
    signals:
-      void deleted(TopWin*);
+      void deleted(MusEGui::TopWin*);
 
    public:
-      WaveEdit(PartList*);
+      WaveEdit(MusECore::PartList*);
       ~WaveEdit();
-      virtual void readStatus(Xml&);
-      virtual void writeStatus(int, Xml&) const;
-      static void readConfiguration(Xml&);
-      static void writeConfiguration(int, Xml&);
+      virtual void readStatus(MusECore::Xml&);
+      virtual void writeStatus(int, MusECore::Xml&) const;
+      static void readConfiguration(MusECore::Xml&);
+      static void writeConfiguration(int, MusECore::Xml&);
 
       enum { CMD_MUTE=0, CMD_NORMALIZE, CMD_FADE_IN, CMD_FADE_OUT, CMD_REVERSE,
              CMD_GAIN_FREE, CMD_GAIN_200, CMD_GAIN_150, CMD_GAIN_75, CMD_GAIN_50, CMD_GAIN_25,
@@ -108,5 +111,7 @@ class WaveEdit : public MidiEditor {
              CMD_SELECT_ALL, CMD_SELECT_NONE };
       };
 
+} // namespace MusEGui
+
 #endif