summaryrefslogtreecommitdiff
path: root/muse2/muse/globals.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-10-08 13:47:24 +0000
committerFlorian Jung <flo@windfisch.org>2011-10-08 13:47:24 +0000
commita347445db32f51562aee5c6a786c312d1f612d2f (patch)
treeba3dc9a6e03eec2edf2c213b7f4d7e5e49903edc /muse2/muse/globals.h
parent375d6a53630f364c6560eb40255a8cc4c0496b8c (diff)
parent5367067f7a36dce8a362dcc000d41ac581bffdfe (diff)
merged namespace changes. HOPEFULLY the last one.
Diffstat (limited to 'muse2/muse/globals.h')
-rw-r--r--muse2/muse/globals.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/muse2/muse/globals.h b/muse2/muse/globals.h
index 33c32c20..c0a3395a 100644
--- a/muse2/muse/globals.h
+++ b/muse2/muse/globals.h
@@ -37,7 +37,7 @@ class QActionGroup;
class QStringList;
class QTimer;
-namespace MusEApp {
+namespace MusEGui {
class MusE;
}
@@ -162,7 +162,7 @@ extern QAction* panicAction;
//class AudioMixerApp;
//extern AudioMixerApp* audioMixer;
-extern MusEApp::MusE* muse;
+extern MusEGui::MusE* muse;
extern int preMeasures;
extern unsigned char measureClickNote;