Allow build with qt6

Author: neochapay

lib/src/abstractvoicecallhandler.h

@@ -46,7 +46,9 @@ class AbstractVoiceCallHandler : public QObject
     Q_PROPERTY(bool isRemoteHeld READ isRemoteHeld NOTIFY remoteHeldChanged)
     Q_PROPERTY(QString parentHandlerId READ parentHandlerId NOTIFY parentHandlerIdChanged)
     Q_PROPERTY(QList<AbstractVoiceCallHandler*> childCalls READ childCalls NOTIFY childCallsChanged)
-
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    Q_MOC_INCLUDE("abstractvoicecallprovider.h");
+#endif
 public:
     enum VoiceCallStatus {
         STATUS_NULL,

plugins/declarative/src/src.pro

@@ -9,7 +9,7 @@ TARGET = voicecall
 uri = org.nemomobile.voicecall
 
 enable-ngf {
-    PKGCONFIG += ngf-qt5
+    PKGCONFIG += ngf-qt$${QT_MAJOR_VERSION}
     DEFINES += WITH_NGF
 }
 

plugins/declarative/src/voicecallaudiorecorder.cpp

@@ -34,6 +34,7 @@
 
 #include "voicecallaudiorecorder.h"
 
+#include <QAudioFormat>
 #include <QDateTime>
 #include <QDBusConnection>
 #include <QDBusMessage>
@@ -44,7 +45,10 @@
 #include <QDataStream>
 #include <QStandardPaths>
 #include <QtDebug>
-
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QAudioDevice>
+#include <QMediaDevices>
+#endif
 #include <unistd.h>
 
 namespace {
@@ -69,17 +73,25 @@ QAudioFormat getRecordingFormat()
     QAudioFormat format;
 
     format.setChannelCount(ChannelCount);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    format.setSampleFormat(QAudioFormat::Int16);
     format.setSampleRate(SampleRate);
+
+    QAudioDevice device(QMediaDevices::defaultAudioInput());
+    if(!device.isFormatSupported(format)) {
+        format = device.preferredFormat();
+    }
+#else
     format.setSampleSize(SampleBits);
     format.setCodec(QStringLiteral("audio/pcm"));
     format.setByteOrder(QAudioFormat::LittleEndian);
     format.setSampleType(QAudioFormat::UnSignedInt);
-
     QAudioDeviceInfo info(QAudioDeviceInfo::defaultInputDevice());
+
     if (!info.isFormatSupported(format)) {
         format = info.nearestFormat(format);
     }
-
+#endif
     return format;
 }
 
@@ -241,11 +253,13 @@ void VoiceCallAudioRecorder::featuresCallFinished(QDBusPendingCallWatcher *watch
 void VoiceCallAudioRecorder::inputStateChanged(QAudio::State state)
 {
     if (state == QAudio::StoppedState) {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         if (input) {
             if (input->error() != QAudio::NoError) {
                 qWarning() << "Recording stopped due to error:" << input->error();
             }
         }
+#endif
         terminateRecording();
     }
 }
@@ -295,10 +309,13 @@ bool VoiceCallAudioRecorder::initiateRecording(const QString &fileName)
     }
 
     output.swap(file);
-
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    input.reset(new QAudioSource(recordingFormat));
+    connect(input.data(), &QAudioSource::stateChanged, this, &VoiceCallAudioRecorder::inputStateChanged);
+#else
     input.reset(new QAudioInput(recordingFormat));
     connect(input.data(), &QAudioInput::stateChanged, this, &VoiceCallAudioRecorder::inputStateChanged);
-
+#endif
     input->start(output.data());
     active = true;
     emit recordingChanged();

plugins/declarative/src/voicecallaudiorecorder.h

@@ -34,8 +34,12 @@
 
 #ifndef VOICECALLAUDIORECORDER_H
 #define VOICECALLAUDIORECORDER_H
-
+#include <QtCore>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QAudioSource>
+#else
 #include <QAudioInput>
+#endif
 #include <QFile>
 #include <QScopedPointer>
 #include <QDBusPendingCallWatcher>
@@ -85,8 +89,11 @@ private slots:
 private:
     bool initiateRecording(const QString &fileName);
     void terminateRecording();
-
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QScopedPointer<QAudioSource> input;
+#else
     QScopedPointer<QAudioInput> input;
+#endif
     QScopedPointer<QFile> output;
     QString label;
     bool featureAvailable;

plugins/declarative/src/voicecallhandler.h

@@ -29,7 +29,9 @@ class VoiceCallHandler : public QObject
     Q_PROPERTY(bool isRemoteHeld READ isRemoteHeld NOTIFY remoteHeldChanged)
     Q_PROPERTY(VoiceCallModel* childCalls READ childCalls NOTIFY childCallsChanged)
     Q_PROPERTY(VoiceCallHandler* parentCall READ parentCall NOTIFY parentCallChanged)
-
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    Q_MOC_INCLUDE("voicecallmodel.h");
+#endif
 public:
     enum VoiceCallStatus {
         STATUS_NULL,

plugins/ngf/src/src.pro

@@ -1,7 +1,7 @@
 include(../../plugin.pri)
 TARGET = voicecall-ngf-plugin
 
-PKGCONFIG += ngf-qt5
+PKGCONFIG += ngf-qt$${QT_MAJOR_VERSION}
 
 DEFINES += PLUGIN_NAME=\\\"ngf-plugin\\\"
 

plugins/plugin.pri

@@ -1,14 +1,10 @@
 TEMPLATE = lib
 QT = core
-CONFIG += plugin link_pkgconfig c++11
-
-QMAKE_CXXFLAGS += -std=c++0x
+CONFIG += plugin link_pkgconfig
 
 # includes are ok all the time, yes, really.
 # it's only used for some macros.
 INCLUDEPATH += $$PWD/../lib/src
 
-LIBS += -L$$PWD/../lib/src -lvoicecall
-
 target.path = $$[QT_INSTALL_LIBS]/voicecall/plugins
 INSTALLS += target

plugins/providers/ofono/src/src.pro

@@ -2,7 +2,7 @@ include(../../../plugin.pri)
 TARGET = voicecall-ofono-plugin
 QT += dbus
 
-PKGCONFIG += qofono-qt5
+PKGCONFIG += qofono-qt$${QT_MAJOR_VERSION}
 
 HEADERS += \
     ofonovoicecallhandler.h  \

src/src.pro

@@ -8,7 +8,7 @@ INCLUDEPATH += ../lib/src
 DEFINES += VOICECALL_PLUGIN_DIRECTORY=\"\\\"$$[QT_INSTALL_LIBS]/voicecall/plugins\\\"\"
 
 enable-nemo-devicelock {
-    PKGCONFIG += libresourceqt5 nemodevicelock
+    PKGCONFIG += libresourceqt$${QT_MAJOR_VERSION} nemodevicelock
     DEFINES += WITH_NEMO_DEVICELOCK
 }