summaryrefslogtreecommitdiffstats
path: root/tests/spectrum/spectrumapp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2015-06-17 14:01:44 +0300
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2015-06-17 14:24:57 +0300
commita71eb045af5a00fe135201f8b3c5999eda26e0bd (patch)
treeb19c639be2034987e234e106104d89b5f6586608 /tests/spectrum/spectrumapp
parent916d67d2664b0262cd03b28ad0c694924dd09b13 (diff)
Fix building against 5.6
Apparently Qt modules are now required to use Q_SIGNALS and Q_SLOTS macros instead of 'signals' and 'slots' in headers. Change-Id: I4140b1fff4386d74bb371176919234366965e887 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
Diffstat (limited to 'tests/spectrum/spectrumapp')
-rw-r--r--tests/spectrum/spectrumapp/engine.h6
-rw-r--r--tests/spectrum/spectrumapp/spectrumanalyser.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/spectrum/spectrumapp/engine.h b/tests/spectrum/spectrumapp/engine.h
index 6fc7a384..2ebc392d 100644
--- a/tests/spectrum/spectrumapp/engine.h
+++ b/tests/spectrum/spectrumapp/engine.h
@@ -117,14 +117,14 @@ public:
*/
void setWindowFunction(WindowFunction type);
-public slots:
+public Q_SLOTS:
void startRecording();
void startPlayback();
void suspend();
void setAudioInputDevice(const QAudioDeviceInfo &device);
void setAudioOutputDevice(const QAudioDeviceInfo &device);
-signals:
+Q_SIGNALS:
void stateChanged(QAudio::Mode mode, QAudio::State state);
/**
@@ -179,7 +179,7 @@ signals:
*/
void bufferChanged(qint64 position, qint64 length, const QByteArray &buffer);
-private slots:
+private Q_SLOTS:
void audioNotify();
void audioStateChanged(QAudio::State state);
void audioDataReady();
diff --git a/tests/spectrum/spectrumapp/spectrumanalyser.h b/tests/spectrum/spectrumapp/spectrumanalyser.h
index f24e44a7..16588014 100644
--- a/tests/spectrum/spectrumapp/spectrumanalyser.h
+++ b/tests/spectrum/spectrumapp/spectrumanalyser.h
@@ -47,13 +47,13 @@ public:
SpectrumAnalyserThread(QObject *parent);
~SpectrumAnalyserThread();
-public slots:
+public Q_SLOTS:
void setWindowFunction(WindowFunction type);
void calculateSpectrum(const QByteArray &buffer,
int inputFrequency,
int bytesPerSample);
-signals:
+Q_SIGNALS:
void calculationComplete(const FrequencySpectrum &spectrum);
private:
@@ -124,10 +124,10 @@ public:
*/
void cancelCalculation();
-signals:
+Q_SIGNALS:
void spectrumChanged(const FrequencySpectrum &spectrum);
-private slots:
+private Q_SLOTS:
void calculationComplete(const FrequencySpectrum &spectrum);
private: