Major cleanup in the #includes. Moved the contents of all.h into individal files.

7 files changed, 26 insertions, 38 deletions

diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 1e7e323a..2e3944bd 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -13,26 +13,12 @@
 #include <uuid/uuid.h>
 #include <math.h>
 
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qpainter.h>
-#include <qpoint.h>
-#include <qlineedit.h>
-#include <qmessagebox.h>
-#include <qmenudata.h>
-
-#include <QByteArray>
-#include <QMimeData>
-#include <QDrag>
-
-//Added by qt3to4:
-#include <QDragLeaveEvent>
-#include <QMouseEvent>
-#include <QDragEnterEvent>
-#include <QKeyEvent>
-#include <QEvent>
-#include <QDropEvent>
-#include <QDragMoveEvent>
+#include <QClipboard>
+#include <QLineEdit>
+#include <QMenu>
+#include <QMessageBox>
+#include <QPainter>
+#include <QUrl>
 
 #include "widgets/tools.h"
 #include "pcanvas.h"
diff --git a/muse2/muse/arranger/pcanvas.h b/muse2/muse/arranger/pcanvas.h
index 8b589d5c..103b3d02 100644
--- a/muse2/muse/arranger/pcanvas.h
+++ b/muse2/muse/arranger/pcanvas.h
@@ -11,14 +11,15 @@
 #include "song.h"
 #include "canvas.h"
 #include "trackautomationview.h"
-//Added by qt3to4:
-#include <QDragMoveEvent>
-#include <QDropEvent>
-#include <QDragLeaveEvent>
-#include <QMouseEvent>
-#include <QKeyEvent>
-#include <QEvent>
-#include <QDragEnterEvent>
+
+class QDragMoveEvent;
+class QDropEvent;
+class QDragLeaveEvent;
+class QMouseEvent;
+class QKeyEvent;
+class QEvent;
+class QDragEnterEvent;
+
 #define beats     4
 
 //---------------------------------------------------------
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index c7c225d3..7ada6e22 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -18,6 +18,7 @@
 #include <QPaintEvent>
 #include <QPixmap>
 #include <QResizeEvent>
+#include <QScrollBar>
 #include <QWheelEvent>
 
 #include "globals.h"
diff --git a/muse2/muse/arranger/tlist.h b/muse2/muse/arranger/tlist.h
index de631e47..cbdcda5d 100644
--- a/muse2/muse/arranger/tlist.h
+++ b/muse2/muse/arranger/tlist.h
@@ -10,6 +10,8 @@
 
 #include "track.h"
 
+#include <QWidget>
+
 class QKeyEvent;
 class QLineEdit;
 class QMouseEvent;
diff --git a/muse2/muse/arranger/trackautomationview.cpp b/muse2/muse/arranger/trackautomationview.cpp
index 43abcc69..8f7cfb12 100644
--- a/muse2/muse/arranger/trackautomationview.cpp
+++ b/muse2/muse/arranger/trackautomationview.cpp
@@ -1,10 +1,9 @@
 #include "trackautomationview.h"
 #include "math.h"
-#include <qpainter.h>
-#include <qbitmap.h>
-#include <qimage.h>
-//Added by qt3to4:
+
+#include <QPainter>
 #include <QPaintEvent>
+
 #include "track.h"
 
 TrackAutomationView::TrackAutomationView(QWidget *parent, Track *t) : QWidget(parent)
diff --git a/muse2/muse/arranger/trackautomationview.h b/muse2/muse/arranger/trackautomationview.h
index 2631035e..2ef05125 100644
--- a/muse2/muse/arranger/trackautomationview.h
+++ b/muse2/muse/arranger/trackautomationview.h
@@ -1,9 +1,8 @@
 #ifndef TRACKAUTOMATIONVIEW_H
 #define TRACKAUTOMATIONVIEW_H
 
-#include <qwidget.h>
-//Added by qt3to4:
-#include <QPaintEvent>
+class QPaintEvent;
+class QWidget;
 
 #include "track.h"
 
diff --git a/muse2/muse/arranger/trackinfo.cpp b/muse2/muse/arranger/trackinfo.cpp
index fdf0b0ce..3a20accb 100644
--- a/muse2/muse/arranger/trackinfo.cpp
+++ b/muse2/muse/arranger/trackinfo.cpp
@@ -5,10 +5,10 @@
 //  (C) Copyright 1999-2004 Werner Schweer (ws@seh.de)
 //=========================================================
 
-#include <QPalette>
-#include <QColor>
 #include <QMenu>
-#include <QPixmap>
+#include <QPainter>
+#include <QScrollBar>
+#include <QTimer>
 
 #include <math.h>
 #include <string.h>