diff options
| author | Florian Jung <flo@windfisch.org> | 2011-12-21 17:39:57 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-12-21 17:39:57 +0000 |
| commit | 1057d7190242cdf9248671b316a398db805f5f56 (patch) | |
| tree | ab50268a7db2f80cfb45a7ad6578fe735ab84ce5 /muse2/muse/globals.h | |
| parent | 9977c7114089b8708d310268833b83343caa0fd1 (diff) | |
| parent | c36a5508aa42e596b005425208054af9a60734b4 (diff) | |
merged with trunk (that is, pulled the fixes from release_2_0)
only quickly tested, seems okay on the first glance
Diffstat (limited to 'muse2/muse/globals.h')
| -rw-r--r-- | muse2/muse/globals.h | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/muse2/muse/globals.h b/muse2/muse/globals.h index c0a3395a..7563c171 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,20 @@ 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* project_create_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; |