Remove unused includes (#3429)

include/BufferManager.h

@@ -30,8 +30,6 @@
 #include "export.h"
 #include "lmms_basics.h"
 
-class QAtomicInt;
-
 const int BM_INITIAL_BUFFERS = 512;
 //const int BM_INCREMENT = 64;
 

include/ConfigManager.h

@@ -35,7 +35,6 @@
 
 #include "export.h"
 #include "MemoryManager.h"
-#include "lmmsversion.h"
 
 class LmmsCore;
 
@@ -135,10 +134,7 @@ public:
 		return dataDir() + SAMPLES_PATH;
 	}
 
-	QString defaultVersion() const
-	{
-		return LMMS_VERSION;
-	}
+	QString defaultVersion() const;
 
 	QString defaultArtworkDir() const
 	{

include/Engine.h

@@ -26,7 +26,6 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include <QtCore/QMap>
 #include <QtCore/QString>
 #include <QtCore/QObject>
 

include/Instrument.h

@@ -27,7 +27,6 @@
 #define INSTRUMENT_H
 
 #include <QString>
-#include <QtGlobal>
 #include "export.h"
 #include "lmms_basics.h"
 #include "MemoryManager.h"

include/Mixer.h

@@ -25,10 +25,6 @@
 #ifndef MIXER_H
 #define MIXER_H
 
-#include "denormals.h"
-
-#include "lmmsconfig.h"
-
 #include <QtCore/QMutex>
 #include <QtCore/QThread>
 #include <QtCore/QVector>

include/NotePlayHandle.h

@@ -32,7 +32,6 @@
 #include "Track.h"
 #include "MemoryManager.h"
 
-class QAtomicInt;
 class QReadWriteLock;
 class InstrumentTrack;
 class NotePlayHandle;

include/PeakController.h

@@ -25,15 +25,12 @@
 #ifndef PEAK_CONTROLLER_H
 #define PEAK_CONTROLLER_H
 
-#include <QWidget>
-
 #include "Model.h"
-#include "AutomatableModel.h"
 #include "Controller.h"
 #include "ControllerDialog.h"
 
-class automatableButtonGroup;
-class Knob;
+class QWidget;
+
 class PeakControllerEffect;
 
 typedef QVector<PeakControllerEffect *> PeakControllerEffectVector;

include/PlayHandle.h

@@ -25,13 +25,14 @@
 #ifndef PLAY_HANDLE_H
 #define PLAY_HANDLE_H
 
-#include <QtCore/QThread>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 #include <QtCore/QMutex>
 
 #include "ThreadableJob.h"
 #include "lmms_basics.h"
 
+class QThread;
+
 class Track;
 class AudioPort;
 

include/SampleBuffer.h

@@ -28,8 +28,6 @@
 
 #include <QtCore/QReadWriteLock>
 #include <QtCore/QObject>
-#include <QtCore/QRect>
-#include <QtCore/QWriteLocker>
 
 #include <samplerate.h>
 
@@ -42,6 +40,7 @@
 
 
 class QPainter;
+class QRect;
 
 // values for buffer margins, used for various libsamplerate interpolation modes
 // the array positions correspond to the converter_type parameter values in libsamplerate

include/TrackContainerView.h

@@ -29,7 +29,7 @@
 #include <QtCore/QVector>
 #include <QScrollArea>
 #include <QWidget>
-
+#include <QThread>
 
 #include "Track.h"
 #include "JournallingObject.h"

include/ValueBuffer.h

@@ -26,10 +26,10 @@
 #ifndef VALUE_BUFFER_H
 #define VALUE_BUFFER_H
 
-#include <QtGlobal>
-#include "interpolation.h"
-#include <string.h>
+#include <vector>
+
 #include "MemoryManager.h"
+#include "export.h"
 
 class EXPORT ValueBuffer : public std::vector<float>
 {

plugins/Eq/EqParameterWidget.cpp

@@ -28,7 +28,6 @@
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QMouseEvent>
-#include <QPainter>
 #include <QWidget>
 
 #include "EqControls.h"

plugins/LadspaEffect/LadspaControlDialog.cpp

@@ -24,6 +24,7 @@
  *
  */
 
+#include <cmath>
 
 #include <QGroupBox>
 #include <QLayout>

plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp

@@ -22,6 +22,8 @@
  *
  */
 
+#include <cmath>
+
 #include <QLayout>
 #include <QPainter>
 

plugins/audio_file_processor/audio_file_processor.cpp

@@ -32,6 +32,7 @@
 #include <samplerate.h>
 
 #include "audio_file_processor.h"
+#include "ConfigManager.h"
 #include "Engine.h"
 #include "Song.h"
 #include "InstrumentTrack.h"

plugins/nes/Nes.cpp

@@ -22,7 +22,6 @@
  *
  */
 
-
 #include <QDomElement>
 
 #include "Nes.h"

plugins/nes/Nes.h

@@ -25,6 +25,8 @@
 #ifndef NES_H
 #define NES_H
 
+#include <cmath>
+
 #include "Instrument.h"
 #include "InstrumentView.h"
 #include "AutomatableModel.h"

plugins/papu/papu_instrument.cpp

@@ -23,6 +23,7 @@
  *
  */
 
+#include <cmath>
 
 #include <QPainter>
 #include <QDomElement>

plugins/patman/patman.cpp

@@ -39,6 +39,7 @@
 #include "StringPairDrag.h"
 #include "ToolTip.h"
 #include "FileDialog.h"
+#include "ConfigManager.h"
 
 #include "embed.cpp"
 

plugins/sf2_player/sf2_player.cpp

@@ -28,6 +28,7 @@
 #include <QLabel>
 #include <QDomDocument>
 
+#include "ConfigManager.h"
 #include "FileDialog.h"
 #include "sf2_player.h"
 #include "Engine.h"

plugins/sfxr/sfxr.cpp

@@ -35,6 +35,7 @@ float frnd(float range)
 	return (float)rnd(10000)/10000*range;
 }
 
+#include <cmath>
 
 #include <QDomElement>
 

plugins/sid/sid_instrument.cpp

@@ -27,6 +27,7 @@
 #include <QPainter>
 #include <QDomElement>
 
+#include <cmath>
 #include <cstdio>
 
 #include "sid.h"

plugins/stk/mallets/mallets.cpp

@@ -33,6 +33,7 @@
 #include "ModalBar.h"
 #include "TubeBell.h"
 
+#include "ConfigManager.h"
 #include "Engine.h"
 #include "gui_templates.h"
 #include "GuiApplication.h"

plugins/zynaddsubfx/ZynAddSubFx.cpp

@@ -32,6 +32,7 @@
 #include <QPushButton>
 
 #include "ZynAddSubFx.h"
+#include "ConfigManager.h"
 #include "Engine.h"
 #include "Knob.h"
 #include "LedCheckbox.h"

src/CMakeLists.txt

@@ -96,6 +96,9 @@ IF(CMAKE_VERSION VERSION_GREATER "2.8.7")
 		$<TARGET_OBJECTS:lmmsobjs>
 		"${WINRC}"
 	)
