diff --git a/src/blackgui/components/weathercomponent.cpp b/src/blackgui/components/weathercomponent.cpp index 2fe98afab..896809a6f 100644 --- a/src/blackgui/components/weathercomponent.cpp +++ b/src/blackgui/components/weathercomponent.cpp @@ -15,7 +15,6 @@ #include "ui_weathercomponent.h" #include -#include #include #include #include diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp index 359cc13ed..18326e3e9 100644 --- a/src/blackgui/dockwidget.cpp +++ b/src/blackgui/dockwidget.cpp @@ -31,7 +31,6 @@ #include #include #include -#include using namespace BlackMisc; using namespace BlackGui::Components; diff --git a/src/blackgui/guiutility.cpp b/src/blackgui/guiutility.cpp index 67501fc1d..f620b610c 100644 --- a/src/blackgui/guiutility.cpp +++ b/src/blackgui/guiutility.cpp @@ -116,20 +116,6 @@ namespace BlackGui return QApplication::desktop()->screenGeometry(QApplication::desktop()).size(); } - QSizeF CGuiUtility::physicalScreenSize(QWidget *currentWidget) - { - QScreen *s = QGuiApplication::screens().front(); - if (currentWidget) - { - const int sn = QApplication::desktop()->screenNumber(currentWidget); - s = QGuiApplication::screens().at(sn); - } - - if (!s) { return QSizeF(); } - const QSizeF ps1 = s->physicalSize(); - return ps1; - } - namespace Private { #ifdef Q_OS_WINDOWS diff --git a/src/blackgui/guiutility.h b/src/blackgui/guiutility.h index 7616ea61c..4f40c71ce 100644 --- a/src/blackgui/guiutility.h +++ b/src/blackgui/guiutility.h @@ -66,10 +66,6 @@ namespace BlackGui //! \remark might be scaled depending on CGuiUtility::mainApplicationWidgetPixelRatio static QSize desktopSize(); - //! Pysical screen resolution - //! \remark unscaled - static QSizeF physicalScreenSize(QWidget *currentWidget = nullptr); - //! Qt independent implementation //! \remark allows to return values before QGuiApplication is initialized static QSize physicalScreenSizeOs(); diff --git a/src/blackgui/views/aircraftmodelstatisticsdialog.cpp b/src/blackgui/views/aircraftmodelstatisticsdialog.cpp index a3cebb829..1058bc31f 100644 --- a/src/blackgui/views/aircraftmodelstatisticsdialog.cpp +++ b/src/blackgui/views/aircraftmodelstatisticsdialog.cpp @@ -13,7 +13,6 @@ #include #include -using namespace QtCharts; using namespace BlackMisc::Aviation; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/views/aircraftmodelstatisticsdialog.h b/src/blackgui/views/aircraftmodelstatisticsdialog.h index 2a988049c..e1a8a7b97 100644 --- a/src/blackgui/views/aircraftmodelstatisticsdialog.h +++ b/src/blackgui/views/aircraftmodelstatisticsdialog.h @@ -14,11 +14,6 @@ namespace Ui { class CAircraftModelStatisticsDialog; } -namespace QtCharts -{ - class QBarSeries; - class QHorizontalBarSeries; -} namespace BlackGui::Views { //! Info about the models diff --git a/src/blackgui/views/viewbasenontemplate.cpp b/src/blackgui/views/viewbasenontemplate.cpp index 7945bf0f1..79b6e66e4 100644 --- a/src/blackgui/views/viewbasenontemplate.cpp +++ b/src/blackgui/views/viewbasenontemplate.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include diff --git a/src/blackmisc/audio/audiodeviceinfo.cpp b/src/blackmisc/audio/audiodeviceinfo.cpp index 1d051591e..e7f85d944 100644 --- a/src/blackmisc/audio/audiodeviceinfo.cpp +++ b/src/blackmisc/audio/audiodeviceinfo.cpp @@ -46,17 +46,6 @@ namespace BlackMisc::Audio stringCompare(device.getMachineName(), this->getMachineName(), Qt::CaseInsensitive); } - CAudioDeviceInfo::DeviceType CAudioDeviceInfo::fromQtMode(QAudio::Mode m) - { - switch (m) - { - case QAudio::AudioInput: return InputDevice; - case QAudio::AudioOutput: return OutputDevice; - default: break; - } - return Unknown; - } - CAudioDeviceInfo CAudioDeviceInfo::getDefaultOutputDevice() { return CAudioDeviceInfo(OutputDevice, QAudioDeviceInfo::defaultOutputDevice().deviceName()); diff --git a/src/blackmisc/audio/audiodeviceinfo.h b/src/blackmisc/audio/audiodeviceinfo.h index e10990d22..21b083cbc 100644 --- a/src/blackmisc/audio/audiodeviceinfo.h +++ b/src/blackmisc/audio/audiodeviceinfo.h @@ -11,7 +11,6 @@ #include "blackmisc/valueobject.h" #include "blackmisc/blackmiscexport.h" -#include #include #include @@ -83,9 +82,6 @@ namespace BlackMisc::Audio //! Matching name, type and machine and process bool matchesNameTypeMachineProcess(const CAudioDeviceInfo &device) const; - //! Convert the Qt type - static DeviceType fromQtMode(QAudio::Mode m); - //! Default output device static CAudioDeviceInfo getDefaultOutputDevice(); diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h index e2cd25f73..e7d9770eb 100644 --- a/src/blackmisc/variant.h +++ b/src/blackmisc/variant.h @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/src/blacksound/audioutilities.cpp b/src/blacksound/audioutilities.cpp index 806d8aae6..5b316c57e 100644 --- a/src/blacksound/audioutilities.cpp +++ b/src/blacksound/audioutilities.cpp @@ -40,13 +40,6 @@ namespace BlackSound return output; } - QVector convertFloatBytesTo16BitPCM(const QByteArray &input) - { - Q_UNUSED(input) - // qFatal("Not implemented"); - return {}; - } - QVector convertFromMonoToStereo(const QVector &mono) { QVector stereo; diff --git a/src/blacksound/audioutilities.h b/src/blacksound/audioutilities.h index db1ffaf03..619c82118 100644 --- a/src/blacksound/audioutilities.h +++ b/src/blacksound/audioutilities.h @@ -19,7 +19,6 @@ namespace BlackSound //! Conversion functions BLACKSOUND_EXPORT QVector convertBytesTo32BitFloatPCM(const QByteArray &input); BLACKSOUND_EXPORT QVector convertBytesTo16BitPCM(const QByteArray &input); - BLACKSOUND_EXPORT QVector convertFloatBytesTo16BitPCM(const QByteArray &input); BLACKSOUND_EXPORT QVector convertFromMonoToStereo(const QVector &mono); BLACKSOUND_EXPORT QVector convertFromStereoToMono(const QVector &stereo); BLACKSOUND_EXPORT QVector convertFromShortToFloat(const QVector &input);