diff --git a/plugins/samplesource/filesource/filesourcegui.cpp b/plugins/samplesource/filesource/filesourcegui.cpp index 54a702895..0905baede 100644 --- a/plugins/samplesource/filesource/filesourcegui.cpp +++ b/plugins/samplesource/filesource/filesourcegui.cpp @@ -190,7 +190,7 @@ void FileSourceGui::on_showFileDialog_clicked(bool checked) void FileSourceGui::configureFileName() { - qDebug() << "FileSourceGui::configureFileName: " << m_fileName.toStdString(); + qDebug() << "FileSourceGui::configureFileName: " << m_fileName.toStdString().c_str(); FileSourceInput::MsgConfigureFileSourceName* message = FileSourceInput::MsgConfigureFileSourceName::create(m_fileName); message->submit(m_pluginAPI->getDSPEngineMessageQueue()); } diff --git a/plugins/samplesource/filesource/filesourceinput.cpp b/plugins/samplesource/filesource/filesourceinput.cpp index 9d0770b39..2c54e653d 100644 --- a/plugins/samplesource/filesource/filesourceinput.cpp +++ b/plugins/samplesource/filesource/filesourceinput.cpp @@ -89,7 +89,7 @@ FileSourceInput::~FileSourceInput() void FileSourceInput::openFileStream() { - qDebug() << "FileSourceInput::openFileStream: " << m_fileName.toStdString(); + qDebug() << "FileSourceInput::openFileStream: " << m_fileName.toStdString().c_str(); //stopInput(); @@ -257,7 +257,7 @@ bool FileSourceInput::applySettings(const GeneralSettings& generalSettings, cons } qDebug() << "FileSourceInput::applySettings:" - << " file name: " << settings.m_fileName.toStdString() + << " file name: " << settings.m_fileName.toStdString().c_str() << " center freq: " << m_centerFrequency << " Hz" << " sample rate: " << m_sampleRate << " Unix timestamp: " << m_startingTimeStamp; diff --git a/sdrbase/dsp/filesink.cpp b/sdrbase/dsp/filesink.cpp index c216e5579..726821d46 100644 --- a/sdrbase/dsp/filesink.cpp +++ b/sdrbase/dsp/filesink.cpp @@ -86,7 +86,7 @@ bool FileSink::handleMessage(Message* message) MsgConfigureFileSink* conf = (MsgConfigureFileSink*) message; handleConfigure(conf->getFileName(), conf->getSampleRate(), conf->getCenterFrequency()); qDebug() << "FileSink::handleMessage:" - << " fileName: " << m_fileName + << " fileName: " << m_fileName.c_str() << " sampleRate: " << m_sampleRate << " centerFrequency: " << m_centerFrequency; message->completed(); diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp index 17d227167..89a3a6d5a 100644 --- a/sdrbase/mainwindow.cpp +++ b/sdrbase/mainwindow.cpp @@ -194,7 +194,7 @@ void MainWindow::loadSettings() void MainWindow::loadSettings(const Preset* preset) { - qDebug() << "MainWindow::loadSettings(preset): " << preset->getSource().toStdString(); + qDebug() << "MainWindow::loadSettings(preset): " << preset->getSource().toStdString().c_str(); ui->glSpectrumGUI->deserialize(preset->getSpectrumConfig()); ui->dcOffset->setChecked(preset->getDCOffsetCorrection()); @@ -217,7 +217,7 @@ void MainWindow::saveSettings() void MainWindow::saveSettings(Preset* preset) { - qDebug() << "MainWindow::saveSettings(preset): " << preset->getSource().toStdString(); + qDebug() << "MainWindow::saveSettings(preset): " << preset->getSource().toStdString().c_str(); preset->setSpectrumConfig(ui->glSpectrumGUI->serialize()); preset->clearChannels(); diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp index 45b73a665..e489c0516 100644 --- a/sdrbase/plugin/pluginmanager.cpp +++ b/sdrbase/plugin/pluginmanager.cpp @@ -71,8 +71,8 @@ void PluginManager::removeChannelInstance(PluginGUI* pluginGUI) void PluginManager::registerSampleSource(const QString& sourceName, PluginInterface* plugin) { qDebug() << "PluginManager::registerSampleSource " - << plugin->getPluginDescriptor().displayedName.toStdString() - << " with source name " << sourceName.toStdString(); + << plugin->getPluginDescriptor().displayedName.toStdString().c_str() + << " with source name " << sourceName.toStdString().c_str(); m_sampleSourceRegistrations.append(SampleSourceRegistration(sourceName, plugin)); } @@ -123,7 +123,7 @@ void PluginManager::loadSettings(const Preset* preset) renameChannelInstances(); if(m_sampleSourceInstance != NULL) { - qDebug() << "m_sampleSourceInstance->deserializeGeneral (" << m_sampleSourceInstance->getName().toStdString() << ")"; + qDebug() << "m_sampleSourceInstance->deserializeGeneral (" << m_sampleSourceInstance->getName().toStdString().c_str() << ")"; m_sampleSourceInstance->deserializeGeneral(preset->getSourceGeneralConfig()); if(m_sampleSource == preset->getSource()) { qDebug() << "m_sampleSourceInstance->deserialize"; @@ -243,14 +243,14 @@ int PluginManager::selectSampleSource(int index) return -1; m_sampleSource = m_sampleSourceDevices[index].m_sourceName; - qDebug() << "m_sampleSource at index " << index << " is " << m_sampleSource.toStdString(); + qDebug() << "m_sampleSource at index " << index << " is " << m_sampleSource.toStdString().c_str(); m_sampleSourceInstance = m_sampleSourceDevices[index].m_plugin->createSampleSource(m_sampleSource, m_sampleSourceDevices[index].m_address); return index; } int PluginManager::selectSampleSource(const QString& source) { - qDebug() << "PluginManager::selectSampleSource by name: " << source.toStdString(); + qDebug() << "PluginManager::selectSampleSource by name: " << source.toStdString().c_str(); int index = -1; @@ -280,7 +280,7 @@ int PluginManager::selectSampleSource(const QString& source) return -1; m_sampleSource = m_sampleSourceDevices[index].m_sourceName; - qDebug() << "m_sampleSource at index " << index << " is " << m_sampleSource.toStdString(); + qDebug() << "m_sampleSource at index " << index << " is " << m_sampleSource.toStdString().c_str(); m_sampleSourceInstance = m_sampleSourceDevices[index].m_plugin->createSampleSource(m_sampleSource, m_sampleSourceDevices[index].m_address); return index; } diff --git a/sdrbase/settings/preset.cpp b/sdrbase/settings/preset.cpp index 518751bc0..9ba2de228 100644 --- a/sdrbase/settings/preset.cpp +++ b/sdrbase/settings/preset.cpp @@ -27,7 +27,7 @@ void Preset::resetToDefaults() QByteArray Preset::serialize() const { - qDebug() << "Preset::serialize (" << this->getSource().toStdString()<< ")"; + qDebug() << "Preset::serialize (" << this->getSource().toStdString().c_str() << ")"; SimpleSerializer s(1); s.writeString(1, m_group); @@ -45,7 +45,7 @@ QByteArray Preset::serialize() const s.writeS32(200, m_channelConfigs.size()); - qDebug() << " m_group: " << m_group.toStdString(); + qDebug() << " m_group: " << m_group.toStdString().c_str(); for(int i = 0; i < m_channelConfigs.size(); i++) { s.writeString(201 + i * 2, m_channelConfigs[i].m_channel); @@ -57,7 +57,7 @@ QByteArray Preset::serialize() const bool Preset::deserialize(const QByteArray& data) { - qDebug() << "Preset::deserialize (" << this->getSource().toStdString() << ")"; + qDebug() << "Preset::deserialize (" << this->getSource().toStdString().c_str() << ")"; SimpleDeserializer d(data); if(!d.isValid()) { @@ -79,7 +79,7 @@ bool Preset::deserialize(const QByteArray& data) d.readBlob(11, &m_sourceGeneralConfig); d.readBlob(12, &m_sourceConfig); - qDebug() << " m_group: " << m_group.toStdString(); + qDebug() << " m_group: " << m_group.toStdString().c_str(); qint32 channelCount = 0; d.readS32(200, &channelCount, 0);