LMMS · JohannesLorenz · Mar 2, 2022 · Feb 28, 2022 · Feb 17, 2022 · Feb 20, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -128,8 +128,6 @@ ENDIF()
 
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-CHECK_INCLUDE_FILES(stdint.h LMMS_HAVE_STDINT_H)
-CHECK_INCLUDE_FILES(stdlib.h LMMS_HAVE_STDLIB_H)
 CHECK_INCLUDE_FILES(pthread.h LMMS_HAVE_PTHREAD_H)
 CHECK_INCLUDE_FILES(semaphore.h LMMS_HAVE_SEMAPHORE_H)
 CHECK_INCLUDE_FILES(unistd.h LMMS_HAVE_UNISTD_H)

diff --git a/include/AudioDevice.h b/include/AudioDevice.h
@@ -25,7 +25,7 @@
 #ifndef AUDIO_DEVICE_H
 #define AUDIO_DEVICE_H
 
-#include <QtCore/QMutex>
+#include <QMutex>
 #include <samplerate.h>
 
 #include "lmms_basics.h"

diff --git a/include/AudioEngine.h b/include/AudioEngine.h
@@ -25,16 +25,15 @@
 #ifndef AUDIO_ENGINE_H
 #define AUDIO_ENGINE_H
 
-#include <QtCore/QMutex>
-#include <QtCore/QThread>
-#include <QtCore/QVector>
-#include <QtCore/QWaitCondition>
+#include <QMutex>
+#include <QThread>
+#include <QVector>
+#include <QWaitCondition>
 #include <samplerate.h>
 
 
 #include "lmms_basics.h"
 #include "LocklessList.h"
-#include "Note.h"
 #include "FifoBuffer.h"
 #include "AudioEngineProfiler.h"
 #include "PlayHandle.h"

diff --git a/include/AudioEngineWorkerThread.h b/include/AudioEngineWorkerThread.h
@@ -25,7 +25,7 @@
 #ifndef AUDIO_ENGINE_WORKER_THREAD_H
 #define AUDIO_ENGINE_WORKER_THREAD_H
 
-#include <QtCore/QThread>
+#include <QThread>
 
 #include <atomic>
 

diff --git a/include/AudioFileDevice.h b/include/AudioFileDevice.h
@@ -26,7 +26,7 @@
 #ifndef AUDIO_FILE_DEVICE_H
 #define AUDIO_FILE_DEVICE_H
 
-#include <QtCore/QFile>
+#include <QFile>
 
 #include "AudioDevice.h"
 #include "OutputSettings.h"

diff --git a/include/AudioJack.h b/include/AudioJack.h
@@ -35,9 +35,7 @@
 #endif
 
 #include <atomic>
-#include <QtCore/QVector>
-#include <QtCore/QList>
-#include <QtCore/QMap>
+#include <QVector>
 
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"

diff --git a/include/AudioPort.h b/include/AudioPort.h
@@ -26,9 +26,8 @@
 #define AUDIO_PORT_H
 
 #include <memory>
-#include <QtCore/QString>
-#include <QtCore/QMutex>
-#include <QtCore/QMutexLocker>
+#include <QString>
+#include <QMutex>
 
 #include "MemoryManager.h"
 #include "PlayHandle.h"

diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h
@@ -25,7 +25,7 @@
 #ifndef AUDIO_PORTAUDIO_H
 #define AUDIO_PORTAUDIO_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "lmmsconfig.h"
 #include "ComboBoxModel.h"
@@ -48,7 +48,6 @@ public slots:
 
 #include <portaudio.h>
 
-#include <QtCore/QSemaphore>
 
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"

diff --git a/include/AudioSampleRecorder.h b/include/AudioSampleRecorder.h
@@ -26,8 +26,8 @@
 #ifndef AUDIO_SAMPLE_RECORDER_H
 #define AUDIO_SAMPLE_RECORDER_H
 
-#include <QtCore/QList>
-#include <QtCore/QPair>
+#include <QList>
+#include <QPair>
 
 #include "AudioDevice.h"
 

diff --git a/include/AudioSdl.h b/include/AudioSdl.h
@@ -30,7 +30,6 @@
 #ifdef LMMS_HAVE_SDL
 
 #ifdef LMMS_HAVE_SDL2
-#include <SDL2/SDL.h>
 #include <SDL2/SDL_audio.h>
 #else
 #include <SDL/SDL.h>

