diff options
| author | Wildemann Stefan <stefan.wildemann@corpuls.com> | 2019-06-18 11:02:31 +0200 |
|---|---|---|
| committer | Wildemann Stefan <stefan.wildemann@corpuls.com> | 2019-06-18 11:05:06 +0200 |
| commit | 94b491325443160011b05eeab177eb5cbf7bebad (patch) | |
| tree | e34476143e7a5a3fa9be8f7e22e6a716cd702b23 | |
| parent | 1bd73ecab8f458950aebf0c07ba7de0c4e15de81 (diff) | |
| download | navit-94b491325443160011b05eeab177eb5cbf7bebad.tar.gz | |
Remove unnecessary moc includes.
This commit removes moc file includes for some classes which do not
define new qt classes. This caused a long standing warning which seems
to be treated as error on some setups.
| -rw-r--r-- | navit/graphics/qt5/QNavitWidget.cpp | 2 | ||||
| -rw-r--r-- | navit/graphics/qt5/event_qt5.cpp | 2 | ||||
| -rw-r--r-- | navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp | 2 | ||||
| -rw-r--r-- | navit/vehicle/qt5/vehicle_qt5.cpp | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/navit/graphics/qt5/QNavitWidget.cpp b/navit/graphics/qt5/QNavitWidget.cpp index 355187b49..869d5f2ec 100644 --- a/navit/graphics/qt5/QNavitWidget.cpp +++ b/navit/graphics/qt5/QNavitWidget.cpp @@ -41,7 +41,7 @@ extern "C" { #include <windows.h> #endif #include "QNavitWidget.h" -#include "QNavitWidget.moc" +//#include "QNavitWidget.moc" #include "graphics_qt5.h" QNavitWidget::QNavitWidget(struct graphics_priv* my_graphics_priv, diff --git a/navit/graphics/qt5/event_qt5.cpp b/navit/graphics/qt5/event_qt5.cpp index 7186534fe..99361011c 100644 --- a/navit/graphics/qt5/event_qt5.cpp +++ b/navit/graphics/qt5/event_qt5.cpp @@ -44,7 +44,7 @@ extern "C" { #endif #include "event_qt5.h" -#include "event_qt5.moc" +//#include "event_qt5.moc" #include "graphics_qt5.h" #include <QSocketNotifier> diff --git a/navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp b/navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp index a5e488391..a0cf338fe 100644 --- a/navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp +++ b/navit/speech/qt5_espeak/Qt5EspeakAudioOut.cpp @@ -81,6 +81,8 @@ void Qt5EspeakAudioOut::handleStateChanged(QAudio::State newState) { break; case QAudio::StoppedState: break; + case QAudio::InterruptedState: + break; case QAudio::IdleState: /*remove all data that was already read*/ data->remove(0, buffer->pos()); diff --git a/navit/vehicle/qt5/vehicle_qt5.cpp b/navit/vehicle/qt5/vehicle_qt5.cpp index b855d12b9..9c613ca54 100644 --- a/navit/vehicle/qt5/vehicle_qt5.cpp +++ b/navit/vehicle/qt5/vehicle_qt5.cpp @@ -38,7 +38,7 @@ extern "C" { #include <time.h> #include "vehicle_qt5.h" -#include "vehicle_qt5.moc" +//#include "vehicle_qt5.moc" #include <QDateTime> /** |