VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed qDebug compile issues with std::string

This commit is contained in:
f4exb 2015-08-09 11:11:28 +02:00
parent 4ba6f66cac
commit 018c477af0
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesource/filesource/filesourcegui.cpp
View File

@ -190,7 +190,7 @@ void FileSourceGui::on_showFileDialog_clicked(bool checked)
void FileSourceGui::configureFileName() 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); FileSourceInput::MsgConfigureFileSourceName* message = FileSourceInput::MsgConfigureFileSourceName::create(m_fileName);
message->submit(m_pluginAPI->getDSPEngineMessageQueue()); message->submit(m_pluginAPI->getDSPEngineMessageQueue());
} }

4
plugins/samplesource/filesource/filesourceinput.cpp
View File

@ -89,7 +89,7 @@ FileSourceInput::~FileSourceInput()
void FileSourceInput::openFileStream() void FileSourceInput::openFileStream()
{ {
qDebug() << "FileSourceInput::openFileStream: " << m_fileName.toStdString(); qDebug() << "FileSourceInput::openFileStream: " << m_fileName.toStdString().c_str();
//stopInput(); //stopInput();
@ -257,7 +257,7 @@ bool FileSourceInput::applySettings(const GeneralSettings& generalSettings, cons
} }
qDebug() << "FileSourceInput::applySettings:" qDebug() << "FileSourceInput::applySettings:"
<< " file name: " << settings.m_fileName.toStdString() << " file name: " << settings.m_fileName.toStdString().c_str()
<< " center freq: " << m_centerFrequency << " Hz" << " center freq: " << m_centerFrequency << " Hz"
<< " sample rate: " << m_sampleRate << " sample rate: " << m_sampleRate
<< " Unix timestamp: " << m_startingTimeStamp; << " Unix timestamp: " << m_startingTimeStamp;

2
sdrbase/dsp/filesink.cpp
View File

@ -86,7 +86,7 @@ bool FileSink::handleMessage(Message* message)
MsgConfigureFileSink* conf = (MsgConfigureFileSink*) message; MsgConfigureFileSink* conf = (MsgConfigureFileSink*) message;
handleConfigure(conf->getFileName(), conf->getSampleRate(), conf->getCenterFrequency()); handleConfigure(conf->getFileName(), conf->getSampleRate(), conf->getCenterFrequency());
qDebug() << "FileSink::handleMessage:" qDebug() << "FileSink::handleMessage:"
<< " fileName: " << m_fileName << " fileName: " << m_fileName.c_str()
<< " sampleRate: " << m_sampleRate << " sampleRate: " << m_sampleRate
<< " centerFrequency: " << m_centerFrequency; << " centerFrequency: " << m_centerFrequency;
message->completed(); message->completed();

4
sdrbase/mainwindow.cpp
View File

@ -194,7 +194,7 @@ void MainWindow::loadSettings()
void MainWindow::loadSettings(const Preset* preset) 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->glSpectrumGUI->deserialize(preset->getSpectrumConfig());
ui->dcOffset->setChecked(preset->getDCOffsetCorrection()); ui->dcOffset->setChecked(preset->getDCOffsetCorrection());
@ -217,7 +217,7 @@ void MainWindow::saveSettings()
void MainWindow::saveSettings(Preset* preset) 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->setSpectrumConfig(ui->glSpectrumGUI->serialize());
preset->clearChannels(); preset->clearChannels();

12
sdrbase/plugin/pluginmanager.cpp
View File

@ -71,8 +71,8 @@ void PluginManager::removeChannelInstance(PluginGUI* pluginGUI)
void PluginManager::registerSampleSource(const QString& sourceName, PluginInterface* plugin) void PluginManager::registerSampleSource(const QString& sourceName, PluginInterface* plugin)
{ {
qDebug() << "PluginManager::registerSampleSource " qDebug() << "PluginManager::registerSampleSource "
<< plugin->getPluginDescriptor().displayedName.toStdString() << plugin->getPluginDescriptor().displayedName.toStdString().c_str()
<< " with source name " << sourceName.toStdString(); << " with source name " << sourceName.toStdString().c_str();
m_sampleSourceRegistrations.append(SampleSourceRegistration(sourceName, plugin)); m_sampleSourceRegistrations.append(SampleSourceRegistration(sourceName, plugin));
} }
@ -123,7 +123,7 @@ void PluginManager::loadSettings(const Preset* preset)
renameChannelInstances(); renameChannelInstances();
if(m_sampleSourceInstance != NULL) { 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()); m_sampleSourceInstance->deserializeGeneral(preset->getSourceGeneralConfig());
if(m_sampleSource == preset->getSource()) { if(m_sampleSource == preset->getSource()) {
qDebug() << "m_sampleSourceInstance->deserialize"; qDebug() << "m_sampleSourceInstance->deserialize";
@ -243,14 +243,14 @@ int PluginManager::selectSampleSource(int index)
return -1; return -1;
m_sampleSource = m_sampleSourceDevices[index].m_sourceName; 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); m_sampleSourceInstance = m_sampleSourceDevices[index].m_plugin->createSampleSource(m_sampleSource, m_sampleSourceDevices[index].m_address);
return index; return index;
} }
int PluginManager::selectSampleSource(const QString& source) 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; int index = -1;
@ -280,7 +280,7 @@ int PluginManager::selectSampleSource(const QString& source)
return -1; return -1;
m_sampleSource = m_sampleSourceDevices[index].m_sourceName; 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); m_sampleSourceInstance = m_sampleSourceDevices[index].m_plugin->createSampleSource(m_sampleSource, m_sampleSourceDevices[index].m_address);
return index; return index;
} }

8
sdrbase/settings/preset.cpp
View File

@ -27,7 +27,7 @@ void Preset::resetToDefaults()
QByteArray Preset::serialize() const QByteArray Preset::serialize() const
{ {
qDebug() << "Preset::serialize (" << this->getSource().toStdString()<< ")"; qDebug() << "Preset::serialize (" << this->getSource().toStdString().c_str() << ")";
SimpleSerializer s(1); SimpleSerializer s(1);
s.writeString(1, m_group); s.writeString(1, m_group);
@ -45,7 +45,7 @@ QByteArray Preset::serialize() const
s.writeS32(200, m_channelConfigs.size()); 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++) { for(int i = 0; i < m_channelConfigs.size(); i++) {
s.writeString(201 + i * 2, m_channelConfigs[i].m_channel); s.writeString(201 + i * 2, m_channelConfigs[i].m_channel);
@ -57,7 +57,7 @@ QByteArray Preset::serialize() const
bool Preset::deserialize(const QByteArray& data) bool Preset::deserialize(const QByteArray& data)
{ {
qDebug() << "Preset::deserialize (" << this->getSource().toStdString() << ")"; qDebug() << "Preset::deserialize (" << this->getSource().toStdString().c_str() << ")";
SimpleDeserializer d(data); SimpleDeserializer d(data);
if(!d.isValid()) { if(!d.isValid()) {
@ -79,7 +79,7 @@ bool Preset::deserialize(const QByteArray& data)
d.readBlob(11, &m_sourceGeneralConfig); d.readBlob(11, &m_sourceGeneralConfig);
d.readBlob(12, &m_sourceConfig); d.readBlob(12, &m_sourceConfig);
qDebug() << " m_group: " << m_group.toStdString(); qDebug() << " m_group: " << m_group.toStdString().c_str();
qint32 channelCount = 0; qint32 channelCount = 0;
d.readS32(200, &channelCount, 0); d.readS32(200, &channelCount, 0);