diff --git a/include/AudioSoundIo.h b/include/AudioSoundIo.h
@@ -25,10 +25,8 @@
 #ifndef AUDIO_SOUNDIO_H
 #define AUDIO_SOUNDIO_H
 
-#include <QtCore/QObject>
 
 #include "lmmsconfig.h"
-#include "ComboBoxModel.h"
 
 #ifdef LMMS_HAVE_SOUNDIO
 

diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h
@@ -25,8 +25,8 @@
 #ifndef AUTOMATABLE_MODEL_H
 #define AUTOMATABLE_MODEL_H
 
-#include <QtCore/QMap>
-#include <QtCore/QMutex>
+#include <QMap>
+#include <QMutex>
 
 #include "JournallingObject.h"
 #include "Model.h"

diff --git a/include/AutomationClip.h b/include/AutomationClip.h
@@ -27,8 +27,8 @@
 #ifndef AUTOMATION_CLIP_H
 #define AUTOMATION_CLIP_H
 
-#include <QtCore/QMap>
-#include <QtCore/QPointer>
+#include <QMap>
+#include <QPointer>
 
 #include "AutomationNode.h"
 #include "Clip.h"

diff --git a/include/AutomationClipView.h b/include/AutomationClipView.h
@@ -27,11 +27,10 @@
 
 #include <QStaticText>
 
-#include "AutomationClip.h"
-#include "Song.h"
-#include "SongEditor.h"
 #include "ClipView.h"
 
