Converted Qt3 methods to Qt4. Ported song.cpp

1 files changed, 6 insertions, 10 deletions

diff --git a/muse2/muse/song.h b/muse2/muse/song.h
index e5f854b0..5661fee3 100644
--- a/muse2/muse/song.h
+++ b/muse2/muse/song.h
@@ -9,14 +9,6 @@
 #ifndef __SONG_H__
 #define __SONG_H__
 
-#include <qstring.h>
-#include <qobject.h>
-#include <qfont.h>
-//Added by qt3to4:
-//#include <Q3PopupMenu>
-#include <QMenu>
-#include <QEvent>
-
 #include "pos.h"
 #include "globaldefs.h"
 #include "tempo.h"
@@ -25,6 +17,12 @@
 #include "undo.h"
 #include "track.h"
 
+class QFont;
+class QMenu;
+class QButton;
+class QString;
+class QStringList;
+
 class SynthI;
 struct MidiMsg;
 struct AudioMsg;
@@ -40,8 +38,6 @@ class EventList;
 class MarkerList;
 class Marker;
 class SNode;
-class QMenu;
-class QButton;
 
 class MidiPort;
 class MidiDevice;