diff --git a/engine/audio/plugins/mad/audiodecoder_mad.cpp b/engine/audio/plugins/mad/audiodecoder_mad.cpp index 003527fa83..a90a9d533d 100644 --- a/engine/audio/plugins/mad/audiodecoder_mad.cpp +++ b/engine/audio/plugins/mad/audiodecoder_mad.cpp @@ -249,7 +249,7 @@ bool AudioDecoderMAD::findHeader() if (mad_header_decode(&header, &m_stream) < 0) { - if(m_stream.error == MAD_ERROR_LOSTSYNC) + if (m_stream.error == MAD_ERROR_LOSTSYNC) { uint tagSize = findID3v2((uchar *)m_stream.this_frame, (ulong) (m_stream.bufend - m_stream.this_frame)); @@ -360,11 +360,11 @@ qint64 AudioDecoderMAD::read(char *data, qint64 size) { forever { - if(((m_stream.error == MAD_ERROR_BUFLEN) || !m_stream.buffer) && !m_eof) + if (((m_stream.error == MAD_ERROR_BUFLEN) || !m_stream.buffer) && !m_eof) { m_eof = !fillBuffer(); } - if(mad_frame_decode(&m_frame, &m_stream) < 0) + if (mad_frame_decode(&m_frame, &m_stream) < 0) { switch((int) m_stream.error) { @@ -381,7 +381,7 @@ qint64 AudioDecoderMAD::read(char *data, qint64 size) continue; } case MAD_ERROR_BUFLEN: - if(m_eof) + if (m_eof) return 0; continue; default: @@ -391,7 +391,7 @@ qint64 AudioDecoderMAD::read(char *data, qint64 size) continue; } } - if(m_skip_frames) + if (m_skip_frames) { m_skip_frames--; continue; @@ -402,7 +402,7 @@ qint64 AudioDecoderMAD::read(char *data, qint64 size) } void AudioDecoderMAD::seek(qint64 pos) { - if(m_totalTime > 0) + if (m_totalTime > 0) { qint64 seek_pos = qint64(pos * m_input.size() / m_totalTime); m_input.seek(seek_pos); @@ -437,7 +437,7 @@ bool AudioDecoderMAD::fillBuffer() qDebug("DecoderMAD: end of file"); return false; } - else if(len < 0) + else if (len < 0) { qWarning("DecoderMAD: error"); return false; @@ -546,7 +546,7 @@ qint64 AudioDecoderMAD::madOutput(char *data, qint64 size) m_output_at = 0; m_output_bytes = 0; - if(samples * channels * 2 > size) + if (samples * channels * 2 > size) { qWarning() << "DecoderMad: input buffer is too small. Required: " << (samples * channels * 2) << ", available: " << size; samples = size / channels / 2; diff --git a/engine/audio/plugins/sndfile/audiodecoder_sndfile.cpp b/engine/audio/plugins/sndfile/audiodecoder_sndfile.cpp index 69ab00ae88..3eb960b870 100644 --- a/engine/audio/plugins/sndfile/audiodecoder_sndfile.cpp +++ b/engine/audio/plugins/sndfile/audiodecoder_sndfile.cpp @@ -78,7 +78,7 @@ bool AudioDecoderSndFile::initialize(const QString &path) m_totalTime = snd_info.frames * 1000 / m_freq; m_bitrate = QFileInfo(m_path).size () * 8.0 / m_totalTime + 0.5; - if((snd_info.format & SF_FORMAT_SUBMASK) == SF_FORMAT_FLOAT) + if ((snd_info.format & SF_FORMAT_SUBMASK) == SF_FORMAT_FLOAT) { qDebug() << "DecoderSndFile: Float audio format"; sf_command (m_sndfile, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE); diff --git a/engine/audio/src/audiocapture.cpp b/engine/audio/src/audiocapture.cpp index 17e6d4245d..809c5c5eba 100644 --- a/engine/audio/src/audiocapture.cpp +++ b/engine/audio/src/audiocapture.cpp @@ -235,7 +235,7 @@ void AudioCapture::processData() #endif // 5 ********* Calculate the average signal power - foreach(int barsNumber, m_fftMagnitudeMap.keys()) + foreach (int barsNumber, m_fftMagnitudeMap.keys()) { maxMagnitude = fillBandsData(barsNumber); pwrSum = 0.; diff --git a/engine/audio/src/audiocapture_portaudio.cpp b/engine/audio/src/audiocapture_portaudio.cpp index 47c46acdce..a10840ee92 100644 --- a/engine/audio/src/audiocapture_portaudio.cpp +++ b/engine/audio/src/audiocapture_portaudio.cpp @@ -45,7 +45,7 @@ bool AudioCapturePortAudio::initialize() PaStreamParameters inputParameters; err = Pa_Initialize(); - if( err != paNoError ) + if (err != paNoError) return false; QSettings settings; @@ -64,18 +64,18 @@ bool AudioCapturePortAudio::initialize() inputParameters.channelCount = m_channels; inputParameters.sampleFormat = paInt16; - inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency; + inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultLowInputLatency; inputParameters.hostApiSpecificStreamInfo = NULL; // ensure initialize() has not been called multiple times Q_ASSERT(stream == NULL); /* -- setup stream -- */ - err = Pa_OpenStream( &stream, &inputParameters, NULL, m_sampleRate, paFramesPerBufferUnspecified, + err = Pa_OpenStream(&stream, &inputParameters, NULL, m_sampleRate, paFramesPerBufferUnspecified, paClipOff, /* we won't output out of range samples so don't bother clipping them */ NULL, /* no callback, use blocking API */ - NULL ); /* no callback, so no callback userData */ - if( err != paNoError ) + NULL); /* no callback, so no callback userData */ + if (err != paNoError) { qWarning("Cannot open audio input stream (%s)\n", Pa_GetErrorText(err)); Pa_Terminate(); @@ -83,11 +83,11 @@ bool AudioCapturePortAudio::initialize() } /* -- start capture -- */ - err = Pa_StartStream( stream ); - if( err != paNoError ) + err = Pa_StartStream(stream); + if (err != paNoError) { qWarning("Cannot start stream capture (%s)\n", Pa_GetErrorText(err)); - Pa_CloseStream( stream ); + Pa_CloseStream(stream); stream = NULL; Pa_Terminate(); return false; @@ -103,19 +103,19 @@ void AudioCapturePortAudio::uninitialize() PaError err; /* -- Now we stop the stream -- */ - err = Pa_StopStream( stream ); - if( err != paNoError ) - qDebug() << "PortAudio error: " << Pa_GetErrorText( err ); + err = Pa_StopStream(stream); + if (err != paNoError) + qDebug() << "PortAudio error: " << Pa_GetErrorText(err); /* -- don't forget to cleanup! -- */ - err = Pa_CloseStream( stream ); - if( err != paNoError ) - qDebug() << "PortAudio error: " << Pa_GetErrorText( err ); + err = Pa_CloseStream(stream); + if (err != paNoError) + qDebug() << "PortAudio error: " << Pa_GetErrorText(err); stream = NULL; err = Pa_Terminate(); - if( err != paNoError ) - qDebug() << "PortAudio error: " << Pa_GetErrorText( err ); + if (err != paNoError) + qDebug() << "PortAudio error: " << Pa_GetErrorText(err); } qint64 AudioCapturePortAudio::latency() @@ -135,10 +135,10 @@ bool AudioCapturePortAudio::readAudio(int maxSize) { Q_ASSERT(stream != NULL); - int err = Pa_ReadStream( stream, m_audioBuffer, maxSize ); - if( err ) + int err = Pa_ReadStream(stream, m_audioBuffer, maxSize); + if (err) { - qWarning("read from audio interface failed (%s)\n", Pa_GetErrorText (err)); + qWarning("read from audio interface failed (%s)\n", Pa_GetErrorText(err)); return false; } diff --git a/engine/audio/src/audiocapture_wavein.cpp b/engine/audio/src/audiocapture_wavein.cpp index c89fd85d8d..4c50fbd680 100644 --- a/engine/audio/src/audiocapture_wavein.cpp +++ b/engine/audio/src/audiocapture_wavein.cpp @@ -154,7 +154,7 @@ bool AudioCaptureWaveIn::readAudio(int maxSize) return false; } - while ( (waveHeaders[m_currentBufferIndex].dwFlags & WHDR_DONE) == 0) + while ((waveHeaders[m_currentBufferIndex].dwFlags & WHDR_DONE) == 0) usleep(100); memcpy(m_audioBuffer, m_internalBuffers[m_currentBufferIndex], maxSize * 2); diff --git a/engine/audio/src/audioplugincache.cpp b/engine/audio/src/audioplugincache.cpp index fd41a580a4..b8d6b0430d 100644 --- a/engine/audio/src/audioplugincache.cpp +++ b/engine/audio/src/audioplugincache.cpp @@ -28,7 +28,7 @@ #include "qlcfile.h" #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - #if defined( __APPLE__) || defined(Q_OS_MAC) + #if defined(__APPLE__) || defined(Q_OS_MAC) #include "audiorenderer_portaudio.h" #elif defined(WIN32) || defined(Q_OS_WIN) #include "audiorenderer_waveout.h" @@ -55,7 +55,7 @@ void AudioPluginCache::load(const QDir &dir) qDebug() << Q_FUNC_INFO << dir.path(); #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) -#if defined( __APPLE__) || defined(Q_OS_MAC) +#if defined(__APPLE__) || defined(Q_OS_MAC) m_audioDevicesList = AudioRendererPortAudio::getDevicesInfo(); #elif defined(WIN32) || defined(Q_OS_WIN) m_audioDevicesList = AudioRendererWaveOut::getDevicesInfo(); @@ -103,7 +103,7 @@ void AudioPluginCache::load(const QDir &dir) QStringList AudioPluginCache::getSupportedFormats() { QStringList caps; - foreach(QString path, m_pluginsMap.values()) + foreach (QString path, m_pluginsMap.values()) { QPluginLoader loader(path, this); AudioDecoder* ptr = qobject_cast (loader.instance()); @@ -124,7 +124,7 @@ AudioDecoder *AudioPluginCache::getDecoderForFile(const QString &filename) if (fn.exists() == false) return NULL; - foreach(QString path, m_pluginsMap.values()) + foreach (QString path, m_pluginsMap.values()) { QPluginLoader loader(path, this); AudioDecoder* ptr = qobject_cast (loader.instance()); diff --git a/engine/audio/src/audiorenderer_alsa.cpp b/engine/audio/src/audiorenderer_alsa.cpp index 043fdccaf1..6155a5f545 100644 --- a/engine/audio/src/audiorenderer_alsa.cpp +++ b/engine/audio/src/audiorenderer_alsa.cpp @@ -220,7 +220,7 @@ QList AudioRendererAlsa::getDevicesInfo() QList devList; int cardIdx = -1; - while( snd_card_next( &cardIdx ) == 0 && cardIdx >= 0 ) + while (snd_card_next(&cardIdx) == 0 && cardIdx >= 0) { snd_ctl_t *cardHandle; snd_ctl_card_info_t *cardInfo; @@ -249,31 +249,31 @@ QList AudioRendererAlsa::getDevicesInfo() qDebug() << "[getDevicesInfo] Card" << cardIdx << "=" << snd_ctl_card_info_get_name(cardInfo); - while( snd_ctl_pcm_next_device( cardHandle, &devIdx ) == 0 && devIdx >= 0 ) + while (snd_ctl_pcm_next_device(cardHandle, &devIdx) == 0 && devIdx >= 0) { snd_pcm_info_t *pcmInfo; int tmpCaps = 0; - snd_pcm_info_alloca( &pcmInfo ); + snd_pcm_info_alloca(&pcmInfo); - snprintf( str, sizeof (str), "plughw:%d,%d", cardIdx, devIdx ); + snprintf(str, sizeof (str), "plughw:%d,%d", cardIdx, devIdx); /* Obtain info about this particular device */ - snd_pcm_info_set_device( pcmInfo, devIdx ); - snd_pcm_info_set_subdevice( pcmInfo, 0 ); - snd_pcm_info_set_stream( pcmInfo, SND_PCM_STREAM_CAPTURE ); - if( snd_ctl_pcm_info( cardHandle, pcmInfo ) >= 0 ) + snd_pcm_info_set_device(pcmInfo, devIdx); + snd_pcm_info_set_subdevice(pcmInfo, 0); + snd_pcm_info_set_stream(pcmInfo, SND_PCM_STREAM_CAPTURE); + if (snd_ctl_pcm_info(cardHandle, pcmInfo) >= 0) tmpCaps |= AUDIO_CAP_INPUT; - snd_pcm_info_set_stream( pcmInfo, SND_PCM_STREAM_PLAYBACK ); - if( snd_ctl_pcm_info( cardHandle, pcmInfo ) >= 0 ) + snd_pcm_info_set_stream(pcmInfo, SND_PCM_STREAM_PLAYBACK); + if (snd_ctl_pcm_info(cardHandle, pcmInfo) >= 0) tmpCaps |= AUDIO_CAP_OUTPUT; if (tmpCaps != 0) { AudioDeviceInfo info; info.deviceName = QString(snd_ctl_card_info_get_name(cardInfo)) + " - " + - QString (snd_pcm_info_get_name( pcmInfo )); + QString(snd_pcm_info_get_name(pcmInfo)); info.privateName = QString(str); info.capabilities = tmpCaps; devList.append(info); @@ -297,7 +297,7 @@ qint64 AudioRendererAlsa::writeAudio(unsigned char *data, qint64 maxSize) if (pcm_handle == NULL || m_prebuf == NULL) return 0; - if((maxSize = qMin(maxSize, m_prebuf_size - m_prebuf_fill)) > 0) + if ((maxSize = qMin(maxSize, m_prebuf_size - m_prebuf_fill)) > 0) { memmove(m_prebuf + m_prebuf_fill, data, maxSize); m_prebuf_fill += maxSize; @@ -325,7 +325,7 @@ qint64 AudioRendererAlsa::writeAudio(unsigned char *data, qint64 maxSize) long AudioRendererAlsa::alsa_write(unsigned char *data, long size) { long m = snd_pcm_avail_update(pcm_handle); - if(m >= 0 && m < size) + if (m >= 0 && m < size) { snd_pcm_wait(pcm_handle, 500); return 0; diff --git a/engine/audio/src/audiorenderer_coreaudio.cpp b/engine/audio/src/audiorenderer_coreaudio.cpp index 7797bd7fa8..9570cd9d2f 100644 --- a/engine/audio/src/audiorenderer_coreaudio.cpp +++ b/engine/audio/src/audiorenderer_coreaudio.cpp @@ -106,7 +106,7 @@ qint64 AudioRendererCoreAudio::latency() qint64 AudioRendererCoreAudio::writeAudio(unsigned char *data, qint64 maxSize) { - if(m_buffersFilled == AUDIO_BUFFERS_NUM) + if (m_buffersFilled == AUDIO_BUFFERS_NUM) return 0; qint64 size = maxSize; diff --git a/engine/audio/src/audiorenderer_portaudio.cpp b/engine/audio/src/audiorenderer_portaudio.cpp index 25ea4484f6..9456966945 100644 --- a/engine/audio/src/audiorenderer_portaudio.cpp +++ b/engine/audio/src/audiorenderer_portaudio.cpp @@ -41,15 +41,15 @@ AudioRendererPortAudio::~AudioRendererPortAudio() PaError err; err = Pa_Terminate(); - if( err != paNoError ) - qDebug() << "PortAudio error: " << Pa_GetErrorText( err ); + if (err != paNoError) + qDebug() << "PortAudio error: " << Pa_GetErrorText(err); } -int AudioRendererPortAudio::dataCallback ( const void *, void *outputBuffer, - unsigned long frameCount, - const PaStreamCallbackTimeInfo*, - PaStreamCallbackFlags , - void *userData ) +int AudioRendererPortAudio::dataCallback(const void *, void *outputBuffer, + unsigned long frameCount, + const PaStreamCallbackTimeInfo*, + PaStreamCallbackFlags , + void *userData) { AudioRendererPortAudio *PAobj = (AudioRendererPortAudio *)userData; @@ -81,7 +81,7 @@ bool AudioRendererPortAudio::initialize(quint32 freq, int chan, AudioFormat form PaStreamFlags flags = paNoFlag; err = Pa_Initialize(); - if( err != paNoError ) + if (err != paNoError) return false; if (m_device.isEmpty()) @@ -105,7 +105,7 @@ bool AudioRendererPortAudio::initialize(quint32 freq, int chan, AudioFormat form m_channels = chan; outputParameters.channelCount = chan; /* stereo output */ - outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency; + outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency; outputParameters.hostApiSpecificStreamInfo = NULL; switch (format) @@ -131,15 +131,15 @@ bool AudioRendererPortAudio::initialize(quint32 freq, int chan, AudioFormat form return false; } - err = Pa_OpenStream( &m_paStream, NULL, &outputParameters, - freq, paFramesPerBufferUnspecified, flags, dataCallback, this ); + err = Pa_OpenStream(&m_paStream, NULL, &outputParameters, + freq, paFramesPerBufferUnspecified, flags, dataCallback, this); - if( err != paNoError ) + if (err != paNoError) return false; - err = Pa_StartStream( m_paStream ); + err = Pa_StartStream(m_paStream); - if( err != paNoError ) + if (err != paNoError) return false; return true; @@ -157,19 +157,19 @@ QList AudioRendererPortAudio::getDevicesInfo() int numDevices, err, i; err = Pa_Initialize(); - if( err != paNoError ) + if (err != paNoError) return devList; numDevices = Pa_GetDeviceCount(); - if( numDevices < 0 ) + if (numDevices < 0) { - qWarning("ERROR: Pa_CountDevices returned 0x%x\n", numDevices ); + qWarning("ERROR: Pa_CountDevices returned 0x%x\n", numDevices); return devList; } for (i = 0; i < numDevices; i++) { - const PaDeviceInfo *deviceInfo = Pa_GetDeviceInfo( i ); + const PaDeviceInfo *deviceInfo = Pa_GetDeviceInfo(i); if (deviceInfo != NULL) { AudioDeviceInfo info; @@ -185,8 +185,8 @@ QList AudioRendererPortAudio::getDevicesInfo() } err = Pa_Terminate(); - if( err != paNoError ) - qDebug() << "PortAudio error: " << Pa_GetErrorText( err ); + if (err != paNoError) + qDebug() << "PortAudio error: " << Pa_GetErrorText(err); return devList; } @@ -211,16 +211,16 @@ void AudioRendererPortAudio::drain() void AudioRendererPortAudio::reset() { QMutexLocker locker(&m_paMutex); - if ( m_paStream == NULL) + if (m_paStream == NULL) return; PaError err; - err = Pa_StopStream( m_paStream ); - if( err != paNoError ) + err = Pa_StopStream(m_paStream); + if (err != paNoError) qDebug() << "PortAudio Error: Stop stream failed!"; - err = Pa_CloseStream( m_paStream ); - if( err != paNoError ) + err = Pa_CloseStream(m_paStream); + if (err != paNoError) qDebug() << "PortAudio Error: Close stream failed!"; m_buffer.clear(); m_paStream = NULL; @@ -232,5 +232,4 @@ void AudioRendererPortAudio::suspend() void AudioRendererPortAudio::resume() { - } diff --git a/engine/audio/src/audiorenderer_portaudio.h b/engine/audio/src/audiorenderer_portaudio.h index 40a6bb2136..b8d1c99059 100644 --- a/engine/audio/src/audiorenderer_portaudio.h +++ b/engine/audio/src/audiorenderer_portaudio.h @@ -63,11 +63,11 @@ class AudioRendererPortAudio : public AudioRenderer void resume(); private: - static int dataCallback ( const void *inputBuffer, void *outputBuffer, - unsigned long framesPerBuffer, - const PaStreamCallbackTimeInfo* timeInfo, - PaStreamCallbackFlags statusFlags, - void *userData ); + static int dataCallback (const void *inputBuffer, void *outputBuffer, + unsigned long framesPerBuffer, + const PaStreamCallbackTimeInfo* timeInfo, + PaStreamCallbackFlags statusFlags, + void *userData ); PaStream *m_paStream; QMutex m_paMutex; diff --git a/engine/audio/src/audiorenderer_qt5.cpp b/engine/audio/src/audiorenderer_qt5.cpp index db182a1230..165ce3efec 100644 --- a/engine/audio/src/audiorenderer_qt5.cpp +++ b/engine/audio/src/audiorenderer_qt5.cpp @@ -129,7 +129,7 @@ QList AudioRendererQt5::getDevicesInfo() } // add the devices left in the input list. These don't have output capabilities - foreach(QString dev, inDevs) + foreach (QString dev, inDevs) { AudioDeviceInfo info; info.deviceName = dev; diff --git a/engine/audio/src/audiorenderer_qt6.cpp b/engine/audio/src/audiorenderer_qt6.cpp index 289ec588aa..dd12676de3 100644 --- a/engine/audio/src/audiorenderer_qt6.cpp +++ b/engine/audio/src/audiorenderer_qt6.cpp @@ -121,7 +121,7 @@ QList AudioRendererQt6::getDevicesInfo() } // add the devices left in the input list. These don't have output capabilities - foreach(QString dev, inDevs) + foreach (QString dev, inDevs) { AudioDeviceInfo info; info.deviceName = dev; diff --git a/engine/src/channelmodifier.cpp b/engine/src/channelmodifier.cpp index a0b2fc452d..6d23657b6b 100644 --- a/engine/src/channelmodifier.cpp +++ b/engine/src/channelmodifier.cpp @@ -119,7 +119,7 @@ QFile::FileError ChannelModifier::saveXML(const QString &fileName) doc.writeTextElement(KXMLQLCChannelModName, m_name); qDebug() << "Got map with" << m_map.count() << "handlers"; - for(int i = 0; i < m_map.count(); i++) + for (int i = 0; i < m_map.count(); i++) { QPair mapElement = m_map.at(i); doc.writeStartElement(KXMLQLCChannelModHandler); @@ -176,7 +176,7 @@ QFile::FileError ChannelModifier::loadXML(const QString &fileName, Type type) { setName(doc->readElementText()); } - else if(doc->name() == KXMLQLCChannelModHandler) + else if (doc->name() == KXMLQLCChannelModHandler) { QPair dmxPair(0, 0); QXmlStreamAttributes attrs = doc->attributes(); diff --git a/engine/src/channelsgroup.cpp b/engine/src/channelsgroup.cpp index 7b165e25e7..62283a9005 100644 --- a/engine/src/channelsgroup.cpp +++ b/engine/src/channelsgroup.cpp @@ -263,7 +263,7 @@ bool ChannelsGroup::saveXML(QXmlStreamWriter *doc) Q_ASSERT(doc != NULL); QString str; - foreach(SceneValue value, this->getChannels()) + foreach (SceneValue value, this->getChannels()) { if (str.isEmpty() == false) str.append(","); diff --git a/engine/src/chaser.cpp b/engine/src/chaser.cpp index 0fd99b4d1e..3a127628e9 100644 --- a/engine/src/chaser.cpp +++ b/engine/src/chaser.cpp @@ -232,7 +232,7 @@ void Chaser::setTotalDuration(quint32 msec) { uint origDuration = m_steps[i].duration; m_steps[i].duration = ((double)m_steps[i].duration * msec) / dtDuration; - if(m_steps[i].hold) + if (m_steps[i].hold) m_steps[i].hold = ((double)m_steps[i].hold * (double)m_steps[i].duration) / (double)origDuration; m_steps[i].fadeIn = m_steps[i].duration - m_steps[i].hold; if (m_steps[i].fadeOut) @@ -576,7 +576,7 @@ bool Chaser::contains(quint32 functionId) Doc *doc = this->doc(); Q_ASSERT(doc != NULL); - foreach(ChaserStep step, m_steps) + foreach (ChaserStep step, m_steps) { Function *function = doc->function(step.fid); // contains() can be called during init, function may be NULL @@ -596,7 +596,7 @@ QList Chaser::components() { QList ids; - foreach(ChaserStep step, m_steps) + foreach (ChaserStep step, m_steps) ids.append(step.fid); return ids; diff --git a/engine/src/chaserrunner.cpp b/engine/src/chaserrunner.cpp index 33c5e0f323..3ea2a8a436 100644 --- a/engine/src/chaserrunner.cpp +++ b/engine/src/chaserrunner.cpp @@ -57,7 +57,7 @@ ChaserRunner::ChaserRunner(const Doc *doc, const Chaser *chaser, quint32 startTi qDebug() << "[ChaserRunner] startTime:" << startTime; int idx = 0; quint32 stepsTime = 0; - foreach(ChaserStep step, chaser->steps()) + foreach (ChaserStep step, chaser->steps()) { uint duration = m_chaser->durationMode() == Chaser::Common ? m_chaser->duration() : step.duration; @@ -96,7 +96,7 @@ void ChaserRunner::slotChaserChanged() // Handle (possible) speed change on the next write() pass m_updateOverrideSpeeds = true; QList delList; - foreach(ChaserRunnerStep *step, m_runnerSteps) + foreach (ChaserRunnerStep *step, m_runnerSteps) { if (!m_chaser->steps().contains(ChaserStep(step->m_function->id()))) { @@ -111,7 +111,7 @@ void ChaserRunner::slotChaserChanged() step->m_duration = stepDuration(step->m_index); } } - foreach(ChaserRunnerStep *step, delList) + foreach (ChaserRunnerStep *step, delList) { step->m_function->stop(functionParent()); m_runnerSteps.removeAll(step); @@ -242,7 +242,7 @@ void ChaserRunner::setAction(ChaserAction &action) { bool stopped = false; - foreach(ChaserRunnerStep *step, m_runnerSteps) + foreach (ChaserRunnerStep *step, m_runnerSteps) { if (action.m_stepIndex == step->m_index) { @@ -428,7 +428,7 @@ void ChaserRunner::adjustStepIntensity(qreal fraction, int requestedStepIndex, i m_pendingAction.m_masterIntensity = fraction; } - foreach(ChaserRunnerStep *step, m_runnerSteps) + foreach (ChaserRunnerStep *step, m_runnerSteps) { if (stepIndex == step->m_index && step->m_function != NULL) { @@ -464,7 +464,7 @@ void ChaserRunner::adjustStepIntensity(qreal fraction, int requestedStepIndex, i void ChaserRunner::clearRunningList() { // empty the running queue - foreach(ChaserRunnerStep *step, m_runnerSteps) + foreach (ChaserRunnerStep *step, m_runnerSteps) { if (step->m_function) { @@ -712,7 +712,7 @@ void ChaserRunner::setPause(bool enable, QList universes) qDebug() << "[ChaserRunner] processing pause request:" << enable; - foreach(ChaserRunnerStep *step, m_runnerSteps) + foreach (ChaserRunnerStep *step, m_runnerSteps) step->m_function->setPause(enable); // there might be a Scene fading out, so request pause @@ -767,7 +767,7 @@ bool ChaserRunner::write(MasterTimer *timer, QList universes) quint32 prevStepRoundElapsed = 0; - foreach(ChaserRunnerStep *step, m_runnerSteps) + foreach (ChaserRunnerStep *step, m_runnerSteps) { if (m_chaser->tempoType() == Function::Beats && timer->isBeat()) { diff --git a/engine/src/chaserstep.cpp b/engine/src/chaserstep.cpp index 750b9fb4af..78cbae3cd1 100644 --- a/engine/src/chaserstep.cpp +++ b/engine/src/chaserstep.cpp @@ -284,7 +284,7 @@ bool ChaserStep::saveXML(QXmlStreamWriter *doc, int stepNumber, bool isSequence) doc->writeAttribute(KXMLQLCSequenceSceneValues, QString::number(values.count())); QString stepValues; quint32 fixtureID = Fixture::invalidId(); - foreach(SceneValue scv, values) + foreach (SceneValue scv, values) { // step values are saved as a string with the following syntax: // fixtureID:channel,value,channel,value:fixtureID:channel,value ... etc diff --git a/engine/src/collection.cpp b/engine/src/collection.cpp index daf2d37217..894eb3acfd 100644 --- a/engine/src/collection.cpp +++ b/engine/src/collection.cpp @@ -61,7 +61,7 @@ quint32 Collection::totalDuration() { quint32 totalDuration = 0; - foreach(QVariant fid, functions()) + foreach (QVariant fid, functions()) { Function* function = doc()->function(fid.toUInt()); totalDuration += function->totalDuration(); diff --git a/engine/src/doc.cpp b/engine/src/doc.cpp index 18ced3ec33..9e285771cc 100644 --- a/engine/src/doc.cpp +++ b/engine/src/doc.cpp @@ -535,7 +535,7 @@ bool Doc::replaceFixtures(QList newFixturesList) m_latestFixtureId = 0; m_addresses.clear(); - foreach(Fixture *fixture, newFixturesList) + foreach (Fixture *fixture, newFixturesList) { quint32 id = fixture->id(); // create a copy of the original cause remapping will @@ -1046,7 +1046,7 @@ QList Doc::functions() const QList Doc::functionsByType(Function::Type type) const { QList list; - foreach(Function *f, m_functions) + foreach (Function *f, m_functions) { if (f != NULL && f->type() == type) list.append(f); @@ -1056,7 +1056,7 @@ QList Doc::functionsByType(Function::Type type) const Function *Doc::functionByName(QString name) { - foreach(Function *f, m_functions) + foreach (Function *f, m_functions) { if (f != NULL && f->name() == name) return f; @@ -1187,7 +1187,7 @@ QList Doc::getUsage(quint32 fid) Show *s = qobject_cast(f); foreach (Track *t, s->tracks()) { - foreach(ShowFunction *sf, t->showFunctions()) + foreach (ShowFunction *sf, t->showFunctions()) { if (sf->functionID() == fid) { diff --git a/engine/src/efx.cpp b/engine/src/efx.cpp index 871db8d55f..1e9cf321e9 100644 --- a/engine/src/efx.cpp +++ b/engine/src/efx.cpp @@ -135,7 +135,7 @@ void EFX::setDuration(uint ms) { Function::setDuration(ms); - for(int i = 0; i < m_fixtures.size(); ++i) + for (int i = 0; i < m_fixtures.size(); ++i) m_fixtures[i]->durationChanged(); emit durationChanged(ms); @@ -614,7 +614,7 @@ bool EFX::addFixture(EFXFixture* ef) * not prevent multiple entries because a fixture can have multiple efx. */ //! @todo Prevent multiple entries using head & mode int i; - for(i = 0; i < m_fixtures.size (); i++) + for (i = 0; i < m_fixtures.size (); i++) { if (m_fixtures[i]->head() == ef->head()) { @@ -624,7 +624,7 @@ bool EFX::addFixture(EFXFixture* ef) } /* If not inserted, put the EFXFixture object into our list */ - if(i >= m_fixtures.size()) + if (i >= m_fixtures.size()) m_fixtures.append(ef); emit changed(this->id()); diff --git a/engine/src/efxfixture.cpp b/engine/src/efxfixture.cpp index d8803b7115..144b2ec524 100644 --- a/engine/src/efxfixture.cpp +++ b/engine/src/efxfixture.cpp @@ -56,7 +56,7 @@ EFXFixture::EFXFixture(const EFX* parent) { Q_ASSERT(parent != NULL); - if(m_rgbGradient.isNull ()) + if (m_rgbGradient.isNull ()) m_rgbGradient = Gradient::getRGBGradient (256, 256); } @@ -205,15 +205,15 @@ QStringList EFXFixture::modeList() QStringList modes; - if(fxi->channelNumber(QLCChannel::Pan, QLCChannel::MSB, head().head) != QLCChannel::invalid() || + if (fxi->channelNumber(QLCChannel::Pan, QLCChannel::MSB, head().head) != QLCChannel::invalid() || fxi->channelNumber(QLCChannel::Tilt, QLCChannel::MSB, head().head) != QLCChannel::invalid()) modes << KXMLQLCEFXFixtureModePanTilt; - if(fxi->masterIntensityChannel() != QLCChannel::invalid() || + if (fxi->masterIntensityChannel() != QLCChannel::invalid() || fxi->channelNumber(QLCChannel::Intensity, QLCChannel::MSB, head().head) != QLCChannel::invalid()) modes << KXMLQLCEFXFixtureModeDimmer; - if(fxi->rgbChannels(head().head).size() >= 3) + if (fxi->rgbChannels(head().head).size() >= 3) modes << KXMLQLCEFXFixtureModeRGB; return modes; diff --git a/engine/src/fixturegroup.cpp b/engine/src/fixturegroup.cpp index 55d478e7f8..94b20fde91 100644 --- a/engine/src/fixturegroup.cpp +++ b/engine/src/fixturegroup.cpp @@ -379,7 +379,7 @@ bool FixtureGroup::saveXML(QXmlStreamWriter *doc) /* Fixture heads */ QList pointsList = m_heads.keys(); - foreach(QLCPoint pt, pointsList) + foreach (QLCPoint pt, pointsList) { GroupHead head = m_heads[pt]; doc->writeStartElement(KXMLQLCFixtureGroupHead); diff --git a/engine/src/function.cpp b/engine/src/function.cpp index f0cf5a5b98..68b1e44671 100644 --- a/engine/src/function.cpp +++ b/engine/src/function.cpp @@ -1386,7 +1386,7 @@ int Function::getAttributeIndex(QString name) const for (int i = 0; i < m_attributes.count(); i++) { Attribute attr = m_attributes.at(i); - if(attr.m_name == name) + if (attr.m_name == name) return i; } return -1; diff --git a/engine/src/gradient.cpp b/engine/src/gradient.cpp index f8ebc2344b..bd06cb2579 100644 --- a/engine/src/gradient.cpp +++ b/engine/src/gradient.cpp @@ -59,7 +59,7 @@ void Gradient::fillWithGradient(int r, int g, int b, QPainter *painter, int x) void Gradient::initialize() { - if( m_rgb.isNull() == false ) + if (m_rgb.isNull() == false) return; m_rgb = QImage(256, 256, QImage::Format_RGB32); diff --git a/engine/src/inputoutputmap.cpp b/engine/src/inputoutputmap.cpp index 75ba9a6a87..f4c6cae17f 100644 --- a/engine/src/inputoutputmap.cpp +++ b/engine/src/inputoutputmap.cpp @@ -323,7 +323,7 @@ void InputOutputMap::setGrandMasterChannelMode(GrandMaster::ChannelMode mode) { Q_ASSERT(m_grandMaster != NULL); - if(m_grandMaster->channelMode() != mode) + if (m_grandMaster->channelMode() != mode) { m_grandMaster->setChannelMode(mode); m_universeChanged = true; @@ -341,7 +341,7 @@ void InputOutputMap::setGrandMasterValueMode(GrandMaster::ValueMode mode) { Q_ASSERT(m_grandMaster != NULL); - if(m_grandMaster->valueMode() != mode) + if (m_grandMaster->valueMode() != mode) { m_grandMaster->setValueMode(mode); m_universeChanged = true; @@ -1287,7 +1287,7 @@ bool InputOutputMap::saveXML(QXmlStreamWriter *doc) const /* IO Map Instance entry */ doc->writeStartElement(KXMLIOMap); - foreach(Universe *uni, m_universeArray) + foreach (Universe *uni, m_universeArray) uni->saveXML(doc); doc->writeEndElement(); diff --git a/engine/src/inputpatch.cpp b/engine/src/inputpatch.cpp index 3481003c5d..b0878dcf72 100644 --- a/engine/src/inputpatch.cpp +++ b/engine/src/inputpatch.cpp @@ -140,7 +140,7 @@ bool InputPatch::reconnect() bool ret = m_plugin->openInput(m_pluginLine, m_universe); if (ret == true) { - foreach(QString par, m_parametersCache.keys()) + foreach (QString par, m_parametersCache.keys()) { qDebug() << "[InputPatch] restoring parameter:" << par << m_parametersCache[par]; m_plugin->setParameter(m_universe, m_pluginLine, QLCIOPlugin::Input, par, m_parametersCache[par]); diff --git a/engine/src/monitorproperties.cpp b/engine/src/monitorproperties.cpp index 11d376257e..8ee1bee6e2 100644 --- a/engine/src/monitorproperties.cpp +++ b/engine/src/monitorproperties.cpp @@ -707,7 +707,7 @@ bool MonitorProperties::saveXML(QXmlStreamWriter *doc, const Doc *mainDocument) doc->writeTextElement(KXMLQLCMonitorCommonBackground, mainDocument->normalizeComponentPath(commonBackgroundImage())); } - else if(customBackgroundList().isEmpty() == false) + else if (customBackgroundList().isEmpty() == false) { QMapIterator it(customBackgroundList()); while (it.hasNext() == true) @@ -801,7 +801,7 @@ bool MonitorProperties::saveXML(QXmlStreamWriter *doc, const Doc *mainDocument) // * write generic items information * // *********************************************************** QMapIterator it(m_genericItems); - while(it.hasNext()) + while (it.hasNext()) { it.next(); quint32 itemID = it.key(); diff --git a/engine/src/outputpatch.cpp b/engine/src/outputpatch.cpp index b7b6564d03..bce2ae056b 100644 --- a/engine/src/outputpatch.cpp +++ b/engine/src/outputpatch.cpp @@ -97,7 +97,7 @@ bool OutputPatch::reconnect() bool ret = m_plugin->openOutput(m_pluginLine, m_universe); if (ret == true) { - foreach(QString par, m_parametersCache.keys()) + foreach (QString par, m_parametersCache.keys()) m_plugin->setParameter(m_universe, m_pluginLine, QLCIOPlugin::Output, par, m_parametersCache[par]); } return ret; diff --git a/engine/src/qlccapability.cpp b/engine/src/qlccapability.cpp index 8a89bd311e..f3b456ab4c 100644 --- a/engine/src/qlccapability.cpp +++ b/engine/src/qlccapability.cpp @@ -469,7 +469,7 @@ bool QLCCapability::loadXML(QXmlStreamReader &doc) /* ************************* LEGACY ATTRIBUTES ************************* */ /* Get (optional) resource name for gobo/effect/... */ - if(attrs.hasAttribute(KXMLQLCCapabilityResource)) + if (attrs.hasAttribute(KXMLQLCCapabilityResource)) { QString path = attrs.value(KXMLQLCCapabilityResource).toString(); if (QFileInfo(path).isRelative()) diff --git a/engine/src/qlcfile.h b/engine/src/qlcfile.h index b7f65d71da..8c53e6e476 100644 --- a/engine/src/qlcfile.h +++ b/engine/src/qlcfile.h @@ -129,7 +129,7 @@ class QLCFile * @param extension * @return */ - static QDir systemDirectory(QString path, QString extension = QString() ); + static QDir systemDirectory(QString path, QString extension = QString()); /** * @brief systemDirectory returns a system dependant QDir based diff --git a/engine/src/qlcfixturehead.cpp b/engine/src/qlcfixturehead.cpp index 1173abe22d..11e5d47637 100644 --- a/engine/src/qlcfixturehead.cpp +++ b/engine/src/qlcfixturehead.cpp @@ -174,7 +174,7 @@ void QLCFixtureHead::cacheChannels(const QLCFixtureMode* mode) m_shutterChannels.clear(); m_channelsMap.clear(); - foreach(quint32 i, m_channels) + foreach (quint32 i, m_channels) { if ((int)i >= mode->channels().size()) { @@ -264,7 +264,7 @@ bool QLCFixtureHead::saveXML(QXmlStreamWriter *doc) const doc->writeStartElement(KXMLQLCFixtureHead); - foreach(quint32 index, m_channels) + foreach (quint32 index, m_channels) doc->writeTextElement(KXMLQLCFixtureHeadChannel, QString::number(index)); doc->writeEndElement(); diff --git a/engine/src/qlcfixturemode.cpp b/engine/src/qlcfixturemode.cpp index 1a5a7546eb..4b19d9a6f5 100644 --- a/engine/src/qlcfixturemode.cpp +++ b/engine/src/qlcfixturemode.cpp @@ -422,7 +422,7 @@ bool QLCFixtureMode::loadXML(QXmlStreamReader &doc) foreach (ChannelActsOnData channelSctsOnData, listChannelsWithActsOnIndex) { - if(m_channels.contains(channelSctsOnData.channel) && + if (m_channels.contains(channelSctsOnData.channel) && channelSctsOnData.actsOnIndex >= 0 && m_channels.size() > channelSctsOnData.actsOnIndex) { @@ -462,7 +462,7 @@ bool QLCFixtureMode::saveXML(QXmlStreamWriter *doc) if (m_actsOnChannelsList.contains(channel)) { QLCChannel *ChannelActsOn = m_actsOnChannelsList.value(channel); - if(ChannelActsOn != NULL){ + if (ChannelActsOn != NULL){ doc->writeAttribute(KXMLQLCFixtureModeChannelActsOn, QString::number(m_channels.indexOf(ChannelActsOn))); } } diff --git a/engine/src/rgbimage.cpp b/engine/src/rgbimage.cpp index 259f0e70cd..78d53b3c39 100644 --- a/engine/src/rgbimage.cpp +++ b/engine/src/rgbimage.cpp @@ -45,7 +45,7 @@ RGBImage::RGBImage(Doc * doc) } RGBImage::RGBImage(const RGBImage& i) - : RGBAlgorithm( i.doc()) + : RGBAlgorithm(i.doc()) , m_filename(i.filename()) , m_animatedSource(i.animatedSource()) , m_animationStyle(i.animationStyle()) diff --git a/engine/src/rgbmatrix.cpp b/engine/src/rgbmatrix.cpp index 881c51eb7f..7b551b2c11 100644 --- a/engine/src/rgbmatrix.cpp +++ b/engine/src/rgbmatrix.cpp @@ -216,7 +216,7 @@ void RGBMatrix::setAlgorithm(RGBAlgorithm* algo) { RGBScript *script = static_cast (m_algorithm); QHashIterator it(m_properties); - while(it.hasNext()) + while (it.hasNext()) { it.next(); if (script->setProperty(it.key(), it.value()) == false) @@ -476,7 +476,7 @@ bool RGBMatrix::saveXML(QXmlStreamWriter *doc) /* Properties */ QHashIterator it(m_properties); - while(it.hasNext()) + while (it.hasNext()) { it.next(); doc->writeStartElement(KXMLQLCRGBMatrixProperty); @@ -531,7 +531,7 @@ void RGBMatrix::preRun(MasterTimer *timer) { RGBScript *script = static_cast (m_algorithm); QHashIterator it(m_properties); - while(it.hasNext()) + while (it.hasNext()) { it.next(); script->setProperty(it.key(), it.value()); diff --git a/engine/src/rgbscript.cpp b/engine/src/rgbscript.cpp index d5424d134c..349f00cbc1 100644 --- a/engine/src/rgbscript.cpp +++ b/engine/src/rgbscript.cpp @@ -61,7 +61,7 @@ RGBScript::RGBScript(const RGBScript& s) , m_apiVersion(0) { evaluate(); - foreach(RGBScriptProperty cap, s.m_properties) + foreach (RGBScriptProperty cap, s.m_properties) { setProperty(cap.m_name, s.property(cap.m_name)); } @@ -79,7 +79,7 @@ RGBScript &RGBScript::operator=(const RGBScript &s) m_contents = s.m_contents; m_apiVersion = s.m_apiVersion; evaluate(); - foreach(RGBScriptProperty cap, s.m_properties) + foreach (RGBScriptProperty cap, s.m_properties) { setProperty(cap.m_name, s.property(cap.m_name)); } @@ -364,7 +364,7 @@ QHash RGBScript::propertiesAsStrings() QMutexLocker engineLocker(s_engineMutex); QHash properties; - foreach(RGBScriptProperty cap, m_properties) + foreach (RGBScriptProperty cap, m_properties) { QScriptValue readMethod = m_script.property(cap.m_readMethod); if (readMethod.isFunction()) @@ -388,7 +388,7 @@ bool RGBScript::setProperty(QString propertyName, QString value) { QMutexLocker engineLocker(s_engineMutex); - foreach(RGBScriptProperty cap, m_properties) + foreach (RGBScriptProperty cap, m_properties) { if (cap.m_name == propertyName) { @@ -419,7 +419,7 @@ QString RGBScript::property(QString propertyName) const { QMutexLocker engineLocker(s_engineMutex); - foreach(RGBScriptProperty cap, m_properties) + foreach (RGBScriptProperty cap, m_properties) { if (cap.m_name == propertyName) { @@ -474,7 +474,7 @@ bool RGBScript::loadProperties() RGBScriptProperty newCap; QStringList propsList = cap.split("|"); - foreach(QString prop, propsList) + foreach (QString prop, propsList) { QStringList keyValue = prop.split(":"); if (keyValue.length() < 2) diff --git a/engine/src/rgbscriptv4.cpp b/engine/src/rgbscriptv4.cpp index 938ffa2886..7fa9a42258 100644 --- a/engine/src/rgbscriptv4.cpp +++ b/engine/src/rgbscriptv4.cpp @@ -53,7 +53,7 @@ RGBScript::RGBScript(const RGBScript& s) , m_apiVersion(0) { evaluate(); - foreach(RGBScriptProperty cap, s.m_properties) + foreach (RGBScriptProperty cap, s.m_properties) { setProperty(cap.m_name, s.property(cap.m_name)); } @@ -71,7 +71,7 @@ RGBScript &RGBScript::operator=(const RGBScript &s) m_contents = s.m_contents; m_apiVersion = s.m_apiVersion; evaluate(); - foreach(RGBScriptProperty cap, s.m_properties) + foreach (RGBScriptProperty cap, s.m_properties) { setProperty(cap.m_name, s.property(cap.m_name)); } @@ -347,7 +347,7 @@ QHash RGBScript::propertiesAsStrings() QMutexLocker engineLocker(s_engineMutex); QHash properties; - foreach(RGBScriptProperty cap, m_properties) + foreach (RGBScriptProperty cap, m_properties) { QJSValue readMethod = m_script.property(cap.m_readMethod); if (readMethod.isCallable()) @@ -367,7 +367,7 @@ bool RGBScript::setProperty(QString propertyName, QString value) { QMutexLocker engineLocker(s_engineMutex); - foreach(RGBScriptProperty cap, m_properties) + foreach (RGBScriptProperty cap, m_properties) { if (cap.m_name == propertyName) { @@ -398,7 +398,7 @@ QString RGBScript::property(QString propertyName) const { QMutexLocker engineLocker(s_engineMutex); - foreach(RGBScriptProperty cap, m_properties) + foreach (RGBScriptProperty cap, m_properties) { if (cap.m_name == propertyName) { @@ -453,7 +453,7 @@ bool RGBScript::loadProperties() RGBScriptProperty newCap; QStringList propsList = cap.split("|"); - foreach(QString prop, propsList) + foreach (QString prop, propsList) { QStringList keyValue = prop.split(":"); if (keyValue.length() < 2) diff --git a/engine/src/scene.cpp b/engine/src/scene.cpp index 1c572dbe61..688ff2fb25 100644 --- a/engine/src/scene.cpp +++ b/engine/src/scene.cpp @@ -206,7 +206,7 @@ QList Scene::components() { QList ids; - foreach(SceneValue scv, m_values.keys()) + foreach (SceneValue scv, m_values.keys()) { if (ids.contains(scv.fxi) == false) ids.append(scv.fxi); @@ -222,7 +222,7 @@ QColor Scene::colorValue(quint32 fxi) bool found = false; QColor CMYcol; - foreach(SceneValue scv, m_values.keys()) + foreach (SceneValue scv, m_values.keys()) { if (fxi != Fixture::invalidId() && fxi != scv.fxi) continue; @@ -540,7 +540,7 @@ bool Scene::loadXML(QXmlStreamReader &root) if (chGrpIDs.isEmpty() == false) { QStringList grpArray = chGrpIDs.split(","); - foreach(QString grp, grpArray) + foreach (QString grp, grpArray) { m_channelGroups.append(grp.toUInt()); m_channelGroupsLevels.append(0); diff --git a/engine/src/script.cpp b/engine/src/script.cpp index fe87eb5b72..dc22b636ee 100644 --- a/engine/src/script.cpp +++ b/engine/src/script.cpp @@ -307,7 +307,7 @@ bool Script::saveXML(QXmlStreamWriter *doc) saveXMLRunOrder(doc); /* Contents */ - foreach(QString cmd, dataLines()) + foreach (QString cmd, dataLines()) { doc->writeTextElement(KXMLQLCScriptCommand, QUrl::toPercentEncoding(cmd)); } diff --git a/engine/src/scriptv4.cpp b/engine/src/scriptv4.cpp index d72fe43056..c85458c8c8 100644 --- a/engine/src/scriptv4.cpp +++ b/engine/src/scriptv4.cpp @@ -306,7 +306,7 @@ bool Script::saveXML(QXmlStreamWriter *doc) saveXMLRunOrder(doc); /* Contents */ - foreach(QString cmd, dataLines()) + foreach (QString cmd, dataLines()) { doc->writeTextElement(KXMLQLCScriptCommand, QUrl::toPercentEncoding(cmd)); } diff --git a/engine/src/show.cpp b/engine/src/show.cpp index 9d1a495c26..c14bd652b9 100644 --- a/engine/src/show.cpp +++ b/engine/src/show.cpp @@ -65,9 +65,9 @@ quint32 Show::totalDuration() { quint32 totalDuration = 0; - foreach(Track *track, tracks()) + foreach (Track *track, tracks()) { - foreach(ShowFunction *sf, track->showFunctions()) + foreach (ShowFunction *sf, track->showFunctions()) { if (sf->startTime() + sf->duration(doc()) > totalDuration) totalDuration = sf->startTime() + sf->duration(doc()); @@ -111,7 +111,7 @@ bool Show::copyFrom(const Function* function) m_latestTrackId = show->m_latestTrackId; // create a copy of each track - foreach(Track *track, show->tracks()) + foreach (Track *track, show->tracks()) { quint32 sceneID = track->getSceneID(); Track* newTrack = new Track(sceneID, this); @@ -119,7 +119,7 @@ bool Show::copyFrom(const Function* function) addTrack(newTrack); // create a copy of each sequence/audio in a track - foreach(ShowFunction *sfunc, track->showFunctions()) + foreach (ShowFunction *sfunc, track->showFunctions()) { Function* function = doc()->function(sfunc->functionID()); if (function == NULL) @@ -300,7 +300,7 @@ void Show::moveTrack(Track *track, int direction) qint32 swapID = -1; if (direction > 0) swapID = INT_MAX; - foreach(quint32 id, m_tracks.keys()) + foreach (quint32 id, m_tracks.keys()) { qint32 signedID = (qint32)id; if (signedID > maxID) maxID = signedID; @@ -377,7 +377,7 @@ bool Show::saveXML(QXmlStreamWriter *doc) doc->writeAttribute(KXMLQLCShowTimeBPM, QString::number(m_timeDivisionBPM)); doc->writeEndElement(); - foreach(Track *track, m_tracks) + foreach (Track *track, m_tracks) track->saveXML(doc); /* End the tag */ @@ -478,7 +478,7 @@ void Show::preRun(MasterTimer* timer) m_runner = new ShowRunner(doc(), this->id(), elapsed()); int i = 0; - foreach(Track *track, m_tracks.values()) + foreach (Track *track, m_tracks.values()) m_runner->adjustIntensity(getAttributeValue(i++), track); connect(m_runner, SIGNAL(timeChanged(quint32)), this, SIGNAL(timeChanged(quint32))); diff --git a/engine/src/showrunner.cpp b/engine/src/showrunner.cpp index b6525fac50..37a37eaa59 100644 --- a/engine/src/showrunner.cpp +++ b/engine/src/showrunner.cpp @@ -51,7 +51,7 @@ ShowRunner::ShowRunner(const Doc* doc, quint32 showID, quint32 startTime) if (m_show == NULL) return; - foreach(Track *track, m_show->tracks()) + foreach (Track *track, m_show->tracks()) { // some sanity checks if (track == NULL || @@ -62,7 +62,7 @@ ShowRunner::ShowRunner(const Doc* doc, quint32 showID, quint32 startTime) continue; // get all the functions of the track and append them to the runner queue - foreach(ShowFunction *sfunc, track->showFunctions()) + foreach (ShowFunction *sfunc, track->showFunctions()) { if (sfunc->startTime() + sfunc->duration(m_doc) <= startTime) continue; @@ -252,7 +252,7 @@ void ShowRunner::write(MasterTimer *timer) // It is done in reverse order for two reasons: // 1- m_runningQueue is not ordered by stop time // 2- to avoid messing up with indices when an entry is removed - for(int i = m_runningQueue.count() - 1; i >= 0; i--) + for (int i = m_runningQueue.count() - 1; i >= 0; i--) { Function *func = m_runningQueue.at(i).first; quint32 stopTime = m_runningQueue.at(i).second; diff --git a/engine/src/track.cpp b/engine/src/track.cpp index 75369ea081..d9bb6b9485 100644 --- a/engine/src/track.cpp +++ b/engine/src/track.cpp @@ -192,7 +192,7 @@ bool Track::saveXML(QXmlStreamWriter *doc) /* Save the list of Functions if any is present */ if (m_functions.isEmpty() == false) { - foreach(ShowFunction *func, showFunctions()) + foreach (ShowFunction *func, showFunctions()) func->saveXML(doc); } diff --git a/engine/src/universe.cpp b/engine/src/universe.cpp index 7b0e734bf4..1008e5e4c0 100644 --- a/engine/src/universe.cpp +++ b/engine/src/universe.cpp @@ -337,7 +337,7 @@ void Universe::run() qDebug() << "Universe thread started" << id(); - while(m_running) + while (m_running) { if (m_semaphore.tryAcquire(1, timeout) == false) { @@ -1258,7 +1258,7 @@ bool Universe::savePluginParametersXML(QXmlStreamWriter *doc, doc->writeStartElement(KXMLQLCUniversePluginParameters); QMapIterator it(parameters); - while(it.hasNext()) + while (it.hasNext()) { it.next(); QString pName = it.key(); diff --git a/engine/src/video.cpp b/engine/src/video.cpp index ea910f469e..885f05cd3a 100644 --- a/engine/src/video.cpp +++ b/engine/src/video.cpp @@ -132,7 +132,7 @@ QStringList Video::getVideoCapabilities() { qDebug() << "Supported video types:" << mimeTypes; - foreach(QString mime, mimeTypes) + foreach (QString mime, mimeTypes) { if (mime.startsWith("video/")) { diff --git a/engine/test/efxfixture/efxfixture_test.cpp b/engine/test/efxfixture/efxfixture_test.cpp index 1b814f40da..ee3d638f1b 100644 --- a/engine/test/efxfixture/efxfixture_test.cpp +++ b/engine/test/efxfixture/efxfixture_test.cpp @@ -437,7 +437,7 @@ void EFXFixture_Test::startOffset() ef.setHead(GroupHead(0,0)); QCOMPARE(0, ef.startOffset()); - for(int i = 0; i < 360; i += 90) + for (int i = 0; i < 360; i += 90) { ef.setStartOffset(i); QCOMPARE(i, ef.startOffset()); diff --git a/engine/test/rgbscript/rgbscript_test.cpp b/engine/test/rgbscript/rgbscript_test.cpp index 888bc5e935..af39714acf 100644 --- a/engine/test/rgbscript/rgbscript_test.cpp +++ b/engine/test/rgbscript/rgbscript_test.cpp @@ -58,7 +58,7 @@ void RGBScript_Test::directories() QDir dir = RGBScriptsCache::systemScriptsDirectory(); QCOMPARE(dir.filter(), QDir::Files); QCOMPARE(dir.nameFilters(), QStringList() << QString("*.js")); -#if defined( __APPLE__) || defined(Q_OS_MAC) +#if defined(__APPLE__) || defined(Q_OS_MAC) QString path("%1/../%2"); QCOMPARE(dir.path(), path.arg(QCoreApplication::applicationDirPath()) .arg("Resources/RGBScripts")); @@ -71,7 +71,7 @@ void RGBScript_Test::directories() dir = RGBScriptsCache::userScriptsDirectory(); QCOMPARE(dir.filter(), QDir::Files); QCOMPARE(dir.nameFilters(), QStringList() << QString("*.js")); -#if defined( __APPLE__) || defined(Q_OS_MAC) +#if defined(__APPLE__) || defined(Q_OS_MAC) QVERIFY(dir.path().endsWith("Library/Application Support/QLC+/RGBScripts")); #elif defined(WIN32) || defined(Q_OS_WIN) QVERIFY(dir.path().endsWith("RGBScripts")); @@ -242,7 +242,7 @@ void RGBScript_Test::runScripts() // Iterate the list of scripts QStringList names = m_doc->rgbScriptsCache()->names(); - foreach(QString name, names) + foreach (QString name, names) { qDebug() << "Evaluating script" << name; RGBScript s = m_doc->rgbScriptsCache()->script(name); diff --git a/engine/test/universe/universe_test.cpp b/engine/test/universe/universe_test.cpp index 77d1bf6913..0702f3ed37 100644 --- a/engine/test/universe/universe_test.cpp +++ b/engine/test/universe/universe_test.cpp @@ -61,7 +61,7 @@ void Universe_Test::initial() QVERIFY(postGM != NULL); QCOMPARE(postGM->length(), 512); - for(ushort i = 0; i < 512; ++i) + for (ushort i = 0; i < 512; ++i) { QVERIFY(m_uni->channelCapabilities(i) == Universe::Undefined); QCOMPARE(int(preGM.at(i)), 0); diff --git a/fixtureeditor/addchannelsdialog.cpp b/fixtureeditor/addchannelsdialog.cpp index abcdd247ee..797731d728 100644 --- a/fixtureeditor/addchannelsdialog.cpp +++ b/fixtureeditor/addchannelsdialog.cpp @@ -98,7 +98,7 @@ void AddChannelsDialog::slotAddChannel() if (selection.count() == 0) return; - foreach(QTreeWidgetItem *item, selection) + foreach (QTreeWidgetItem *item, selection) { QTreeWidgetItem *newItem = item->clone(); m_modeTree->addTopLevelItem(newItem); @@ -112,7 +112,7 @@ void AddChannelsDialog::slotRemoveChannel() if (selection.count() == 0) return; - foreach(QTreeWidgetItem *item, selection) + foreach (QTreeWidgetItem *item, selection) { QTreeWidgetItem *newItem = item->clone(); m_allTree->addTopLevelItem(newItem); diff --git a/fixtureeditor/editchannel.cpp b/fixtureeditor/editchannel.cpp index bf4636b24b..3818f03090 100644 --- a/fixtureeditor/editchannel.cpp +++ b/fixtureeditor/editchannel.cpp @@ -240,7 +240,7 @@ void EditChannel::slotPresetActivated(int index) } } - foreach(QLCCapability *cap, m_channel->capabilities()) + foreach (QLCCapability *cap, m_channel->capabilities()) m_channel->removeCapability(cap); m_channel->addPresetCapability(); diff --git a/hotplugmonitor/src/hotplugmonitor.cpp b/hotplugmonitor/src/hotplugmonitor.cpp index 55c194ab3a..aca42f1558 100644 --- a/hotplugmonitor/src/hotplugmonitor.cpp +++ b/hotplugmonitor/src/hotplugmonitor.cpp @@ -26,7 +26,7 @@ #if defined(WIN32) || defined(Q_OS_WIN) # include "hpmprivate-win32.h" -#elif defined( __APPLE__) || defined(Q_OS_MAC) +#elif defined(__APPLE__) || defined(Q_OS_MAC) # include "hpmprivate-iokit.h" #else # include "hpmprivate-udev.h" diff --git a/main/main.cpp b/main/main.cpp index c0643d31e2..b788e21355 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -274,9 +274,9 @@ bool parseArgs() QLCArgs::enableWebAccess = true; QLCArgs::enableWebAuth = true; } - else if(arg == "-a" || arg == "--web-auth-file") + else if (arg == "-a" || arg == "--web-auth-file") { - if(it.hasNext()) + if (it.hasNext()) QLCArgs::webAccessPasswordFile = it.next(); } else if (arg == "-v" || arg == "--version") diff --git a/plugins/E1.31/configuree131.cpp b/plugins/E1.31/configuree131.cpp index 77cdce1c6d..7605e0a417 100644 --- a/plugins/E1.31/configuree131.cpp +++ b/plugins/E1.31/configuree131.cpp @@ -79,7 +79,7 @@ void ConfigureE131::fillMappingTree() QTreeWidgetItem* outputItem = NULL; QList IOmap = m_plugin->getIOMapping(); - foreach(E131IO io, IOmap) + foreach (E131IO io, IOmap) { E131Controller *controller = io.controller; if (controller == NULL) @@ -98,7 +98,7 @@ void ConfigureE131::fillMappingTree() outputItem->setText(KMapColumnInterface, tr("Outputs")); outputItem->setExpanded(true); } - foreach(quint32 universe, controller->universesList()) + foreach (quint32 universe, controller->universesList()) { UniverseInfo *info = controller->getUniverseInfo(universe); qDebug() << Q_FUNC_INFO << "uni" << universe << "type" << info->type; @@ -402,7 +402,7 @@ void ConfigureE131::accept() E131_UNIVERSE, universeSpin->value()); QComboBox* transCombo = qobject_cast(m_uniMapTree->itemWidget(item, KMapColumnTransmitMode)); - if(transCombo->currentIndex() == 1) + if (transCombo->currentIndex() == 1) m_plugin->setParameter(universe, line, QLCIOPlugin::Output, E131_TRANSMITMODE, E131Controller::transmissionModeToString(E131Controller::Partial)); else diff --git a/plugins/E1.31/e131controller.cpp b/plugins/E1.31/e131controller.cpp index d56d91395d..3319f57a0e 100644 --- a/plugins/E1.31/e131controller.cpp +++ b/plugins/E1.31/e131controller.cpp @@ -129,7 +129,7 @@ void E131Controller::setInputMulticast(quint32 universe, bool multicast) QSharedPointer E131Controller::getInputSocket(bool multicast, QHostAddress const& address, quint16 port) { - foreach(UniverseInfo const& info, m_universeMap) + foreach (UniverseInfo const& info, m_universeMap) { if (info.inputSocket && info.inputMulticast == multicast) { @@ -315,7 +315,7 @@ UniverseInfo *E131Controller::getUniverseInfo(quint32 universe) E131Controller::Type E131Controller::type() { int type = Unknown; - foreach(UniverseInfo info, m_universeMap.values()) + foreach (UniverseInfo info, m_universeMap.values()) { type |= info.type; } diff --git a/plugins/E1.31/e131plugin.cpp b/plugins/E1.31/e131plugin.cpp index 8c737b5901..94ad9e854c 100644 --- a/plugins/E1.31/e131plugin.cpp +++ b/plugins/E1.31/e131plugin.cpp @@ -41,7 +41,7 @@ void E131Plugin::init() else m_ifaceWaitTime = 0; - foreach(QNetworkInterface iface, QNetworkInterface::allInterfaces()) + foreach (QNetworkInterface iface, QNetworkInterface::allInterfaces()) { foreach (QNetworkAddressEntry entry, iface.addressEntries()) { @@ -54,7 +54,7 @@ void E131Plugin::init() tmpIO.controller = NULL; bool alreadyInList = false; - for(int j = 0; j < m_IOmapping.count(); j++) + for (int j = 0; j < m_IOmapping.count(); j++) { if (m_IOmapping.at(j).address == tmpIO.address) { diff --git a/plugins/artnet/src/artnetcontroller.cpp b/plugins/artnet/src/artnetcontroller.cpp index 5e76e3d211..9ebe075bcf 100644 --- a/plugins/artnet/src/artnetcontroller.cpp +++ b/plugins/artnet/src/artnetcontroller.cpp @@ -69,7 +69,7 @@ ArtNetController::~ArtNetController() ArtNetController::Type ArtNetController::type() { int type = Unknown; - foreach(UniverseInfo info, m_universeMap.values()) + foreach (UniverseInfo info, m_universeMap.values()) { type |= info.type; } @@ -559,7 +559,7 @@ void ArtNetController::slotSendPoll() QListaddressList; /* first, retrieve a list of unique output addresses */ - foreach(quint32 universe, universesList()) + foreach (quint32 universe, universesList()) { UniverseInfo info = m_universeMap[universe]; if (addressList.contains(info.outputAddress) == false) diff --git a/plugins/artnet/src/artnetplugin.cpp b/plugins/artnet/src/artnetplugin.cpp index 3664eacecc..b866f63404 100644 --- a/plugins/artnet/src/artnetplugin.cpp +++ b/plugins/artnet/src/artnetplugin.cpp @@ -41,7 +41,7 @@ void ArtNetPlugin::init() else m_ifaceWaitTime = 0; - foreach(QNetworkInterface iface, QNetworkInterface::allInterfaces()) + foreach (QNetworkInterface iface, QNetworkInterface::allInterfaces()) { foreach (QNetworkAddressEntry entry, iface.addressEntries()) { @@ -54,7 +54,7 @@ void ArtNetPlugin::init() tmpIO.controller = NULL; bool alreadyInList = false; - for(int j = 0; j < m_IOmapping.count(); j++) + for (int j = 0; j < m_IOmapping.count(); j++) { if (m_IOmapping.at(j).address == tmpIO.address) { @@ -443,7 +443,7 @@ void ArtNetPlugin::handlePacket(QByteArray const& datagram, QHostAddress const& { // A firts filter: look for a controller on the same subnet as the sender. // This allows having the same ArtNet Universe on 2 different network interfaces. - foreach(ArtNetIO io, m_IOmapping) + foreach (ArtNetIO io, m_IOmapping) { if (senderAddress.isInSubnet(io.address.ip(), io.address.prefixLength())) { @@ -454,7 +454,7 @@ void ArtNetPlugin::handlePacket(QByteArray const& datagram, QHostAddress const& } // Packet comming from another subnet. This is an unusual case. // We stop at the first controller that handles this packet. - foreach(ArtNetIO io, m_IOmapping) + foreach (ArtNetIO io, m_IOmapping) { if (io.controller != NULL) { diff --git a/plugins/artnet/src/configureartnet.cpp b/plugins/artnet/src/configureartnet.cpp index 0b33d32156..900558a7cc 100644 --- a/plugins/artnet/src/configureartnet.cpp +++ b/plugins/artnet/src/configureartnet.cpp @@ -108,7 +108,7 @@ void ConfigureArtNet::fillMappingTree() QTreeWidgetItem* outputItem = NULL; QList IOmap = m_plugin->getIOMapping(); - foreach(ArtNetIO io, IOmap) + foreach (ArtNetIO io, IOmap) { if (io.controller == NULL) continue; @@ -130,7 +130,7 @@ void ConfigureArtNet::fillMappingTree() outputItem->setText(KMapColumnInterface, tr("Outputs")); outputItem->setExpanded(true); } - foreach(quint32 universe, controller->universesList()) + foreach (quint32 universe, controller->universesList()) { UniverseInfo *info = controller->getUniverseInfo(universe); diff --git a/plugins/dmxusb/src/dmxusb.cpp b/plugins/dmxusb/src/dmxusb.cpp index 7d98b78d50..ea983a8799 100644 --- a/plugins/dmxusb/src/dmxusb.cpp +++ b/plugins/dmxusb/src/dmxusb.cpp @@ -35,7 +35,7 @@ DMXUSB::~DMXUSB() { - while(m_widgets.isEmpty() == false) + while (m_widgets.isEmpty() == false) delete m_widgets.takeFirst(); } @@ -61,7 +61,7 @@ bool DMXUSB::rescanWidgets() m_inputs.clear(); m_outputs.clear(); - while(m_widgets.isEmpty() == false) + while (m_widgets.isEmpty() == false) delete m_widgets.takeFirst(); m_widgets = DMXUSBWidget::widgets(); @@ -130,7 +130,7 @@ QStringList DMXUSB::outputs() for (int w = 0; w < m_outputs.count();) { DMXUSBWidget* widget = m_outputs.at(w); - foreach(QString name, widget->outputNames()) + foreach (QString name, widget->outputNames()) list << name; w += widget->outputsNumber(); } @@ -248,7 +248,7 @@ QStringList DMXUSB::inputs() for (int w = 0; w < m_inputs.count();) { DMXUSBWidget* widget = m_inputs.at(w); - foreach(QString name, widget->inputNames()) + foreach (QString name, widget->inputNames()) list << name; w += widget->inputsNumber(); } diff --git a/plugins/dmxusb/src/enttecdmxusbpro.cpp b/plugins/dmxusb/src/enttecdmxusbpro.cpp index 9b9bdb2066..12b6c16d49 100644 --- a/plugins/dmxusb/src/enttecdmxusbpro.cpp +++ b/plugins/dmxusb/src/enttecdmxusbpro.cpp @@ -69,7 +69,7 @@ DMXUSBWidget::Type EnttecDMXUSBPro::type() const { if (name().toUpper().contains("PRO MK2") == true) return ProMk2; - else if(m_dmxKingMode) + else if (m_dmxKingMode) return UltraPro; else return ProRXTX; @@ -422,7 +422,7 @@ void EnttecDMXUSBPro::slotDataReceived(QByteArray data, bool isMidi) //qDebug() << "MIDI byte:" << byte; if (midiCounter == 0) { - if(MIDI_IS_CMD(byte)) + if (MIDI_IS_CMD(byte)) { midiCmd = byte; midiCounter++; diff --git a/plugins/dmxusb/src/euroliteusbdmxpro.cpp b/plugins/dmxusb/src/euroliteusbdmxpro.cpp index f2062c7827..07db6ed5dc 100644 --- a/plugins/dmxusb/src/euroliteusbdmxpro.cpp +++ b/plugins/dmxusb/src/euroliteusbdmxpro.cpp @@ -84,7 +84,7 @@ QString EuroliteUSBDMXPro::getDeviceName() if (ttyDir.exists()) { QStringList ttyList = ttyDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); - foreach(QString ttyName, ttyList) + foreach (QString ttyName, ttyList) { qDebug() << "This EuroliteUSBDMXPro adapter will use" << QString("/dev/" + ttyName); return QString("/dev/" + ttyName); diff --git a/plugins/dmxusb/src/nanodmx.cpp b/plugins/dmxusb/src/nanodmx.cpp index 10e1e3f992..c34b2d2009 100644 --- a/plugins/dmxusb/src/nanodmx.cpp +++ b/plugins/dmxusb/src/nanodmx.cpp @@ -120,7 +120,7 @@ QString NanoDMX::getDeviceName() if (ttyDir.exists()) { QStringList ttyList = ttyDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); - foreach(QString ttyName, ttyList) + foreach (QString ttyName, ttyList) { qDebug() << "This NanoDMX adapter will use" << QString("/dev/" + ttyName); return QString("/dev/" + ttyName); diff --git a/plugins/enttecwing/src/playbackwing.cpp b/plugins/enttecwing/src/playbackwing.cpp index b42fc0759e..f7ddcc6a26 100644 --- a/plugins/enttecwing/src/playbackwing.cpp +++ b/plugins/enttecwing/src/playbackwing.cpp @@ -193,7 +193,7 @@ QString PlaybackWing::name() const void PlaybackWing::parseData(const QByteArray& data) { - if (data.size() < WING_PLAYBACK_PACKET_SIZE ) + if (data.size() < WING_PLAYBACK_PACKET_SIZE) { qWarning() << Q_FUNC_INFO << "Expected at least" << WING_PLAYBACK_PACKET_SIZE << "bytes for buttons but got only" << data.size(); @@ -254,7 +254,7 @@ void PlaybackWing::parseData(const QByteArray& data) //check sync status int curdiff = quint8(m_feedbackValues[page()][slider]) - quint8(data[WING_PLAYBACK_BYTE_SLIDER + slider]); - // send input after crossing widget values ( sign of diff is changing) + // send input after crossing widget values (sign of diff is changing) if (curdiff == 0 || (curdiff > 0 && diff < 0) || (curdiff < 0 && diff > 0)) { setCacheValue(slider, value); @@ -273,7 +273,7 @@ void PlaybackWing::parseData(const QByteArray& data) void PlaybackWing::applyExtraButtons(const QByteArray& data) { /* Check that there's enough data for flags */ - if (data.size() < WING_PLAYBACK_PACKET_SIZE ) + if (data.size() < WING_PLAYBACK_PACKET_SIZE) return; // WING_PLAYBACK_BIT_PAGEUP diff --git a/plugins/gpio/gpioconfiguration.cpp b/plugins/gpio/gpioconfiguration.cpp index c9eeffbf56..8288ac94c3 100644 --- a/plugins/gpio/gpioconfiguration.cpp +++ b/plugins/gpio/gpioconfiguration.cpp @@ -48,7 +48,7 @@ GPIOConfiguration::~GPIOConfiguration() void GPIOConfiguration::fillTree() { - foreach(GPIOPinInfo* gpio, m_plugin->gpioList()) + foreach (GPIOPinInfo* gpio, m_plugin->gpioList()) { QTreeWidgetItem* item = new QTreeWidgetItem(m_treeWidget); item->setText(KColumnGPIONumber, QString::number(gpio->m_number)); @@ -73,7 +73,7 @@ void GPIOConfiguration::accept() { QList gpioList = m_plugin->gpioList(); - for(int i = 0; i < m_treeWidget->topLevelItemCount(); i++) + for (int i = 0; i < m_treeWidget->topLevelItemCount(); i++) { QTreeWidgetItem *item = m_treeWidget->topLevelItem(i); diff --git a/plugins/gpio/gpioreaderthread.cpp b/plugins/gpio/gpioreaderthread.cpp index 3b23094940..f4f07201cb 100644 --- a/plugins/gpio/gpioreaderthread.cpp +++ b/plugins/gpio/gpioreaderthread.cpp @@ -99,7 +99,7 @@ void ReadThread::run() QMutexLocker locker(&m_mutex); - foreach(GPIOPinInfo *gpio, m_readList) + foreach (GPIOPinInfo *gpio, m_readList) { if (gpio->m_file == NULL || gpio->m_file->isOpen() == false) continue; diff --git a/plugins/hid/hiddmxdevice.cpp b/plugins/hid/hiddmxdevice.cpp index 2b652940b9..c0a7bb7466 100644 --- a/plugins/hid/hiddmxdevice.cpp +++ b/plugins/hid/hiddmxdevice.cpp @@ -134,7 +134,7 @@ void HIDDMXDevice::feedBack(quint32 channel, uchar value) void HIDDMXDevice::run() { - while(m_running == true) + while (m_running == true) { unsigned char buffer[35]; int size; @@ -147,9 +147,9 @@ void HIDDMXDevice::run() * from, the nth chunk starts at address n * 32 * [1]-[32] = channel values, where the nth value is the offset + n */ - while(size > 0) + while (size > 0) { - if(size == 33) + if (size == 33) { unsigned short startOff = buffer[0] * 32; if (buffer[0] < 16) diff --git a/plugins/hid/hidplugin.cpp b/plugins/hid/hidplugin.cpp index c9621db53b..69968c9493 100644 --- a/plugins/hid/hidplugin.cpp +++ b/plugins/hid/hidplugin.cpp @@ -265,7 +265,7 @@ void HIDPlugin::rescanDevices() /** Device already exists, delete from remove list */ destroyList.removeAll(dev); } - else if((cur_dev->vendor_id == HID_DMX_INTERFACE_VENDOR_ID + else if ((cur_dev->vendor_id == HID_DMX_INTERFACE_VENDOR_ID && cur_dev->product_id == HID_DMX_INTERFACE_PRODUCT_ID) || (cur_dev->vendor_id == HID_DMX_INTERFACE_VENDOR_ID_2 && cur_dev->product_id == HID_DMX_INTERFACE_PRODUCT_ID_2) || @@ -286,11 +286,11 @@ void HIDPlugin::rescanDevices() { dev = new HIDLinuxJoystick(this, line++, cur_dev); #elif defined(WIN32) || defined (Q_OS_WIN) - else if(HIDWindowsJoystick::isJoystick(cur_dev->vendor_id, cur_dev->product_id) == true) + else if (HIDWindowsJoystick::isJoystick(cur_dev->vendor_id, cur_dev->product_id) == true) { dev = new HIDWindowsJoystick(this, line++, cur_dev); #elif defined (__APPLE__) || defined(Q_OS_MACX) - else if(HIDOSXJoystick::isJoystick(cur_dev->usage) == true) + else if (HIDOSXJoystick::isJoystick(cur_dev->usage) == true) { dev = new HIDOSXJoystick(this, line++, cur_dev); #endif diff --git a/plugins/hid/linux/hidapi.cpp b/plugins/hid/linux/hidapi.cpp index 56b6a10967..c7446d46c9 100644 --- a/plugins/hid/linux/hidapi.cpp +++ b/plugins/hid/linux/hidapi.cpp @@ -414,7 +414,7 @@ struct hid_device_info HID_API_EXPORT *hid_enumerate(unsigned short vendor_id, devices = udev_enumerate_get_list_entry(enumerate); /* For each item, see if it matches the vid/pid, and if so create a udev_device record for it */ - udev_list_entry_foreach(dev_list_entry, devices) { + udev_list_entry_foreach (dev_list_entry, devices) { const char *sysfs_path; const char *dev_path; const char *str; @@ -802,7 +802,7 @@ int HID_API_EXPORT_CALL hid_get_serial_number_string(hid_device *dev, wchar_t *s return get_device_string(dev, DEVICE_STRING_SERIAL, string, maxlen); } -int HID_API_EXPORT_CALL hid_get_indexed_string(hid_device *, int , wchar_t *, size_t ) +int HID_API_EXPORT_CALL hid_get_indexed_string(hid_device *, int , wchar_t *, size_t) { return -1; } diff --git a/plugins/hid/macx/hidapi.cpp b/plugins/hid/macx/hidapi.cpp index 9ea55c83be..e3419f0a9b 100644 --- a/plugins/hid/macx/hidapi.cpp +++ b/plugins/hid/macx/hidapi.cpp @@ -47,15 +47,15 @@ typedef struct pthread_barrier { static int pthread_barrier_init(pthread_barrier_t *barrier, const pthread_barrierattr_t *, unsigned int count) { - if(count == 0) { + if (count == 0) { errno = EINVAL; return -1; } - if(pthread_mutex_init(&barrier->mutex, 0) < 0) { + if (pthread_mutex_init(&barrier->mutex, 0) < 0) { return -1; } - if(pthread_cond_init(&barrier->cond, 0) < 0) { + if (pthread_cond_init(&barrier->cond, 0) < 0) { pthread_mutex_destroy(&barrier->mutex); return -1; } @@ -76,7 +76,7 @@ static int pthread_barrier_wait(pthread_barrier_t *barrier) { pthread_mutex_lock(&barrier->mutex); ++(barrier->count); - if(barrier->count >= barrier->trip_count) + if (barrier->count >= barrier->trip_count) { barrier->count = 0; pthread_cond_broadcast(&barrier->cond); @@ -401,7 +401,7 @@ static void process_pending_events(void) { SInt32 res; do { res = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.001, FALSE); - } while(res != kCFRunLoopRunFinished && res != kCFRunLoopRunTimedOut); + } while (res != kCFRunLoopRunFinished && res != kCFRunLoopRunTimedOut); } struct hid_device_info HID_API_EXPORT *hid_enumerate(unsigned short vendor_id, unsigned short product_id) @@ -1025,7 +1025,7 @@ int HID_API_EXPORT_CALL hid_get_serial_number_string(hid_device *dev, wchar_t *s return get_serial_number(dev->device_handle, string, maxlen); } -int HID_API_EXPORT_CALL hid_get_indexed_string(hid_device *, int , wchar_t *, size_t ) +int HID_API_EXPORT_CALL hid_get_indexed_string(hid_device *, int , wchar_t *, size_t) { /* TODO: */ diff --git a/plugins/hid/macx/hidosxjoystick.cpp b/plugins/hid/macx/hidosxjoystick.cpp index b565cdacee..e8f7e4d0cf 100644 --- a/plugins/hid/macx/hidosxjoystick.cpp +++ b/plugins/hid/macx/hidosxjoystick.cpp @@ -85,10 +85,10 @@ void HIDOSXJoystick::init() return; // to return all elements for a device - CFArrayRef elementsArray = IOHIDDeviceCopyMatchingElements( m_IOKitDevice, NULL, kIOHIDOptionsTypeNone ); + CFArrayRef elementsArray = IOHIDDeviceCopyMatchingElements(m_IOKitDevice, NULL, kIOHIDOptionsTypeNone); if (elementsArray) { - CFIndex count = CFArrayGetCount( elementsArray ); + CFIndex count = CFArrayGetCount(elementsArray); //qDebug() << "Device" << QString::fromWCharArray(m_dev_info->product_string) << "has elements:" << count; @@ -99,7 +99,7 @@ void HIDOSXJoystick::init() unsigned int usage = IOHIDElementGetUsage(elem); unsigned int usagePage = IOHIDElementGetUsagePage(elem); - if(elemType == kIOHIDElementTypeInput_Misc || + if (elemType == kIOHIDElementTypeInput_Misc || elemType == kIOHIDElementTypeInput_Button || elemType == kIOHIDElementTypeInput_Axis || elemType == kIOHIDElementTypeInput_ScanCodes) diff --git a/plugins/hid/win32/hidwindowsjoystick.cpp b/plugins/hid/win32/hidwindowsjoystick.cpp index 76f00061f1..d0f7efe18d 100644 --- a/plugins/hid/win32/hidwindowsjoystick.cpp +++ b/plugins/hid/win32/hidwindowsjoystick.cpp @@ -34,12 +34,12 @@ bool HIDWindowsJoystick::isJoystick(unsigned short vid, unsigned short pid) for (UINT i = 0; i < joyGetNumDevs(); i++) { - memset( &caps, 0, sizeof( JOYCAPS ) ); + memset(&caps, 0, sizeof(JOYCAPS)); - MMRESULT error = joyGetDevCapsW( i, &caps, sizeof(JOYCAPS)); + MMRESULT error = joyGetDevCapsW(i, &caps, sizeof(JOYCAPS)); if (error == JOYERR_NOERROR && vid == caps.wMid && pid == caps.wPid) { - if( joyGetPos(i, & joyInfo) == JOYERR_NOERROR ) + if (joyGetPos(i, & joyInfo) == JOYERR_NOERROR) return true; } } @@ -49,7 +49,7 @@ bool HIDWindowsJoystick::isJoystick(unsigned short vid, unsigned short pid) void HIDWindowsJoystick::init() { m_info.dwFlags = JOY_RETURNALL; - m_info.dwSize = sizeof( m_info ); + m_info.dwSize = sizeof(m_info); QString devPath = path(); bool ok; @@ -58,16 +58,16 @@ void HIDWindowsJoystick::init() for (UINT i = 0; i < joyGetNumDevs(); i++) { - memset( &m_caps, 0, sizeof( m_caps ) ); + memset(&m_caps, 0, sizeof(m_caps)); - MMRESULT error = joyGetDevCapsW( i, &m_caps, sizeof(JOYCAPS)); + MMRESULT error = joyGetDevCapsW(i, &m_caps, sizeof(JOYCAPS)); if (error == JOYERR_NOERROR && VID == m_caps.wMid && PID == m_caps.wPid) { /* Windows joystick drivers may provide any combination of * X,Y,Z,R,U,V,POV - not necessarily the first n of these. */ - if( m_caps.wCaps & JOYCAPS_HASV ) + if (m_caps.wCaps & JOYCAPS_HASV) { m_axesNumber = 6; //joy->min[ 7 ] = -1.0; joy->max[ 7 ] = 1.0; /* POV Y */ @@ -92,12 +92,12 @@ void HIDWindowsJoystick::init() bool HIDWindowsJoystick::readEvent() { - MMRESULT status = joyGetPosEx( m_windId, &m_info ); + MMRESULT status = joyGetPosEx(m_windId, &m_info); - if ( status != JOYERR_NOERROR ) + if (status != JOYERR_NOERROR) return false; - if ( m_buttonsNumber ) + if (m_buttonsNumber) { for (int i = 0; i < m_buttonsNumber; ++i) { @@ -113,7 +113,7 @@ bool HIDWindowsJoystick::readEvent() m_buttonsMask = m_info.dwButtons; } - if ( m_axesNumber ) + if (m_axesNumber) { QList cmpVals; cmpVals.append(m_info.dwXpos); @@ -134,4 +134,3 @@ bool HIDWindowsJoystick::readEvent() } return true; } - diff --git a/plugins/interfaces/qlcioplugin.cpp b/plugins/interfaces/qlcioplugin.cpp index fc6e2d61fa..03d2e6747b 100644 --- a/plugins/interfaces/qlcioplugin.cpp +++ b/plugins/interfaces/qlcioplugin.cpp @@ -172,7 +172,7 @@ void QLCIOPlugin::addToMap(quint32 universe, quint32 line, { desc.inputLine = line; } - else if(type == Output) + else if (type == Output) { desc.outputLine = line; } @@ -191,7 +191,7 @@ void QLCIOPlugin::removeFromMap(quint32 universe, quint32 line, QLCIOPlugin::Cap m_universesMap[universe].inputParameters.clear(); return; } - else if(type == Output && m_universesMap[universe].outputLine == line) + else if (type == Output && m_universesMap[universe].outputLine == line) { m_universesMap[universe].outputLine = UINT_MAX; m_universesMap[universe].outputParameters.clear(); diff --git a/plugins/loopback/src/loopback.cpp b/plugins/loopback/src/loopback.cpp index cc4815b21f..37e3335791 100644 --- a/plugins/loopback/src/loopback.cpp +++ b/plugins/loopback/src/loopback.cpp @@ -130,7 +130,7 @@ QString Loopback::pluginInfo() str += QString("

"); str += QString("

%1

").arg(name()); - str += tr("This plugin provides DMX loopback. Data written to each output is forwarded to the respective input." ); + str += tr("This plugin provides DMX loopback. Data written to each output is forwarded to the respective input."); str += QString("

"); return str; diff --git a/plugins/midi/src/alsa/alsamidiinputthread.cpp b/plugins/midi/src/alsa/alsamidiinputthread.cpp index 4ecbe7b82c..c3ed98a1f9 100644 --- a/plugins/midi/src/alsa/alsamidiinputthread.cpp +++ b/plugins/midi/src/alsa/alsamidiinputthread.cpp @@ -273,11 +273,11 @@ void AlsaMidiInputThread::readEvent() continue; if (ev->type == SND_SEQ_EVENT_START) cmd = MIDI_BEAT_START; - else if(ev->type == SND_SEQ_EVENT_STOP) + else if (ev->type == SND_SEQ_EVENT_STOP) cmd = MIDI_BEAT_STOP; - else if(ev->type == SND_SEQ_EVENT_CONTINUE) + else if (ev->type == SND_SEQ_EVENT_CONTINUE) cmd = MIDI_BEAT_CONTINUE; - else if(ev->type == SND_SEQ_EVENT_CLOCK) + else if (ev->type == SND_SEQ_EVENT_CLOCK) cmd = MIDI_BEAT_CLOCK; qDebug() << "MIDI clock: " << cmd; diff --git a/plugins/midi/src/alsa/alsamidioutputdevice.cpp b/plugins/midi/src/alsa/alsamidioutputdevice.cpp index a23d19d334..9f5f368a28 100644 --- a/plugins/midi/src/alsa/alsamidioutputdevice.cpp +++ b/plugins/midi/src/alsa/alsamidioutputdevice.cpp @@ -244,7 +244,7 @@ void AlsaMidiOutputDevice::writeFeedback(uchar cmd, uchar data1, uchar data2) void AlsaMidiOutputDevice::writeSysEx(QByteArray message) { - if(message.isEmpty()) + if (message.isEmpty()) return; if (isOpen() == false) diff --git a/plugins/midi/src/common/midiplugin.cpp b/plugins/midi/src/common/midiplugin.cpp index 31d56b7c49..452a690b7d 100644 --- a/plugins/midi/src/common/midiplugin.cpp +++ b/plugins/midi/src/common/midiplugin.cpp @@ -348,7 +348,7 @@ void MidiPlugin::configure() // walk the universe map to update/add the // plugin custom parameters - foreach(quint32 universe, m_universesMap.keys()) + foreach (quint32 universe, m_universesMap.keys()) { m_universesMap[universe].inputParameters.clear(); diff --git a/plugins/midi/src/macx/coremidioutputdevice.cpp b/plugins/midi/src/macx/coremidioutputdevice.cpp index c1743855e4..bd468e66be 100644 --- a/plugins/midi/src/macx/coremidioutputdevice.cpp +++ b/plugins/midi/src/macx/coremidioutputdevice.cpp @@ -201,7 +201,7 @@ void CoreMidiOutputDevice::writeFeedback(uchar cmd, uchar data1, uchar data2) void CoreMidiOutputDevice::writeSysEx(QByteArray message) { - if(message.isEmpty()) + if (message.isEmpty()) return; if (isOpen() == false) diff --git a/plugins/midi/src/win32/win32midioutputdevice.cpp b/plugins/midi/src/win32/win32midioutputdevice.cpp index 0faf7ba67d..167216bee1 100644 --- a/plugins/midi/src/win32/win32midioutputdevice.cpp +++ b/plugins/midi/src/win32/win32midioutputdevice.cpp @@ -170,7 +170,7 @@ void Win32MidiOutputDevice::sendData(BYTE command, BYTE channel, BYTE value) void Win32MidiOutputDevice::writeSysEx(QByteArray message) { - if(message.isEmpty()) + if (message.isEmpty()) return; if (isOpen() == false) diff --git a/plugins/osc/configureosc.cpp b/plugins/osc/configureosc.cpp index 97c2b9c33d..aa31245221 100644 --- a/plugins/osc/configureosc.cpp +++ b/plugins/osc/configureosc.cpp @@ -72,7 +72,7 @@ void ConfigureOSC::fillMappingTree() QTreeWidgetItem* outputItem = NULL; QList IOmap = m_plugin->getIOMapping(); - foreach(OSCIO io, IOmap) + foreach (OSCIO io, IOmap) { if (io.controller == NULL) continue; @@ -94,7 +94,7 @@ void ConfigureOSC::fillMappingTree() outputItem->setText(KMapColumnInterface, tr("Outputs")); outputItem->setExpanded(true); } - foreach(quint32 universe, controller->universesList()) + foreach (quint32 universe, controller->universesList()) { UniverseInfo *info = controller->getUniverseInfo(universe); QString networkIP = controller->getNetworkIP().toString(); @@ -182,10 +182,10 @@ void ConfigureOSC::showIPAlert(QString ip) void ConfigureOSC::accept() { - for(int i = 0; i < m_uniMapTree->topLevelItemCount(); i++) + for (int i = 0; i < m_uniMapTree->topLevelItemCount(); i++) { QTreeWidgetItem *topItem = m_uniMapTree->topLevelItem(i); - for(int c = 0; c < topItem->childCount(); c++) + for (int c = 0; c < topItem->childCount(); c++) { QTreeWidgetItem *item = topItem->child(c); if (item->data(KMapColumnInterface, PROP_UNIVERSE).isValid() == false) diff --git a/plugins/osc/osccontroller.cpp b/plugins/osc/osccontroller.cpp index d89484a2d9..b79146295e 100644 --- a/plugins/osc/osccontroller.cpp +++ b/plugins/osc/osccontroller.cpp @@ -120,7 +120,7 @@ bool OSCController::setInputPort(quint32 universe, quint16 port) QSharedPointer OSCController::getInputSocket(quint16 port) { - foreach(UniverseInfo const& info, m_universeMap) + foreach (UniverseInfo const& info, m_universeMap) { if (info.inputSocket && info.inputPort == port) return info.inputSocket; @@ -199,7 +199,7 @@ UniverseInfo* OSCController::getUniverseInfo(quint32 universe) OSCController::Type OSCController::type() const { int type = Unknown; - foreach(UniverseInfo info, m_universeMap.values()) + foreach (UniverseInfo info, m_universeMap.values()) { type |= info.type; } @@ -371,7 +371,7 @@ void OSCController::handlePacket(QUdpSocket* socket, QByteArray const& datagram, if (values.length() > 1) { info.multipartCache[path] = values; - for(int i = 0; i < values.length(); i++) + for (int i = 0; i < values.length(); i++) { QString modPath = QString("%1_%2").arg(path).arg(i); emit valueChanged(universe, m_line, getHash(modPath), (uchar)values.at(i), modPath); diff --git a/plugins/osc/oscplugin.cpp b/plugins/osc/oscplugin.cpp index 9dd01d5051..e807898b80 100644 --- a/plugins/osc/oscplugin.cpp +++ b/plugins/osc/oscplugin.cpp @@ -41,7 +41,7 @@ void OSCPlugin::init() else m_ifaceWaitTime = 0; - foreach(QNetworkInterface iface, QNetworkInterface::allInterfaces()) + foreach (QNetworkInterface iface, QNetworkInterface::allInterfaces()) { foreach (QNetworkAddressEntry entry, iface.addressEntries()) { @@ -53,7 +53,7 @@ void OSCPlugin::init() tmpIO.controller = NULL; bool alreadyInList = false; - for(int j = 0; j < m_IOmapping.count(); j++) + for (int j = 0; j < m_IOmapping.count(); j++) { if (m_IOmapping.at(j).IPAddress == tmpIO.IPAddress) { diff --git a/plugins/peperoni/unix/peperoni.cpp b/plugins/peperoni/unix/peperoni.cpp index c3c01a7927..582e5d5119 100644 --- a/plugins/peperoni/unix/peperoni.cpp +++ b/plugins/peperoni/unix/peperoni.cpp @@ -81,7 +81,7 @@ QStringList Peperoni::outputs() int i = 0; QList devList = m_devices.values(); - foreach(PeperoniDevice* dev, devList) + foreach (PeperoniDevice* dev, devList) list << dev->name(i++); return list; @@ -175,7 +175,7 @@ QStringList Peperoni::inputs() int i = 0; QList devList = m_devices.values(); - foreach(PeperoniDevice* dev, devList) + foreach (PeperoniDevice* dev, devList) list << dev->name(i++); return list; @@ -273,7 +273,7 @@ void Peperoni::rescanDevices() //qDebug() << "[Peperoni] Need to destroy" << destroyList.count() << "devices"; QHashIterator it(destroyList); - while(it.hasNext()) + while (it.hasNext()) { it.next(); PeperoniDevice *dev = m_devices.take(it.key()); diff --git a/plugins/peperoni/unix/peperonidevice.cpp b/plugins/peperoni/unix/peperonidevice.cpp index 5f463bf350..874589c348 100644 --- a/plugins/peperoni/unix/peperonidevice.cpp +++ b/plugins/peperoni/unix/peperonidevice.cpp @@ -364,7 +364,7 @@ void PeperoniDevice::run() qDebug() << "[Peperoni] input thread started correctly"; - while(m_running == true) + while (m_running == true) { QByteArray tmpBuffer(512, 0); diff --git a/plugins/spi/spioutthread.cpp b/plugins/spi/spioutthread.cpp index e857ba98af..079224cb06 100644 --- a/plugins/spi/spioutthread.cpp +++ b/plugins/spi/spioutthread.cpp @@ -48,15 +48,15 @@ void SPIOutThread::runThread(int fd, int speed) int status = -1; status = ioctl (m_spifd, SPI_IOC_WR_MODE, &mode); - if(status < 0) + if (status < 0) qWarning() << "Could not set SPIMode (WR)...ioctl fail"; status = ioctl (m_spifd, SPI_IOC_WR_BITS_PER_WORD, &m_bitsPerWord); - if(status < 0) + if (status < 0) qWarning() << "Could not set SPI bitsPerWord (WR)...ioctl fail"; status = ioctl (m_spifd, SPI_IOC_WR_MAX_SPEED_HZ, &m_speed); - if(status < 0) + if (status < 0) qWarning() << "Could not set SPI speed (WR)...ioctl fail"; m_isRunning = true; diff --git a/plugins/spi/spiplugin.cpp b/plugins/spi/spiplugin.cpp index 75b4aced2e..7809483534 100644 --- a/plugins/spi/spiplugin.cpp +++ b/plugins/spi/spiplugin.cpp @@ -79,7 +79,7 @@ bool SPIPlugin::openOutput(quint32 output, quint32 universe) return true; m_spifd = open(SPI_DEFAULT_DEVICE, O_RDWR); - if(m_spifd < 0) + if (m_spifd < 0) { qWarning() << "Cannot open SPI device!"; return false; diff --git a/plugins/uart/uartwidget.cpp b/plugins/uart/uartwidget.cpp index f187d85d3e..d2e5ee34fd 100644 --- a/plugins/uart/uartwidget.cpp +++ b/plugins/uart/uartwidget.cpp @@ -70,7 +70,7 @@ bool UARTWidget::close(UARTWidget::WidgetMode mode) void UARTWidget::updateMode() { - if(m_mode != Closed && m_running == false) + if (m_mode != Closed && m_running == false) start(); else if (m_mode == Closed && m_running == true) stop(); @@ -155,10 +155,10 @@ void UARTWidget::run() if (m_mode & Output) { m_serialPort->setBreakEnabled(true); - if(m_granularity == Good) + if (m_granularity == Good) usleep(DMX_BREAK); m_serialPort->setBreakEnabled(false); - if(m_granularity == Good) + if (m_granularity == Good) usleep(DMX_MAB); if (m_serialPort->write(m_outputBuffer) == 0) diff --git a/qmlui/app.cpp b/qmlui/app.cpp index 663c50993d..daf8b5240c 100644 --- a/qmlui/app.cpp +++ b/qmlui/app.cpp @@ -488,7 +488,7 @@ void App::slotItemReadyForPrinting() { QPrinter printer; QPrintDialog *dlg = new QPrintDialog(&printer); - if(dlg->exec() == QDialog::Accepted) + if (dlg->exec() == QDialog::Accepted) { QRectF pageRect = printer.pageLayout().paintRect(); QSize imgSize = m_printerImage->image().size(); @@ -511,7 +511,7 @@ void App::slotItemReadyForPrinting() } // handle multi-page printing - while(totalHeight > 0) + while (totalHeight > 0) { painter.drawImage(QPoint(0, 0), img, QRectF(0, yOffset, actualWidth, pageRect.height())); yOffset += pageRect.height(); diff --git a/qmlui/audioeditor.cpp b/qmlui/audioeditor.cpp index 7a27ce7e7a..d5e1e9ef2d 100644 --- a/qmlui/audioeditor.cpp +++ b/qmlui/audioeditor.cpp @@ -144,7 +144,7 @@ int AudioEditor::cardLineIndex() const int i = 1; QString device = m_audio->audioDevice(); - foreach(AudioDeviceInfo info, devList) + foreach (AudioDeviceInfo info, devList) { if (info.capabilities & AUDIO_CAP_OUTPUT) { @@ -174,7 +174,7 @@ void AudioEditor::setCardLineIndex(int cardLineIndex) QList devList = m_doc->audioPluginCache()->audioDevicesList(); int i = 1; - foreach(AudioDeviceInfo info, devList) + foreach (AudioDeviceInfo info, devList) { if (info.capabilities & AUDIO_CAP_OUTPUT) { diff --git a/qmlui/collectioneditor.cpp b/qmlui/collectioneditor.cpp index 0588f8ea57..c4ac0c0f1e 100644 --- a/qmlui/collectioneditor.cpp +++ b/qmlui/collectioneditor.cpp @@ -51,7 +51,7 @@ bool CollectionEditor::addFunction(quint32 fid, int insertIndex) { if (m_collection != nullptr) { - if(m_collection->addFunction(fid, insertIndex) == true) + if (m_collection->addFunction(fid, insertIndex) == true) { Tardis::instance()->enqueueAction(Tardis::CollectionAddFunction, m_collection->id(), QVariant(), QVariant::fromValue(UIntPair(fid, insertIndex))); diff --git a/qmlui/contextmanager.cpp b/qmlui/contextmanager.cpp index f2d1b49f3b..17f5e15e3b 100644 --- a/qmlui/contextmanager.cpp +++ b/qmlui/contextmanager.cpp @@ -354,7 +354,7 @@ void ContextManager::setPositionPickPoint(QVector3D point) panDeg = 90.0 + (90.0 - panDeg); else if (!xLeft && !zBack) panDeg = 180.0 + panDeg; - else if(!xLeft && zBack) + else if (!xLeft && zBack) panDeg = 270.0 + (90.0 - panDeg); if (itemFlags & MonitorProperties::InvertedPanFlag) diff --git a/qmlui/fixturebrowser.cpp b/qmlui/fixturebrowser.cpp index 2e94b12b25..519af76408 100644 --- a/qmlui/fixturebrowser.cpp +++ b/qmlui/fixturebrowser.cpp @@ -154,7 +154,7 @@ QStringList FixtureBrowser::modesList() if (definition != nullptr) { QList fxModesList = definition->modes(); - foreach(QLCFixtureMode *mode, fxModesList) + foreach (QLCFixtureMode *mode, fxModesList) { modesList.append(mode->name()); if (m_selectedMode.isEmpty()) diff --git a/qmlui/fixturegroupeditor.cpp b/qmlui/fixturegroupeditor.cpp index 316f2e13d1..c717635a78 100644 --- a/qmlui/fixturegroupeditor.cpp +++ b/qmlui/fixturegroupeditor.cpp @@ -52,7 +52,7 @@ QVariant FixtureGroupEditor::groupsListModel() { QVariantList groupsList; - foreach(FixtureGroup *grp, m_doc->fixtureGroups()) + foreach (FixtureGroup *grp, m_doc->fixtureGroups()) { QVariantMap grpMap; grpMap.insert("mIcon", "qrc:/group.svg"); diff --git a/qmlui/fixturemanager.cpp b/qmlui/fixturemanager.cpp index 2ceff06846..95b798e3bb 100644 --- a/qmlui/fixturemanager.cpp +++ b/qmlui/fixturemanager.cpp @@ -1424,7 +1424,7 @@ QVariantList FixtureManager::fixturesMap() continue; quint32 startAddress = fx->address(); - for(quint32 cn = 0; cn < fx->channels(); cn++) + for (quint32 cn = 0; cn < fx->channels(); cn++) { m_fixturesMap.append(fx->id()); m_fixturesMap.append(startAddress + cn); @@ -1583,7 +1583,7 @@ bool FixtureManager::loadColorFilters(const QDir &dir, bool user) void FixtureManager::resetColorFilters() { - while(!m_colorFilters.isEmpty()) + while (!m_colorFilters.isEmpty()) { ColorFilters *cf = m_colorFilters.takeLast(); delete cf; @@ -1752,7 +1752,7 @@ QMultiHash FixtureManager::getFixtureCapabilities(quint32 itemI for (quint32 ch : channelIndices) { const QLCChannel* channel(fixture->channel(ch)); - if(channel == nullptr) + if (channel == nullptr) continue; int chType = channel->group(); diff --git a/qmlui/fixtureutils.cpp b/qmlui/fixtureutils.cpp index b4035ea351..f22864c601 100644 --- a/qmlui/fixtureutils.cpp +++ b/qmlui/fixtureutils.cpp @@ -271,7 +271,7 @@ QPointF FixtureUtils::available2DPosition(Doc *doc, int pointOfView, QRectF fxRe qreal itemHeight = fxSize.height(); // store the next Y row in case we need to lower down - if (itemYPos + itemHeight > maxYOffset ) + if (itemYPos + itemHeight > maxYOffset) maxYOffset = itemYPos + itemHeight; QRectF itemRect(itemXPos, itemYPos, itemWidth, itemHeight); diff --git a/qmlui/functionmanager.cpp b/qmlui/functionmanager.cpp index 69789f357b..90e887e5f5 100644 --- a/qmlui/functionmanager.cpp +++ b/qmlui/functionmanager.cpp @@ -1033,7 +1033,7 @@ void FunctionManager::createFolder() if (m_emptyFolderList.contains(fName) == false) break; index++; - } while(1); + } while (1); // check if there is some selected folder if (m_selectedFolderList.count()) diff --git a/qmlui/importmanager.cpp b/qmlui/importmanager.cpp index d4518517ab..f16293f355 100644 --- a/qmlui/importmanager.cpp +++ b/qmlui/importmanager.cpp @@ -753,7 +753,7 @@ void ImportManager::updateFunctionsTree() { m_functionTree->clear(); - for(Function *func : m_importDoc->functions()) // C++11 + for (Function *func : m_importDoc->functions()) // C++11 { if (func == nullptr || func->isVisible() == false) return; diff --git a/qmlui/inputoutputmanager.cpp b/qmlui/inputoutputmanager.cpp index 7fd94d8584..1b2e3a813a 100644 --- a/qmlui/inputoutputmanager.cpp +++ b/qmlui/inputoutputmanager.cpp @@ -236,7 +236,7 @@ QVariant InputOutputManager::audioInputDevice() } QList devList = m_doc->audioPluginCache()->audioDevicesList(); - foreach(AudioDeviceInfo info, devList) + foreach (AudioDeviceInfo info, devList) { if (info.capabilities & AUDIO_CAP_INPUT && info.deviceName == devName) @@ -268,7 +268,7 @@ QVariant InputOutputManager::audioOutputDevice() } QList devList = m_doc->audioPluginCache()->audioDevicesList(); - foreach(AudioDeviceInfo info, devList) + foreach (AudioDeviceInfo info, devList) { if (info.capabilities & AUDIO_CAP_OUTPUT && info.deviceName == devName) @@ -388,11 +388,11 @@ QVariant InputOutputManager::universeInputSources(int universe) currLine = ip->input(); } - foreach(QString pluginName, m_ioMap->inputPluginNames()) + foreach (QString pluginName, m_ioMap->inputPluginNames()) { QLCIOPlugin *plugin = m_doc->ioPluginCache()->plugin(pluginName); int i = 0; - foreach(QString pLine, m_ioMap->pluginInputs(pluginName)) + foreach (QString pLine, m_ioMap->pluginInputs(pluginName)) { if (pluginName == currPlugin && i == currLine) { @@ -429,11 +429,11 @@ QVariant InputOutputManager::universeOutputSources(int universe) currLine = op->output(); } - foreach(QString pluginName, m_ioMap->outputPluginNames()) + foreach (QString pluginName, m_ioMap->outputPluginNames()) { QLCIOPlugin *plugin = m_doc->ioPluginCache()->plugin(pluginName); int i = 0; - foreach(QString pLine, m_ioMap->pluginOutputs(pluginName)) + foreach (QString pLine, m_ioMap->pluginOutputs(pluginName)) { if (pluginName == currPlugin && i == currLine) { @@ -719,7 +719,7 @@ QVariant InputOutputManager::beatGeneratorsList() genList.append(internalMap); // add the currently open MIDI input devices - foreach(Universe *uni, m_ioMap->universes()) + foreach (Universe *uni, m_ioMap->universes()) { InputPatch *ip = uni->inputPatch(); if (ip == nullptr || ip->pluginName() != "MIDI") @@ -754,7 +754,7 @@ QVariant InputOutputManager::beatGeneratorsList() else { QList devList = m_doc->audioPluginCache()->audioDevicesList(); - foreach(AudioDeviceInfo info, devList) + foreach (AudioDeviceInfo info, devList) { if (info.capabilities & AUDIO_CAP_INPUT && info.deviceName == devName) diff --git a/qmlui/mainview2d.cpp b/qmlui/mainview2d.cpp index fca8e34fca..68113991a3 100644 --- a/qmlui/mainview2d.cpp +++ b/qmlui/mainview2d.cpp @@ -68,7 +68,7 @@ void MainView2D::setUniverseFilter(quint32 universeFilter) { PreviewContext::setUniverseFilter(universeFilter); QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); quint32 itemID = it.key(); @@ -89,7 +89,7 @@ void MainView2D::setUniverseFilter(quint32 universeFilter) void MainView2D::resetItems() { QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); delete it.value(); @@ -570,13 +570,13 @@ void MainView2D::selectFixture(QQuickItem *fxItem, bool enable) void MainView2D::updateFixtureSelection(QList fixtures) { QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); quint32 fxID = it.key(); bool enable = false; - if(fixtures.contains(fxID)) + if (fixtures.contains(fxID)) enable = true; selectFixture(it.value(), enable); diff --git a/qmlui/mainview3d.cpp b/qmlui/mainview3d.cpp index f6ca82d637..6bcf45a857 100644 --- a/qmlui/mainview3d.cpp +++ b/qmlui/mainview3d.cpp @@ -160,7 +160,7 @@ void MainView3D::resetItems() QMetaObject::invokeMethod(m_scene3D, "updateFrameGraph", Q_ARG(QVariant, false)); QMapIterator it(m_entitiesMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); SceneItem *e = it.value(); @@ -179,7 +179,7 @@ void MainView3D::resetItems() m_entitiesMap.clear(); QMapIterator it2(m_genericMap); - while(it2.hasNext()) + while (it2.hasNext()) { it2.next(); SceneItem *e = it2.value(); @@ -214,7 +214,7 @@ void MainView3D::setUniverseFilter(quint32 universeFilter) PreviewContext::setUniverseFilter(universeFilter); QMapIterator it(m_entitiesMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); quint32 itemID = it.key(); @@ -1303,7 +1303,7 @@ void MainView3D::updateFixtureItem(Fixture *fixture, quint16 headIndex, quint16 void MainView3D::updateFixtureSelection(QList fixtures) { QMapIterator it(m_entitiesMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); quint32 fxID = it.key(); diff --git a/qmlui/mainviewdmx.cpp b/qmlui/mainviewdmx.cpp index f8dcc0c685..a1aae20cc0 100644 --- a/qmlui/mainviewdmx.cpp +++ b/qmlui/mainviewdmx.cpp @@ -58,7 +58,7 @@ void MainViewDMX::setUniverseFilter(quint32 universeFilter) { PreviewContext::setUniverseFilter(universeFilter); QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); quint32 fxID = it.key(); @@ -77,7 +77,7 @@ void MainViewDMX::setUniverseFilter(quint32 universeFilter) void MainViewDMX::reset() { QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); Fixture *fixture = m_doc->fixture(it.key()); @@ -150,7 +150,7 @@ void MainViewDMX::updateFixture(Fixture *fixture) void MainViewDMX::updateFixtureSelection(QListfixtures) { QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); quint32 itemID = FixtureUtils::fixtureItemID(it.key(), 0, 0); diff --git a/qmlui/rgbmatrixeditor.cpp b/qmlui/rgbmatrixeditor.cpp index 6865f19678..348620b636 100644 --- a/qmlui/rgbmatrixeditor.cpp +++ b/qmlui/rgbmatrixeditor.cpp @@ -125,7 +125,7 @@ void RGBMatrixEditor::setAlgorithmIndex(int algoIndex) { qDebug() << "Set algorithm:" << algoIndex; QStringList algoList = algorithms(); - if(algoIndex < 0 || algoIndex >= algorithms().count()) + if (algoIndex < 0 || algoIndex >= algorithms().count()) return; RGBAlgorithm *algo = RGBAlgorithm::algorithm(m_doc, algoList.at(algoIndex)); @@ -408,7 +408,7 @@ void RGBMatrixEditor::createScriptObjects(QQuickItem *parent) RGBScript *script = static_cast (m_matrix->algorithm()); QList properties = script->properties(); - foreach(RGBScriptProperty prop, properties) + foreach (RGBScriptProperty prop, properties) { // always create a label first QMetaObject::invokeMethod(parent, "addLabel", @@ -423,7 +423,7 @@ void RGBMatrixEditor::createScriptObjects(QQuickItem *parent) int currIdx = 0; QString pValue = m_matrix->property(prop.m_name); - foreach(QString val, prop.m_listValues) + foreach (QString val, prop.m_listValues) { if (val == pValue) currIdx = idx; @@ -598,7 +598,7 @@ void RGBMatrixEditor::slotPreviewTimeout() return; QMapIterator it(m_group->headsMap()); - while(it.hasNext()) + while (it.hasNext()) { it.next(); diff --git a/qmlui/sceneeditor.cpp b/qmlui/sceneeditor.cpp index 6c85feffe2..1f3ca2bd50 100644 --- a/qmlui/sceneeditor.cpp +++ b/qmlui/sceneeditor.cpp @@ -108,7 +108,7 @@ void SceneEditor::setPreviewEnabled(bool enable) if (enable == true) { - foreach(SceneValue sv, m_scene->values()) + foreach (SceneValue sv, m_scene->values()) m_source->set(sv.fxi, sv.channel, sv.value); } else diff --git a/qmlui/showmanager.cpp b/qmlui/showmanager.cpp index 9e25eeba9a..d071085ff1 100644 --- a/qmlui/showmanager.cpp +++ b/qmlui/showmanager.cpp @@ -558,7 +558,7 @@ void ShowManager::resetContents() void ShowManager::resetView() { QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); delete it.value(); @@ -687,7 +687,7 @@ void ShowManager::setItemSelection(int trackIdx, ShowFunction *sf, QQuickItem *i void ShowManager::resetItemsSelection() { - foreach(SelectedShowItem ssi, m_selectedItems) + foreach (SelectedShowItem ssi, m_selectedItems) { if (ssi.m_item != nullptr) ssi.m_item->setProperty("isSelected", false); @@ -751,7 +751,7 @@ bool ShowManager::checkOverlapping(Track *track, ShowFunction *sourceFunc, if (track == nullptr) return false; - foreach(ShowFunction *sf, track->showFunctions()) + foreach (ShowFunction *sf, track->showFunctions()) { if (sf == sourceFunc) continue; diff --git a/qmlui/tardis/networkmanager.cpp b/qmlui/tardis/networkmanager.cpp index 6518fcbcaa..9bafa10168 100644 --- a/qmlui/tardis/networkmanager.cpp +++ b/qmlui/tardis/networkmanager.cpp @@ -166,7 +166,7 @@ bool NetworkManager::sendTCPPacket(QTcpSocket *socket, QByteArray &packet, bool if (encrypt) { QByteArray encPacket = m_packetizer->encryptPacket(packet, m_crypt); - while(totalBytesSent < (quint64)encPacket.length()) + while (totalBytesSent < (quint64)encPacket.length()) { sent = socket->write(encPacket.data() + totalBytesSent, encPacket.length() - totalBytesSent); totalBytesSent += sent; @@ -176,7 +176,7 @@ bool NetworkManager::sendTCPPacket(QTcpSocket *socket, QByteArray &packet, bool } else { - while(totalBytesSent < (quint64)packet.length()) + while (totalBytesSent < (quint64)packet.length()) { sent = socket->write(packet.data() + totalBytesSent, packet.length() - totalBytesSent); totalBytesSent += sent; @@ -329,7 +329,7 @@ bool NetworkManager::sendWorkspaceToClient(QString hostName, QString filename) m_packetizer->addSection(packet, QVariant((int)workspace.size())); } - else if(data.length() < WORKSPACE_CHUNK_SIZE) + else if (data.length() < WORKSPACE_CHUNK_SIZE) { m_packetizer->addSection(packet, QVariant(2)); } @@ -410,7 +410,7 @@ bool NetworkManager::initializeClient() m_packetizer->addSection(packet, QVariant(m_hostName)); /* now send the packet on every network interface */ - foreach(QNetworkInterface iface, QNetworkInterface::allInterfaces()) + foreach (QNetworkInterface iface, QNetworkInterface::allInterfaces()) { foreach (QNetworkAddressEntry entry, iface.addressEntries()) { diff --git a/qmlui/uimanager.cpp b/qmlui/uimanager.cpp index b063b27c83..2941d3539c 100644 --- a/qmlui/uimanager.cpp +++ b/qmlui/uimanager.cpp @@ -164,7 +164,7 @@ bool UiManager::saveSettings() /** Add parameters to JSON objects representing categories */ QMapIterator it(m_parameterMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); QString paramName = it.key(); @@ -179,7 +179,7 @@ bool UiManager::saveSettings() /** Add each JSON object to the root object */ QMapIterator cIt(objMap); - while(cIt.hasNext()) + while (cIt.hasNext()) { cIt.next(); objRoot[cIt.key()] = *cIt.value(); diff --git a/qmlui/virtualconsole/vcbutton.cpp b/qmlui/virtualconsole/vcbutton.cpp index e059361ee7..84debd96e8 100644 --- a/qmlui/virtualconsole/vcbutton.cpp +++ b/qmlui/virtualconsole/vcbutton.cpp @@ -168,7 +168,7 @@ void VCButton::setFunctionID(quint32 fid) if ((isEditing() && caption().isEmpty()) || caption() == defaultCaption()) setCaption(function->name()); - if(running) + if (running) { function->start(m_doc->masterTimer(), functionParent()); setState(Active); diff --git a/qmlui/virtualconsole/vcclock.cpp b/qmlui/virtualconsole/vcclock.cpp index bcfc7ea9c8..df7214a5e7 100644 --- a/qmlui/virtualconsole/vcclock.cpp +++ b/qmlui/virtualconsole/vcclock.cpp @@ -238,7 +238,7 @@ void VCClock::slotTimerTimeout() return; } - for(VCClockSchedule *sch : m_scheduleList) // C++11 + for (VCClockSchedule *sch : m_scheduleList) // C++11 { if (sch->m_cachedDuration == -1) { @@ -258,7 +258,7 @@ void VCClock::slotTimerTimeout() * Each case must be checked against days of the week */ - if(dayTimeSecs >= sch->startTime()) + if (dayTimeSecs >= sch->startTime()) { // if there's a stop time and we past it, then skip if (sch->stopTime() > 0 && dayTimeSecs > sch->stopTime()) @@ -327,7 +327,7 @@ void VCClock::setEnableSchedule(bool enableSchedule) /* When disabling, check for running functions and stop them */ if (enableSchedule == false) { - for(VCClockSchedule *sch : m_scheduleList) // C++11 + for (VCClockSchedule *sch : m_scheduleList) // C++11 { Function *f = m_doc->function(sch->functionID()); if (f != nullptr && f->isRunning()) @@ -343,7 +343,7 @@ void VCClock::setEnableSchedule(bool enableSchedule) QVariantList VCClock::scheduleList() { QVariantList list; - for(VCClockSchedule *sch : m_scheduleList) // C++11 + for (VCClockSchedule *sch : m_scheduleList) // C++11 list.append(QVariant::fromValue(sch)); return list; } @@ -509,7 +509,7 @@ bool VCClock::saveXML(QXmlStreamWriter *doc) /* Appearance */ saveXMLAppearance(doc); - for(VCClockSchedule *sch : m_scheduleList) // C++11 + for (VCClockSchedule *sch : m_scheduleList) // C++11 sch->saveXML(doc); /* End the tag */ diff --git a/qmlui/virtualconsole/vccuelist.cpp b/qmlui/virtualconsole/vccuelist.cpp index 577e46eb78..7a7678d399 100644 --- a/qmlui/virtualconsole/vccuelist.cpp +++ b/qmlui/virtualconsole/vccuelist.cpp @@ -260,7 +260,7 @@ void VCCueList::setSideFaderLevel(int level) if (ch->stepsCount() < 256) { float stepSize = 255 / float(ch->stepsCount()); - if(level >= 255 - stepSize) + if (level >= 255 - stepSize) newStep = ch->stepsCount() - 1; else newStep = qFloor(qreal(level) / qreal(stepSize)); diff --git a/qmlui/virtualconsole/vcframe.cpp b/qmlui/virtualconsole/vcframe.cpp index 130e08c279..b3b103a259 100644 --- a/qmlui/virtualconsole/vcframe.cpp +++ b/qmlui/virtualconsole/vcframe.cpp @@ -104,7 +104,7 @@ void VCFrame::render(QQuickView *view, QQuickItem *parent) QString chName = QString("frameDropArea%1").arg(id()); QQuickItem *childrenArea = qobject_cast(m_item->findChild(chName)); - foreach(VCWidget *child, m_pagesMap.keys()) + foreach (VCWidget *child, m_pagesMap.keys()) child->render(view, childrenArea); } } @@ -194,7 +194,7 @@ QList VCFrame::children(bool recursive) return m_pagesMap.keys(); else { - foreach(VCWidget *widget, m_pagesMap.keys()) + foreach (VCWidget *widget, m_pagesMap.keys()) { widgetsList.append(widget); if (widget->type() == FrameWidget || widget->type() == SoloFrameWidget) @@ -508,7 +508,7 @@ void VCFrame::deleteChildren() { it.next(); VCWidget *widget = it.key(); - if(widget->type() == FrameWidget || widget->type() == SoloFrameWidget) + if (widget->type() == FrameWidget || widget->type() == SoloFrameWidget) { VCFrame *frame = qobject_cast(widget); frame->deleteChildren(); @@ -1137,7 +1137,7 @@ bool VCFrame::loadXML(QXmlStreamReader &root) if (attrs.hasAttribute(KXMLQLCVCFrameCurrentPage)) currentPage = attrs.value(KXMLQLCVCFrameCurrentPage).toInt(); - if(attrs.hasAttribute(KXMLQLCVCFramePagesLoop)) + if (attrs.hasAttribute(KXMLQLCVCFramePagesLoop)) setPagesLoop(true); root.skipCurrentElement(); @@ -1285,7 +1285,7 @@ bool VCFrame::saveXML(QXmlStreamWriter *doc) } /* Save children */ - foreach(VCWidget *child, children(false)) + foreach (VCWidget *child, children(false)) child->saveXML(doc); /* End the tag */ diff --git a/qmlui/virtualconsole/vcpage.cpp b/qmlui/virtualconsole/vcpage.cpp index 6bea623754..ec50cd8c2a 100644 --- a/qmlui/virtualconsole/vcpage.cpp +++ b/qmlui/virtualconsole/vcpage.cpp @@ -100,7 +100,7 @@ void VCPage::unMapInputSource(quint32 id, quint32 universe, quint32 channel, //qDebug() << "Multihash keys before deletion:" << m_inputSourcesMap.count(key); - for(QPair, VCWidget *> match : m_inputSourcesMap.values(key)) // C++11 + for (QPair, VCWidget *> match : m_inputSourcesMap.values(key)) // C++11 { if (match.first->id() == id && match.first->page() == page) { @@ -137,7 +137,7 @@ void VCPage::inputValueChanged(quint32 universe, quint32 channel, uchar value) * check also if the page matches and finally inform the VC widget * about the event, including the source ID */ - for(QPair, VCWidget *> match : m_inputSourcesMap.values(key)) // C++11 + for (QPair, VCWidget *> match : m_inputSourcesMap.values(key)) // C++11 { // make sure input signals always pass to frame widgets bool passDisable = (match.second->type() == VCWidget::FrameWidget) || @@ -184,7 +184,7 @@ void VCPage::unMapKeySequence(QKeySequence sequence, quint32 id, VCWidget *widge if (checkChildren && children(true).contains(widget) == false) return; - for(QPair match : m_keySequencesMap.values(sequence)) // C++11 + for (QPair match : m_keySequencesMap.values(sequence)) // C++11 { if (match.first == id && match.second == widget) { @@ -208,7 +208,7 @@ void VCPage::updateKeySequenceIDInMap(QKeySequence sequence, quint32 id, VCWidge quint32 oldId = UINT_MAX; /** Perform a lookup of the existing map to find the old control ID */ - for(QPair match : m_keySequencesMap.values(sequence)) // C++11 + for (QPair match : m_keySequencesMap.values(sequence)) // C++11 { if (match.second == widget) { @@ -248,7 +248,7 @@ void VCPage::handleKeyEvent(QKeyEvent *e, bool pressed) { QKeySequence seq(e->key() | e->modifiers()); - for(QPair match : m_keySequencesMap.values(seq)) // C++11 + for (QPair match : m_keySequencesMap.values(seq)) // C++11 { // make sure input signals always pass to frame widgets bool passDisable = (match.second->type() == VCWidget::FrameWidget) || diff --git a/qmlui/virtualconsole/vcslider.cpp b/qmlui/virtualconsole/vcslider.cpp index c67a4eee43..8d22e3902e 100644 --- a/qmlui/virtualconsole/vcslider.cpp +++ b/qmlui/virtualconsole/vcslider.cpp @@ -803,7 +803,7 @@ void VCSlider::setControlledFunction(quint32 fid) disconnect(current, SIGNAL(attributeChanged(int,qreal)), this, SLOT(slotControlledFunctionAttributeChanged(int,qreal))); - if(current->isRunning()) + if (current->isRunning()) { running = true; current->stop(functionParent()); diff --git a/qmlui/virtualconsole/vcsoloframe.cpp b/qmlui/virtualconsole/vcsoloframe.cpp index f0ccbd567e..c4efa430a1 100644 --- a/qmlui/virtualconsole/vcsoloframe.cpp +++ b/qmlui/virtualconsole/vcsoloframe.cpp @@ -58,7 +58,7 @@ void VCSoloFrame::render(QQuickView *view, QQuickItem *parent) QString chName = QString("frameDropArea%1").arg(id()); QQuickItem *childrenArea = qobject_cast(item->findChild(chName)); - foreach(VCWidget *child, m_pagesMap.keys()) + foreach (VCWidget *child, m_pagesMap.keys()) child->render(view, childrenArea); } } @@ -95,7 +95,7 @@ bool VCSoloFrame::copyFrom(const VCWidget *widget) void VCSoloFrame::slotFunctionStarting(VCWidget *widget, quint32 fid, qreal intensity) { qDebug() << "[VCSoloFrame] requested to start a Function with ID:" << fid << intensity << widget->caption(); - foreach(VCWidget *child, children(true)) + foreach (VCWidget *child, children(true)) { if (child != widget) child->notifyFunctionStarting(widget, fid, intensity); diff --git a/qmlui/virtualconsole/vcwidget.cpp b/qmlui/virtualconsole/vcwidget.cpp index a8cb47b648..65fa66700f 100644 --- a/qmlui/virtualconsole/vcwidget.cpp +++ b/qmlui/virtualconsole/vcwidget.cpp @@ -125,7 +125,7 @@ bool VCWidget::copyFrom(const VCWidget* widget) } QMapIterator it(m_keySequenceMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); @@ -620,7 +620,7 @@ QVariant VCWidget::externalControlsList() const QVariantList controlsList; QMapIterator it(m_externalControlList); - while(it.hasNext()) + while (it.hasNext()) { it.next(); ExternalControlInfo info = it.value(); @@ -802,7 +802,7 @@ QVariantList VCWidget::inputSourcesList() } QMapIterator it(m_keySequenceMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); diff --git a/qmlui/virtualconsole/virtualconsole.cpp b/qmlui/virtualconsole/virtualconsole.cpp index be171774ea..bc17556a08 100644 --- a/qmlui/virtualconsole/virtualconsole.cpp +++ b/qmlui/virtualconsole/virtualconsole.cpp @@ -495,7 +495,7 @@ void VirtualConsole::setWidgetSelection(quint32 wID, QQuickItem *item, bool enab { // disable any previously selected widget QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); QQuickItem *uiWidget = it.value(); @@ -534,7 +534,7 @@ void VirtualConsole::setWidgetSelection(quint32 wID, QQuickItem *item, bool enab void VirtualConsole::resetWidgetSelection() { - foreach(QQuickItem *widget, m_itemsMap.values()) + foreach (QQuickItem *widget, m_itemsMap.values()) widget->setProperty("isSelected", false); m_itemsMap.clear(); @@ -547,7 +547,7 @@ QStringList VirtualConsole::selectedWidgetNames() QStringList names; if (m_itemsMap.isEmpty() == false) { - foreach(quint32 wID, m_itemsMap.keys()) + foreach (quint32 wID, m_itemsMap.keys()) { VCWidget *vcWidget = m_widgetsMap[wID]; if (vcWidget != nullptr) @@ -573,7 +573,7 @@ QVariantList VirtualConsole::selectedWidgetIDs() QVariantList ids; if (m_itemsMap.isEmpty() == false) { - foreach(quint32 wID, m_itemsMap.keys()) + foreach (quint32 wID, m_itemsMap.keys()) ids << wID; } @@ -614,7 +614,7 @@ void VirtualConsole::setWidgetsAlignment(VCWidget *refWidget, int alignment) QRectF refGeom = refWidget->geometry(); QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); @@ -652,7 +652,7 @@ void VirtualConsole::setWidgetsAlignment(VCWidget *refWidget, int alignment) void VirtualConsole::setWidgetsCaption(QString caption) { QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); @@ -664,7 +664,7 @@ void VirtualConsole::setWidgetsCaption(QString caption) void VirtualConsole::setWidgetsForegroundColor(QColor color) { QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); @@ -676,7 +676,7 @@ void VirtualConsole::setWidgetsForegroundColor(QColor color) void VirtualConsole::setWidgetsBackgroundColor(QColor color) { QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); @@ -688,7 +688,7 @@ void VirtualConsole::setWidgetsBackgroundColor(QColor color) void VirtualConsole::setWidgetsBackgroundImage(QString path) { QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); @@ -700,7 +700,7 @@ void VirtualConsole::setWidgetsBackgroundImage(QString path) void VirtualConsole::setWidgetsFont(QFont font) { QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); @@ -711,7 +711,7 @@ void VirtualConsole::setWidgetsFont(QFont font) void VirtualConsole::deleteVCWidgets(QVariantList IDList) { - foreach(QVariant id, IDList) + foreach (QVariant id, IDList) { quint32 wID = id.toUInt(); VCWidget *w = widget(wID); @@ -814,7 +814,7 @@ void VirtualConsole::pasteFromClipboard() QPoint currPos(0, 0); QMapIterator it(m_itemsMap); - while(it.hasNext()) + while (it.hasNext()) { it.next(); @@ -970,7 +970,7 @@ void VirtualConsole::updateKeySequenceControlID(VCWidget *widget, quint32 id, QS widget->updateKeySequenceControlID(seq, id); /** Update also the key sequence maps in VC pages */ - for(VCPage *page : m_pages) // C++11 + for (VCPage *page : m_pages) // C++11 page->updateKeySequenceIDInMap(seq, id, widget, true); } @@ -991,7 +991,7 @@ void VirtualConsole::deleteInputSource(VCWidget *widget, quint32 id, quint32 uni /** In case an autodetection process is running, stop it */ disableAutoDetection(); - for(VCPage *page : m_pages) // C++11 + for (VCPage *page : m_pages) // C++11 page->unMapInputSource(id, universe, channel, widget, true); widget->deleteInputSurce(id, universe, channel); @@ -1007,7 +1007,7 @@ void VirtualConsole::deleteKeySequence(VCWidget *widget, quint32 id, QString key QKeySequence seq(keyText); - for(VCPage *page : m_pages) // C++11 + for (VCPage *page : m_pages) // C++11 page->unMapKeySequence(seq, id, widget, true); widget->deleteKeySequence(seq); @@ -1043,7 +1043,7 @@ void VirtualConsole::handleKeyEvent(QKeyEvent *e, bool pressed) qDebug() << "Got key sequence:" << seq.toString(QKeySequence::NativeText); m_autoDetectionWidget->updateKeySequence(m_autoDetectionKey, seq, m_autoDetectionKeyId); - for(VCPage *page : m_pages) // C++11 + for (VCPage *page : m_pages) // C++11 page->mapKeySequence(seq, m_autoDetectionKeyId, m_autoDetectionWidget, true); /** At last, disable the autodetection process */ diff --git a/ui/src/addfixture.cpp b/ui/src/addfixture.cpp index bd821e2186..948e64f675 100644 --- a/ui/src/addfixture.cpp +++ b/ui/src/addfixture.cpp @@ -277,7 +277,7 @@ void AddFixture::fillTree(const QString& selectManufacturer, parent->setExpanded(true); m_tree->setCurrentItem(child); } - else if(expanded.indexOf(manuf) != -1) + else if (expanded.indexOf(manuf) != -1) { parent->setExpanded(true); } @@ -304,7 +304,7 @@ void AddFixture::fillTree(const QString& selectManufacturer, parent->setExpanded(true); m_tree->setCurrentItem(child); } - else if(expanded.indexOf(manuf) != -1) + else if (expanded.indexOf(manuf) != -1) { parent->setExpanded(true); } diff --git a/ui/src/addresstool.cpp b/ui/src/addresstool.cpp index ff41c165ed..4c1c1846f6 100644 --- a/ui/src/addresstool.cpp +++ b/ui/src/addresstool.cpp @@ -166,7 +166,7 @@ void DIPSwitchWidget::mousePressEvent(QMouseEvent *e) quint32 newvalue = m_value ^ (1< 512) newvalue = 512; m_value = newvalue; diff --git a/ui/src/app.cpp b/ui/src/app.cpp index 1f80877e0b..03a44b6c32 100644 --- a/ui/src/app.cpp +++ b/ui/src/app.cpp @@ -349,7 +349,7 @@ void App::closeEvent(QCloseEvent* e) if (m_doc->isKiosk() == false) { - if( saveModifiedDoc(tr("Close"), tr("Do you wish to save the current workspace " \ + if (saveModifiedDoc(tr("Close"), tr("Do you wish to save the current workspace " \ "before closing the application?")) == true) { e->accept(); @@ -502,7 +502,7 @@ void App::slotDocModified(bool state) void App::slotUniverseWritten(quint32 idx, const QByteArray &ua) { - foreach(Fixture *fixture, m_doc->fixtures()) + foreach (Fixture *fixture, m_doc->fixtures()) { if (fixture->universe() != idx) continue; diff --git a/ui/src/audiobar.cpp b/ui/src/audiobar.cpp index 51e2a618b7..ec46f5fc98 100644 --- a/ui/src/audiobar.cpp +++ b/ui/src/audiobar.cpp @@ -112,7 +112,7 @@ void AudioBar::attachDmxChannels(Doc *doc, QList list) m_dmxChannels.clear(); m_dmxChannels = list; m_absDmxChannels.clear(); - foreach(SceneValue scv, m_dmxChannels) + foreach (SceneValue scv, m_dmxChannels) { Fixture *fx = doc->fixture(scv.fxi); if (fx != NULL) diff --git a/ui/src/channelmodifiereditor.cpp b/ui/src/channelmodifiereditor.cpp index 347d873d93..61cc114d6a 100644 --- a/ui/src/channelmodifiereditor.cpp +++ b/ui/src/channelmodifiereditor.cpp @@ -96,7 +96,7 @@ void ChannelModifierEditor::updateModifiersList(QString modifier) std::stable_sort(names.begin(), names.end(), alphabeticSort); m_templatesTree->clear(); - foreach(QString name, names) + foreach (QString name, names) { QTreeWidgetItem *item = new QTreeWidgetItem(m_templatesTree); item->setText(0, name); diff --git a/ui/src/channelmodifiergraphicsview.cpp b/ui/src/channelmodifiergraphicsview.cpp index 298385d8fb..2123263099 100644 --- a/ui/src/channelmodifiergraphicsview.cpp +++ b/ui/src/channelmodifiergraphicsview.cpp @@ -65,7 +65,7 @@ void ChannelModifierGraphicsView::addNewHandler() int prevHdlrIdx = 0; HandlerItem *nextHandler = NULL; - for(prevHdlrIdx = 0; prevHdlrIdx < m_handlers.count(); prevHdlrIdx++) + for (prevHdlrIdx = 0; prevHdlrIdx < m_handlers.count(); prevHdlrIdx++) { HandlerItem *hdlr = m_handlers.at(prevHdlrIdx); if (hdlr == prevHandler) @@ -127,7 +127,7 @@ void ChannelModifierGraphicsView::setModifierMap(QList > map QPen(Qt::NoPen), QBrush(QColor(70, 70, 70, 255), Qt::SolidPattern)); m_bgRect->setZValue(0); - for(int i = 0; i < map.count(); i++) + for (int i = 0; i < map.count(); i++) { QPair dmxPair = map.at(i); HandlerItem *handler = new HandlerItem; @@ -140,7 +140,7 @@ void ChannelModifierGraphicsView::setModifierMap(QList > map handler->m_line = m_scene->addLine(0,0,1,1,QPen(Qt::yellow)); m_handlers.append(handler); } - for(int i = 0; i < map.count(); i++) + for (int i = 0; i < map.count(); i++) updateHandlerBoundingBox(i); updateView(); } @@ -148,15 +148,15 @@ void ChannelModifierGraphicsView::setModifierMap(QList > map QList< QPair > ChannelModifierGraphicsView::modifiersMap() { QList< QPair > modMap; - foreach(HandlerItem *item, m_handlers) + foreach (HandlerItem *item, m_handlers) modMap.append(item->m_dmxMap); return modMap; } HandlerItem *ChannelModifierGraphicsView::getSelectedHandler() { - foreach(HandlerItem *handler, m_handlers) - if(handler->m_item->isSelected()) + foreach (HandlerItem *handler, m_handlers) + if (handler->m_item->isSelected()) return handler; return NULL; } @@ -194,7 +194,7 @@ void ChannelModifierGraphicsView::updateHandlerBoundingBox(int itemIndex) handler->m_item->setBoundingBox(QRect(m_bgRect->x() - 1, m_bgRect->y(), 1, m_bgRect->rect().height())); return; } - else if(itemIndex == m_handlers.count() - 1) + else if (itemIndex == m_handlers.count() - 1) { handler->m_item->setBoundingBox(QRect(m_bgRect->rect().right(), m_bgRect->y(), 1, m_bgRect->rect().height())); return; @@ -353,7 +353,7 @@ void ChannelModifierGraphicsView::slotItemMoved(HandlerGraphicsItem *item, ********************************************************************/ HandlerGraphicsItem::HandlerGraphicsItem(qreal x, qreal y, qreal w, qreal h, - const QPen & pen, const QBrush & brush ) + const QPen & pen, const QBrush &brush) : QGraphicsEllipseItem(x, y, w, h) { setCursor(Qt::OpenHandCursor); diff --git a/ui/src/channelmodifiergraphicsview.h b/ui/src/channelmodifiergraphicsview.h index d40c2143e2..b77b5952e7 100644 --- a/ui/src/channelmodifiergraphicsview.h +++ b/ui/src/channelmodifiergraphicsview.h @@ -31,7 +31,7 @@ class HandlerGraphicsItem : public QObject, public QGraphicsEllipseItem public: HandlerGraphicsItem(qreal x, qreal y, qreal w, qreal h, const QPen & pen = QPen(), - const QBrush & brush = QBrush() ); + const QBrush & brush = QBrush()); void setBoundingBox(QRectF rect); QRectF boundingBox(); @@ -106,7 +106,7 @@ class ChannelModifierGraphicsView : public QGraphicsView void updateView(); /** Event caught when the GraphicsView is resized */ - void resizeEvent( QResizeEvent *event ); + void resizeEvent(QResizeEvent *event); void mouseReleaseEvent(QMouseEvent *e); diff --git a/ui/src/channelsselection.cpp b/ui/src/channelsselection.cpp index d53203829e..7b8bbb7b2c 100644 --- a/ui/src/channelsselection.cpp +++ b/ui/src/channelsselection.cpp @@ -100,7 +100,7 @@ void ChannelsSelection::updateFixturesTree() m_channelsTree->setIconSize(QSize(24, 24)); m_channelsTree->setAllColumnsShowFocus(true); - foreach(Fixture *fxi, m_doc->fixtures()) + foreach (Fixture *fxi, m_doc->fixtures()) { QTreeWidgetItem *topItem = NULL; quint32 uni = fxi->universe(); @@ -256,7 +256,7 @@ void ChannelsSelection::slotItemChecked(QTreeWidgetItem *item, int col) Qt::CheckState enable = item->checkState(KColumnSelection); - foreach(QTreeWidgetItem *chItem, getSameChannels(item)) + foreach (QTreeWidgetItem *chItem, getSameChannels(item)) chItem->setCheckState(KColumnSelection, enable); m_channelsTree->blockSignals(false); @@ -279,7 +279,7 @@ void ChannelsSelection::slotComboChanged(int idx) QVariant var = combo->property("treeItem"); QTreeWidgetItem *item = (QTreeWidgetItem *) var.value(); - foreach(QTreeWidgetItem *chItem, getSameChannels(item)) + foreach (QTreeWidgetItem *chItem, getSameChannels(item)) { QComboBox *chCombo = qobject_cast(m_channelsTree->itemWidget(chItem, KColumnBehaviour)); if (chCombo != NULL) @@ -315,7 +315,7 @@ void ChannelsSelection::slotModifierButtonClicked() QVariant var = button->property("treeItem"); QTreeWidgetItem *item = (QTreeWidgetItem *) var.value(); - foreach(QTreeWidgetItem *chItem, getSameChannels(item)) + foreach (QTreeWidgetItem *chItem, getSameChannels(item)) { QPushButton *chButton = qobject_cast(m_channelsTree->itemWidget(chItem, KColumnModifier)); if (chButton != NULL) diff --git a/ui/src/chasereditor.cpp b/ui/src/chasereditor.cpp index 30c407a85a..62e6d38c23 100644 --- a/ui/src/chasereditor.cpp +++ b/ui/src/chasereditor.cpp @@ -739,11 +739,11 @@ void ChaserEditor::slotPasteClicked() Sequence *sequence = qobject_cast(m_chaser); quint32 sceneID = sequence->boundSceneID(); Scene *scene = qobject_cast(m_doc->function(sceneID)); - foreach(ChaserStep step, pasteList) + foreach (ChaserStep step, pasteList) { if (step.fid != sceneID) // if IDs are the same then it's a valid step { - foreach(SceneValue scv, step.values) + foreach (SceneValue scv, step.values) { if (scene->checkValue(scv) == false) { diff --git a/ui/src/clickandgoslider.cpp b/ui/src/clickandgoslider.cpp index 743f778170..670650cb4a 100644 --- a/ui/src/clickandgoslider.cpp +++ b/ui/src/clickandgoslider.cpp @@ -29,7 +29,7 @@ ClickAndGoSlider::ClickAndGoSlider(QWidget *parent) : QSlider(parent) void ClickAndGoSlider::setSliderStyleSheet(const QString &styleSheet) { - if(isVisible()) + if (isVisible()) QSlider::setStyleSheet(styleSheet); else m_styleSheet = styleSheet; diff --git a/ui/src/clickandgowidget.cpp b/ui/src/clickandgowidget.cpp index 0e4d71170c..c75daedcb5 100644 --- a/ui/src/clickandgowidget.cpp +++ b/ui/src/clickandgowidget.cpp @@ -210,7 +210,7 @@ QImage ClickAndGoWidget::getImageFromValue(uchar value) * the pre-loaded resource */ if (m_type == Preset) { - foreach(PresetResource res, m_resources) + foreach (PresetResource res, m_resources) { if (value >= res.m_min && value <= res.m_max) return res.m_thumbnail; @@ -242,7 +242,7 @@ void ClickAndGoWidget::createPresetList(const QLCChannel *chan) //qDebug() << Q_FUNC_INFO << "cap #" << chan->capabilities().size(); - foreach(QLCCapability* cap, chan->capabilities()) + foreach (QLCCapability* cap, chan->capabilities()) { if (cap->presetType() == QLCCapability::Picture) { diff --git a/ui/src/collectioneditor.cpp b/ui/src/collectioneditor.cpp index 8691de2999..4c6a41fe25 100644 --- a/ui/src/collectioneditor.cpp +++ b/ui/src/collectioneditor.cpp @@ -195,7 +195,7 @@ void CollectionEditor::updateFunctionList() { m_tree->clear(); - foreach(QVariant fid, m_collection->functions()) + foreach (QVariant fid, m_collection->functions()) { Function* function = m_doc->function(fid.toUInt()); Q_ASSERT(function != NULL); diff --git a/ui/src/consolechannel.cpp b/ui/src/consolechannel.cpp index 5186e94bcc..b075b136bb 100644 --- a/ui/src/consolechannel.cpp +++ b/ui/src/consolechannel.cpp @@ -292,7 +292,7 @@ void ConsoleChannel::slotChecked(bool state) void ConsoleChannel::setChannelStyleSheet(const QString &styleSheet) { - if(isVisible()) + if (isVisible()) QGroupBox::setStyleSheet(styleSheet); else m_styleSheet = styleSheet; diff --git a/ui/src/ctkrangeslider.cpp b/ui/src/ctkrangeslider.cpp index 2acaae20fc..ee3c676765 100644 --- a/ui/src/ctkrangeslider.cpp +++ b/ui/src/ctkrangeslider.cpp @@ -33,180 +33,176 @@ class ctkRangeSliderPrivate { - Q_DECLARE_PUBLIC(ctkRangeSlider); + Q_DECLARE_PUBLIC(ctkRangeSlider); protected: - ctkRangeSlider* const q_ptr; + ctkRangeSlider *const q_ptr; public: - /// Boolean indicates the selected handle - /// True for the minimum range handle, false for the maximum range handle - enum Handle { - NoHandle = 0x0, - MinimumHandle = 0x1, - MaximumHandle = 0x2 - }; - Q_DECLARE_FLAGS(Handles, Handle); + /// Boolean indicates the selected handle + /// True for the minimum range handle, false for the maximum range handle + enum Handle { + NoHandle = 0x0, + MinimumHandle = 0x1, + MaximumHandle = 0x2 + }; + Q_DECLARE_FLAGS(Handles, Handle); - ctkRangeSliderPrivate(ctkRangeSlider& object); - void init(); + ctkRangeSliderPrivate(ctkRangeSlider& object); + void init(); - /// Return the handle at the given pos, or none if no handle is at the pos. - /// If a handle is selected, handleRect is set to the handle rect. - /// otherwise return NoHandle and handleRect is set to the combined rect of - /// the min and max handles - Handle handleAtPos(const QPoint& pos, QRect& handleRect)const; + /// Return the handle at the given pos, or none if no handle is at the pos. + /// If a handle is selected, handleRect is set to the handle rect. + /// otherwise return NoHandle and handleRect is set to the combined rect of + /// the min and max handles + Handle handleAtPos(const QPoint& pos, QRect& handleRect)const; - /// Copied verbatim from QSliderPrivate class (see QSlider.cpp) - int pixelPosToRangeValue(int pos) const; - int pixelPosFromRangeValue(int val) const; + /// Copied verbatim from QSliderPrivate class (see QSlider.cpp) + int pixelPosToRangeValue(int pos) const; + int pixelPosFromRangeValue(int val) const; - /// Draw the bottom and top sliders. - void drawMinimumSlider( QStylePainter* painter ) const; - void drawMaximumSlider( QStylePainter* painter ) const; + /// Draw the bottom and top sliders. + void drawMinimumSlider(QStylePainter *painter) const; + void drawMaximumSlider(QStylePainter *painter) const; - /// End points of the range on the Model - int m_MaximumValue; - int m_MinimumValue; + /// End points of the range on the Model + int m_MaximumValue; + int m_MinimumValue; - /// End points of the range on the GUI. This is synced with the model. - int m_MaximumPosition; - int m_MinimumPosition; + /// End points of the range on the GUI. This is synced with the model. + int m_MaximumPosition; + int m_MinimumPosition; - /// Controls selected ? - QStyle::SubControl m_MinimumSliderSelected; - QStyle::SubControl m_MaximumSliderSelected; + /// Controls selected ? + QStyle::SubControl m_MinimumSliderSelected; + QStyle::SubControl m_MaximumSliderSelected; - /// See QSliderPrivate::clickOffset. - /// Overrides this ivar - int m_SubclassClickOffset; + /// See QSliderPrivate::clickOffset. + /// Overrides this ivar + int m_SubclassClickOffset; - /// See QSliderPrivate::position - /// Overrides this ivar. - int m_SubclassPosition; + /// See QSliderPrivate::position + /// Overrides this ivar. + int m_SubclassPosition; - /// Original width between the 2 bounds before any moves - int m_SubclassWidth; + /// Original width between the 2 bounds before any moves + int m_SubclassWidth; - ctkRangeSliderPrivate::Handles m_SelectedHandles; + ctkRangeSliderPrivate::Handles m_SelectedHandles; - /// When symmetricMoves is true, moving a handle will move the other handle - /// symmetrically, otherwise the handles are independent. - bool m_SymmetricMoves; + /// When symmetricMoves is true, moving a handle will move the other handle + /// symmetrically, otherwise the handles are independent. + bool m_SymmetricMoves; - QString m_HandleToolTip; + QString m_HandleToolTip; private: - Q_DISABLE_COPY(ctkRangeSliderPrivate); + Q_DISABLE_COPY(ctkRangeSliderPrivate); }; // -------------------------------------------------------------------------- ctkRangeSliderPrivate::ctkRangeSliderPrivate(ctkRangeSlider& object) - :q_ptr(&object) + : q_ptr(&object) { - this->m_MinimumValue = 0; - this->m_MaximumValue = 100; - this->m_MinimumPosition = 0; - this->m_MaximumPosition = 100; - this->m_MinimumSliderSelected = QStyle::SC_None; - this->m_MaximumSliderSelected = QStyle::SC_None; - this->m_SubclassClickOffset = 0; - this->m_SubclassPosition = 0; - this->m_SubclassWidth = 0; - this->m_SelectedHandles = NoHandle; - this->m_SymmetricMoves = false; + this->m_MinimumValue = 0; + this->m_MaximumValue = 100; + this->m_MinimumPosition = 0; + this->m_MaximumPosition = 100; + this->m_MinimumSliderSelected = QStyle::SC_None; + this->m_MaximumSliderSelected = QStyle::SC_None; + this->m_SubclassClickOffset = 0; + this->m_SubclassPosition = 0; + this->m_SubclassWidth = 0; + this->m_SelectedHandles = NoHandle; + this->m_SymmetricMoves = false; } // -------------------------------------------------------------------------- void ctkRangeSliderPrivate::init() { - Q_Q(ctkRangeSlider); - this->m_MinimumValue = q->minimum(); - this->m_MaximumValue = q->maximum(); - this->m_MinimumPosition = q->minimum(); - this->m_MaximumPosition = q->maximum(); - q->connect(q, SIGNAL(rangeChanged(int,int)), q, SLOT(onRangeChanged(int,int))); + Q_Q(ctkRangeSlider); + this->m_MinimumValue = q->minimum(); + this->m_MaximumValue = q->maximum(); + this->m_MinimumPosition = q->minimum(); + this->m_MaximumPosition = q->maximum(); + q->connect(q, SIGNAL(rangeChanged(int,int)), q, SLOT(onRangeChanged(int,int))); } // -------------------------------------------------------------------------- ctkRangeSliderPrivate::Handle ctkRangeSliderPrivate::handleAtPos(const QPoint& pos, QRect& handleRect)const { - Q_Q(const ctkRangeSlider); + Q_Q(const ctkRangeSlider); - QStyleOptionSlider option; - q->initStyleOption( &option ); + QStyleOptionSlider option; + q->initStyleOption(&option); - // The functinos hitTestComplexControl only know about 1 handle. As we have - // 2, we change the position of the handle and test if the pos correspond to - // any of the 2 positions. + // The functinos hitTestComplexControl only know about 1 handle. As we have + // 2, we change the position of the handle and test if the pos correspond to + // any of the 2 positions. - // Test the MinimumHandle - option.sliderPosition = this->m_MinimumPosition; - option.sliderValue = this->m_MinimumValue; + // Test the MinimumHandle + option.sliderPosition = this->m_MinimumPosition; + option.sliderValue = this->m_MinimumValue; - QStyle::SubControl minimumControl = q->style()->hitTestComplexControl( - QStyle::CC_Slider, &option, pos, q); - QRect minimumHandleRect = q->style()->subControlRect( - QStyle::CC_Slider, &option, QStyle::SC_SliderHandle, q); + QStyle::SubControl minimumControl = q->style()->hitTestComplexControl(QStyle::CC_Slider, &option, pos, q); + QRect minimumHandleRect = q->style()->subControlRect(QStyle::CC_Slider, &option, QStyle::SC_SliderHandle, q); - // Test if the pos is under the Maximum handle - option.sliderPosition = this->m_MaximumPosition; - option.sliderValue = this->m_MaximumValue; + // Test if the pos is under the Maximum handle + option.sliderPosition = this->m_MaximumPosition; + option.sliderValue = this->m_MaximumValue; - QStyle::SubControl maximumControl = q->style()->hitTestComplexControl( - QStyle::CC_Slider, &option, pos, q); - QRect maximumHandleRect = q->style()->subControlRect( - QStyle::CC_Slider, &option, QStyle::SC_SliderHandle, q); + QStyle::SubControl maximumControl = q->style()->hitTestComplexControl(QStyle::CC_Slider, &option, pos, q); + QRect maximumHandleRect = q->style()->subControlRect(QStyle::CC_Slider, &option, QStyle::SC_SliderHandle, q); - // The pos is above both handles, select the closest handle - if (minimumControl == QStyle::SC_SliderHandle && - maximumControl == QStyle::SC_SliderHandle) + // The pos is above both handles, select the closest handle + if (minimumControl == QStyle::SC_SliderHandle && + maximumControl == QStyle::SC_SliderHandle) { - int minDist = 0; - int maxDist = 0; - if (q->orientation() == Qt::Horizontal) - { - minDist = pos.x() - minimumHandleRect.left(); - maxDist = maximumHandleRect.right() - pos.x(); - } - else //if (q->orientation() == Qt::Vertical) - { - minDist = minimumHandleRect.bottom() - pos.y(); - maxDist = pos.y() - maximumHandleRect.top(); - } - Q_ASSERT( minDist >= 0 && maxDist >= 0); - minimumControl = minDist < maxDist ? minimumControl : QStyle::SC_None; + int minDist = 0; + int maxDist = 0; + if (q->orientation() == Qt::Horizontal) + { + minDist = pos.x() - minimumHandleRect.left(); + maxDist = maximumHandleRect.right() - pos.x(); + } + else //if (q->orientation() == Qt::Vertical) + { + minDist = minimumHandleRect.bottom() - pos.y(); + maxDist = pos.y() - maximumHandleRect.top(); + } + Q_ASSERT(minDist >= 0 && maxDist >= 0); + minimumControl = minDist < maxDist ? minimumControl : QStyle::SC_None; } - if (minimumControl == QStyle::SC_SliderHandle) + if (minimumControl == QStyle::SC_SliderHandle) { - handleRect = minimumHandleRect; - return MinimumHandle; + handleRect = minimumHandleRect; + return MinimumHandle; } - else if (maximumControl == QStyle::SC_SliderHandle) + else if (maximumControl == QStyle::SC_SliderHandle) { - handleRect = maximumHandleRect; - return MaximumHandle; + handleRect = maximumHandleRect; + return MaximumHandle; } - handleRect = minimumHandleRect.united(maximumHandleRect); - return NoHandle; + handleRect = minimumHandleRect.united(maximumHandleRect); + return NoHandle; } // -------------------------------------------------------------------------- // Copied verbatim from QSliderPrivate::pixelPosToRangeValue. See QSlider.cpp // -int ctkRangeSliderPrivate::pixelPosToRangeValue( int pos ) const -{ - Q_Q(const ctkRangeSlider); - QStyleOptionSlider option; - q->initStyleOption( &option ); - - QRect gr = q->style()->subControlRect( QStyle::CC_Slider, - &option, - QStyle::SC_SliderGroove, - q ); - QRect sr = q->style()->subControlRect( QStyle::CC_Slider, - &option, - QStyle::SC_SliderHandle, - q ); +int ctkRangeSliderPrivate::pixelPosToRangeValue(int pos) const +{ + Q_Q(const ctkRangeSlider); + QStyleOptionSlider option; + q->initStyleOption(&option); + + QRect gr = q->style()->subControlRect(QStyle::CC_Slider, + &option, + QStyle::SC_SliderGroove, + q); + QRect sr = q->style()->subControlRect(QStyle::CC_Slider, + &option, + QStyle::SC_SliderHandle, + q); int sliderMin, sliderMax, sliderLength; if (option.orientation == Qt::Horizontal) { @@ -221,135 +217,135 @@ int ctkRangeSliderPrivate::pixelPosToRangeValue( int pos ) const sliderMax = gr.bottom() - sliderLength + 1; } - return QStyle::sliderValueFromPosition( q->minimum(), - q->maximum(), - pos - sliderMin, - sliderMax - sliderMin, - option.upsideDown ); + return QStyle::sliderValueFromPosition(q->minimum(), + q->maximum(), + pos - sliderMin, + sliderMax - sliderMin, + option.upsideDown); } //--------------------------------------------------------------------------- -int ctkRangeSliderPrivate::pixelPosFromRangeValue( int val ) const -{ - Q_Q(const ctkRangeSlider); - QStyleOptionSlider option; - q->initStyleOption( &option ); - - QRect gr = q->style()->subControlRect( QStyle::CC_Slider, - &option, - QStyle::SC_SliderGroove, - q ); - QRect sr = q->style()->subControlRect( QStyle::CC_Slider, - &option, - QStyle::SC_SliderHandle, - q ); - int sliderMin, sliderMax, sliderLength; - if (option.orientation == Qt::Horizontal) +int ctkRangeSliderPrivate::pixelPosFromRangeValue(int val) const +{ + Q_Q(const ctkRangeSlider); + QStyleOptionSlider option; + q->initStyleOption(&option); + + QRect gr = q->style()->subControlRect(QStyle::CC_Slider, + &option, + QStyle::SC_SliderGroove, + q); + QRect sr = q->style()->subControlRect(QStyle::CC_Slider, + &option, + QStyle::SC_SliderHandle, + q); + int sliderMin, sliderMax, sliderLength; + if (option.orientation == Qt::Horizontal) { - sliderLength = sr.width(); - sliderMin = gr.x(); - sliderMax = gr.right() - sliderLength + 1; + sliderLength = sr.width(); + sliderMin = gr.x(); + sliderMax = gr.right() - sliderLength + 1; } - else + else { - sliderLength = sr.height(); - sliderMin = gr.y(); - sliderMax = gr.bottom() - sliderLength + 1; + sliderLength = sr.height(); + sliderMin = gr.y(); + sliderMax = gr.bottom() - sliderLength + 1; } - return QStyle::sliderPositionFromValue( q->minimum(), - q->maximum(), - val, - sliderMax - sliderMin, - option.upsideDown ) + sliderMin; + return QStyle::sliderPositionFromValue(q->minimum(), + q->maximum(), + val, + sliderMax - sliderMin, + option.upsideDown) + sliderMin; } //--------------------------------------------------------------------------- // Draw slider at the bottom end of the range -void ctkRangeSliderPrivate::drawMinimumSlider( QStylePainter* painter ) const +void ctkRangeSliderPrivate::drawMinimumSlider(QStylePainter *painter) const { - Q_Q(const ctkRangeSlider); - QStyleOptionSlider option; - q->initMinimumSliderStyleOption( &option ); + Q_Q(const ctkRangeSlider); + QStyleOptionSlider option; + q->initMinimumSliderStyleOption(&option); - option.subControls = QStyle::SC_SliderHandle; - option.sliderValue = m_MinimumValue; - option.sliderPosition = m_MinimumPosition; - if (q->isMinimumSliderDown()) + option.subControls = QStyle::SC_SliderHandle; + option.sliderValue = m_MinimumValue; + option.sliderPosition = m_MinimumPosition; + if (q->isMinimumSliderDown()) { - option.activeSubControls = QStyle::SC_SliderHandle; - option.state |= QStyle::State_Sunken; + option.activeSubControls = QStyle::SC_SliderHandle; + option.state |= QStyle::State_Sunken; } #ifdef Q_OS_MAC - // On mac style, drawing just the handle actually draws also the groove. - QRect clip = q->style()->subControlRect(QStyle::CC_Slider, &option, - QStyle::SC_SliderHandle, q); - painter->setClipRect(clip); + // On mac style, drawing just the handle actually draws also the groove. + QRect clip = q->style()->subControlRect(QStyle::CC_Slider, &option, + QStyle::SC_SliderHandle, q); + painter->setClipRect(clip); #endif - painter->drawComplexControl(QStyle::CC_Slider, option); + painter->drawComplexControl(QStyle::CC_Slider, option); } //--------------------------------------------------------------------------- // Draw slider at the top end of the range -void ctkRangeSliderPrivate::drawMaximumSlider( QStylePainter* painter ) const +void ctkRangeSliderPrivate::drawMaximumSlider(QStylePainter *painter) const { - Q_Q(const ctkRangeSlider); - QStyleOptionSlider option; - q->initMaximumSliderStyleOption( &option ); + Q_Q(const ctkRangeSlider); + QStyleOptionSlider option; + q->initMaximumSliderStyleOption(&option); - option.subControls = QStyle::SC_SliderHandle; - option.sliderValue = m_MaximumValue; - option.sliderPosition = m_MaximumPosition; - if (q->isMaximumSliderDown()) + option.subControls = QStyle::SC_SliderHandle; + option.sliderValue = m_MaximumValue; + option.sliderPosition = m_MaximumPosition; + if (q->isMaximumSliderDown()) { - option.activeSubControls = QStyle::SC_SliderHandle; - option.state |= QStyle::State_Sunken; + option.activeSubControls = QStyle::SC_SliderHandle; + option.state |= QStyle::State_Sunken; } #ifdef Q_OS_MAC - // On mac style, drawing just the handle actually draws also the groove. - QRect clip = q->style()->subControlRect(QStyle::CC_Slider, &option, - QStyle::SC_SliderHandle, q); - painter->setClipRect(clip); + // On mac style, drawing just the handle actually draws also the groove. + QRect clip = q->style()->subControlRect(QStyle::CC_Slider, &option, + QStyle::SC_SliderHandle, q); + painter->setClipRect(clip); #endif - painter->drawComplexControl(QStyle::CC_Slider, option); + painter->drawComplexControl(QStyle::CC_Slider, option); } // -------------------------------------------------------------------------- -ctkRangeSlider::ctkRangeSlider(QWidget* _parent) - : QSlider(_parent) - , d_ptr(new ctkRangeSliderPrivate(*this)) +ctkRangeSlider::ctkRangeSlider(QWidget *_parent) + : QSlider(_parent) + , d_ptr(new ctkRangeSliderPrivate(*this)) { - Q_D(ctkRangeSlider); - d->init(); + Q_D(ctkRangeSlider); + d->init(); } // -------------------------------------------------------------------------- -ctkRangeSlider::ctkRangeSlider( Qt::Orientation o, - QWidget* parentObject ) - :QSlider(o, parentObject) - , d_ptr(new ctkRangeSliderPrivate(*this)) +ctkRangeSlider::ctkRangeSlider(Qt::Orientation o, + QWidget *parentObject) + : QSlider(o, parentObject) + , d_ptr(new ctkRangeSliderPrivate(*this)) { - Q_D(ctkRangeSlider); - d->init(); + Q_D(ctkRangeSlider); + d->init(); } // -------------------------------------------------------------------------- -ctkRangeSlider::ctkRangeSlider(ctkRangeSliderPrivate* impl, QWidget* _parent) - : QSlider(_parent) - , d_ptr(impl) +ctkRangeSlider::ctkRangeSlider(ctkRangeSliderPrivate *impl, QWidget *_parent) + : QSlider(_parent) + , d_ptr(impl) { - Q_D(ctkRangeSlider); - d->init(); + Q_D(ctkRangeSlider); + d->init(); } // -------------------------------------------------------------------------- -ctkRangeSlider::ctkRangeSlider( ctkRangeSliderPrivate* impl, Qt::Orientation o, - QWidget* parentObject ) - :QSlider(o, parentObject) - , d_ptr(impl) +ctkRangeSlider::ctkRangeSlider(ctkRangeSliderPrivate *impl, Qt::Orientation o, + QWidget *parentObject) + : QSlider(o, parentObject) + , d_ptr(impl) { - Q_D(ctkRangeSlider); - d->init(); + Q_D(ctkRangeSlider); + d->init(); } // -------------------------------------------------------------------------- @@ -360,278 +356,271 @@ ctkRangeSlider::~ctkRangeSlider() // -------------------------------------------------------------------------- int ctkRangeSlider::minimumValue() const { - Q_D(const ctkRangeSlider); - return d->m_MinimumValue; + Q_D(const ctkRangeSlider); + return d->m_MinimumValue; } // -------------------------------------------------------------------------- -void ctkRangeSlider::setMinimumValue( int min ) +void ctkRangeSlider::setMinimumValue(int min) { - Q_D(ctkRangeSlider); - this->setValues( min, qMax(d->m_MaximumValue,min) ); + Q_D(ctkRangeSlider); + this->setValues(min, qMax(d->m_MaximumValue,min)); } // -------------------------------------------------------------------------- int ctkRangeSlider::maximumValue() const { - Q_D(const ctkRangeSlider); - return d->m_MaximumValue; + Q_D(const ctkRangeSlider); + return d->m_MaximumValue; } // -------------------------------------------------------------------------- -void ctkRangeSlider::setMaximumValue( int max ) +void ctkRangeSlider::setMaximumValue(int max) { - Q_D(ctkRangeSlider); - this->setValues( qMin(d->m_MinimumValue, max), max ); + Q_D(ctkRangeSlider); + this->setValues(qMin(d->m_MinimumValue, max), max); } // -------------------------------------------------------------------------- void ctkRangeSlider::setValues(int l, int u) { - Q_D(ctkRangeSlider); - const int minValue = - qBound(this->minimum(), qMin(l,u), this->maximum()); - const int maxValue = - qBound(this->minimum(), qMax(l,u), this->maximum()); - bool emitMinValChanged = (minValue != d->m_MinimumValue); - bool emitMaxValChanged = (maxValue != d->m_MaximumValue); + Q_D(ctkRangeSlider); + const int minValue = qBound(this->minimum(), qMin(l,u), this->maximum()); + const int maxValue = qBound(this->minimum(), qMax(l,u), this->maximum()); + bool emitMinValChanged = (minValue != d->m_MinimumValue); + bool emitMaxValChanged = (maxValue != d->m_MaximumValue); - d->m_MinimumValue = minValue; - d->m_MaximumValue = maxValue; + d->m_MinimumValue = minValue; + d->m_MaximumValue = maxValue; - bool emitMinPosChanged = - (minValue != d->m_MinimumPosition); - bool emitMaxPosChanged = - (maxValue != d->m_MaximumPosition); - d->m_MinimumPosition = minValue; - d->m_MaximumPosition = maxValue; + bool emitMinPosChanged = (minValue != d->m_MinimumPosition); + bool emitMaxPosChanged = (maxValue != d->m_MaximumPosition); + d->m_MinimumPosition = minValue; + d->m_MaximumPosition = maxValue; - if (isSliderDown()) + if (isSliderDown()) { - if (emitMinPosChanged || emitMaxPosChanged) - { - emit positionsChanged(d->m_MinimumPosition, d->m_MaximumPosition); - } - if (emitMinPosChanged) - { - emit minimumPositionChanged(d->m_MinimumPosition); - } - if (emitMaxPosChanged) - { - emit maximumPositionChanged(d->m_MaximumPosition); - } + if (emitMinPosChanged || emitMaxPosChanged) + { + emit positionsChanged(d->m_MinimumPosition, d->m_MaximumPosition); + } + if (emitMinPosChanged) + { + emit minimumPositionChanged(d->m_MinimumPosition); + } + if (emitMaxPosChanged) + { + emit maximumPositionChanged(d->m_MaximumPosition); + } } - if (emitMinValChanged || emitMaxValChanged) + if (emitMinValChanged || emitMaxValChanged) { - emit valuesChanged(d->m_MinimumValue, - d->m_MaximumValue); + emit valuesChanged(d->m_MinimumValue, d->m_MaximumValue); } - if (emitMinValChanged) + if (emitMinValChanged) { - emit minimumValueChanged(d->m_MinimumValue); + emit minimumValueChanged(d->m_MinimumValue); } - if (emitMaxValChanged) + if (emitMaxValChanged) { - emit maximumValueChanged(d->m_MaximumValue); + emit maximumValueChanged(d->m_MaximumValue); } - if (emitMinPosChanged || emitMaxPosChanged || - emitMinValChanged || emitMaxValChanged) + if (emitMinPosChanged || emitMaxPosChanged || + emitMinValChanged || emitMaxValChanged) { - this->update(); + this->update(); } } // -------------------------------------------------------------------------- int ctkRangeSlider::minimumPosition() const { - Q_D(const ctkRangeSlider); - return d->m_MinimumPosition; + Q_D(const ctkRangeSlider); + return d->m_MinimumPosition; } // -------------------------------------------------------------------------- int ctkRangeSlider::maximumPosition() const { - Q_D(const ctkRangeSlider); - return d->m_MaximumPosition; + Q_D(const ctkRangeSlider); + return d->m_MaximumPosition; } // -------------------------------------------------------------------------- void ctkRangeSlider::setMinimumPosition(int l) { - Q_D(const ctkRangeSlider); - this->setPositions(l, qMax(l, d->m_MaximumPosition)); + Q_D(const ctkRangeSlider); + this->setPositions(l, qMax(l, d->m_MaximumPosition)); } // -------------------------------------------------------------------------- void ctkRangeSlider::setMaximumPosition(int u) { - Q_D(const ctkRangeSlider); - this->setPositions(qMin(d->m_MinimumPosition, u), u); + Q_D(const ctkRangeSlider); + this->setPositions(qMin(d->m_MinimumPosition, u), u); } // -------------------------------------------------------------------------- void ctkRangeSlider::setPositions(int min, int max) { - Q_D(ctkRangeSlider); - const int minPosition = - qBound(this->minimum(), qMin(min, max), this->maximum()); - const int maxPosition = - qBound(this->minimum(), qMax(min, max), this->maximum()); + Q_D(ctkRangeSlider); + const int minPosition = qBound(this->minimum(), qMin(min, max), this->maximum()); + const int maxPosition = qBound(this->minimum(), qMax(min, max), this->maximum()); - bool emitMinPosChanged = (minPosition != d->m_MinimumPosition); - bool emitMaxPosChanged = (maxPosition != d->m_MaximumPosition); + bool emitMinPosChanged = (minPosition != d->m_MinimumPosition); + bool emitMaxPosChanged = (maxPosition != d->m_MaximumPosition); - if (!emitMinPosChanged && !emitMaxPosChanged) + if (!emitMinPosChanged && !emitMaxPosChanged) { - return; + return; } - d->m_MinimumPosition = minPosition; - d->m_MaximumPosition = maxPosition; + d->m_MinimumPosition = minPosition; + d->m_MaximumPosition = maxPosition; - if (!this->hasTracking()) + if (!this->hasTracking()) { - this->update(); + this->update(); } - if (isSliderDown()) + if (isSliderDown()) { - if (emitMinPosChanged) - { - emit minimumPositionChanged(d->m_MinimumPosition); - } - if (emitMaxPosChanged) - { - emit maximumPositionChanged(d->m_MaximumPosition); - } - if (emitMinPosChanged || emitMaxPosChanged) - { - emit positionsChanged(d->m_MinimumPosition, d->m_MaximumPosition); - } + if (emitMinPosChanged) + { + emit minimumPositionChanged(d->m_MinimumPosition); + } + if (emitMaxPosChanged) + { + emit maximumPositionChanged(d->m_MaximumPosition); + } + if (emitMinPosChanged || emitMaxPosChanged) + { + emit positionsChanged(d->m_MinimumPosition, d->m_MaximumPosition); + } } - if (this->hasTracking()) + if (this->hasTracking()) { - this->triggerAction(SliderMove); - this->setValues(d->m_MinimumPosition, d->m_MaximumPosition); + this->triggerAction(SliderMove); + this->setValues(d->m_MinimumPosition, d->m_MaximumPosition); } } // -------------------------------------------------------------------------- void ctkRangeSlider::setSymmetricMoves(bool symmetry) { - Q_D(ctkRangeSlider); - d->m_SymmetricMoves = symmetry; + Q_D(ctkRangeSlider); + d->m_SymmetricMoves = symmetry; } // -------------------------------------------------------------------------- bool ctkRangeSlider::symmetricMoves()const { - Q_D(const ctkRangeSlider); - return d->m_SymmetricMoves; + Q_D(const ctkRangeSlider); + return d->m_SymmetricMoves; } // -------------------------------------------------------------------------- void ctkRangeSlider::onRangeChanged(int _minimum, int _maximum) { - Q_UNUSED(_minimum); - Q_UNUSED(_maximum); - Q_D(ctkRangeSlider); - this->setValues(d->m_MinimumValue, d->m_MaximumValue); + Q_UNUSED(_minimum); + Q_UNUSED(_maximum); + Q_D(ctkRangeSlider); + this->setValues(d->m_MinimumValue, d->m_MaximumValue); } // -------------------------------------------------------------------------- // Render -void ctkRangeSlider::paintEvent( QPaintEvent* ) -{ - Q_D(ctkRangeSlider); - QStyleOptionSlider option; - this->initStyleOption(&option); - - QStylePainter painter(this); - option.subControls = QStyle::SC_SliderGroove; - // Move to minimum to not highlight the SliderGroove. - // On mac style, drawing just the slider groove also draws the handles, - // therefore we give a negative (outside of view) position. - option.sliderValue = this->minimum() - this->maximum(); - option.sliderPosition = this->minimum() - this->maximum(); - painter.drawComplexControl(QStyle::CC_Slider, option); - - option.sliderPosition = d->m_MinimumPosition; - const QRect lr = style()->subControlRect( QStyle::CC_Slider, - &option, - QStyle::SC_SliderHandle, - this); - option.sliderPosition = d->m_MaximumPosition; - - const QRect ur = style()->subControlRect( QStyle::CC_Slider, - &option, - QStyle::SC_SliderHandle, - this); - - QRect sr = style()->subControlRect( QStyle::CC_Slider, - &option, - QStyle::SC_SliderGroove, - this); - QRect rangeBox; - if (option.orientation == Qt::Horizontal) +void ctkRangeSlider::paintEvent(QPaintEvent *) +{ + Q_D(ctkRangeSlider); + QStyleOptionSlider option; + this->initStyleOption(&option); + + QStylePainter painter(this); + option.subControls = QStyle::SC_SliderGroove; + // Move to minimum to not highlight the SliderGroove. + // On mac style, drawing just the slider groove also draws the handles, + // therefore we give a negative (outside of view) position. + option.sliderValue = this->minimum() - this->maximum(); + option.sliderPosition = this->minimum() - this->maximum(); + painter.drawComplexControl(QStyle::CC_Slider, option); + + option.sliderPosition = d->m_MinimumPosition; + const QRect lr = style()->subControlRect(QStyle::CC_Slider, + &option, + QStyle::SC_SliderHandle, + this); + option.sliderPosition = d->m_MaximumPosition; + + const QRect ur = style()->subControlRect(QStyle::CC_Slider, + &option, + QStyle::SC_SliderHandle, + this); + + QRect sr = style()->subControlRect(QStyle::CC_Slider, + &option, + QStyle::SC_SliderGroove, + this); + QRect rangeBox; + if (option.orientation == Qt::Horizontal) { - rangeBox = QRect( - QPoint(qMin( lr.center().x(), ur.center().x() ), sr.center().y() - 2), - QPoint(qMax( lr.center().x(), ur.center().x() ), sr.center().y() + 1)); + rangeBox = QRect( + QPoint(qMin(lr.center().x(), ur.center().x()), sr.center().y() - 2), + QPoint(qMax(lr.center().x(), ur.center().x()), sr.center().y() + 1)); } - else + else { - rangeBox = QRect( - QPoint(sr.center().x() - 2, qMin( lr.center().y(), ur.center().y() )), - QPoint(sr.center().x() + 1, qMax( lr.center().y(), ur.center().y() ))); + rangeBox = QRect( + QPoint(sr.center().x() - 2, qMin(lr.center().y(), ur.center().y())), + QPoint(sr.center().x() + 1, qMax(lr.center().y(), ur.center().y()))); } - // ----------------------------- - // Render the range - // - QRect groove = this->style()->subControlRect( QStyle::CC_Slider, - &option, - QStyle::SC_SliderGroove, - this ); - groove.adjust(0, 0, -1, 0); + // ----------------------------- + // Render the range + // + QRect groove = this->style()->subControlRect(QStyle::CC_Slider, + &option, + QStyle::SC_SliderGroove, + this); + groove.adjust(0, 0, -1, 0); - // Create default colors based on the transfer function. - // - QColor highlight = this->palette().color(QPalette::Normal, QPalette::Highlight); - QLinearGradient gradient; - if (option.orientation == Qt::Horizontal) + // Create default colors based on the transfer function. + // + QColor highlight = this->palette().color(QPalette::Normal, QPalette::Highlight); + QLinearGradient gradient; + if (option.orientation == Qt::Horizontal) { - gradient = QLinearGradient( groove.center().x(), groove.top(), - groove.center().x(), groove.bottom()); + gradient = QLinearGradient(groove.center().x(), groove.top(), + groove.center().x(), groove.bottom()); } - else + else { - gradient = QLinearGradient( groove.left(), groove.center().y(), - groove.right(), groove.center().y()); + gradient = QLinearGradient(groove.left(), groove.center().y(), + groove.right(), groove.center().y()); } - // TODO: Set this based on the supplied transfer function - //QColor l = Qt::darkGray; - //QColor u = Qt::black; + // TODO: Set this based on the supplied transfer function + //QColor l = Qt::darkGray; + //QColor u = Qt::black; - gradient.setColorAt(0, highlight.darker(120)); - gradient.setColorAt(1, highlight.lighter(160)); + gradient.setColorAt(0, highlight.darker(120)); + gradient.setColorAt(1, highlight.lighter(160)); - painter.setPen(QPen(highlight.darker(150), 0)); - painter.setBrush(gradient); - painter.drawRect( rangeBox.intersected(groove) ); + painter.setPen(QPen(highlight.darker(150), 0)); + painter.setBrush(gradient); + painter.drawRect(rangeBox.intersected(groove)); - // ----------------------------------- - // Render the sliders - // - if (this->isMinimumSliderDown()) + // ----------------------------------- + // Render the sliders + // + if (this->isMinimumSliderDown()) { - d->drawMaximumSlider( &painter ); - d->drawMinimumSlider( &painter ); + d->drawMaximumSlider(&painter); + d->drawMinimumSlider(&painter); } - else + else { - d->drawMinimumSlider( &painter ); - d->drawMaximumSlider( &painter ); + d->drawMinimumSlider(&painter); + d->drawMaximumSlider(&painter); } } @@ -639,221 +628,219 @@ void ctkRangeSlider::paintEvent( QPaintEvent* ) // Standard Qt UI events void ctkRangeSlider::mousePressEvent(QMouseEvent* mouseEvent) { - Q_D(ctkRangeSlider); - if (minimum() == maximum() || (mouseEvent->buttons() ^ mouseEvent->button())) + Q_D(ctkRangeSlider); + if (minimum() == maximum() || (mouseEvent->buttons() ^ mouseEvent->button())) { - mouseEvent->ignore(); - return; + mouseEvent->ignore(); + return; } - int mepos = this->orientation() == Qt::Horizontal ? - mouseEvent->pos().x() : mouseEvent->pos().y(); + int mepos = this->orientation() == Qt::Horizontal ? + mouseEvent->pos().x() : mouseEvent->pos().y(); - QStyleOptionSlider option; - this->initStyleOption( &option ); + QStyleOptionSlider option; + this->initStyleOption(&option); - QRect handleRect; - ctkRangeSliderPrivate::Handle handle_ = d->handleAtPos(mouseEvent->pos(), handleRect); + QRect handleRect; + ctkRangeSliderPrivate::Handle handle_ = d->handleAtPos(mouseEvent->pos(), handleRect); - if (handle_ != ctkRangeSliderPrivate::NoHandle) + if (handle_ != ctkRangeSliderPrivate::NoHandle) { - d->m_SubclassPosition = (handle_ == ctkRangeSliderPrivate::MinimumHandle)? - d->m_MinimumPosition : d->m_MaximumPosition; + d->m_SubclassPosition = (handle_ == ctkRangeSliderPrivate::MinimumHandle) ? + d->m_MinimumPosition : d->m_MaximumPosition; - // save the position of the mouse inside the handle for later - d->m_SubclassClickOffset = mepos - (this->orientation() == Qt::Horizontal ? - handleRect.left() : handleRect.top()); + // save the position of the mouse inside the handle for later + d->m_SubclassClickOffset = mepos - (this->orientation() == Qt::Horizontal ? + handleRect.left() : handleRect.top()); - this->setSliderDown(true); + this->setSliderDown(true); - if (d->m_SelectedHandles != handle_) - { - d->m_SelectedHandles = handle_; - this->update(handleRect); - } - // Accept the mouseEvent - mouseEvent->accept(); - return; - } - - // if we are here, no handles have been pressed - // Check if we pressed on the groove between the 2 handles - - QStyle::SubControl control = this->style()->hitTestComplexControl( - QStyle::CC_Slider, &option, mouseEvent->pos(), this); - QRect sr = style()->subControlRect( - QStyle::CC_Slider, &option, QStyle::SC_SliderGroove, this); - int minCenter = (this->orientation() == Qt::Horizontal ? - handleRect.left() : handleRect.top()); - int maxCenter = (this->orientation() == Qt::Horizontal ? - handleRect.right() : handleRect.bottom()); - if (control == QStyle::SC_SliderGroove && - mepos > minCenter && mepos < maxCenter) - { - // warning lost of precision it might be fatal - d->m_SubclassPosition = (d->m_MinimumPosition + d->m_MaximumPosition) / 2.; - d->m_SubclassClickOffset = mepos - d->pixelPosFromRangeValue(d->m_SubclassPosition); - d->m_SubclassWidth = (d->m_MaximumPosition - d->m_MinimumPosition) / 2; - qMax(d->m_SubclassPosition - d->m_MinimumPosition, d->m_MaximumPosition - d->m_SubclassPosition); - this->setSliderDown(true); - if (!this->isMinimumSliderDown() || !this->isMaximumSliderDown()) - { - d->m_SelectedHandles = - QFlags(ctkRangeSliderPrivate::MinimumHandle) | - QFlags(ctkRangeSliderPrivate::MaximumHandle); - this->update(handleRect.united(sr)); - } - mouseEvent->accept(); - return; + if (d->m_SelectedHandles != handle_) + { + d->m_SelectedHandles = handle_; + this->update(handleRect); + } + // Accept the mouseEvent + mouseEvent->accept(); + return; + } + + // if we are here, no handles have been pressed + // Check if we pressed on the groove between the 2 handles + + QStyle::SubControl control = this->style()->hitTestComplexControl(QStyle::CC_Slider, &option, mouseEvent->pos(), this); + QRect sr = style()->subControlRect(QStyle::CC_Slider, &option, QStyle::SC_SliderGroove, this); + int minCenter = (this->orientation() == Qt::Horizontal ? + handleRect.left() : handleRect.top()); + int maxCenter = (this->orientation() == Qt::Horizontal ? + handleRect.right() : handleRect.bottom()); + if (control == QStyle::SC_SliderGroove && + mepos > minCenter && mepos < maxCenter) + { + // warning lost of precision it might be fatal + d->m_SubclassPosition = (d->m_MinimumPosition + d->m_MaximumPosition) / 2.; + d->m_SubclassClickOffset = mepos - d->pixelPosFromRangeValue(d->m_SubclassPosition); + d->m_SubclassWidth = (d->m_MaximumPosition - d->m_MinimumPosition) / 2; + qMax(d->m_SubclassPosition - d->m_MinimumPosition, d->m_MaximumPosition - d->m_SubclassPosition); + this->setSliderDown(true); + if (!this->isMinimumSliderDown() || !this->isMaximumSliderDown()) + { + d->m_SelectedHandles = + QFlags(ctkRangeSliderPrivate::MinimumHandle) | + QFlags(ctkRangeSliderPrivate::MaximumHandle); + this->update(handleRect.united(sr)); + } + mouseEvent->accept(); + return; } - mouseEvent->ignore(); + mouseEvent->ignore(); } // -------------------------------------------------------------------------- // Standard Qt UI events void ctkRangeSlider::mouseMoveEvent(QMouseEvent* mouseEvent) { - Q_D(ctkRangeSlider); - if (!d->m_SelectedHandles) + Q_D(ctkRangeSlider); + if (!d->m_SelectedHandles) { - mouseEvent->ignore(); - return; + mouseEvent->ignore(); + return; } - int mepos = this->orientation() == Qt::Horizontal ? - mouseEvent->pos().x() : mouseEvent->pos().y(); + int mepos = this->orientation() == Qt::Horizontal ? + mouseEvent->pos().x() : mouseEvent->pos().y(); - QStyleOptionSlider option; - this->initStyleOption(&option); + QStyleOptionSlider option; + this->initStyleOption(&option); - const int m = style()->pixelMetric( QStyle::PM_MaximumDragDistance, &option, this ); + const int m = style()->pixelMetric(QStyle::PM_MaximumDragDistance, &option, this); - int newPosition = d->pixelPosToRangeValue(mepos - d->m_SubclassClickOffset); + int newPosition = d->pixelPosToRangeValue(mepos - d->m_SubclassClickOffset); - if (m >= 0) + if (m >= 0) { - const QRect r = rect().adjusted(-m, -m, m, m); - if (!r.contains(mouseEvent->pos())) - { - newPosition = d->m_SubclassPosition; - } + const QRect r = rect().adjusted(-m, -m, m, m); + if (!r.contains(mouseEvent->pos())) + { + newPosition = d->m_SubclassPosition; + } } - // Only the lower/left slider is down - if (this->isMinimumSliderDown() && !this->isMaximumSliderDown()) + // Only the lower/left slider is down + if (this->isMinimumSliderDown() && !this->isMaximumSliderDown()) { - double newMinPos = qMin(newPosition,d->m_MaximumPosition); - this->setPositions(newMinPos, d->m_MaximumPosition + - (d->m_SymmetricMoves ? d->m_MinimumPosition - newMinPos : 0)); + double newMinPos = qMin(newPosition,d->m_MaximumPosition); + this->setPositions(newMinPos, d->m_MaximumPosition + + (d->m_SymmetricMoves ? d->m_MinimumPosition - newMinPos : 0)); } - // Only the upper/right slider is down - else if (this->isMaximumSliderDown() && !this->isMinimumSliderDown()) + // Only the upper/right slider is down + else if (this->isMaximumSliderDown() && !this->isMinimumSliderDown()) { - double newMaxPos = qMax(d->m_MinimumPosition, newPosition); - this->setPositions(d->m_MinimumPosition - - (d->m_SymmetricMoves ? newMaxPos - d->m_MaximumPosition: 0), - newMaxPos); + double newMaxPos = qMax(d->m_MinimumPosition, newPosition); + this->setPositions(d->m_MinimumPosition - + (d->m_SymmetricMoves ? newMaxPos - d->m_MaximumPosition: 0), + newMaxPos); } - // Both handles are down (the user clicked in between the handles) - else if (this->isMinimumSliderDown() && this->isMaximumSliderDown()) + // Both handles are down (the user clicked in between the handles) + else if (this->isMinimumSliderDown() && this->isMaximumSliderDown()) { - this->setPositions(newPosition - d->m_SubclassWidth, - newPosition + d->m_SubclassWidth ); + this->setPositions(newPosition - d->m_SubclassWidth, + newPosition + d->m_SubclassWidth); } - mouseEvent->accept(); + mouseEvent->accept(); } // -------------------------------------------------------------------------- // Standard Qt UI mouseEvents void ctkRangeSlider::mouseReleaseEvent(QMouseEvent* mouseEvent) { - Q_D(ctkRangeSlider); - this->QSlider::mouseReleaseEvent(mouseEvent); + Q_D(ctkRangeSlider); + this->QSlider::mouseReleaseEvent(mouseEvent); - setSliderDown(false); - d->m_SelectedHandles = ctkRangeSliderPrivate::NoHandle; + setSliderDown(false); + d->m_SelectedHandles = ctkRangeSliderPrivate::NoHandle; - this->update(); + this->update(); } // -------------------------------------------------------------------------- bool ctkRangeSlider::isMinimumSliderDown()const { - Q_D(const ctkRangeSlider); - return d->m_SelectedHandles & ctkRangeSliderPrivate::MinimumHandle; + Q_D(const ctkRangeSlider); + return d->m_SelectedHandles & ctkRangeSliderPrivate::MinimumHandle; } // -------------------------------------------------------------------------- bool ctkRangeSlider::isMaximumSliderDown()const { - Q_D(const ctkRangeSlider); - return d->m_SelectedHandles & ctkRangeSliderPrivate::MaximumHandle; + Q_D(const ctkRangeSlider); + return d->m_SelectedHandles & ctkRangeSliderPrivate::MaximumHandle; } // -------------------------------------------------------------------------- void ctkRangeSlider::initMinimumSliderStyleOption(QStyleOptionSlider* option) const { - this->initStyleOption(option); + this->initStyleOption(option); } // -------------------------------------------------------------------------- void ctkRangeSlider::initMaximumSliderStyleOption(QStyleOptionSlider* option) const { - this->initStyleOption(option); + this->initStyleOption(option); } // -------------------------------------------------------------------------- QString ctkRangeSlider::handleToolTip()const { - Q_D(const ctkRangeSlider); - return d->m_HandleToolTip; + Q_D(const ctkRangeSlider); + return d->m_HandleToolTip; } // -------------------------------------------------------------------------- void ctkRangeSlider::setHandleToolTip(const QString& _toolTip) { - Q_D(ctkRangeSlider); - d->m_HandleToolTip = _toolTip; + Q_D(ctkRangeSlider); + d->m_HandleToolTip = _toolTip; } // -------------------------------------------------------------------------- bool ctkRangeSlider::event(QEvent* _event) { - Q_D(ctkRangeSlider); - switch(_event->type()) + Q_D(ctkRangeSlider); + switch(_event->type()) { case QEvent::ToolTip: - { - QHelpEvent* helpEvent = static_cast(_event); - QStyleOptionSlider opt; - // Test the MinimumHandle - opt.sliderPosition = d->m_MinimumPosition; - opt.sliderValue = d->m_MinimumValue; - this->initStyleOption(&opt); - QStyle::SubControl hoveredControl = - this->style()->hitTestComplexControl( - QStyle::CC_Slider, &opt, helpEvent->pos(), this); - if (!d->m_HandleToolTip.isEmpty() && - hoveredControl == QStyle::SC_SliderHandle) + { + QHelpEvent* helpEvent = static_cast(_event); + QStyleOptionSlider opt; + // Test the MinimumHandle + opt.sliderPosition = d->m_MinimumPosition; + opt.sliderValue = d->m_MinimumValue; + this->initStyleOption(&opt); + QStyle::SubControl hoveredControl = + this->style()->hitTestComplexControl( + QStyle::CC_Slider, &opt, helpEvent->pos(), this); + if (!d->m_HandleToolTip.isEmpty() && + hoveredControl == QStyle::SC_SliderHandle) { - QToolTip::showText(helpEvent->globalPos(), d->m_HandleToolTip.arg(this->minimumValue())); - _event->accept(); - return true; + QToolTip::showText(helpEvent->globalPos(), d->m_HandleToolTip.arg(this->minimumValue())); + _event->accept(); + return true; } - // Test the MaximumHandle - opt.sliderPosition = d->m_MaximumPosition; - opt.sliderValue = d->m_MaximumValue; - this->initStyleOption(&opt); - hoveredControl = this->style()->hitTestComplexControl( - QStyle::CC_Slider, &opt, helpEvent->pos(), this); - if (!d->m_HandleToolTip.isEmpty() && - hoveredControl == QStyle::SC_SliderHandle) + // Test the MaximumHandle + opt.sliderPosition = d->m_MaximumPosition; + opt.sliderValue = d->m_MaximumValue; + this->initStyleOption(&opt); + hoveredControl = this->style()->hitTestComplexControl( + QStyle::CC_Slider, &opt, helpEvent->pos(), this); + if (!d->m_HandleToolTip.isEmpty() && + hoveredControl == QStyle::SC_SliderHandle) { - QToolTip::showText(helpEvent->globalPos(), d->m_HandleToolTip.arg(this->maximumValue())); - _event->accept(); - return true; + QToolTip::showText(helpEvent->globalPos(), d->m_HandleToolTip.arg(this->maximumValue())); + _event->accept(); + return true; } - } + } default: - break; + break; } - return this->Superclass::event(_event); + return this->Superclass::event(_event); } diff --git a/ui/src/ctkrangeslider.h b/ui/src/ctkrangeslider.h index b53adecab5..99c8b99a02 100644 --- a/ui/src/ctkrangeslider.h +++ b/ui/src/ctkrangeslider.h @@ -47,163 +47,163 @@ class ctkRangeSliderPrivate; /// \sa ctkDoubleRangeSlider, ctkDoubleSlider, ctkRangeWidget class ctkRangeSlider : public QSlider { - Q_OBJECT - Q_PROPERTY(int minimumValue READ minimumValue WRITE setMinimumValue) - Q_PROPERTY(int maximumValue READ maximumValue WRITE setMaximumValue) - Q_PROPERTY(int minimumPosition READ minimumPosition WRITE setMinimumPosition) - Q_PROPERTY(int maximumPosition READ maximumPosition WRITE setMaximumPosition) - Q_PROPERTY(bool symmetricMoves READ symmetricMoves WRITE setSymmetricMoves) - Q_PROPERTY(QString handleToolTip READ handleToolTip WRITE setHandleToolTip) + Q_OBJECT + Q_PROPERTY(int minimumValue READ minimumValue WRITE setMinimumValue) + Q_PROPERTY(int maximumValue READ maximumValue WRITE setMaximumValue) + Q_PROPERTY(int minimumPosition READ minimumPosition WRITE setMinimumPosition) + Q_PROPERTY(int maximumPosition READ maximumPosition WRITE setMaximumPosition) + Q_PROPERTY(bool symmetricMoves READ symmetricMoves WRITE setSymmetricMoves) + Q_PROPERTY(QString handleToolTip READ handleToolTip WRITE setHandleToolTip) public: - // Superclass typedef - typedef QSlider Superclass; - /// Constructor, builds a ctkRangeSlider that ranges from 0 to 100 and has - /// a lower and upper values of 0 and 100 respectively, other properties - /// are set the QSlider default properties. - explicit ctkRangeSlider( Qt::Orientation o, QWidget* par= 0 ); - explicit ctkRangeSlider( QWidget* par = 0 ); - virtual ~ctkRangeSlider(); - - /// - /// This property holds the slider's current minimum value. - /// The slider silently forces minimumValue to be within the legal range: - /// minimum() <= minimumValue() <= maximumValue() <= maximum(). - /// Changing the minimumValue also changes the minimumPosition. - int minimumValue() const; - - /// - /// This property holds the slider's current maximum value. - /// The slider forces the maximum value to be within the legal range: - /// The slider silently forces maximumValue to be within the legal range: - /// Changing the maximumValue also changes the maximumPosition. - int maximumValue() const; - - /// - /// This property holds the current slider minimum position. - /// If tracking is enabled (the default), this is identical to minimumValue. - int minimumPosition() const; - void setMinimumPosition(int min); - - /// - /// This property holds the current slider maximum position. - /// If tracking is enabled (the default), this is identical to maximumValue. - int maximumPosition() const; - void setMaximumPosition(int max); - - /// - /// Utility function that set the minimum position and - /// maximum position at once. - void setPositions(int min, int max); - - /// - /// When symmetricMoves is true, moving a handle will move the other handle - /// symmetrically, otherwise the handles are independent. False by default - bool symmetricMoves()const; - void setSymmetricMoves(bool symmetry); - - /// - /// Controls the text to display for the handle tooltip. It is in addition - /// to the widget tooltip. - /// "%1" is replaced by the current value of the slider. - /// Empty string (by default) means no tooltip. - QString handleToolTip()const; - void setHandleToolTip(const QString& toolTip); - - /// Returns true if the minimum value handle is down, false if it is up. - /// \sa isMaximumSliderDown() - bool isMinimumSliderDown()const; - /// Returns true if the maximum value handle is down, false if it is up. - /// \sa isMinimumSliderDown() - bool isMaximumSliderDown()const; + // Superclass typedef + typedef QSlider Superclass; + /// Constructor, builds a ctkRangeSlider that ranges from 0 to 100 and has + /// a lower and upper values of 0 and 100 respectively, other properties + /// are set the QSlider default properties. + explicit ctkRangeSlider(Qt::Orientation o, QWidget *par= 0); + explicit ctkRangeSlider(QWidget *par = 0); + virtual ~ctkRangeSlider(); + + /// + /// This property holds the slider's current minimum value. + /// The slider silently forces minimumValue to be within the legal range: + /// minimum() <= minimumValue() <= maximumValue() <= maximum(). + /// Changing the minimumValue also changes the minimumPosition. + int minimumValue() const; + + /// + /// This property holds the slider's current maximum value. + /// The slider forces the maximum value to be within the legal range: + /// The slider silently forces maximumValue to be within the legal range: + /// Changing the maximumValue also changes the maximumPosition. + int maximumValue() const; + + /// + /// This property holds the current slider minimum position. + /// If tracking is enabled (the default), this is identical to minimumValue. + int minimumPosition() const; + void setMinimumPosition(int min); + + /// + /// This property holds the current slider maximum position. + /// If tracking is enabled (the default), this is identical to maximumValue. + int maximumPosition() const; + void setMaximumPosition(int max); + + /// + /// Utility function that set the minimum position and + /// maximum position at once. + void setPositions(int min, int max); + + /// + /// When symmetricMoves is true, moving a handle will move the other handle + /// symmetrically, otherwise the handles are independent. False by default + bool symmetricMoves()const; + void setSymmetricMoves(bool symmetry); + + /// + /// Controls the text to display for the handle tooltip. It is in addition + /// to the widget tooltip. + /// "%1" is replaced by the current value of the slider. + /// Empty string (by default) means no tooltip. + QString handleToolTip()const; + void setHandleToolTip(const QString& toolTip); + + /// Returns true if the minimum value handle is down, false if it is up. + /// \sa isMaximumSliderDown() + bool isMinimumSliderDown()const; + /// Returns true if the maximum value handle is down, false if it is up. + /// \sa isMinimumSliderDown() + bool isMaximumSliderDown()const; Q_SIGNALS: - /// - /// This signal is emitted when the slider minimum value has changed, - /// with the new slider value as argument. - void minimumValueChanged(int min); - /// - /// This signal is emitted when the slider maximum value has changed, - /// with the new slider value as argument. - void maximumValueChanged(int max); - /// - /// Utility signal that is fired when minimum or maximum values have changed. - void valuesChanged(int min, int max); - - /// - /// This signal is emitted when sliderDown is true and the slider moves. - /// This usually happens when the user is dragging the minimum slider. - /// The value is the new slider minimum position. - /// This signal is emitted even when tracking is turned off. - void minimumPositionChanged(int min); - - /// - /// This signal is emitted when sliderDown is true and the slider moves. - /// This usually happens when the user is dragging the maximum slider. - /// The value is the new slider maximum position. - /// This signal is emitted even when tracking is turned off. - void maximumPositionChanged(int max); - - /// - /// Utility signal that is fired when minimum or maximum positions - /// have changed. - void positionsChanged(int min, int max); + /// + /// This signal is emitted when the slider minimum value has changed, + /// with the new slider value as argument. + void minimumValueChanged(int min); + /// + /// This signal is emitted when the slider maximum value has changed, + /// with the new slider value as argument. + void maximumValueChanged(int max); + /// + /// Utility signal that is fired when minimum or maximum values have changed. + void valuesChanged(int min, int max); + + /// + /// This signal is emitted when sliderDown is true and the slider moves. + /// This usually happens when the user is dragging the minimum slider. + /// The value is the new slider minimum position. + /// This signal is emitted even when tracking is turned off. + void minimumPositionChanged(int min); + + /// + /// This signal is emitted when sliderDown is true and the slider moves. + /// This usually happens when the user is dragging the maximum slider. + /// The value is the new slider maximum position. + /// This signal is emitted even when tracking is turned off. + void maximumPositionChanged(int max); + + /// + /// Utility signal that is fired when minimum or maximum positions + /// have changed. + void positionsChanged(int min, int max); public Q_SLOTS: - /// - /// This property holds the slider's current minimum value. - /// The slider silently forces min to be within the legal range: - /// minimum() <= min <= maximumValue() <= maximum(). - /// Note: Changing the minimumValue also changes the minimumPosition. - /// \sa stMaximumValue, setValues, setMinimum, setMaximum, setRange - void setMinimumValue(int min); - - /// - /// This property holds the slider's current maximum value. - /// The slider silently forces max to be within the legal range: - /// minimum() <= minimumValue() <= max <= maximum(). - /// Note: Changing the maximumValue also changes the maximumPosition. - /// \sa stMinimumValue, setValues, setMinimum, setMaximum, setRange - void setMaximumValue(int max); - - /// - /// Utility function that set the minimum value and maximum value at once. - /// The slider silently forces min and max to be within the legal range: - /// minimum() <= min <= max <= maximum(). - /// Note: Changing the minimumValue and maximumValue also changes the - /// minimumPosition and maximumPosition. - /// \sa setMinimumValue, setMaximumValue, setMinimum, setMaximum, setRange - void setValues(int min, int max); + /// + /// This property holds the slider's current minimum value. + /// The slider silently forces min to be within the legal range: + /// minimum() <= min <= maximumValue() <= maximum(). + /// Note: Changing the minimumValue also changes the minimumPosition. + /// \sa stMaximumValue, setValues, setMinimum, setMaximum, setRange + void setMinimumValue(int min); + + /// + /// This property holds the slider's current maximum value. + /// The slider silently forces max to be within the legal range: + /// minimum() <= minimumValue() <= max <= maximum(). + /// Note: Changing the maximumValue also changes the maximumPosition. + /// \sa stMinimumValue, setValues, setMinimum, setMaximum, setRange + void setMaximumValue(int max); + + /// + /// Utility function that set the minimum value and maximum value at once. + /// The slider silently forces min and max to be within the legal range: + /// minimum() <= min <= max <= maximum(). + /// Note: Changing the minimumValue and maximumValue also changes the + /// minimumPosition and maximumPosition. + /// \sa setMinimumValue, setMaximumValue, setMinimum, setMaximum, setRange + void setValues(int min, int max); protected Q_SLOTS: - void onRangeChanged(int minimum, int maximum); + void onRangeChanged(int minimum, int maximum); protected: - ctkRangeSlider( ctkRangeSliderPrivate* impl, Qt::Orientation o, QWidget* par= 0 ); - ctkRangeSlider( ctkRangeSliderPrivate* impl, QWidget* par = 0 ); + ctkRangeSlider(ctkRangeSliderPrivate *impl, Qt::Orientation o, QWidget *par= 0); + ctkRangeSlider(ctkRangeSliderPrivate *impl, QWidget *par = 0); - // Description: - // Standard Qt UI events - virtual void mousePressEvent(QMouseEvent* ev); - virtual void mouseMoveEvent(QMouseEvent* ev); - virtual void mouseReleaseEvent(QMouseEvent* ev); + // Description: + // Standard Qt UI events + virtual void mousePressEvent(QMouseEvent *ev); + virtual void mouseMoveEvent(QMouseEvent *ev); + virtual void mouseReleaseEvent(QMouseEvent *ev); - // Description: - // Rendering is done here. - virtual void paintEvent(QPaintEvent* ev); - virtual void initMinimumSliderStyleOption(QStyleOptionSlider* option) const; - virtual void initMaximumSliderStyleOption(QStyleOptionSlider* option) const; + // Description: + // Rendering is done here. + virtual void paintEvent(QPaintEvent *ev); + virtual void initMinimumSliderStyleOption(QStyleOptionSlider *option) const; + virtual void initMaximumSliderStyleOption(QStyleOptionSlider *option) const; - // Description: - // Reimplemented for the tooltips - virtual bool event(QEvent* event); + // Description: + // Reimplemented for the tooltips + virtual bool event(QEvent *event); protected: - QScopedPointer d_ptr; + QScopedPointer d_ptr; private: - Q_DECLARE_PRIVATE(ctkRangeSlider); - Q_DISABLE_COPY(ctkRangeSlider); + Q_DECLARE_PRIVATE(ctkRangeSlider); + Q_DISABLE_COPY(ctkRangeSlider); }; #endif diff --git a/ui/src/dmxdumpfactory.cpp b/ui/src/dmxdumpfactory.cpp index deaa4cc74a..d56f1aab34 100644 --- a/ui/src/dmxdumpfactory.cpp +++ b/ui/src/dmxdumpfactory.cpp @@ -80,7 +80,7 @@ DmxDumpFactory::DmxDumpFactory(Doc *doc, DmxDumpFactoryProperties *props, QWidge else m_dumpSelectedRadio->setChecked(true); - if(m_properties->nonZeroValuesMode() == true) + if (m_properties->nonZeroValuesMode() == true) m_nonZeroCheck->setChecked(true); connect(m_sceneButton, SIGNAL(clicked(bool)), @@ -94,7 +94,7 @@ DmxDumpFactory::~DmxDumpFactory() void DmxDumpFactory::slotUpdateChasersTree() { m_addtoTree->clear(); - foreach(Function *f, m_doc->functionsByType(Function::ChaserType)) + foreach (Function *f, m_doc->functionsByType(Function::ChaserType)) { Chaser *chaser = qobject_cast(f); QTreeWidgetItem *item = new QTreeWidgetItem(m_addtoTree); @@ -136,7 +136,7 @@ void DmxDumpFactory::slotSelectSceneButtonClicked() QByteArray chMask = m_properties->channelsMask(); chMask.fill(0); - foreach(SceneValue scv, scene->values()) + foreach (SceneValue scv, scene->values()) { Fixture *fxi = m_doc->fixture(scv.fxi); if (fxi == NULL) diff --git a/ui/src/docbrowser.cpp b/ui/src/docbrowser.cpp index 483e11400b..7793352d21 100644 --- a/ui/src/docbrowser.cpp +++ b/ui/src/docbrowser.cpp @@ -194,7 +194,7 @@ DocBrowser::~DocBrowser() } void DocBrowser::slotAnchorClicked(QUrl url){ - if(url.scheme() == QLatin1String("http") || url.scheme() == QLatin1String("https")) + if (url.scheme() == QLatin1String("http") || url.scheme() == QLatin1String("https")) { QDesktopServices::openUrl(url); } diff --git a/ui/src/efxeditor.cpp b/ui/src/efxeditor.cpp index f3c4427443..fabad0db76 100644 --- a/ui/src/efxeditor.cpp +++ b/ui/src/efxeditor.cpp @@ -343,7 +343,7 @@ void EFXEditor::slotTabChanged(int tab) m_efx->setUiStateValue(UI_STATE_TAB_INDEX, tab); //When preview animation is opened restart animation but avoid restart if test is running. - if(tab == 1 && (m_testButton->isChecked () == false)) + if (tab == 1 && (m_testButton->isChecked () == false)) m_previewArea->restart (); } @@ -615,13 +615,13 @@ void EFXEditor::slotFixtureItemChanged(QTreeWidgetItem* item, int column) void EFXEditor::slotFixtureModeChanged(int index) { - QComboBox* combo = qobject_cast(QObject::sender()); + QComboBox *combo = qobject_cast(QObject::sender()); Q_ASSERT(combo != NULL); - EFXFixture* ef = (EFXFixture*) combo->property(PROPERTY_FIXTURE).toULongLong(); + EFXFixture *ef = (EFXFixture*) combo->property(PROPERTY_FIXTURE).toULongLong(); Q_ASSERT(ef != NULL); - ef->setMode ( ef->stringToMode (combo->itemText(index)) ); + ef->setMode(ef->stringToMode (combo->itemText(index))); // Restart the test after the latest mode change, delayed m_testTimer.start(); @@ -629,9 +629,9 @@ void EFXEditor::slotFixtureModeChanged(int index) void EFXEditor::slotFixtureStartOffsetChanged(int startOffset) { - QSpinBox* spin = qobject_cast(QObject::sender()); + QSpinBox *spin = qobject_cast(QObject::sender()); Q_ASSERT(spin != NULL); - EFXFixture* ef = (EFXFixture*) spin->property(PROPERTY_FIXTURE).toULongLong(); + EFXFixture *ef = (EFXFixture*) spin->property(PROPERTY_FIXTURE).toULongLong(); Q_ASSERT(ef != NULL); ef->setStartOffset(startOffset); diff --git a/ui/src/efxpreviewarea.cpp b/ui/src/efxpreviewarea.cpp index 2cd8ff7709..b1d29554ed 100644 --- a/ui/src/efxpreviewarea.cpp +++ b/ui/src/efxpreviewarea.cpp @@ -60,7 +60,7 @@ void EFXPreviewArea::setFixturePolygons(const QVector &fixturePoints) m_originalFixturePoints.resize(fixturePoints.size()); m_fixturePoints.resize(fixturePoints.size()); - for(int i = 0; i < m_fixturePoints.size(); ++i) + for (int i = 0; i < m_fixturePoints.size(); ++i) { m_originalFixturePoints[i] = QPolygonF(fixturePoints[i]); m_fixturePoints[i] = scale(m_originalFixturePoints[i], size()); diff --git a/ui/src/fixtureconsole.cpp b/ui/src/fixtureconsole.cpp index 310240e543..22e1aad138 100644 --- a/ui/src/fixtureconsole.cpp +++ b/ui/src/fixtureconsole.cpp @@ -261,7 +261,7 @@ QList FixtureConsole::values() const bool FixtureConsole::hasSelections() { - foreach(ConsoleChannel *cc, m_channels) + foreach (ConsoleChannel *cc, m_channels) { Q_ASSERT(cc != NULL); if (cc->isChecked() && cc->isSelected()) diff --git a/ui/src/fixturemanager.cpp b/ui/src/fixturemanager.cpp index 614b8db046..45ed7f9158 100644 --- a/ui/src/fixturemanager.cpp +++ b/ui/src/fixturemanager.cpp @@ -587,7 +587,7 @@ void FixtureManager::slotSelectionChanged() if (uniID.isValid() == true) uniName = m_doc->inputOutputMap()->getUniverseNameByID(uniID.toUInt()); - foreach(Fixture *fixture, m_doc->fixtures()) + foreach (Fixture *fixture, m_doc->fixtures()) { if (fixture == NULL || fixture->universe() != uniID.toUInt() || fixture->fixtureMode() == NULL) continue; @@ -629,7 +629,7 @@ void FixtureManager::slotSelectionChanged() "

Click " \ " to remove the selected fixtures.

"); - foreach(QTreeWidgetItem *item, m_fixtures_tree->selectedItems()) + foreach (QTreeWidgetItem *item, m_fixtures_tree->selectedItems()) { QVariant fxID = item->data(KColumnName, PROP_ID); if (fxID.isValid() == false) diff --git a/ui/src/fixtureremap.cpp b/ui/src/fixtureremap.cpp index 4abd465039..08b5e9ff79 100644 --- a/ui/src/fixtureremap.cpp +++ b/ui/src/fixtureremap.cpp @@ -94,7 +94,7 @@ FixtureRemap::FixtureRemap(Doc *doc, QWidget *parent) m_targetDoc->inputOutputMap()->removeAllUniverses(); int index = 0; - foreach(Universe *uni, m_doc->inputOutputMap()->universes()) + foreach (Universe *uni, m_doc->inputOutputMap()->universes()) { m_targetDoc->inputOutputMap()->addUniverse(uni->id()); m_targetDoc->inputOutputMap()->setUniverseName(index, uni->name()); @@ -176,7 +176,7 @@ QTreeWidgetItem *FixtureRemap::getUniverseItem(Doc *doc, quint32 universe, QTree void FixtureRemap::fillFixturesTree(Doc *doc, QTreeWidget *tree) { - foreach(Fixture *fxi, doc->fixtures()) + foreach (Fixture *fxi, doc->fixtures()) { quint32 uni = fxi->universe(); QTreeWidgetItem *topItem = getUniverseItem(doc, uni, tree); @@ -370,7 +370,7 @@ void FixtureRemap::slotAddTargetFixture() QLCFixtureMode* mode = af.mode(); int gap = af.gap(); - for(int i = 0; i < af.amount(); i++) + for (int i = 0; i < af.amount(); i++) { QString modname; @@ -550,7 +550,7 @@ void FixtureRemap::slotCloneSourceFixture() m_targetTree->resizeColumnToContents(KColumnName); - foreach(QTreeWidgetItem *it, m_targetTree->selectedItems()) + foreach (QTreeWidgetItem *it, m_targetTree->selectedItems()) it->setSelected(false); fItem->setSelected(true); @@ -610,7 +610,7 @@ void FixtureRemap::connectFixtures(QTreeWidgetItem *sourceItem, QTreeWidgetItem qDebug() << "Idx:" << srcIdx << ", src:" << srcFxiSelected << ", tgt:" << tgtFxiSelected; if ((srcFxiSelected == true && tgtFxiSelected == false) || - (srcFxiSelected == false && tgtFxiSelected == true) ) + (srcFxiSelected == false && tgtFxiSelected == true)) { QMessageBox::warning(this, tr("Invalid selection"), @@ -778,7 +778,7 @@ QList FixtureRemap::remapSceneValues(QList funcList, QList &tgtList) { QList newValuesList; - foreach(SceneValue val, funcList) + foreach (SceneValue val, funcList) { for (int v = 0; v < srcList.count(); v++) { @@ -832,13 +832,13 @@ void FixtureRemap::accept() /* ********************************************************************** * 4 - remap fixture groups and channel groups * ********************************************************************** */ - foreach(FixtureGroup *group, m_doc->fixtureGroups()) + foreach (FixtureGroup *group, m_doc->fixtureGroups()) { QMap grpHash = group->headsMap(); group->reset(); QMapIterator it(grpHash); - while(it.hasNext()) + while (it.hasNext()) { it.next(); @@ -915,7 +915,7 @@ void FixtureRemap::accept() EFX *e = qobject_cast(func); // make a copy of this EFX fixtures list QList fixListCopy; - foreach(EFXFixture *efxFix, e->fixtures()) + foreach (EFXFixture *efxFix, e->fixtures()) { EFXFixture* ef = new EFXFixture(e); ef->copyFrom(efxFix); @@ -925,7 +925,7 @@ void FixtureRemap::accept() e->removeAllFixtures(); QListremappedFixtures; - foreach( EFXFixture *efxFix, fixListCopy) + foreach (EFXFixture *efxFix, fixListCopy) { quint32 fxID = efxFix->head().fxi; for (int i = 0; i < sourceList.count(); i++) @@ -959,7 +959,7 @@ void FixtureRemap::accept() default: break; } - if(progress.wasCanceled()) + if (progress.wasCanceled()) break; f++; progress.setValue((f * 100) / funcNum); @@ -1065,7 +1065,7 @@ void FixtureRemap::accept() foreach (quint32 fxID, props->fixtureItemsID()) { - for( int v = 0; v < sourceList.count(); v++) + for (int v = 0; v < sourceList.count(); v++) { if (sourceList.at(v).fxi == fxID) { diff --git a/ui/src/functionmanager.cpp b/ui/src/functionmanager.cpp index f002640e81..9346c7e0e0 100644 --- a/ui/src/functionmanager.cpp +++ b/ui/src/functionmanager.cpp @@ -595,7 +595,7 @@ void FunctionManager::slotDelete() if (item->childCount() > 0) { msg.append("\n" + tr("(This will also DELETE: ")); - for(int i = 0; i < item->childCount(); i++) + for (int i = 0; i < item->childCount(); i++) { QTreeWidgetItem *child = item->child(i); if (i > 0) msg.append(", "); diff --git a/ui/src/functionstreewidget.cpp b/ui/src/functionstreewidget.cpp index 17fa4d1351..a1603f73fa 100644 --- a/ui/src/functionstreewidget.cpp +++ b/ui/src/functionstreewidget.cpp @@ -277,7 +277,7 @@ QTreeWidgetItem *FunctionsTreeWidget::folderItem(QString name) int type = Function::Undefined; QString fullPath; QStringList levelsList = name.split("/"); - foreach(QString level, levelsList) + foreach (QString level, levelsList) { // the first round is a category node. Just retrieve the item pointer // and the type, then skip it. diff --git a/ui/src/functionwizard.cpp b/ui/src/functionwizard.cpp index 8469e0b3f2..1ce818c7fd 100644 --- a/ui/src/functionwizard.cpp +++ b/ui/src/functionwizard.cpp @@ -304,7 +304,7 @@ void FunctionWizard::updateAvailableFunctionsTree() QStringList caps = PaletteGenerator::getCapabilities(fxi); - foreach(QString cap, caps) + foreach (QString cap, caps) { if (cap == KQLCChannelRGB || cap == KQLCChannelCMY) { @@ -398,19 +398,19 @@ void FunctionWizard::updateResultFunctionsTree() (PaletteGenerator::PaletteSubType)subType); m_paletteList.append(palette); - foreach(Scene *scene, palette->scenes()) + foreach (Scene *scene, palette->scenes()) { QTreeWidgetItem *item = new QTreeWidgetItem(getFunctionGroupItem(scene)); item->setText(KFunctionName, scene->name()); item->setIcon(KFunctionName, scene->getIcon()); } - foreach(Chaser *chaser, palette->chasers()) + foreach (Chaser *chaser, palette->chasers()) { QTreeWidgetItem *item = new QTreeWidgetItem(getFunctionGroupItem(chaser)); item->setText(KFunctionName, chaser->name()); item->setIcon(KFunctionName, chaser->getIcon()); } - foreach(RGBMatrix *matrix, palette->matrices()) + foreach (RGBMatrix *matrix, palette->matrices()) { QTreeWidgetItem *item = new QTreeWidgetItem(getFunctionGroupItem(matrix)); item->setText(KFunctionName, matrix->name()); @@ -442,7 +442,7 @@ void FunctionWizard::updateWidgetsTree() { m_widgetsTree->clear(); - foreach(PaletteGenerator *palette, m_paletteList) + foreach (PaletteGenerator *palette, m_paletteList) { QTreeWidgetItem *frame = new QTreeWidgetItem(m_widgetsTree); frame->setText(KWidgetName, palette->fullName()); @@ -470,7 +470,7 @@ void FunctionWizard::updateWidgetsTree() soloFrameItem->setCheckState(KWidgetName, Qt::Unchecked); soloFrameItem->setData(KWidgetName, Qt::UserRole, VCWidget::SoloFrameWidget); } - foreach(Scene *scene, palette->scenes()) + foreach (Scene *scene, palette->scenes()) { QTreeWidgetItem *item = NULL; if (soloFrameItem != NULL) @@ -485,7 +485,7 @@ void FunctionWizard::updateWidgetsTree() item->setData(KWidgetName, Qt::UserRole + 1, QVariant::fromValue((void *)scene)); } - foreach(Chaser *chaser, palette->chasers()) + foreach (Chaser *chaser, palette->chasers()) { QTreeWidgetItem *item = new QTreeWidgetItem(frame); QString toRemove = " - " + palette->model(); @@ -496,7 +496,7 @@ void FunctionWizard::updateWidgetsTree() item->setData(KWidgetName, Qt::UserRole + 1, QVariant::fromValue((void *)chaser)); } - foreach(RGBMatrix *matrix, palette->matrices()) + foreach (RGBMatrix *matrix, palette->matrices()) { QTreeWidgetItem *item = NULL; if (soloFrameItem != NULL) @@ -621,7 +621,7 @@ VCWidget *FunctionWizard::createWidget(int type, VCWidget *parent, int xpos, int } else if (pType == PaletteGenerator::Gobos) { - foreach(SceneValue scv, scene->values()) + foreach (SceneValue scv, scene->values()) { Fixture *fixture = m_doc->fixture(scv.fxi); if (fixture == NULL) diff --git a/ui/src/grandmasterslider.cpp b/ui/src/grandmasterslider.cpp index 397645d989..c55f3e11a6 100644 --- a/ui/src/grandmasterslider.cpp +++ b/ui/src/grandmasterslider.cpp @@ -130,7 +130,7 @@ void GrandMasterSlider::slotValueChanged(int value) // Avoid double calls triggered by slotGrandMasterValueChanged int curval = m_ioMap->grandMasterValue(); - if(value != curval) + if (value != curval) { // Write new grand master value to universes m_ioMap->setGrandMasterValue(value); diff --git a/ui/src/groupsconsole.cpp b/ui/src/groupsconsole.cpp index 0fd281bcde..989d774dd8 100644 --- a/ui/src/groupsconsole.cpp +++ b/ui/src/groupsconsole.cpp @@ -58,7 +58,7 @@ QList GroupsConsole::groups() void GroupsConsole::init() { int idx = 0; - foreach(quint32 id, m_ids) + foreach (quint32 id, m_ids) { ChannelsGroup *grp = m_doc->channelsGroup(id); if (grp != NULL && grp->getChannels().count() > 0) diff --git a/ui/src/inputoutputmanager.cpp b/ui/src/inputoutputmanager.cpp index 5017b8411c..f566b1ae20 100644 --- a/ui/src/inputoutputmanager.cpp +++ b/ui/src/inputoutputmanager.cpp @@ -371,7 +371,7 @@ void InputOutputManager::slotDeleteUniverse() if (uniID == m_ioMap->invalidUniverse()) return; - foreach(Fixture *fx, m_doc->fixtures()) + foreach (Fixture *fx, m_doc->fixtures()) { if (fx->universe() == uniID) { diff --git a/ui/src/inputoutputpatcheditor.cpp b/ui/src/inputoutputpatcheditor.cpp index f875f79873..2b4382acd3 100644 --- a/ui/src/inputoutputpatcheditor.cpp +++ b/ui/src/inputoutputpatcheditor.cpp @@ -896,7 +896,7 @@ void InputOutputPatchEditor::initAudioTab() if (var.isValid() == true) outputName = var.toString(); - foreach( AudioDeviceInfo info, devList) + foreach (AudioDeviceInfo info, devList) { QTreeWidgetItem* item = new QTreeWidgetItem(m_audioMapTree); item->setText(KAudioColumnDeviceName, info.deviceName); diff --git a/ui/src/inputprofileeditor.cpp b/ui/src/inputprofileeditor.cpp index 99dd5b8f3e..778be451e7 100644 --- a/ui/src/inputprofileeditor.cpp +++ b/ui/src/inputprofileeditor.cpp @@ -518,7 +518,7 @@ void InputProfileEditor::slotMovementComboChanged(int index) else m_sensitivitySpin->setEnabled(false); - foreach(QLCInputChannel *channel, selectedChannels()) + foreach (QLCInputChannel *channel, selectedChannels()) { if (channel->type() == QLCInputChannel::Slider || channel->type() == QLCInputChannel::Knob) @@ -533,7 +533,7 @@ void InputProfileEditor::slotMovementComboChanged(int index) void InputProfileEditor::slotSensitivitySpinChanged(int value) { - foreach(QLCInputChannel *channel, selectedChannels()) + foreach (QLCInputChannel *channel, selectedChannels()) { if ((channel->type() == QLCInputChannel::Slider || channel->type() == QLCInputChannel::Knob) && @@ -546,16 +546,16 @@ void InputProfileEditor::slotSensitivitySpinChanged(int value) void InputProfileEditor::slotExtraPressChecked(bool checked) { - foreach(QLCInputChannel *channel, selectedChannels()) + foreach (QLCInputChannel *channel, selectedChannels()) { - if(channel->type() == QLCInputChannel::Button) + if (channel->type() == QLCInputChannel::Button) channel->setSendExtraPress(checked); } } void InputProfileEditor::slotLowerValueSpinChanged(int value) { - foreach(QLCInputChannel *channel, selectedChannels()) + foreach (QLCInputChannel *channel, selectedChannels()) { if (channel->type() == QLCInputChannel::Button) channel->setRange(uchar(value), uchar(m_upperSpin->value())); @@ -564,7 +564,7 @@ void InputProfileEditor::slotLowerValueSpinChanged(int value) void InputProfileEditor::slotUpperValueSpinChanged(int value) { - foreach(QLCInputChannel *channel, selectedChannels()) + foreach (QLCInputChannel *channel, selectedChannels()) { if (channel->type() == QLCInputChannel::Button) channel->setRange(uchar(m_lowerSpin->value()), uchar(value)); @@ -596,7 +596,7 @@ void InputProfileEditor::slotInputValueChanged(quint32 universe, /* No channel items found. Create a new channel to the profile and display it also in the tree widget */ QLCInputChannel* ch = new QLCInputChannel(); - if(key.isEmpty()) + if (key.isEmpty()) ch->setName(tr("Button %1").arg(channel + 1)); else ch->setName(key); @@ -636,7 +636,7 @@ void InputProfileEditor::slotInputValueChanged(quint32 universe, if (ch->type() == QLCInputChannel::Button) { ch->setType(QLCInputChannel::Slider); - if(key.isEmpty()) + if (key.isEmpty()) ch->setName(tr("Slider %1").arg(channel + 1)); else ch->setName(key); diff --git a/ui/src/inputprofileeditor.h b/ui/src/inputprofileeditor.h index ae4587965c..72d0a61304 100644 --- a/ui/src/inputprofileeditor.h +++ b/ui/src/inputprofileeditor.h @@ -42,16 +42,16 @@ class InputProfileEditor : public QDialog, public Ui_InputProfileEditor * Initialization ************************************************************************/ public: - InputProfileEditor(QWidget* parent, QLCInputProfile* profile, InputOutputMap* ioMap); + InputProfileEditor(QWidget *parent, QLCInputProfile *profile, InputOutputMap *ioMap); virtual ~InputProfileEditor(); protected: void fillTree(); - void updateChannelItem(QTreeWidgetItem* item, QLCInputChannel* ch); + void updateChannelItem(QTreeWidgetItem *item, QLCInputChannel *ch); void setOptionsVisibility(QLCInputChannel::Type type); protected slots: - void slotTypeComboChanged(int ); + void slotTypeComboChanged(int); private: InputOutputMap* m_ioMap; diff --git a/ui/src/monitor/monitor.cpp b/ui/src/monitor/monitor.cpp index 6ea00f84a5..14855a2cc0 100644 --- a/ui/src/monitor/monitor.cpp +++ b/ui/src/monitor/monitor.cpp @@ -156,7 +156,7 @@ void Monitor::fillDMXView() m_monitorWidget->setFont(m_props->font()); /* Create a bunch of MonitorFixtures for each fixture */ - foreach(Fixture* fxi, m_doc->fixtures()) + foreach (Fixture* fxi, m_doc->fixtures()) { Q_ASSERT(fxi != NULL); if (m_currentUniverse == Universe::invalid() || diff --git a/ui/src/monitor/monitorfixtureitem.cpp b/ui/src/monitor/monitorfixtureitem.cpp index 308b4d3b49..6727bd5738 100644 --- a/ui/src/monitor/monitorfixtureitem.cpp +++ b/ui/src/monitor/monitorfixtureitem.cpp @@ -248,7 +248,7 @@ MonitorFixtureItem::~MonitorFixtureItem() disconnect(fxi, SIGNAL(valuesChanged()), this, SLOT(slotUpdateValues())); } - foreach(FixtureHead *head, m_heads) + foreach (FixtureHead *head, m_heads) { if (head->m_strobeTimer != 0) { @@ -439,7 +439,7 @@ void MonitorFixtureItem::slotUpdateValues() bool needUpdate = false; - foreach(FixtureHead *head, m_heads) + foreach (FixtureHead *head, m_heads) { head->m_color = computeColor(head, fxValues); head->m_dimmerValue = computeAlpha(head, fxValues); diff --git a/ui/src/monitor/monitorgraphicsview.cpp b/ui/src/monitor/monitorgraphicsview.cpp index eb84f20f83..ebd95019e0 100644 --- a/ui/src/monitor/monitorgraphicsview.cpp +++ b/ui/src/monitor/monitorgraphicsview.cpp @@ -97,7 +97,7 @@ void MonitorGraphicsView::setFixtureRotation(quint32 id, ushort degrees) void MonitorGraphicsView::showFixturesLabels(bool visible) { - foreach(MonitorFixtureItem *item, m_fixtures.values()) + foreach (MonitorFixtureItem *item, m_fixtures.values()) item->showLabel(visible); } @@ -220,7 +220,7 @@ bool MonitorGraphicsView::removeFixture(quint32 id) void MonitorGraphicsView::clearFixtures() { - foreach(MonitorFixtureItem *item, m_fixtures.values()) + foreach (MonitorFixtureItem *item, m_fixtures.values()) delete item; m_fixtures.clear(); } @@ -252,7 +252,7 @@ void MonitorGraphicsView::updateGrid() for (int i = 0; i < m_gridSize.width() + 1; i++) { QGraphicsLineItem *item = m_scene->addLine(xPos, m_yOffset, xPos, this->height() - m_yOffset, - QPen( QColor(40, 40, 40, 255) )); + QPen(QColor(40, 40, 40, 255))); item->setZValue(1); xPos += m_cellPixels; m_gridItems.append(item); @@ -261,7 +261,7 @@ void MonitorGraphicsView::updateGrid() for (int i = 0; i < m_gridSize.height() + 1; i++) { QGraphicsLineItem *item = m_scene->addLine(m_xOffset, yPos, this->width() - m_xOffset, yPos, - QPen( QColor(40, 40, 40, 255) )); + QPen(QColor(40, 40, 40, 255))); item->setZValue(1); yPos += m_cellPixels; m_gridItems.append(item); diff --git a/ui/src/monitor/monitorgraphicsview.h b/ui/src/monitor/monitorgraphicsview.h index ba80e991bf..17c1a0ddc1 100644 --- a/ui/src/monitor/monitorgraphicsview.h +++ b/ui/src/monitor/monitorgraphicsview.h @@ -106,21 +106,21 @@ class MonitorGraphicsView : public QGraphicsView void updateGrid(); /** Event caught when the GraphicsView is resized */ - void resizeEvent( QResizeEvent *event ); + void resizeEvent(QResizeEvent *event); public slots: - void mouseReleaseEvent(QMouseEvent * e); + void mouseReleaseEvent(QMouseEvent *e); protected slots: /** Slot called when a MonitorFixtureItem is dropped after a drag */ - void slotFixtureMoved(MonitorFixtureItem * item); + void slotFixtureMoved(MonitorFixtureItem *item); signals: /** Signal emitted after fixture point -> metrics conversion */ void fixtureMoved(quint32 id, QPointF pos); /** Signal emitted when the graphics view is clicked */ - void viewClicked(QMouseEvent * e); + void viewClicked(QMouseEvent *e); private: Doc *m_doc; diff --git a/ui/src/palettegenerator.cpp b/ui/src/palettegenerator.cpp index 5471015132..cb35fc132e 100644 --- a/ui/src/palettegenerator.cpp +++ b/ui/src/palettegenerator.cpp @@ -235,7 +235,7 @@ void PaletteGenerator::createColorScene(QList chMap, QString name, P oddScene = new Scene(m_doc); } - foreach(SceneValue scv, chMap) + foreach (SceneValue scv, chMap) { scene->setValue(scv.fxi, scv.channel, 255); @@ -305,7 +305,7 @@ void PaletteGenerator::createRGBCMYScene(QList rcMap, oddScene = new Scene(m_doc); } - foreach(SceneValue scv, rcMap) + foreach (SceneValue scv, rcMap) { Fixture *fxi = m_doc->fixture(scv.fxi); int gmCh = -1, byCh = -1; diff --git a/ui/src/remapwidget.cpp b/ui/src/remapwidget.cpp index 34a9f41160..918180aafa 100644 --- a/ui/src/remapwidget.cpp +++ b/ui/src/remapwidget.cpp @@ -58,7 +58,7 @@ void RemapWidget::paintEvent(QPaintEvent *e) int yOffset = m_sourceTree->header()->height() + 10; - foreach(RemapInfo info, m_list) + foreach (RemapInfo info, m_list) { QRect srcRect = m_sourceTree->visualItemRect(info.source); QRect tgtRect = m_targetTree->visualItemRect(info.target); diff --git a/ui/src/rgbmatrixeditor.cpp b/ui/src/rgbmatrixeditor.cpp index 422f1985dc..0ec4f6c1d7 100644 --- a/ui/src/rgbmatrixeditor.cpp +++ b/ui/src/rgbmatrixeditor.cpp @@ -484,7 +484,7 @@ void RGBMatrixEditor::displayProperties(RGBScript *script) if (properties.count() > 0) m_propertiesGroup->show(); - foreach(RGBScriptProperty prop, properties) + foreach (RGBScriptProperty prop, properties) { switch(prop.m_type) { @@ -1226,7 +1226,7 @@ void RGBMatrixEditor::slotSaveToSequenceClicked() } } -void RGBMatrixEditor::slotShapeToggle(bool ) +void RGBMatrixEditor::slotShapeToggle(bool) { createPreviewItems(); } diff --git a/ui/src/sceneeditor.cpp b/ui/src/sceneeditor.cpp index c8151d293d..ec0276afc3 100644 --- a/ui/src/sceneeditor.cpp +++ b/ui/src/sceneeditor.cpp @@ -456,7 +456,7 @@ void SceneEditor::slotEnableCurrent() } else { - foreach(FixtureConsole *fc, m_consoleList.values()) + foreach (FixtureConsole *fc, m_consoleList.values()) { if (fc == NULL) continue; @@ -476,7 +476,7 @@ void SceneEditor::slotDisableCurrent() } else { - foreach(FixtureConsole *fc, m_consoleList.values()) + foreach (FixtureConsole *fc, m_consoleList.values()) { if (fc == NULL) continue; @@ -508,7 +508,7 @@ void SceneEditor::slotCopy() { bool oneHasSelection = false; QList selectedOnlyList; - foreach(FixtureConsole *fc, m_consoleList.values()) + foreach (FixtureConsole *fc, m_consoleList.values()) { if (fc == NULL) continue; @@ -544,13 +544,13 @@ void SceneEditor::slotPaste() } else { - foreach(FixtureConsole *fc, m_consoleList.values()) + foreach (FixtureConsole *fc, m_consoleList.values()) { if (fc == NULL) continue; quint32 fxi = fc->fixture(); QListthisFixtureVals; - foreach(SceneValue val, clipboard->getSceneValues()) + foreach (SceneValue val, clipboard->getSceneValues()) { if (val.fxi == fxi) thisFixtureVals.append(val); @@ -610,7 +610,7 @@ void SceneEditor::slotPositionTool() Q_ASSERT(fxi != NULL); - for (int i = 0; i < fxi->heads(); ++i ) + for (int i = 0; i < fxi->heads(); ++i) { if (!range.isValid()) range = fxi->degreesRange(i); @@ -622,7 +622,7 @@ void SceneEditor::slotPositionTool() if (panMsbChannel != QLCChannel::invalid()) { - if (!panFound ) + if (!panFound) { qDebug() << "panFound" << i; panFound = true; @@ -638,7 +638,7 @@ void SceneEditor::slotPositionTool() if (tiltMsbChannel != QLCChannel::invalid()) { - if (!tiltFound ) + if (!tiltFound) { tiltFound = true; qDebug() << "tiltFound" << i; @@ -745,7 +745,7 @@ QColor SceneEditor::slotColorSelectorChanged(const QColor& color) GroupsConsole* gc = groupConsoleTab(m_currentTab); if (gc != NULL) { - foreach(ConsoleChannel *cc, gc->groups()) + foreach (ConsoleChannel *cc, gc->groups()) { Fixture* fxi = m_doc->fixture(cc->fixture()); Q_ASSERT(fxi != NULL); @@ -788,7 +788,7 @@ void SceneEditor::slotPositionSelectorChanged(const QPointF& position) Fixture* fxi = m_doc->fixture(fc->fixture()); Q_ASSERT(fxi != NULL); - for (int i = 0; i < fxi->heads(); ++i ) + for (int i = 0; i < fxi->heads(); ++i) { quint32 panMsbChannel = fxi->channelNumber(QLCChannel::Pan, QLCChannel::MSB, i); quint32 panLsbChannel = fxi->channelNumber(QLCChannel::Pan, QLCChannel::LSB, i); @@ -825,7 +825,7 @@ void SceneEditor::slotPositionSelectorChanged(const QPointF& position) GroupsConsole* gc = groupConsoleTab(m_currentTab); if (gc != NULL) { - foreach(ConsoleChannel *cc, gc->groups()) + foreach (ConsoleChannel *cc, gc->groups()) { Fixture* fxi = m_doc->fixture(cc->fixture()); Q_ASSERT(fxi != NULL); @@ -837,7 +837,7 @@ void SceneEditor::slotPositionSelectorChanged(const QPointF& position) else cc->setValue(panLsbNew); } - else if(ch->group() == QLCChannel::Tilt) + else if (ch->group() == QLCChannel::Tilt) { if (ch->controlByte() == QLCChannel::MSB) cc->setValue(tiltMsbNew); @@ -874,7 +874,7 @@ void SceneEditor::slotBlindToggled(bool state) if (m_scene != NULL && !m_scene->isRunning()) { m_source = new GenericDMXSource(m_doc); - foreach(SceneValue scv, m_scene->values()) + foreach (SceneValue scv, m_scene->values()) m_source->set(scv.fxi, scv.channel, scv.value); } } @@ -1064,7 +1064,7 @@ bool SceneEditor::isColorToolAvailable() if (gc != NULL) { cyan = magenta = yellow = red = green = blue = QLCChannel::invalid(); - foreach(ConsoleChannel *cc, gc->groups()) + foreach (ConsoleChannel *cc, gc->groups()) { fxi = m_doc->fixture(cc->fixture()); Q_ASSERT(fxi != NULL); @@ -1126,7 +1126,7 @@ bool SceneEditor::isPositionToolAvailable() GroupsConsole* gc = groupConsoleTab(m_currentTab); if (gc != NULL) { - foreach(ConsoleChannel *cc, gc->groups()) + foreach (ConsoleChannel *cc, gc->groups()) { fxi = m_doc->fixture(cc->fixture()); Q_ASSERT(fxi != NULL); diff --git a/ui/src/scripteditor.cpp b/ui/src/scripteditor.cpp index 2663d81e5e..79c6c2a185 100644 --- a/ui/src/scripteditor.cpp +++ b/ui/src/scripteditor.cpp @@ -355,7 +355,7 @@ void ScriptEditor::slotAddSetFixture() return; // User pressed cancel QList channelsList = cfg.channelsList(); - foreach(SceneValue sv, channelsList) + foreach (SceneValue sv, channelsList) { Fixture* fxi = m_doc->fixture(sv.fxi); if (fxi != NULL) @@ -392,7 +392,7 @@ void ScriptEditor::slotAddSystemCommand() QStringList argsList = args.split(" "); QString formattedArgs; - foreach(QString arg, argsList) + foreach (QString arg, argsList) { formattedArgs.append(QString("arg:%1 ").arg(arg)); } @@ -476,7 +476,7 @@ void ScriptEditor::slotCheckSyntax() else { QStringList lines = scriptText.split(QRegularExpression("(\\r\\n|\\n\\r|\\r|\\n)")); - foreach(int line, errLines) + foreach (int line, errLines) { errResult.append(tr("Syntax error at line %1:\n%2\n\n").arg(line).arg(lines.at(line - 1))); } diff --git a/ui/src/showmanager/audioitem.cpp b/ui/src/showmanager/audioitem.cpp index b1db008dae..3b219786de 100644 --- a/ui/src/showmanager/audioitem.cpp +++ b/ui/src/showmanager/audioitem.cpp @@ -199,7 +199,7 @@ void AudioItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *) menu.addSeparator(); } - foreach(QAction *action, getDefaultActions()) + foreach (QAction *action, getDefaultActions()) menu.addAction(action); menu.exec(QCursor::pos()); @@ -287,7 +287,7 @@ void PreviewThread::run() dataRead = ad->read((char *)audioData + audioDataOffset, onePixelReadLen * 2); if (dataRead > 0) { - if((quint32)dataRead + audioDataOffset >= onePixelReadLen) + if ((quint32)dataRead + audioDataOffset >= onePixelReadLen) { tmpExceedData = (dataRead + audioDataOffset) - onePixelReadLen; dataRead = onePixelReadLen; diff --git a/ui/src/showmanager/efxitem.cpp b/ui/src/showmanager/efxitem.cpp index 6f64dd6573..c599dcf6e0 100644 --- a/ui/src/showmanager/efxitem.cpp +++ b/ui/src/showmanager/efxitem.cpp @@ -132,7 +132,7 @@ void EFXItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *) menuFont.setPixelSize(14); menu.setFont(menuFont); - foreach(QAction *action, getDefaultActions()) + foreach (QAction *action, getDefaultActions()) menu.addAction(action); menu.exec(QCursor::pos()); diff --git a/ui/src/showmanager/headeritems.cpp b/ui/src/showmanager/headeritems.cpp index b549c46bfe..3e6275c711 100644 --- a/ui/src/showmanager/headeritems.cpp +++ b/ui/src/showmanager/headeritems.cpp @@ -66,7 +66,7 @@ void ShowHeaderItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *op for (int i = 0; i < m_width / m_timeStep; i++) { float xpos = ((float)i * m_timeStep) + 1; - painter->setPen(QPen( QColor(250, 250, 250, 255), 1)); + painter->setPen(QPen(QColor(250, 250, 250, 255), 1)); if (i%m_timeHit == 0) { painter->drawLine(xpos, 20, xpos, 34); @@ -75,7 +75,7 @@ void ShowHeaderItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *op painter->setPen(QPen(QColor(105, 105, 105, 255), 1)); painter->drawLine(xpos, HEADER_HEIGHT, xpos, m_height); } - painter->setPen(QPen( Qt::black, 1)); + painter->setPen(QPen(Qt::black, 1)); if (m_type == Show::Time) { tmpSec = (i/2) * m_timeScale; diff --git a/ui/src/showmanager/multitrackview.cpp b/ui/src/showmanager/multitrackview.cpp index 8dde84eb5f..0bc8e2b550 100644 --- a/ui/src/showmanager/multitrackview.cpp +++ b/ui/src/showmanager/multitrackview.cpp @@ -101,14 +101,14 @@ void MultiTrackView::updateTracksDividers() { QGraphicsItem *item = m_scene->addRect(0, ypos + (j * TRACK_HEIGHT), m_scene->width(), 1, - QPen( QColor(150, 150, 150, 255) ), - QBrush( QColor(190, 190, 190, 255) ) ); + QPen(QColor(150, 150, 150, 255)), + QBrush(QColor(190, 190, 190, 255))); item->setZValue(-1); m_hdividers.append(item); } m_vdivider = m_scene->addRect(TRACK_WIDTH - 3, 0, 3, m_scene->height(), - QPen( QColor(150, 150, 150, 255) ), - QBrush( QColor(190, 190, 190, 255) ) ); + QPen(QColor(150, 150, 150, 255)), + QBrush(QColor(190, 190, 190, 255))); } void MultiTrackView::setViewSize(int width, int height) @@ -164,7 +164,7 @@ void MultiTrackView::resetView() void MultiTrackView::addTrack(Track *track) { // check if track already exists - foreach(TrackItem *item, m_tracks) + foreach (TrackItem *item, m_tracks) { if (item->getTrack()->id() == track->id()) return; @@ -330,7 +330,7 @@ quint32 MultiTrackView::deleteSelectedItem() } int trackIndex = 0; - foreach(TrackItem *item, m_tracks) + foreach (TrackItem *item, m_tracks) { if (item->isActive() == true) { @@ -340,8 +340,8 @@ quint32 MultiTrackView::deleteSelectedItem() QString msg = tr("Do you want to DELETE track:") + QString("\n\n") + track->name(); if (sfList.count() > 0) { - msg += QString("\n\n") + tr("This operation will also DELETE:" ) + QString("\n\n"); - foreach(ShowItem *item, m_items) + msg += QString("\n\n") + tr("This operation will also DELETE:") + QString("\n\n"); + foreach (ShowItem *item, m_items) { if (item->getTrackIndex() == trackIndex) msg += item->functionName() + QString("\n"); @@ -394,7 +394,7 @@ void MultiTrackView::rewindCursor() void MultiTrackView::activateTrack(Track *track) { - foreach(TrackItem *item, m_tracks) + foreach (TrackItem *item, m_tracks) { if (item->getTrack()->id() == track->id()) item->setActive(true); @@ -405,7 +405,7 @@ void MultiTrackView::activateTrack(Track *track) ShowItem *MultiTrackView::getSelectedItem() { - foreach(ShowItem *item, m_items) + foreach (ShowItem *item, m_items) if (item->isSelected()) return item; @@ -507,7 +507,7 @@ void MultiTrackView::slotTimeScaleChanged(int val) //int oldScale = m_header->getTimeScale(); m_header->setTimeScale(val); - foreach(ShowItem *item, m_items) + foreach (ShowItem *item, m_items) { quint32 newXpos = getPositionFromTime(item->getStartTime()); item->setPos(newXpos + 2, item->y()); @@ -521,7 +521,7 @@ void MultiTrackView::slotTimeScaleChanged(int val) void MultiTrackView::slotTrackClicked(TrackItem *track) { - foreach(TrackItem *item, m_tracks) + foreach (TrackItem *item, m_tracks) { if (item == track) item->setActive(true); @@ -538,7 +538,7 @@ void MultiTrackView::slotTrackDoubleClicked(TrackItem *track) void MultiTrackView::slotTrackSoloFlagChanged(TrackItem* track, bool solo) { - foreach(TrackItem *item, m_tracks) + foreach (TrackItem *item, m_tracks) { if (item != track) item->setFlags(false, solo); diff --git a/ui/src/showmanager/rgbmatrixitem.cpp b/ui/src/showmanager/rgbmatrixitem.cpp index cbc8179cfa..78302c5908 100644 --- a/ui/src/showmanager/rgbmatrixitem.cpp +++ b/ui/src/showmanager/rgbmatrixitem.cpp @@ -137,7 +137,7 @@ void RGBMatrixItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *) menuFont.setPixelSize(14); menu.setFont(menuFont); - foreach(QAction *action, getDefaultActions()) + foreach (QAction *action, getDefaultActions()) menu.addAction(action); menu.exec(QCursor::pos()); diff --git a/ui/src/showmanager/sequenceitem.cpp b/ui/src/showmanager/sequenceitem.cpp index a1da975603..f8a76826c7 100644 --- a/ui/src/showmanager/sequenceitem.cpp +++ b/ui/src/showmanager/sequenceitem.cpp @@ -170,7 +170,7 @@ void SequenceItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *) menuFont.setPixelSize(14); menu.setFont(menuFont); - foreach(QAction *action, getDefaultActions()) + foreach (QAction *action, getDefaultActions()) menu.addAction(action); menu.exec(QCursor::pos()); diff --git a/ui/src/showmanager/showeditor.cpp b/ui/src/showmanager/showeditor.cpp index b88c657c69..974728cdef 100644 --- a/ui/src/showmanager/showeditor.cpp +++ b/ui/src/showmanager/showeditor.cpp @@ -107,7 +107,7 @@ void ShowEditor::updateFunctionList() masterItem->setData(NAME_COL, PROP_ID, m_show->id()); masterItem->setIcon(NAME_COL, QIcon(":/show.png")); - foreach(Track *track, m_show->tracks()) + foreach (Track *track, m_show->tracks()) { QTreeWidgetItem* sceneItem = NULL; Scene *scene = qobject_cast(m_doc->function(track->getSceneID())); @@ -123,7 +123,7 @@ void ShowEditor::updateFunctionList() } } - foreach(ShowFunction *sf, track->showFunctions()) + foreach (ShowFunction *sf, track->showFunctions()) { Function *func = m_doc->function(sf->functionID()); if (func == NULL) diff --git a/ui/src/showmanager/showitem.cpp b/ui/src/showmanager/showitem.cpp index 4ab550f913..279f6e92a0 100644 --- a/ui/src/showmanager/showitem.cpp +++ b/ui/src/showmanager/showitem.cpp @@ -227,7 +227,7 @@ void ShowItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { QGraphicsItem::mousePressEvent(event); m_pos = this->pos(); - if(event->button() == Qt::LeftButton) + if (event->button() == Qt::LeftButton) m_pressed = true; this->setSelected(true); } diff --git a/ui/src/showmanager/showmanager.cpp b/ui/src/showmanager/showmanager.cpp index c10b4a25ff..ea16be7bc5 100644 --- a/ui/src/showmanager/showmanager.cpp +++ b/ui/src/showmanager/showmanager.cpp @@ -109,8 +109,8 @@ ShowManager::ShowManager(QWidget* parent, Doc* doc) m_showview->setAcceptDrops(true); m_showview->setAlignment(Qt::AlignLeft | Qt::AlignTop); m_showview->setBackgroundBrush(QBrush(QColor(88, 88, 88, 255), Qt::SolidPattern)); - connect(m_showview, SIGNAL(viewClicked ( QMouseEvent * )), - this, SLOT(slotViewClicked( QMouseEvent * ))); + connect(m_showview, SIGNAL(viewClicked(QMouseEvent *)), + this, SLOT(slotViewClicked(QMouseEvent *))); connect(m_showview, SIGNAL(showItemMoved(ShowItem*,quint32,bool)), this, SLOT(slotShowItemMoved(ShowItem*,quint32,bool))); @@ -1063,9 +1063,9 @@ void ShowManager::slotPaste() else { // Verify the Chaser copy steps against the current Scene - foreach(ChaserStep cs, sequence->steps()) + foreach (ChaserStep cs, sequence->steps()) { - foreach(SceneValue scv, cs.values) + foreach (SceneValue scv, cs.values) { if (m_currentScene->checkValue(scv) == false) { @@ -1587,7 +1587,7 @@ void ShowManager::slotFunctionRemoved(quint32 id) foreach (Function *function, m_doc->functionsByType(Function::ShowType)) { Show *show = qobject_cast(function); - foreach(Track *track, show->tracks()) + foreach (Track *track, show->tracks()) { foreach (ShowFunction *sf, track->showFunctions()) { @@ -1642,7 +1642,7 @@ void ShowManager::updateMultiTrackView() Track *firstTrack = NULL; - foreach(Track *track, m_show->tracks()) + foreach (Track *track, m_show->tracks()) { if (firstTrack == NULL) firstTrack = track; @@ -1657,7 +1657,7 @@ void ShowManager::updateMultiTrackView() m_showview->addTrack(track); - foreach(ShowFunction *sf, track->showFunctions()) + foreach (ShowFunction *sf, track->showFunctions()) { Function *fn = m_doc->function(sf->functionID()); if (fn != NULL) @@ -1725,7 +1725,7 @@ bool ShowManager::checkOverlapping(quint32 startTime, quint32 duration) if (m_currentTrack == NULL) return false; - foreach(ShowFunction *sf, m_currentTrack->showFunctions()) + foreach (ShowFunction *sf, m_currentTrack->showFunctions()) { Function *func = m_doc->function(sf->functionID()); if (func != NULL) diff --git a/ui/src/showmanager/videoitem.cpp b/ui/src/showmanager/videoitem.cpp index 81090e37a3..621c3a5ac9 100644 --- a/ui/src/showmanager/videoitem.cpp +++ b/ui/src/showmanager/videoitem.cpp @@ -191,7 +191,7 @@ void VideoItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *) } } menu.addAction(m_fullscreenAction); - foreach(QAction *action, getDefaultActions()) + foreach (QAction *action, getDefaultActions()) menu.addAction(action); menu.exec(QCursor::pos()); diff --git a/ui/src/simpledesk.cpp b/ui/src/simpledesk.cpp index dea9a05b39..ce9bb2df54 100644 --- a/ui/src/simpledesk.cpp +++ b/ui/src/simpledesk.cpp @@ -507,7 +507,7 @@ void SimpleDesk::initSliderView(bool fullMode) fixturesLayout->setContentsMargins(2, 2, 2, 2); int c = 0; - foreach(Fixture *fixture, m_doc->fixtures()) + foreach (Fixture *fixture, m_doc->fixtures()) { if (fixture->universe() != (quint32)m_universesCombo->currentIndex()) continue; @@ -566,7 +566,7 @@ void SimpleDesk::initChannelGroupsView() { m_chGroupsArea = new QScrollArea(); QList chGrpIDs; - foreach(ChannelsGroup *grp, m_doc->channelsGroups()) + foreach (ChannelsGroup *grp, m_doc->channelsGroups()) chGrpIDs.append(grp->id()); GroupsConsole* console = new GroupsConsole(m_chGroupsArea, m_doc, chGrpIDs, QList()); m_chGroupsArea->setWidget(console); @@ -955,7 +955,7 @@ void SimpleDesk::slotUniverseWritten(quint32 idx, const QByteArray& universeData } else { - foreach(FixtureConsole *fc, m_consoleList.values()) + foreach (FixtureConsole *fc, m_consoleList.values()) { if (fc == NULL) continue; @@ -1136,7 +1136,7 @@ void SimpleDesk::slotGroupValueChanged(quint32 groupID, uchar value) if (m_consoleList.contains(fixture->id())) { FixtureConsole *fc = m_consoleList[fixture->id()]; - if(fc != NULL) + if (fc != NULL) { fc->blockSignals(true); if (m_engine->hasChannel(absAddr) == false) diff --git a/ui/src/speeddial.cpp b/ui/src/speeddial.cpp index 61ef6fe08d..97e1c0624e 100644 --- a/ui/src/speeddial.cpp +++ b/ui/src/speeddial.cpp @@ -565,7 +565,7 @@ void SpeedDial::slotTapClicked() m_tapHistory.append(m_value); // This algorithm stabilizes around a tempo very quickly, // so keeping more than a few taps in the history merely complicates tempo changes. - while(m_tapHistory.count() > 16) + while (m_tapHistory.count() > 16) m_tapHistory.removeFirst(); // Find the median time between taps, assume that the tempo is +-40% of this diff --git a/ui/src/universeitemwidget.h b/ui/src/universeitemwidget.h index df91c49823..74b43a02d9 100644 --- a/ui/src/universeitemwidget.h +++ b/ui/src/universeitemwidget.h @@ -41,8 +41,8 @@ class UniverseItemWidget : public QItemDelegate *********************************************************************/ protected: - void paint ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const; - //QSize sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const; + void paint (QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const; + //QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const; }; diff --git a/ui/src/videoeditor.cpp b/ui/src/videoeditor.cpp index 9e63c8f3d5..a324535a74 100644 --- a/ui/src/videoeditor.cpp +++ b/ui/src/videoeditor.cpp @@ -84,7 +84,7 @@ VideoEditor::VideoEditor(QWidget* parent, Video *video, Doc* doc) connect(m_fullCheck, SIGNAL(clicked()), this, SLOT(slotFullscreenCheckClicked())); - if(m_video->runOrder() == Video::Loop) + if (m_video->runOrder() == Video::Loop) m_loopCheck->setChecked(true); else m_singleCheck->setChecked(true); diff --git a/ui/src/videoprovider.cpp b/ui/src/videoprovider.cpp index 9d2abb73e3..fdeef53c7a 100644 --- a/ui/src/videoprovider.cpp +++ b/ui/src/videoprovider.cpp @@ -52,7 +52,7 @@ void VideoProvider::slotFunctionAdded(quint32 id) if (func == NULL) return; - if(func->type() == Function::VideoType) + if (func->type() == Function::VideoType) { VideoWidget *vWidget = new VideoWidget(qobject_cast