+class AutomationClip;
+
 
 class AutomationClipView : public ClipView
 {

diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h
@@ -26,7 +26,6 @@
 #ifndef AUTOMATION_EDITOR_H
 #define AUTOMATION_EDITOR_H
 
-#include <QVector>
 #include <QWidget>
 
 #include "Editor.h"
@@ -36,13 +35,13 @@
 #include "TimePos.h"
 #include "AutomationClip.h"
 #include "ComboBoxModel.h"
-#include "Knob.h"
 
 class QPainter;
 class QPixmap;
 class QScrollBar;
 
 class ComboBox;
+class Knob;
 class NotePlayHandle;
 class TimeLineWidget;
 

diff --git a/include/AutomationTrackView.h b/include/AutomationTrackView.h
@@ -26,9 +26,10 @@
 #ifndef AUTOMATION_TRACK_VIEW_H
 #define AUTOMATION_TRACK_VIEW_H
 
-#include "AutomationTrack.h"
 #include "TrackView.h"
 
+class AutomationTrack;
+
 
 class AutomationTrackView : public TrackView
 {

diff --git a/include/BasicFilters.h b/include/BasicFilters.h
@@ -36,7 +36,7 @@
 #define __USE_XOPEN
 #endif
 
-#include <math.h>
+#include <cmath>
 
 #include "lmms_basics.h"
 #include "lmms_constants.h"

diff --git a/include/CPULoadWidget.h b/include/CPULoadWidget.h
@@ -27,7 +27,7 @@
 #ifndef CPULOAD_WIDGET_H
 #define CPULOAD_WIDGET_H
 
-#include <QtCore/QTimer>
+#include <QTimer>
 #include <QPixmap>
 #include <QWidget>
 

diff --git a/include/Clip.h b/include/Clip.h
@@ -28,7 +28,6 @@
 #include <QColor>
 
 #include "AutomatableModel.h"
-#include "lmms_basics.h"
 
 
 class Track;

diff --git a/include/ClipView.h b/include/ClipView.h
@@ -26,7 +26,7 @@
 #define TRACK_CONTENT_OBJECT_VIEW_H
 
 
-#include <QtCore/QVector>
+#include <QVector>
 
 #include "ModelView.h"
 #include "Rubberband.h"
@@ -61,6 +61,8 @@ class ClipView : public selectableObject, public ModelView
 	Q_PROPERTY( QSize mouseHotspotKnife MEMBER m_mouseHotspotKnife )
 
 public:
+	const static int BORDER_WIDTH = 2;
+
 	ClipView( Clip * clip, TrackView * tv );
 	virtual ~ClipView();
 

diff --git a/include/Clipboard.h b/include/Clipboard.h
@@ -25,7 +25,7 @@
 #ifndef CLIPBOARD_H
 #define CLIPBOARD_H
 
-#include <QtCore/QMap>
+#include <QMap>
 #include <QDomElement>
 
 class QMimeData;

diff --git a/include/ComboBoxModel.h b/include/ComboBoxModel.h
@@ -25,7 +25,6 @@
 #ifndef COMBOBOX_MODEL_H
 #define COMBOBOX_MODEL_H
 
-#include <cassert>
 #include <memory>
 #include <utility>
 #include <vector>

diff --git a/include/ConfigManager.h b/include/ConfigManager.h
@@ -28,11 +28,11 @@
 
 #include "lmmsconfig.h"
 
-#include <QtCore/QMap>
-#include <QtCore/QPair>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
-#include <QtCore/QObject>
+#include <QMap>
+#include <QPair>
+#include <QStringList>
+#include <QVector>
+#include <QObject>
 
 #include "lmms_export.h"
 

diff --git a/include/ControllerConnection.h b/include/ControllerConnection.h
@@ -30,8 +30,8 @@
 #ifndef CONTROLLER_CONNECTION_H
 #define CONTROLLER_CONNECTION_H
 
-#include <QtCore/QObject>
-#include <QtCore/QVector>
+#include <QObject>
+#include <QVector>
 
 #include "Controller.h"
 #include "JournallingObject.h"

diff --git a/include/Controls.h b/include/Controls.h
@@ -26,7 +26,6 @@
 #define CONTROLS_H
 
 
-#include "Model.h"
 
 // headers only required for covariance
 #include "AutomatableModel.h"

diff --git a/include/DataFile.h b/include/DataFile.h
@@ -32,8 +32,8 @@
 
 #include "lmms_export.h"
 #include "MemoryManager.h"
-#include "ProjectVersion.h"
 
+class ProjectVersion;
 class QTextStream;
 
 class LMMS_EXPORT DataFile : public QDomDocument

diff --git a/include/DummyEffect.h b/include/DummyEffect.h
@@ -25,10 +25,14 @@
 #ifndef DUMMY_EFFECT_H
 #define DUMMY_EFFECT_H
 
+#include <QDomElement>
+
 #include "Effect.h"
 #include "EffectControls.h"
 #include "EffectControlDialog.h"
 
+class Knob;
+
 
 class DummyEffectControlDialog : public EffectControlDialog
 {

diff --git a/include/DummyInstrument.h b/include/DummyInstrument.h
@@ -30,7 +30,7 @@
 #include "InstrumentView.h"
 #include "Engine.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "AudioEngine.h"
 

diff --git a/include/EffectSelectDialog.h b/include/EffectSelectDialog.h
@@ -29,7 +29,6 @@
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 
-#include "EffectChain.h"
 #include "Effect.h"
 
 

diff --git a/include/Engine.h b/include/Engine.h
@@ -26,8 +26,8 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include <QtCore/QString>
-#include <QtCore/QObject>
+#include <QString>
+#include <QObject>
 
 
 #include "lmmsconfig.h"

diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h
@@ -25,7 +25,7 @@
 #ifndef ENVELOPE_AND_LFO_PARAMETERS_H
 #define ENVELOPE_AND_LFO_PARAMETERS_H
 
-#include <QtCore/QVector>
+#include <QVector>
 
 #include "JournallingObject.h"
 #include "AutomatableModel.h"

diff --git a/include/ExportFilter.h b/include/ExportFilter.h
@@ -26,7 +26,7 @@
 #ifndef EXPORT_FILTER_H
 #define EXPORT_FILTER_H
 
-#include <QtCore/QFile>
+#include <QFile>
 
 #include "TrackContainer.h"
 #include "Plugin.h"

diff --git a/include/FifoBuffer.h b/include/FifoBuffer.h
@@ -25,7 +25,7 @@
 #ifndef FIFO_BUFFER_H
 #define FIFO_BUFFER_H
 
-#include <QtCore/QSemaphore>
+#include <QSemaphore>
 
 
 template<typename T>

diff --git a/include/FileBrowser.h b/include/FileBrowser.h
@@ -27,8 +27,8 @@
 #define FILE_BROWSER_H
 
 #include <QCheckBox>
-#include <QtCore/QDir>
-#include <QtCore/QMutex>
+#include <QDir>
+#include <QMutex>
 #include <QTreeWidget>
 
 

diff --git a/include/GuiApplication.h b/include/GuiApplication.h
@@ -25,7 +25,7 @@
 #ifndef GUIAPPLICATION_H
 #define GUIAPPLICATION_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "lmms_export.h"
 #include "lmmsconfig.h"