housekeeping: pulled fixes from release into trunk

1 files changed, 13 insertions, 28 deletions

diff --git a/muse2/muse/globals.h b/muse2/muse/globals.h
index c0a3395a..ae624fb8 100644
--- a/muse2/muse/globals.h
+++ b/muse2/muse/globals.h
@@ -34,7 +34,6 @@
 class QString;
 class QAction;
 class QActionGroup;
-class QStringList;
 class QTimer;
 
 namespace MusEGui {
@@ -91,33 +90,19 @@ extern bool realTimeScheduling;
 extern int realTimePriority;
 extern int midiRTPrioOverride;
 
-/*
-extern const char* midi_file_pattern[];  //!< File name pattern for midi files
-extern const char* midi_file_save_pattern[];  //!< File name pattern for saving midi files
-extern const char* med_file_pattern[];   //!< File name pattern for muse project files
-extern const char* med_file_save_pattern[];   //!< File name pattern for saving muse project files
-extern const char* image_file_pattern[]; //!< File name pattern for image files (gfx)
-//extern const char* ctrl_file_pattern[];  //!< File name pattern for controller-files
-extern const char* part_file_pattern[];  //!< File name pattern for part files
-extern const char* part_file_save_pattern[];  //!< File name pattern for saving part files
-//extern const char* plug_file_pattern[];  //!< File name pattern for plugin files
-extern const char* preset_file_pattern[];  //!< File name pattern for plugin files
-extern const char* preset_file_save_pattern[];  //!< File name pattern for saving plugin files
-*/
-
-extern const QStringList midi_file_pattern;
-extern const QStringList midi_file_save_pattern;
-extern const QStringList med_file_pattern;
-extern const QStringList med_file_save_pattern;
-extern const QStringList image_file_pattern;
-//extern const QStringList ctrl_file_pattern;
-extern const QStringList part_file_pattern;
-extern const QStringList part_file_save_pattern;
-extern const QStringList preset_file_pattern;
-extern const QStringList preset_file_save_pattern;
-extern const QStringList drum_map_file_pattern;
-extern const QStringList drum_map_file_save_pattern;
-extern const QStringList audio_file_pattern;
+extern const char* midi_file_pattern[];
+extern const char* midi_file_save_pattern[];
+extern const char* med_file_pattern[];
+extern const char* med_file_save_pattern[];
+extern const char* image_file_pattern[];
+//extern const char* ctrl_file_pattern[];
+extern const char* part_file_pattern[];
+extern const char* part_file_save_pattern[];
+extern const char* preset_file_pattern[];
+extern const char* preset_file_save_pattern[];
+extern const char* drum_map_file_pattern[];
+extern const char* drum_map_file_save_pattern[];
+extern const char* audio_file_pattern[];
 
 ///extern Qt::ButtonState globalKeyState;
 extern Qt::KeyboardModifiers globalKeyState;