Replace #include directives with forward declarations

8 files changed, 17 insertions, 16 deletions

diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp
index 4cb31e36de..969f43f8d9 100644
--- a/src/widget/wtrackmenu.cpp
+++ b/src/widget/wtrackmenu.cpp
@@ -10,6 +10,8 @@
 #include "library/crate/cratefeaturehelper.h"
 #include "library/dao/trackdao.h"
 #include "library/dao/trackschema.h"
+#include "library/dlgtagfetcher.h"
+#include "library/dlgtrackinfo.h"
 #include "library/dlgtrackmetadataexport.h"
 #include "library/externaltrackcollection.h"
 #include "library/library.h"
diff --git a/src/widget/wtrackmenu.h b/src/widget/wtrackmenu.h
index 67957ad76b..f4a25a4794 100644
--- a/src/widget/wtrackmenu.h
+++ b/src/widget/wtrackmenu.h
@@ -1,17 +1,19 @@
 #pragma once
 
 #include <QMenu>
+#include <QModelIndex>
+#include <QPointer>
 
 #include "library/dao/playlistdao.h"
-#include "library/dlgtagfetcher.h"
-#include "library/dlgtrackinfo.h"
-#include "library/trackmodel.h"
+#include "preferences/usersettings.h"
+#include "track/track.h"
 
 class ControlProxy;
 class DlgTagFetcher;
 class DlgTrackInfo;
 class ExternalTrackCollection;
 class TrackCollectionManager;
+class TrackModel;
 class WColorPickerAction;
 class WCoverArtMenu;
 
diff --git a/src/widget/wtrackproperty.cpp b/src/widget/wtrackproperty.cpp
index b657b5db19..294102a27e 100644
--- a/src/widget/wtrackproperty.cpp
+++ b/src/widget/wtrackproperty.cpp
@@ -2,6 +2,7 @@
 #include <QUrl>
 
 #include "control/controlobject.h"
+#include "widget/wtrackmenu.h"
 #include "widget/wtrackproperty.h"
 #include "util/dnd.h"
 
diff --git a/src/widget/wtrackproperty.h b/src/widget/wtrackproperty.h
index 47b7f9ce23..e66ac282bb 100644
--- a/src/widget/wtrackproperty.h
+++ b/src/widget/wtrackproperty.h
@@ -1,5 +1,4 @@
-#ifndef WTRACKPROPERTY_H
-#define WTRACKPROPERTY_H
+#pragma once
 
 #include <QDragEnterEvent>
 #include <QDropEvent>
@@ -11,7 +10,8 @@
 #include "util/parented_ptr.h"
 #include "widget/trackdroptarget.h"
 #include "widget/wlabel.h"
-#include "widget/wtrackmenu.h"
+
+class WTrackMenu;
 
 class WTrackProperty : public WLabel, public TrackDropTarget {
     Q_OBJECT
@@ -52,6 +52,3 @@ signals:
 
     const parented_ptr<WTrackMenu> m_pTrackMenu;
 };
-
-
-#endif /* WTRACKPROPERTY_H */
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index a4fce2e8ec..c50b6e56cf 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -20,6 +20,7 @@
 #include "util/assert.h"
 #include "util/dnd.h"
 #include "util/time.h"
+#include "widget/wtrackmenu.h"
 #include "widget/wtracktableviewheader.h"
 
 WTrackTableView::WTrackTableView(QWidget* parent,
diff --git a/src/widget/wtracktableview.h b/src/widget/wtracktableview.h
index f185d46165..4ec2d68017 100644
--- a/src/widget/wtracktableview.h
+++ b/src/widget/wtracktableview.h
@@ -12,13 +12,13 @@
 #include "util/duration.h"
 #include "util/parented_ptr.h"
 #include "widget/wlibrarytableview.h"
-#include "widget/wtrackmenu.h"
 
 class ControlProxy;
 class DlgTagFetcher;
 class DlgTrackInfo;
 class TrackCollectionManager;
 class ExternalTrackCollection;
+class WTrackMenu;
 
 const QString WTRACKTABLEVIEW_VSCROLLBARPOS_KEY = "VScrollBarPos"; /** ConfigValue key for QTable vertical scrollbar position */
 const QString LIBRARY_CONFIGVALUE = "[Library]"; /** ConfigValue "value" (wtf) for library stuff */
diff --git a/src/widget/wtracktext.cpp b/src/widget/wtracktext.cpp
index 359f98412c..591338c3d0 100644
--- a/src/widget/wtracktext.cpp
+++ b/src/widget/wtracktext.cpp
@@ -3,6 +3,7 @@
 #include <QUrl>
 
 #include "control/controlobject.h"
+#include "widget/wtrackmenu.h"
 #include "widget/wtracktext.h"
 #include "util/dnd.h"
 
diff --git a/src/widget/wtracktext.h b/src/widget/wtracktext.h
index c726d63fd0..fd49f28242 100644
--- a/src/widget/wtracktext.h
+++ b/src/widget/wtracktext.h
@@ -1,5 +1,4 @@
-#ifndef WTRACKTEXT_H
-#define WTRACKTEXT_H
+#pragma once
 
 #include <QDragEnterEvent>
 #include <QDropEvent>
@@ -10,7 +9,8 @@
 #include "util/parented_ptr.h"
 #include "widget/trackdroptarget.h"
 #include "widget/wlabel.h"
-#include "widget/wtrackmenu.h"
+
+class WTrackMenu;
 
 class WTrackText : public WLabel, public TrackDropTarget {
     Q_OBJECT
@@ -45,6 +45,3 @@ class WTrackText : public WLabel, public TrackDropTarget {
     TrackPointer m_pCurrentTrack;
     const parented_ptr<WTrackMenu> m_pTrackMenu;
 };
-
-
-#endif /* WTRACKTEXT_H */