+
+    SET(iwyu include-what-you-use -Xiwyu --mapping_file=/usr/share/include-what-you-use/qt5_4.imp)
+    #SET_PROPERTY(TARGET lmmsobjs PROPERTY CXX_INCLUDE_WHAT_YOU_USE ${iwyu})
 ELSE()
 	ADD_EXECUTABLE(lmms
 		core/main.cpp

src/core/AutomatableModel.cpp

@@ -24,9 +24,10 @@
 
 #include "AutomatableModel.h"
 
+#include "lmms_math.h"
+
 #include "AutomationPattern.h"
 #include "ControllerConnection.h"
-#include "lmms_math.h"
 #include "Mixer.h"
 #include "ProjectJournal.h"
 

src/core/AutomationPattern.cpp

@@ -32,7 +32,8 @@
 #include "ProjectJournal.h"
 #include "BBTrackContainer.h"
 #include "Song.h"
-#include "embed.h"
+
+#include <cmath>
 
 int AutomationPattern::s_quantization = 1;
 const float AutomationPattern::DEFAULT_MIN_VALUE = 0;

src/core/BandLimitedWave.cpp

@@ -27,8 +27,6 @@
 
 #include <QDataStream>
 
-#include "ConfigManager.h"
-
 WaveMipMap BandLimitedWave::s_waveforms[4] = {  };
 bool BandLimitedWave::s_wavesGenerated = false;
 QString BandLimitedWave::s_wavetableDir = "";

src/core/BufferManager.cpp

@@ -25,9 +25,6 @@
 
 #include "BufferManager.h"
 
-#include <QtCore/QtGlobal>
-#include <QtCore/QAtomicInt>
-
 #include "MemoryManager.h"
 
 sampleFrame ** BufferManager::s_available;

src/core/ConfigManager.cpp

@@ -24,8 +24,6 @@
 
 #include <QDomElement>
 #include <QDir>
-#include <QFile>
-#include <QFileInfo>
 #include <QMessageBox>
 #include <QApplication>
 #include <QtCore/QTextStream>
@@ -35,6 +33,7 @@
 #include "ProjectVersion.h"
 #include "GuiApplication.h"
 
+#include "lmmsversion.h"
 
 static inline QString ensureTrailingSlash( const QString & s )
 {
@@ -177,6 +176,11 @@ void ConfigManager::upgrade()
 	m_version = LMMS_VERSION;
 }
 
+QString ConfigManager::defaultVersion() const
+{
+	return LMMS_VERSION;
+}
+
 bool ConfigManager::hasWorkingDir() const
 {
 	return QDir( m_workingDir ).exists();

src/core/Controller.cpp

@@ -30,9 +30,7 @@
 
 
 #include "Song.h"
-#include "Engine.h"
 #include "Mixer.h"
-#include "Controller.h"
 #include "ControllerConnection.h"
 #include "ControllerDialog.h"
 #include "LfoController.h"

src/core/ControllerConnection.cpp

@@ -29,7 +29,6 @@
 
 
 #include "Song.h"
-#include "Engine.h"
 #include "ControllerConnection.h"
 
 

src/core/DataFile.cpp

@@ -32,20 +32,19 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QMessageBox>
-#include <QTextStream>
 
 #include "base64.h"
 #include "ConfigManager.h"
 #include "Effect.h"
 #include "embed.h"
 #include "GuiApplication.h"
-#include "lmms_basics.h"
-#include "lmmsversion.h"
 #include "PluginFactory.h"
 #include "ProjectVersion.h"
 #include "SongEditor.h"
 #include "TextFloat.h"
 
+#include "lmmsversion.h"
+
 static void findIds(const QDomElement& elem, QList<jo_id_t>& idList);
 
 

src/core/DrumSynth.cpp

@@ -28,11 +28,8 @@
 
 #include <fstream>
 #include <cstring>
-#include <limits>
 
 #include <math.h>     //sin(), exp(), etc.
-#include <stdio.h>    //sscanf(), sprintf()
-#include <stdlib.h>   //RAND_MAX
 
 #ifdef LMMS_BUILD_WIN32
 #define powf pow

src/core/Effect.cpp

@@ -26,7 +26,6 @@
 #include <QDomElement>
 
 #include "Effect.h"
-#include "Engine.h"
 #include "EffectChain.h"
 #include "EffectControls.h"
 #include "EffectView.h"

src/core/EffectChain.cpp

@@ -28,7 +28,6 @@
 
 #include "EffectChain.h"
 #include "Effect.h"
-#include "Engine.h"
 #include "DummyEffect.h"
 #include "MixHelpers.h"
 #include "Song.h"

src/core/Engine.cpp

@@ -31,13 +31,9 @@
 #include "Mixer.h"
 #include "PresetPreviewPlayHandle.h"
 #include "ProjectJournal.h"
-#include "Plugin.h"
-#include "PluginFactory.h"
 #include "Song.h"
 #include "BandLimitedWave.h"
 
-#include "GuiApplication.h"
-
 float LmmsCore::s_framesPerTick;
 Mixer* LmmsCore::s_mixer = NULL;
 FxMixer * LmmsCore::s_fxMixer = NULL;

src/core/FxMixer.cpp

@@ -33,7 +33,6 @@
 
 #include "InstrumentTrack.h"
 #include "BBTrackContainer.h"
-#include "ValueBuffer.h"
 
 FxRoute::FxRoute( FxChannel * from, FxChannel * to, float amount ) :
 	m_from( from ),

src/core/Instrument.cpp

@@ -25,8 +25,6 @@
 #include "Instrument.h"
 #include "InstrumentTrack.h"
 #include "DummyInstrument.h"
-#include "NotePlayHandle.h"
-#include "Engine.h"
 
 
 Instrument::Instrument( InstrumentTrack * _instrument_track,

src/core/InstrumentFunctions.cpp

@@ -29,7 +29,6 @@
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "Mixer.h"
-#include "NotePlayHandle.h"
 #include "PresetPreviewPlayHandle.h"
 
 

src/core/InstrumentSoundShaping.cpp

@@ -32,8 +32,6 @@
 #include "Instrument.h"
 #include "InstrumentTrack.h"
 #include "Mixer.h"
-#include "NotePlayHandle.h"
-
 
 
 const float CUT_FREQ_MULTIPLIER = 6000.0f;

src/core/JournallingObject.cpp

@@ -24,8 +24,6 @@
 
 #include <QDomElement>
 
-#include <cstdio>
-
 #include "JournallingObject.h"
 #include "AutomatableModel.h"
 #include "ProjectJournal.h"

src/core/LadspaManager.cpp

@@ -27,7 +27,6 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
-#include <QFileInfo>
 #include <QLibrary>
 
 #include <math.h>

src/core/LfoController.cpp

@@ -28,10 +28,8 @@
 
 
 #include "Song.h"
-#include "Engine.h"
 #include "Mixer.h"
 #include "LfoController.h"
-#include "lmms_math.h"
 
 
 LfoController::LfoController( Model * _parent ) :

src/core/MemoryManager.cpp

@@ -25,9 +25,7 @@
 
 
 #include "MemoryManager.h"
-#include <QtGlobal>
 #include <QReadWriteLock>
-#include <stdint.h>
 
 
 MemoryPoolVector MemoryManager::s_memoryPools;

src/core/Mixer.cpp

@@ -24,17 +24,18 @@
 
 #include "Mixer.h"
 
+#include "denormals.h"
+
+#include "lmmsconfig.h"
+
 #include "AudioPort.h"
 #include "FxMixer.h"
 #include "MixerWorkerThread.h"
 #include "Song.h"
 #include "EnvelopeAndLfoParameters.h"
 #include "NotePlayHandle.h"
-#include "Engine.h"
 #include "ConfigManager.h"
 #include "SamplePlayHandle.h"
-#include "GuiApplication.h"
-#include "PianoRoll.h"
 
 // platform-specific audio-interface-classes
 #include "AudioAlsa.h"
@@ -57,11 +58,8 @@
 #include "MidiApple.h"
 #include "MidiDummy.h"
 
-#include "MemoryHelper.h"
 #include "BufferManager.h"
 
-
-
 typedef LocklessList<PlayHandle *>::Element LocklessListElement;
 
 

src/core/MixerWorkerThread.cpp

@@ -24,13 +24,12 @@
 
 #include "MixerWorkerThread.h"
 
+#include "denormals.h"
 #include <QMutex>
 #include <QWaitCondition>
 #include "ThreadableJob.h"
 #include "Mixer.h"
 
-#include "denormals.h"
-
 MixerWorkerThread::JobQueue MixerWorkerThread::globalJobQueue;
 QWaitCondition * MixerWorkerThread::queueReadyWaitCond = NULL;
 QList<MixerWorkerThread *> MixerWorkerThread::workerThreads;

src/core/Note.cpp

@@ -29,10 +29,6 @@
 
 #include "Note.h"
 #include "DetuningHelper.h"
-#include "templates.h"
-
-
-
 
 
 Note::Note( const MidiTime & length, const MidiTime & pos,

src/core/NotePlayHandle.cpp

@@ -29,8 +29,6 @@
 #include "InstrumentSoundShaping.h"
 #include "InstrumentTrack.h"
 #include "Instrument.h"
-#include "MidiEvent.h"
-#include "MidiPort.h"
 #include "Mixer.h"
 #include "Song.h"
 

src/core/PeakController.cpp

@@ -25,19 +25,16 @@
 
 #include "PeakController.h"
 
-#include <cstdio>
+#include <cmath>
+
 #include <QDomElement>
-#include <QObject>
 #include <QMessageBox>
 
-#include "Engine.h"
 #include "Mixer.h"
 #include "EffectChain.h"
 #include "plugins/peak_controller_effect/peak_controller_effect.h"
 #include "PresetPreviewPlayHandle.h"
 
-class ControllerDialog;
-
 PeakControllerEffectVector PeakController::s_effects;
 int PeakController::m_getCount;
 int PeakController::m_loadCount;

src/core/Piano.cpp

@@ -39,9 +39,6 @@
 #include "Piano.h"
 
 #include "InstrumentTrack.h"
-#include "MidiEvent.h"
-#include "MidiEventProcessor.h"
-#include "Note.h"
 
 
 /*! The black / white order of keys as they appear on the keyboard.

src/core/PlayHandle.cpp

@@ -25,6 +25,8 @@
 #include "PlayHandle.h"
 #include "BufferManager.h"
 
+#include <QtCore/QThread>
+
 
 PlayHandle::PlayHandle( const Type type, f_cnt_t offset ) :
 		m_type( type ),

src/core/Plugin.cpp

@@ -31,8 +31,6 @@
 #include "embed.h"
 #include "Engine.h"
 #include "GuiApplication.h"
-#include "Mixer.h"
-#include "ConfigManager.h"
 #include "DummyPlugin.h"
 #include "AutomatableModel.h"
 #include "Song.h"

src/core/PluginFactory.cpp

@@ -27,11 +27,8 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
-#include <QtCore/QFileInfo>
 #include <QtCore/QLibrary>
 
-#include "Plugin.h"
-
 #ifdef LMMS_BUILD_WIN32
 	QStringList nameFilters("*.dll");
 #else

src/core/PresetPreviewPlayHandle.cpp

@@ -23,17 +23,12 @@
  */
 
 #include <QFileInfo>
-#include <QMutexLocker>
 
 #include "PresetPreviewPlayHandle.h"
-#include "debug.h"
 #include "Engine.h"
 #include "Instrument.h"
 #include "InstrumentTrack.h"
-#include "MidiPort.h"
 #include "Mixer.h"
-#include "DataFile.h"
-#include "NotePlayHandle.h"
 #include "PluginFactory.h"
 #include "ProjectJournal.h"
 #include "TrackContainer.h"

src/core/ProjectRenderer.cpp

@@ -27,15 +27,13 @@
 
 #include "ProjectRenderer.h"
 #include "Song.h"
-#include "Engine.h"
 
 #include "AudioFileWave.h"
 #include "AudioFileOgg.h"
 
 #ifdef LMMS_HAVE_SCHED_H
-#include <sched.h>
+#include "sched.h"
 #endif
-#include <QMutexLocker>
 
 const ProjectRenderer::FileEncodeDevice ProjectRenderer::fileEncodeDevices[] =
 {

src/core/RemotePlugin.cpp

@@ -32,14 +32,9 @@
 #include "RemotePlugin.h"
 #include "Mixer.h"
 #include "Engine.h"
-#include "ConfigManager.h"
 
 #include <QDir>
 
-#ifdef LMMS_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifndef SYNC_WITH_SHM_FIFO
 #include <QtCore/QUuid>
 #include <sys/socket.h>
@@ -504,9 +499,3 @@ bool RemotePlugin::processMessage( const message & _m )
 
 	return true;
 }
-
-
-
-
-
-

src/core/RenderManager.cpp

@@ -22,7 +22,6 @@
  *
  */
 
-#include <QFileInfo>
 #include <QDebug>
 #include <QDir>
 
@@ -30,7 +29,6 @@
 #include "Song.h"
 #include "BBTrackContainer.h"
 #include "BBTrack.h"
-#include "debug.h"
 
 RenderManager::RenderManager(
 		const Mixer::qualitySettings & qualitySettings,

src/core/RingBuffer.cpp

@@ -26,7 +26,6 @@
 #include "RingBuffer.h"
 #include "Engine.h"
 #include "Mixer.h"
-#include <string.h>
 #include "MixHelpers.h"
 
  

src/core/SampleBuffer.cpp

@@ -30,11 +30,8 @@
 #include <QFileInfo>
 #include <QMessageBox>
 #include <QPainter>
-#include <QReadLocker>
 
 
-#include <cstring>
-
 #include <sndfile.h>
 
 #define OV_EXCLUDE_STATIC_CALLBACKS
@@ -53,17 +50,13 @@
 
 #include "base64.h"
 #include "ConfigManager.h"
-#include "debug.h"
 #include "DrumSynth.h"
 #include "endian_handling.h"
 #include "Engine.h"
 #include "GuiApplication.h"
-#include "interpolation.h"
 #include "Mixer.h"
-#include "templates.h"
 
 #include "FileDialog.h"
-#include "MemoryManager.h"
 
 
 SampleBuffer::SampleBuffer( const QString & _audio_file,

src/core/SamplePlayHandle.cpp

@@ -28,7 +28,6 @@
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "Mixer.h"
-#include "SampleBuffer.h"
 #include "SampleTrack.h"
 
 

src/core/Song.cpp

@@ -29,9 +29,6 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QMessageBox>
-#include <QApplication>
-
-#include <math.h>
 
 #include "AutomationTrack.h"
 #include "AutomationEditor.h"
@@ -49,20 +46,13 @@
 #include "GuiApplication.h"
 #include "ImportFilter.h"
 #include "ExportFilter.h"
-#include "InstrumentTrack.h"
 #include "MainWindow.h"
 #include "FileDialog.h"
-#include "MidiClient.h"
-#include "DataFile.h"
-#include "NotePlayHandle.h"
 #include "Pattern.h"
 #include "PianoRoll.h"
 #include "ProjectJournal.h"
 #include "ProjectNotes.h"
-#include "ProjectRenderer.h"
-#include "RenameDialog.h"
 #include "SongEditor.h"
-#include "templates.h"
 #include "TextFloat.h"
 #include "TimeLineWidget.h"
 #include "PeakController.h"

src/core/Track.cpp

@@ -38,7 +38,6 @@
 #include "Track.h"
 
 #include <assert.h>
-#include <cstdio>
 
 #include <QLayout>
 #include <QMenu>
@@ -60,20 +59,14 @@
 #include "GuiApplication.h"
 #include "FxMixerView.h"
 #include "gui_templates.h"
-#include "InstrumentTrack.h"
 #include "MainWindow.h"
 #include "Mixer.h"
-#include "DataFile.h"
-#include "PixmapButton.h"
 #include "ProjectJournal.h"
 #include "SampleTrack.h"
 #include "Song.h"
 #include "SongEditor.h"
 #include "StringPairDrag.h"
-#include "templates.h"
 #include "TextFloat.h"
-#include "ToolTip.h"
-#include "TrackContainer.h"
 
 
 /*! The width of the resize grip in pixels

src/core/ValueBuffer.cpp

@@ -1,5 +1,7 @@
 #include "ValueBuffer.h"
 
+#include "interpolation.h"
+
 ValueBuffer::ValueBuffer()
 {}
 

src/core/VstSyncController.cpp

@@ -27,7 +27,6 @@
 
 #include "ConfigManager.h"
 #include "Engine.h"
-#include "lmmsconfig.h"
 #include "Mixer.h"
 #include "VstSyncController.h"
 #include "RemotePlugin.h"

src/core/audio/AudioAlsa.cpp

@@ -24,7 +24,6 @@
 
 #include <QComboBox>
 #include <QLineEdit>
-#include <QLabel>
 
 #include "AudioAlsa.h"
 
@@ -33,13 +32,8 @@
 #include "endian_handling.h"
 #include "ConfigManager.h"
 #include "Engine.h"
-#include "LcdSpinBox.h"
 #include "Mixer.h"
 #include "gui_templates.h"
-#include "templates.h"
-
-#include <iostream>
-#include <vector>
 
 
 AudioAlsa::AudioAlsa( bool & _success_ful, Mixer*  _mixer ) :

src/core/audio/AudioFileOgg.cpp

@@ -32,7 +32,6 @@
 
 
 #include <vorbis/vorbisenc.h>
-#include <cstring>
 
 #include "Mixer.h"
 

src/core/audio/AudioJack.cpp

@@ -30,8 +30,6 @@
 #include <QLabel>
 #include <QMessageBox>
 
-#include <stdlib.h>
-
 #include "Engine.h"
 #include "GuiApplication.h"
 #include "templates.h"

src/core/audio/AudioOss.cpp

@@ -35,7 +35,6 @@
 #include "Mixer.h"
 #include "Engine.h"
 #include "gui_templates.h"
-#include "templates.h"
 
 #ifdef LMMS_HAVE_UNISTD_H
 #include <unistd.h>
@@ -46,9 +45,6 @@
 #ifdef LMMS_HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
-#ifdef LMMS_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 
 #ifdef LMMS_HAVE_SYS_SOUNDCARD_H
 // This is recommended by OSS

src/core/audio/AudioPort.cpp

@@ -30,8 +30,6 @@
 #include "Mixer.h"
 #include "MixHelpers.h"
 #include "BufferManager.h"
-#include "ValueBuffer.h"
-#include "panning.h"
 
 
 AudioPort::AudioPort( const QString & _name, bool _has_effect_chain,

src/core/audio/AudioPortAudio.cpp

@@ -42,12 +42,10 @@ void AudioPortAudioSetupUtil::updateChannels()
 #include <QLineEdit>
 
 #include "Engine.h"
-#include "debug.h"
 #include "ConfigManager.h"
 #include "gui_templates.h"
 #include "templates.h"
 #include "ComboBox.h"
-#include "LcdSpinBox.h"
 #include "Mixer.h"
 
 

src/core/audio/AudioPulseAudio.cpp

@@ -29,12 +29,10 @@
 
 #ifdef LMMS_HAVE_PULSEAUDIO
 
-#include "endian_handling.h"
 #include "ConfigManager.h"
 #include "LcdSpinBox.h"
 #include "Mixer.h"
 #include "gui_templates.h"
-#include "templates.h"
 #include "Engine.h"
 
 

src/core/audio/AudioSdl.cpp

@@ -30,13 +30,9 @@
 #include <QLineEdit>
 
 #include "Engine.h"
-#include "debug.h"
 #include "ConfigManager.h"
 #include "gui_templates.h"
 #include "Mixer.h"
-#include "templates.h"
-
-
 
 
 AudioSdl::AudioSdl( bool & _success_ful, Mixer*  _mixer ) :

src/core/audio/AudioSndio.cpp

@@ -2,8 +2,6 @@
 
 /* license */
 
-#include "AudioSndio.h"
-
 #ifdef LMMS_HAVE_SNDIO
 
 #include <QtCore/QFileInfo>

src/core/audio/AudioSoundIo.cpp

@@ -35,7 +35,6 @@
 #include "gui_templates.h"
 #include "templates.h"
 #include "ComboBox.h"
-#include "LcdSpinBox.h"
 #include "Mixer.h"
 
 AudioSoundIo::AudioSoundIo( bool & outSuccessful, Mixer * _mixer ) :

src/core/base64.cpp

@@ -23,13 +23,10 @@
  *
  */
 
-
-
 #include "base64.h"
 
 #include <QBuffer>
 #include <QDataStream>
-#include <QVariant>
 
 namespace base64
 {

src/core/main.cpp

@@ -31,7 +31,6 @@
 
 #include <QFileInfo>
 #include <QLocale>
-#include <QDate>
 #include <QTimer>
 #include <QTranslator>
 #include <QApplication>
@@ -44,11 +43,7 @@
 #endif
 
 #ifdef LMMS_HAVE_SCHED_H
-#include <sched.h>
-#endif
-
-#ifdef LMMS_HAVE_SYS_TIME_H
-#include <sys/time.h>
+#include "sched.h"
 #endif
 
 #ifdef LMMS_HAVE_PROCESS_H
@@ -71,7 +66,6 @@
 #include "MainWindow.h"
 #include "ProjectRenderer.h"
 #include "RenderManager.h"
-#include "DataFile.h"
 #include "Song.h"
 #include "SetupDialog.h"
 

src/core/midi/MidiAlsaSeq.cpp

@@ -28,7 +28,6 @@
 #include "gui_templates.h"
 #include "Song.h"
 #include "MidiPort.h"
-#include "MidiTime.h"
 #include "Note.h"
 
 

src/core/midi/MidiApple.cpp

@@ -23,9 +23,10 @@
  *
  */
 
-
 #include "MidiApple.h"
 
+#ifdef LMMS_BUILD_APPLE
+
 #include <QtAlgorithms>
 #include <algorithm>
 
@@ -33,8 +34,6 @@
 #include "MidiPort.h"
 #include "Note.h"
 
-#ifdef LMMS_BUILD_APPLE
-
 #include <CoreMIDI/CoreMIDI.h>
 
 const unsigned int SYSEX_LENGTH=1024;

src/core/midi/MidiController.cpp

@@ -25,10 +25,8 @@
 
 #include <QDomElement>
 #include <QObject>
-#include <QVector>
 
 #include "Song.h"
-#include "Engine.h"
 #include "Mixer.h"
 #include "MidiClient.h"
 #include "MidiController.h"

src/core/midi/MidiJack.cpp

@@ -27,13 +27,7 @@
 #ifdef LMMS_HAVE_JACK
 
 #include <QCompleter>
-#include <QDirModel>
 #include <QMessageBox>
-#include <QTranslator>
-
-#ifdef LMMS_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 
 #include "ConfigManager.h"
 #include "gui_templates.h"

src/core/midi/MidiOss.cpp

@@ -27,13 +27,6 @@
 
 #ifdef LMMS_HAVE_OSS
 
-
-
-#ifdef LMMS_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-
 #include "ConfigManager.h"
 #include "gui_templates.h"
 

src/core/midi/MidiSndio.cpp

@@ -2,8 +2,6 @@
 
 /* license */
 
-#include "MidiSndio.h"
-
 #ifdef LMMS_HAVE_SNDIO
 
 #include <QtGui/QLabel>

src/core/midi/MidiWinMM.cpp

@@ -23,13 +23,8 @@
  */
 
 #include "MidiWinMM.h"
-#include "ConfigManager.h"
-#include "Engine.h"
-#include "gui_templates.h"
-#include "MidiPort.h"
 #include "Note.h"
 
-
 #ifdef LMMS_BUILD_WIN32
 
 

src/gui/AudioAlsaSetupWidget.cpp

@@ -33,9 +33,6 @@
 #include "LcdSpinBox.h"
 #include "gui_templates.h"
 
-#include <iostream>
-
-
 
 AudioAlsaSetupWidget::AudioAlsaSetupWidget( QWidget * _parent ) :
 	AudioDeviceSetupWidget( AudioAlsa::name(), _parent ),

src/gui/AutomationPatternView.cpp

@@ -28,7 +28,6 @@
 #include <QMenu>
 
 #include "AutomationEditor.h"
-#include "AutomationPattern.h"
 #include "embed.h"
 #include "GuiApplication.h"
 #include "gui_templates.h"

src/gui/ControllerConnectionDialog.cpp

@@ -38,7 +38,6 @@
 #include "LcdSpinBox.h"
 #include "LedCheckbox.h"
 #include "ComboBox.h"
-#include "TabWidget.h"
 #include "GroupBox.h"
 #include "Song.h"
 #include "ToolButton.h"

src/gui/EffectControlDialog.cpp

@@ -28,7 +28,6 @@
 
 #include "EffectControlDialog.h"
 #include "EffectControls.h"
-#include "Effect.h"
 
 
 EffectControlDialog::EffectControlDialog( EffectControls * _controls ) :

src/gui/ExportProjectDialog.cpp

@@ -31,8 +31,6 @@
 #include "Song.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
-#include "BBTrackContainer.h"
-#include "BBTrack.h"
 
 
 ExportProjectDialog::ExportProjectDialog( const QString & _file_name,

src/gui/FileBrowser.cpp

@@ -37,7 +37,6 @@
 #include "FileBrowser.h"
 #include "BBTrackContainer.h"
 #include "ConfigManager.h"
-#include "debug.h"
 #include "embed.h"
 #include "Engine.h"
 #include "GuiApplication.h"
@@ -47,7 +46,6 @@
 #include "InstrumentTrack.h"
 #include "MainWindow.h"
 #include "Mixer.h"
-#include "DataFile.h"
 #include "PluginFactory.h"
 #include "PresetPreviewPlayHandle.h"
 #include "SamplePlayHandle.h"

src/gui/FxMixerView.cpp

@@ -32,15 +32,14 @@
 #include <QMdiSubWindow>
 #include <QPainter>
 #include <QPushButton>
-#include <QToolButton>
 #include <QScrollArea>
 #include <QStyle>
 #include <QKeyEvent>
 
+#include "lmms_math.h"
+
 #include "FxMixerView.h"
 #include "Knob.h"
-#include "Engine.h"
-#include "embed.h"
 #include "FxLine.h"
 #include "FxMixer.h"
 #include "GuiApplication.h"
@@ -50,7 +49,6 @@
 #include "InstrumentTrack.h"
 #include "Song.h"
 #include "BBTrackContainer.h"
-#include "lmms_math.h"
 
 FxMixerView::FxMixerView() :
 	QWidget(),

src/gui/GuiApplication.cpp

@@ -34,7 +34,6 @@
 #include "ConfigManager.h"
 #include "ControllerRackView.h"
 #include "FxMixerView.h"
-#include "InstrumentTrack.h"
 #include "MainWindow.h"
 #include "PianoRoll.h"
 #include "ProjectNotes.h"

src/gui/InstrumentView.cpp

@@ -26,7 +26,6 @@
 
 #include "InstrumentView.h"
 #include "embed.h"
-#include "Instrument.h"
 #include "InstrumentTrack.h"
 #include "StringPairDrag.h"
 

src/gui/LfoControllerDialog.cpp

@@ -26,20 +26,17 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QMdiArea>
-#include <QMdiSubWindow>
 #include <QPainter>
 
 #include "CaptionMenu.h"
 #include "gui_templates.h"
 #include "embed.h"
-#include "Engine.h"
 #include "LedCheckbox.h"
 #include "MainWindow.h"
 #include "ToolTip.h"
 
 
 #include "LfoController.h"
-#include "ControllerDialog.h"
 #include "Knob.h"
 #include "TempoSyncKnob.h"
 #include "PixmapButton.h"

src/gui/LmmsPalette.cpp

@@ -26,7 +26,6 @@
 #include <QApplication>
 #include <QStyle>
 #include "LmmsPalette.h"
-#include "LmmsStyle.h"
 
 
 LmmsPalette::LmmsPalette( QWidget * parent, QStyle * stylearg ) : 

src/gui/LmmsStyle.cpp

@@ -28,12 +28,10 @@
 #include <QApplication>
 #include <QFrame>
 #include <QPainter>
-#include <QPixmapCache>
 #include <QStyleFactory>
 #include <QStyleOption>
 
 #include "LmmsStyle.h"
-#include "LmmsPalette.h"
 
 QPalette * LmmsStyle::s_palette = NULL;
 

src/gui/MainWindow.cpp

@@ -30,7 +30,6 @@
 #include <QDomElement>
 #include <QFileInfo>
 #include <QMdiArea>
-#include <QMdiSubWindow>
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QShortcut>
@@ -42,7 +41,6 @@
 #include "AudioDummy.h"
 #include "AutomationEditor.h"
 #include "BBEditor.h"
-#include "ConfigManager.h"
 #include "ControllerRackView.h"
 #include "embed.h"
 #include "Engine.h"
@@ -50,11 +48,7 @@
 #include "FileDialog.h"
 #include "FxMixerView.h"
 #include "GuiApplication.h"
-#include "InstrumentTrack.h"
-#include "lmmsversion.h"
-#include "Mixer.h"
 #include "PianoRoll.h"
-#include "PianoView.h"
 #include "PluginBrowser.h"
 #include "PluginFactory.h"
 #include "PluginView.h"
@@ -62,14 +56,12 @@
 #include "ProjectNotes.h"
 #include "SetupDialog.h"
 #include "SideBar.h"
-#include "Song.h"
 #include "SongEditor.h"
-#include "SubWindow.h"
-#include "templates.h"
 #include "ToolButton.h"
 #include "ToolPlugin.h"
 #include "VersionedSaveDialog.h"
 
+#include "lmmsversion.h"
 
 
 

src/gui/PeakControllerDialog.cpp

@@ -27,21 +27,17 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QMdiArea>
-#include <QMdiSubWindow>
 #include <QPainter>
 
 #include "CaptionMenu.h"
 #include "gui_templates.h"
 #include "embed.h"
-#include "Engine.h"
 #include "MainWindow.h"
 #include "ToolTip.h"
 
 #include "PeakController.h"
-#include "ControllerDialog.h"
 #include "Knob.h"
 #include "TempoSyncKnob.h"
-#include "PixmapButton.h"
 
 
 PeakControllerDialog::PeakControllerDialog( Controller * _model, QWidget * _parent ) :

src/gui/PianoView.cpp

@@ -36,29 +36,22 @@
  * \todo write isWhite inline function and replace throughout
  */
 
+#include <cmath>
 
 #include <QCursor>
 #include <QKeyEvent>
-#include <QMouseEvent>
 #include <QPainter>
 #include <QVBoxLayout>
 
-
 #include "PianoView.h"
 #include "Piano.h"
 #include "CaptionMenu.h"
 #include "embed.h"
-#include "Engine.h"
 #include "gui_templates.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"
 #include "StringPairDrag.h"
 #include "MainWindow.h"
-#include "MidiEvent.h"
-#include "templates.h"
-#include "update_event.h"
-
-
 
 
 /*! The scale of C Major - white keys only.

src/gui/PluginBrowser.cpp

@@ -24,17 +24,13 @@
 
 #include "PluginBrowser.h"
 
-#include <algorithm> // for std::sort
-
 #include <QLabel>
 #include <QPainter>
-#include <QCursor>
 #include <QMouseEvent>
 #include <QScrollArea>
 #include <QStyleOption>
 
 #include "embed.h"
-#include "debug.h"
 #include "templates.h"
 #include "gui_templates.h"
 #include "StringPairDrag.h"