# HG changeset patch # User Chris Cannam # Date 1353067984 0 # Node ID f8f29700831230cc176a8ffc6f41ae465cab5cf6 # Parent a11a9c04df44be1bf36f18fda2ec7e3eba3eccbf Cut back on includes diff -r a11a9c04df44 -r f8f297008312 src/MainWindow.cpp --- a/src/MainWindow.cpp Fri Nov 16 12:02:55 2012 +0000 +++ b/src/MainWindow.cpp Fri Nov 16 12:13:04 2012 +0000 @@ -21,49 +21,22 @@ #include "view/Pane.h" #include "view/PaneStack.h" #include "data/model/WaveFileModel.h" -#include "data/model/SparseOneDimensionalModel.h" -#include "data/model/FFTModel.h" #include "view/ViewManager.h" #include "base/Preferences.h" #include "layer/WaveformLayer.h" -#include "layer/TimeRulerLayer.h" #include "layer/TimeInstantLayer.h" #include "layer/TimeValueLayer.h" -#include "layer/Colour3DPlotLayer.h" -#include "layer/SliceLayer.h" -#include "layer/SliceableLayer.h" #include "widgets/Fader.h" #include "view/Overview.h" -#include "widgets/PropertyBox.h" -#include "widgets/PropertyStack.h" #include "widgets/AudioDial.h" #include "widgets/IconLoader.h" -#include "widgets/ListInputDialog.h" -#include "widgets/SubdividingMenu.h" -#include "widgets/NotifyingPushButton.h" #include "widgets/KeyReference.h" #include "audioio/AudioCallbackPlaySource.h" #include "audioio/AudioCallbackPlayTarget.h" -#include "audioio/AudioTargetFactory.h" #include "audioio/PlaySpeedRangeMapper.h" -#include "data/fileio/DataFileReaderFactory.h" -#include "data/fileio/PlaylistFileReader.h" -#include "data/fileio/WavFileWriter.h" -#include "data/fileio/CSVFileWriter.h" -#include "data/fileio/BZipFileDevice.h" -#include "data/fileio/FileSource.h" -#include "data/fft/FFTDataServer.h" -#include "base/RecentFiles.h" -#include "transform/TransformFactory.h" -#include "transform/ModelTransformerFactory.h" -#include "base/PlayParameterRepository.h" -#include "base/XmlExportable.h" -#include "widgets/CommandHistory.h" #include "base/Profiler.h" -#include "base/Clipboard.h" #include "base/UnitDatabase.h" #include "layer/ColourDatabase.h" -#include "data/osc/OSCQueue.h" // For version information #include "vamp/vamp.h" @@ -75,24 +48,16 @@ #include #include #include -#include #include #include #include -#include #include #include -#include #include #include -#include #include -#include +#include #include -#include -#include -#include -#include #include #include @@ -103,8 +68,6 @@ using std::endl; using std::vector; -using std::map; -using std::set; MainWindow::MainWindow(bool withAudioOutput, bool withOSCSupport) : diff -r a11a9c04df44 -r f8f297008312 src/MainWindow.h --- a/src/MainWindow.h Fri Nov 16 12:02:55 2012 +0000 +++ b/src/MainWindow.h Fri Nov 16 12:13:04 2012 +0000 @@ -16,45 +16,7 @@ #ifndef _MAIN_WINDOW_H_ #define _MAIN_WINDOW_H_ -#include -#include -#include -#include -#include - #include "framework/MainWindowBase.h" -#include "base/Command.h" -#include "view/ViewManager.h" -#include "base/PropertyContainer.h" -#include "base/RecentFiles.h" -#include "layer/LayerFactory.h" -#include "transform/Transform.h" -#include "framework/SVFileReader.h" -#include "widgets/InteractiveFileFinder.h" -#include - -class Document; -class PaneStack; -class Pane; -class View; -class Fader; -class Overview; -class Layer; -class WaveformLayer; -class WaveFileModel; -class AudioCallbackPlaySource; -class AudioCallbackPlayTarget; -class CommandHistory; -class QMenu; -class AudioDial; -class QLabel; -class QCheckBox; -class QTreeView; -class QPushButton; -class OSCQueue; -class OSCMessage; -class KeyReference; - class MainWindow : public MainWindowBase {