From fe4c2b59ee5a752133032cfa3f0149732f1e3bb6 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 27 Sep 2020 16:52:19 +0100 Subject: [PATCH] Revert to narrow character logging --- Configuration.cpp | 2 +- L10nLoader.cpp | 18 ++++----- Logger.cpp | 18 ++++----- Logger.hpp | 4 +- .../DXLabSuiteCommanderTransceiver.cpp | 32 ++++++++-------- Transceiver/HRDTransceiver.cpp | 38 +++++++++---------- Transceiver/OmniRigTransceiver.cpp | 20 +++++----- Transceiver/Transceiver.cpp | 12 +++--- Transceiver/Transceiver.hpp | 6 +-- Transceiver/TransceiverFactory.cpp | 2 +- WSJTXLogging.cpp | 24 ++++++------ main.cpp | 12 +++--- 12 files changed, 94 insertions(+), 94 deletions(-) diff --git a/Configuration.cpp b/Configuration.cpp index 568cda581..cb69aadd8 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -2752,7 +2752,7 @@ void Configuration::impl::handle_transceiver_update (TransceiverState const& sta void Configuration::impl::handle_transceiver_failure (QString const& reason) { - LOG_ERROR ("handle_transceiver_failure: reason: " << reason.toStdWString ()); + LOG_ERROR ("handle_transceiver_failure: reason: " << reason); close_rig (); ui_->test_PTT_push_button->setChecked (false); diff --git a/L10nLoader.cpp b/L10nLoader.cpp index 3889fedee..0a290a343 100644 --- a/L10nLoader.cpp +++ b/L10nLoader.cpp @@ -67,7 +67,7 @@ L10nLoader::L10nLoader (QApplication * app, QLocale const& locale, QString const .arg (QLocale::languageToString (locale.language ())) .arg (QLocale::scriptToString (locale.script ())) .arg (QLocale::countryToString (locale.country ())) - .arg (locale.uiLanguages ().join (", ")).toStdWString ()); + .arg (locale.uiLanguages ().join (", "))); // we don't load translators if the language override is 'en', // 'en_US', or 'en-US'. In these cases we assume the user is trying @@ -105,12 +105,12 @@ L10nLoader::L10nLoader (QApplication * app, QLocale const& locale, QString const auto language = locale_name.left (2); if (locale.uiLanguages ().front ().left (2) == language) { - LOG_TRACE (QString {"Trying %1"}.arg (language).toStdWString ()); + LOG_TRACE (QString {"Trying %1"}.arg (language)); if (m_->load_translator ("wsjtx_" + language, translations_dir)) { LOG_INFO (QString {"Loaded WSJT-X base translation file from %1 based on language %2"} .arg (translations_dir) - .arg (language).toStdWString ()); + .arg (language)); break; } } @@ -141,7 +141,7 @@ L10nLoader::L10nLoader (QApplication * app, QLocale const& locale, QString const { LOG_INFO (QString {"Loaded base translation file from %1 based on language %2"} .arg (translations_dir) - .arg (base_language).toStdWString ()); + .arg (base_language)); } // now load the requested translations (may be a duplicate // but we shouldn't care) @@ -150,7 +150,7 @@ L10nLoader::L10nLoader (QApplication * app, QLocale const& locale, QString const { LOG_INFO (QString {"Loaded translation file from %1 based on language %2"} .arg (translations_dir) - .arg (language).toStdWString ()); + .arg (language)); } } @@ -169,10 +169,10 @@ L10nLoader::L10nLoader (QApplication * app, QLocale const& locale, QString const auto language = locale_name.left (2); if (locale.uiLanguages ().front ().left (2) == language) { - LOG_TRACE (QString {"Trying %1"}.arg (language).toStdWString ()); + LOG_TRACE (QString {"Trying %1"}.arg (language)); if (m_->load_translator ("wsjtx_" + language)) { - LOG_INFO (QString {"Loaded base translation file from $cwd based on language %1"}.arg (language).toStdWString ()); + LOG_INFO (QString {"Loaded base translation file from $cwd based on language %1"}.arg (language)); break; } } @@ -204,14 +204,14 @@ L10nLoader::L10nLoader (QApplication * app, QLocale const& locale, QString const LOG_TRACE ("Looking for WSJT-X translations based on command line override country in the current directory"); if (m_->load_translator ("wsjtx_" + base_language)) { - LOG_INFO (QString {"Loaded base translation file from $cwd based on language %1"}.arg (base_language).toStdWString ()); + LOG_INFO (QString {"Loaded base translation file from $cwd based on language %1"}.arg (base_language)); } // now load the requested translations (may be a duplicate // but we shouldn't care) LOG_TRACE ("Looking for WSJT-X translations based on command line region in the current directory"); if (m_->load_translator ("wsjtx_" + language)) { - LOG_INFO (QString {"loaded translation file from $cwd based on language %1"}.arg (language).toStdWString ()); + LOG_INFO (QString {"loaded translation file from $cwd based on language %1"}.arg (language)); } } } diff --git a/Logger.cpp b/Logger.cpp index 9a1b9429a..4dca29985 100644 --- a/Logger.cpp +++ b/Logger.cpp @@ -34,11 +34,11 @@ namespace ptime = boost::posix_time; namespace Logger { BOOST_LOG_GLOBAL_LOGGER_CTOR_ARGS (sys, - srcs::wseverity_channel_logger_mt, - (keywords::channel = L"SYSLOG")); + srcs::severity_channel_logger_mt, + (keywords::channel = "SYSLOG")); BOOST_LOG_GLOBAL_LOGGER_CTOR_ARGS (data, - srcs::wseverity_channel_logger_mt, - (keywords::channel = L"DATALOG")); + srcs::severity_channel_logger_mt, + (keywords::channel = "DATALOG")); namespace { @@ -149,21 +149,21 @@ namespace Logger void add_datafile_log (std::string const& log_file_name) { // Create a text file sink - boost::shared_ptr backend + boost::shared_ptr backend ( - new sinks::wtext_ostream_backend() + new sinks::text_ostream_backend() ); - backend->add_stream (boost::shared_ptr (new std::wofstream (log_file_name))); + backend->add_stream (boost::shared_ptr (new std::ofstream (log_file_name))); // Flush after each log record backend->auto_flush (true); // Create a sink for the backend - typedef sinks::synchronous_sink sink_t; + typedef sinks::synchronous_sink sink_t; boost::shared_ptr sink (new sink_t (backend)); // The log output formatter - sink->set_formatter (expr::format (L"[%1%][%2%] %3%") + sink->set_formatter (expr::format ("[%1%][%2%] %3%") % expr::attr ("TimeStamp") % logging::trivial::severity % expr::message diff --git a/Logger.hpp b/Logger.hpp index dece480ae..9c7aa5348 100644 --- a/Logger.hpp +++ b/Logger.hpp @@ -13,9 +13,9 @@ namespace Logger { BOOST_LOG_GLOBAL_LOGGER (sys, - boost::log::sources::wseverity_channel_logger_mt); + boost::log::sources::severity_channel_logger_mt); BOOST_LOG_GLOBAL_LOGGER (data, - boost::log::sources::wseverity_channel_logger_mt); + boost::log::sources::severity_channel_logger_mt); // trivial logging to console void init (); diff --git a/Transceiver/DXLabSuiteCommanderTransceiver.cpp b/Transceiver/DXLabSuiteCommanderTransceiver.cpp index 9cdf8b79a..7991d3e82 100644 --- a/Transceiver/DXLabSuiteCommanderTransceiver.cpp +++ b/Transceiver/DXLabSuiteCommanderTransceiver.cpp @@ -71,7 +71,7 @@ int DXLabSuiteCommanderTransceiver::do_start () commander_->connectToHost (std::get<0> (server_details), std::get<1> (server_details)); if (!commander_->waitForConnected ()) { - CAT_ERROR ("failed to connect" << commander_->errorString ().toStdWString ()); + CAT_ERROR ("failed to connect" << commander_->errorString ()); throw error {tr ("Failed to connect to DX Lab Suite Commander\n") + commander_->errorString ()}; } @@ -127,7 +127,7 @@ int DXLabSuiteCommanderTransceiver::do_start () } else { - CAT_ERROR ("get frequency unexpected response" << reply.toStdWString ()); + CAT_ERROR ("get frequency unexpected response" << reply); throw error {tr ("DX Lab Suite Commander didn't respond correctly reading frequency: ") + reply}; } @@ -174,13 +174,13 @@ void DXLabSuiteCommanderTransceiver::do_ptt (bool on) } else { - CAT_ERROR ("unexpected TX state" << state.toStdWString ()); + CAT_ERROR ("unexpected TX state" << state); throw error {tr ("DX Lab Suite Commander sent an unrecognised TX state: ") + state}; } } else { - CAT_ERROR ("get TX unexpected response" << reply.toStdWString ()); + CAT_ERROR ("get TX unexpected response" << reply); throw error {tr ("DX Lab Suite Commander didn't respond correctly polling TX status: ") + reply}; } if (tx != on) QThread::msleep (10); // don't thrash Commander @@ -268,7 +268,7 @@ void DXLabSuiteCommanderTransceiver::do_poll () } else { - CAT_ERROR ("get frequency unexpected response" << reply.toStdWString ()); + CAT_ERROR ("get frequency unexpected response" << reply); throw error {tr ("DX Lab Suite Commander didn't respond correctly polling frequency: ") + reply}; } @@ -289,7 +289,7 @@ void DXLabSuiteCommanderTransceiver::do_poll () } else { - CAT_ERROR ("get tx frequency unexpected response" << reply.toStdWString ()); + CAT_ERROR ("get tx frequency unexpected response" << reply); throw error {tr ("DX Lab Suite Commander didn't respond correctly polling TX frequency: ") + reply}; } } @@ -308,13 +308,13 @@ void DXLabSuiteCommanderTransceiver::do_poll () } else { - CAT_ERROR ("unexpected split state" << split.toStdWString ()); + CAT_ERROR ("unexpected split state" << split); throw error {tr ("DX Lab Suite Commander sent an unrecognised split state: ") + split}; } } else { - CAT_ERROR ("get split mode unexpected response" << reply.toStdWString ()); + CAT_ERROR ("get split mode unexpected response" << reply); throw error {tr ("DX Lab Suite Commander didn't respond correctly polling split status: ") + reply}; } @@ -370,14 +370,14 @@ auto DXLabSuiteCommanderTransceiver::get_mode () -> MODE } else { - CAT_ERROR ("unexpected mode name" << mode.toStdWString ()); + CAT_ERROR ("unexpected mode name" << mode); throw error {tr ("DX Lab Suite Commander sent an unrecognised mode: \"") + mode + '"'}; } update_mode (m); } else { - CAT_ERROR ("unexpected response" << reply.toStdWString ()); + CAT_ERROR ("unexpected response" << reply); throw error {tr ("DX Lab Suite Commander didn't respond correctly polling mode: ") + reply}; } return m; @@ -387,11 +387,11 @@ void DXLabSuiteCommanderTransceiver::simple_command (QString const& cmd) { Q_ASSERT (commander_); - CAT_TRACE (cmd.toStdWString ()); + CAT_TRACE (cmd); if (!write_to_port (cmd)) { - CAT_ERROR ("failed:" << commander_->errorString ().toStdWString ()); + CAT_ERROR ("failed:" << commander_->errorString ()); throw error {tr ("DX Lab Suite Commander send command failed\n") + commander_->errorString ()}; } } @@ -402,7 +402,7 @@ QString DXLabSuiteCommanderTransceiver::command_with_reply (QString const& cmd) if (!write_to_port (cmd)) { - CAT_ERROR ("failed to send command:" << commander_->errorString ().toStdWString ()); + CAT_ERROR ("failed to send command:" << commander_->errorString ()); throw error { tr ("DX Lab Suite Commander send command failed \"%1\": %2\n") .arg (cmd) @@ -419,7 +419,7 @@ QString DXLabSuiteCommanderTransceiver::command_with_reply (QString const& cmd) replied = commander_->waitForReadyRead (); if (!replied && commander_->error () != commander_->SocketTimeoutError) { - CAT_ERROR (cmd.toStdWString () << "failed to read reply:" << commander_->errorString ().toStdWString ()); + CAT_ERROR (cmd << "failed to read reply:" << commander_->errorString ()); throw error { tr ("DX Lab Suite Commander send command \"%1\" read reply failed: %2\n") .arg (cmd) @@ -430,7 +430,7 @@ QString DXLabSuiteCommanderTransceiver::command_with_reply (QString const& cmd) if (!replied) { - CAT_ERROR (cmd.toStdWString () << "retries exhausted"); + CAT_ERROR (cmd << "retries exhausted"); throw error { tr ("DX Lab Suite Commander retries exhausted sending command \"%1\"") .arg (cmd) @@ -444,7 +444,7 @@ QString DXLabSuiteCommanderTransceiver::command_with_reply (QString const& cmd) // qDebug () << i << ":" << hex << int (result[i]); // } - CAT_TRACE (cmd.toStdWString () << "->" << QString {result}.toStdWString ()); + CAT_TRACE (cmd << "->" << QString {result}); return result; // converting raw UTF-8 bytes to QString } diff --git a/Transceiver/HRDTransceiver.cpp b/Transceiver/HRDTransceiver.cpp index 1e0e6ab32..9ea10949c 100644 --- a/Transceiver/HRDTransceiver.cpp +++ b/Transceiver/HRDTransceiver.cpp @@ -125,7 +125,7 @@ int HRDTransceiver::do_start () hrd_->connectToHost (std::get<0> (server_details), std::get<1> (server_details)); if (!hrd_->waitForConnected ()) { - CAT_ERROR ("failed to connect:" << hrd_->errorString ().toStdWString ()); + CAT_ERROR ("failed to connect:" << hrd_->errorString ()); throw error {tr ("Failed to connect to Ham Radio Deluxe\n") + hrd_->errorString ()}; } @@ -150,7 +150,7 @@ int HRDTransceiver::do_start () hrd_->connectToHost (std::get<0> (server_details), std::get<1> (server_details)); if (!hrd_->waitForConnected ()) { - CAT_ERROR ("failed to connect:" << hrd_->errorString ().toStdWString ()); + CAT_ERROR ("failed to connect:" << hrd_->errorString ()); throw error {tr ("Failed to connect to Ham Radio Deluxe\n") + hrd_->errorString ()}; } @@ -167,7 +167,7 @@ int HRDTransceiver::do_start () auto id = send_command ("get id", false, false); auto version = send_command ("get version", false, false); - CAT_INFO ("Id: " << id.toStdWString () << "Version: " << version.toStdWString ()); + CAT_INFO ("Id: " << id << "Version: " << version); HRD_info << "Id: " << id << "\n"; HRD_info << "Version: " << version << "\n"; @@ -189,7 +189,7 @@ int HRDTransceiver::do_start () CAT_TRACE ("radios:-"); Q_FOREACH (auto const& radio, radios_) { - CAT_TRACE ("\t[" << std::get<0> (radio) << "] " << std::get<1> (radio).toStdWString ()); + CAT_TRACE ("\t[" << std::get<0> (radio) << "] " << std::get<1> (radio)); } auto current_radio_name = send_command ("get radio", false, false); @@ -205,7 +205,7 @@ int HRDTransceiver::do_start () CAT_TRACE ("vfo count:" << vfo_count_); buttons_ = send_command ("get buttons").trimmed ().split (',', SkipEmptyParts).replaceInStrings (" ", "~"); - CAT_TRACE ("HRD Buttons: " << buttons_.join (", ").toStdWString ()); + CAT_TRACE ("HRD Buttons: " << buttons_.join (", ")); HRD_info << "Buttons: {" << buttons_.join (", ") << "}\n"; dropdown_names_ = send_command ("get dropdowns").trimmed ().split (',', SkipEmptyParts); @@ -214,7 +214,7 @@ int HRDTransceiver::do_start () Q_FOREACH (auto const& dd, dropdown_names_) { auto selections = send_command ("get dropdown-list {" + dd + "}").trimmed ().split (','); - CAT_TRACE ("\t" << dd.toStdWString () << ": {" << selections.join (", ").toStdWString () << "}"); + CAT_TRACE ("\t" << dd << ": {" << selections.join (", ") << "}"); HRD_info << "\t" << dd << ": {" << selections.join (", ") << "}\n"; dropdowns_[dd] = selections; } @@ -225,7 +225,7 @@ int HRDTransceiver::do_start () Q_FOREACH (auto const& s, slider_names_) { auto range = send_command ("get slider-range " + current_radio_name + " " + s).trimmed ().split (',', SkipEmptyParts); - CAT_TRACE ("\t" << s.toStdWString () << ": {" << range.join (", ").toStdWString () << "}"); + CAT_TRACE ("\t" << s << ": {" << range.join (", ") << "}"); HRD_info << "\t" << s << ": {" << range.join (", ") << "}\n"; sliders_[s] = range; } @@ -406,11 +406,11 @@ void HRDTransceiver::map_modes (int dropdown, ModeMap *map) map->push_back (std::forward_as_tuple (FM, find_dropdown_selection (dropdown, QRegExp ("^(FM|FM\\(N\\)|FM-N|WFM)$")))); map->push_back (std::forward_as_tuple (DIG_FM, find_dropdown_selection (dropdown, QRegExp ("^(PKT-FM|PKT|DATA\\(FM\\)|FM)$")))); - CAT_TRACE ("for dropdown" << dropdown_names_[dropdown].toStdWString ()); + CAT_TRACE ("for dropdown" << dropdown_names_[dropdown]); std::for_each (map->begin (), map->end (), [this, dropdown] (ModeMap::value_type const& item) { auto const& rhs = std::get<1> (item); - CAT_TRACE ('\t' << std::get<0> (item) << "<->" << (rhs.size () ? dropdowns_[dropdown_names_[dropdown]][rhs.front ()].toStdWString () : L"None")); + CAT_TRACE ('\t' << std::get<0> (item) << "<->" << (rhs.size () ? dropdowns_[dropdown_names_[dropdown]][rhs.front ()] : "None")); }); } @@ -472,7 +472,7 @@ void HRDTransceiver::set_dropdown (int dd, int value) } else { - CAT_ERROR ("item" << value << "not found in" << dd_name.toStdWString ()); + CAT_ERROR ("item" << value << "not found in" << dd_name); throw error {tr ("Ham Radio Deluxe: item not found in %1 dropdown list").arg (dd_name)}; } } @@ -1040,7 +1040,7 @@ QString HRDTransceiver::send_command (QString const& cmd, bool prepend_context, if (QTcpSocket::ConnectedState != hrd_->state ()) { - CAT_ERROR (cmd.toStdWString () << "failed" << hrd_->errorString ().toStdWString ()); + CAT_ERROR (cmd << "failed" << hrd_->errorString ()); throw error { tr ("Ham Radio Deluxe send command \"%1\" failed %2\n") .arg (cmd) @@ -1053,7 +1053,7 @@ QString HRDTransceiver::send_command (QString const& cmd, bool prepend_context, auto message = ((prepend_context ? context + cmd : cmd) + "\r").toLocal8Bit (); if (!write_to_port (message.constData (), message.size ())) { - CAT_ERROR ("failed to write command" << cmd.toStdWString () << "to HRD"); + CAT_ERROR ("failed to write command" << cmd << "to HRD"); throw error { tr ("Ham Radio Deluxe: failed to write command \"%1\"") .arg (cmd) @@ -1066,7 +1066,7 @@ QString HRDTransceiver::send_command (QString const& cmd, bool prepend_context, QScopedPointer message {new (string) HRDMessage}; if (!write_to_port (reinterpret_cast (message.data ()), message->size_)) { - CAT_ERROR ("failed to write command" << cmd.toStdWString () << "to HRD"); + CAT_ERROR ("failed to write command" << cmd << "to HRD"); throw error { tr ("Ham Radio Deluxe: failed to write command \"%1\"") .arg (cmd) @@ -1083,7 +1083,7 @@ QString HRDTransceiver::send_command (QString const& cmd, bool prepend_context, HRDMessage const * reply {new (buffer) HRDMessage}; if (reply->magic_1_value_ != reply->magic_1_ && reply->magic_2_value_ != reply->magic_2_) { - CAT_ERROR (cmd.toStdWString () << "invalid reply"); + CAT_ERROR (cmd << "invalid reply"); throw error { tr ("Ham Radio Deluxe sent an invalid reply to our command \"%1\"") .arg (cmd) @@ -1093,14 +1093,14 @@ QString HRDTransceiver::send_command (QString const& cmd, bool prepend_context, // keep reading until expected size arrives while (buffer.size () - offsetof (HRDMessage, size_) < reply->size_) { - CAT_TRACE (cmd.toStdWString () << "reading more reply data"); + CAT_TRACE (cmd << "reading more reply data"); buffer += read_reply (cmd); reply = new (buffer) HRDMessage; } result = QString {reply->payload_}; // this is not a memory leak (honest!) } - CAT_TRACE (cmd.toStdWString () << " ->" << result.toStdWString ()); + CAT_TRACE (cmd << " ->" << result); return result; } @@ -1131,7 +1131,7 @@ QByteArray HRDTransceiver::read_reply (QString const& cmd) replied = hrd_->waitForReadyRead (); if (!replied && hrd_->error () != hrd_->SocketTimeoutError) { - CAT_ERROR (cmd.toStdWString () << "failed to reply" << hrd_->errorString ().toStdWString ()); + CAT_ERROR (cmd << "failed to reply" << hrd_->errorString ()); throw error { tr ("Ham Radio Deluxe failed to reply to command \"%1\" %2\n") .arg (cmd) @@ -1141,7 +1141,7 @@ QByteArray HRDTransceiver::read_reply (QString const& cmd) } if (!replied) { - CAT_ERROR (cmd.toStdWString () << "retries exhausted"); + CAT_ERROR (cmd << "retries exhausted"); throw error { tr ("Ham Radio Deluxe retries exhausted sending command \"%1\"") .arg (cmd) @@ -1154,7 +1154,7 @@ void HRDTransceiver::send_simple_command (QString const& command) { if ("OK" != send_command (command)) { - CAT_ERROR (command.toStdWString () << "unexpected response"); + CAT_ERROR (command << "unexpected response"); throw error { tr ("Ham Radio Deluxe didn't respond to command \"%1\" as expected") .arg (command) diff --git a/Transceiver/OmniRigTransceiver.cpp b/Transceiver/OmniRigTransceiver.cpp index 6bbeca781..236bdcf84 100644 --- a/Transceiver/OmniRigTransceiver.cpp +++ b/Transceiver/OmniRigTransceiver.cpp @@ -212,7 +212,7 @@ int OmniRigTransceiver::do_start () .arg (rig_type_) .arg (readable_params_, 8, 16, QChar ('0')) .arg (writable_params_, 8, 16, QChar ('0')) - .arg (rig_number_).toStdWString ()); + .arg (rig_number_)); for (int i = 0; i < 5; ++i) { if (OmniRig::ST_ONLINE == rig_->Status ()) @@ -349,7 +349,7 @@ void OmniRigTransceiver::do_stop () void OmniRigTransceiver::handle_COM_exception (int code, QString source, QString desc, QString help) { - CAT_ERROR ((QString::number (code) + " at " + source + ": " + desc + " (" + help + ')').toStdWString ()); + CAT_ERROR ((QString::number (code) + " at " + source + ": " + desc + " (" + help + ')')); throw_qstring (tr ("OmniRig COM/OLE error: %1 at %2: %3 (%4)").arg (QString::number (code)).arg (source). arg (desc). arg (help)); } @@ -371,18 +371,18 @@ void OmniRigTransceiver::handle_rig_type_change (int rig_number) .arg (rig_->RigType ()) .arg (readable_params_, 8, 16, QChar ('0')) .arg (writable_params_, 8, 16, QChar ('0')) - .arg (rig_number).toStdWString ()); + .arg (rig_number)); } } void OmniRigTransceiver::handle_status_change (int rig_number) { - CAT_TRACE (QString {"status change for rig %1"}.arg (rig_number).toStdWString ()); + CAT_TRACE (QString {"status change for rig %1"}.arg (rig_number)); if (rig_number_ == rig_number) { if (!rig_ || rig_->isNull ()) return; auto const& status = rig_->StatusStr (); - CAT_TRACE ("OmniRig status change: new status = " << status.toStdWString ()); + CAT_TRACE ("OmniRig status change: new status = " << status); if (OmniRig::ST_ONLINE != rig_->Status ()) { if (!offline_timer_->isActive ()) @@ -411,7 +411,7 @@ void OmniRigTransceiver::handle_params_change (int rig_number, int params) { CAT_TRACE (QString {"params change: params=0x%1 for rig %2"} .arg (params, 8, 16, QChar ('0')) - .arg (rig_number).toStdWString () + .arg (rig_number) << "state before:" << state ()); if (rig_number_ == rig_number) { @@ -556,7 +556,7 @@ void OmniRigTransceiver::handle_params_change (int rig_number, int params) { auto f = readable_params_ & OmniRig::PM_FREQA ? rig_->FreqA () : rig_->Freq (); auto m = map_mode (rig_->Mode ()); - CAT_TRACE (QString {"VFOEQUAL f=%1 m=%2"}.arg (f).arg (m).toStdWString ()); + CAT_TRACE (QString {"VFOEQUAL f=%1 m=%2"}.arg (f).arg (m)); update_rx_frequency (f); update_other_frequency (f); update_mode (m); @@ -664,9 +664,9 @@ void OmniRigTransceiver::handle_custom_reply (int rig_number, QVariant const& co if (rig_number_ == rig_number) { if (!rig_ || rig_->isNull ()) return; - CAT_TRACE ("custom command" << command.toString ().toStdWString () - << "with reply" << reply.toString ().toStdWString () - << QString ("for rig %1").arg (rig_number).toStdWString ()); + CAT_TRACE ("custom command" << command.toString () + << "with reply" << reply.toString () + << QString ("for rig %1").arg (rig_number)); CAT_TRACE ("rig number:" << rig_number_ << ':' << state ()); } } diff --git a/Transceiver/Transceiver.cpp b/Transceiver/Transceiver.cpp index bc1f97ecf..e240d151f 100644 --- a/Transceiver/Transceiver.cpp +++ b/Transceiver/Transceiver.cpp @@ -23,14 +23,14 @@ QDebug operator << (QDebug d, Transceiver::TransceiverState const& s) } #endif -std::wostream& operator << (std::wostream& os, Transceiver::TransceiverState const& s) +std::ostream& operator << (std::ostream& os, Transceiver::TransceiverState const& s) { return os - << L"Transceiver::TransceiverState(online: " << (s.online_ ? L"yes" : L"no") - << L" Frequency {" << s.rx_frequency_ << L"Hz, " << s.tx_frequency_ << L"Hz} " << s.mode_ - << L"; SPLIT: " << (Transceiver::TransceiverState::Split::on == s.split_ ? L"on" : Transceiver::TransceiverState::Split::off == s.split_ ? L"off" : L"unknown") - << L"; PTT: " << (s.ptt_ ? L"on" : L"off") - << L')'; + << "Transceiver::TransceiverState(online: " << (s.online_ ? "yes" : "no") + << " Frequency {" << s.rx_frequency_ << "Hz, " << s.tx_frequency_ << "Hz} " << s.mode_ + << "; SPLIT: " << (Transceiver::TransceiverState::Split::on == s.split_ ? "on" : Transceiver::TransceiverState::Split::off == s.split_ ? "off" : "unknown") + << "; PTT: " << (s.ptt_ ? "on" : "off") + << ')'; } ENUM_QDATASTREAM_OPS_IMPL (Transceiver, MODE); diff --git a/Transceiver/Transceiver.hpp b/Transceiver/Transceiver.hpp index 4175717cd..655d11700 100644 --- a/Transceiver/Transceiver.hpp +++ b/Transceiver/Transceiver.hpp @@ -60,7 +60,7 @@ class Transceiver public: using Frequency = Radio::Frequency; - using logger_type = boost::log::sources::wseverity_channel_logger_mt; + using logger_type = boost::log::sources::severity_channel_logger_mt; protected: Transceiver (logger_type *, QObject * parent); @@ -115,7 +115,7 @@ public: friend QDebug operator << (QDebug, TransceiverState const&); friend bool operator != (TransceiverState const&, TransceiverState const&); - friend std::wostream& operator << (std::wostream&, Transceiver::TransceiverState const&); + friend std::ostream& operator << (std::ostream&, Transceiver::TransceiverState const&); }; // @@ -169,7 +169,7 @@ Q_DECLARE_METATYPE (Transceiver::TransceiverState); QDebug operator << (QDebug, Transceiver::TransceiverState const&); #endif -std::wostream& operator << (std::wostream&, Transceiver::TransceiverState const&); +std::ostream& operator << (std::ostream&, Transceiver::TransceiverState const&); ENUM_QDATASTREAM_OPS_DECL (Transceiver, MODE); ENUM_CONVERSION_OPS_DECL (Transceiver, MODE); diff --git a/Transceiver/TransceiverFactory.cpp b/Transceiver/TransceiverFactory.cpp index d2e8a956c..7cc62bb4a 100644 --- a/Transceiver/TransceiverFactory.cpp +++ b/Transceiver/TransceiverFactory.cpp @@ -32,7 +32,7 @@ namespace } TransceiverFactory::TransceiverFactory () - : logger_ (boost::log::keywords::channel = L"RIGCTRL") + : logger_ (boost::log::keywords::channel = "RIGCTRL") { HamlibTransceiver::register_transceivers (&logger_, &transceivers_); DXLabSuiteCommanderTransceiver::register_transceivers (&logger_, &transceivers_, CommanderId); diff --git a/WSJTXLogging.cpp b/WSJTXLogging.cpp index 4a806feb9..603cda844 100644 --- a/WSJTXLogging.cpp +++ b/WSJTXLogging.cpp @@ -37,7 +37,7 @@ namespace ptime = boost::posix_time; namespace container = boost::container; BOOST_LOG_ATTRIBUTE_KEYWORD(severity, "Severity", trivial::severity_level) -BOOST_LOG_ATTRIBUTE_KEYWORD(channel, "Channel", std::wstring) +BOOST_LOG_ATTRIBUTE_KEYWORD(channel, "Channel", std::string) namespace { @@ -105,7 +105,7 @@ WSJTXLogging::WSJTXLogging () std::stringbuf buffer {new_config.toStdString (), std::ios_base::in}; std::istream stream {&buffer}; Logger::init_from_config (stream); - LOG_INFO ("Unable to read logging configuration file: " << log_config.fileName ().toStdWString ()); + LOG_INFO ("Unable to read logging configuration file: " << log_config.fileName ()); } else // Default setup { @@ -148,11 +148,11 @@ WSJTXLogging::WSJTXLogging () sys_sink->locked_backend ()->scan_for_files (); // Per channel severity level filter - using min_severity_filter = expr::channel_severity_filter_actor; + using min_severity_filter = expr::channel_severity_filter_actor; min_severity_filter min_severity = expr::channel_severity_filter (channel, severity); - min_severity[L"SYSLOG"] = trivial::info; - min_severity[L"RIGCTRL"] = trivial::info; - min_severity[L"DATALOG"] = trivial::info; + min_severity["SYSLOG"] = trivial::info; + min_severity["RIGCTRL"] = trivial::info; + min_severity["DATALOG"] = trivial::info; sys_sink->set_filter (min_severity || severity >= trivial::fatal); sys_sink->set_formatter @@ -168,7 +168,7 @@ WSJTXLogging::WSJTXLogging () core->add_sink (sys_sink); #if !defined (NDEBUG) && defined (Q_OS_WIN) - // auto windbg_sink = boost::make_shared> (); + // auto windbg_sink = boost::make_shared> (); // windbg_sink->set_filter (trivial::severity >= trivial::trace && expr::is_debugger_present ()); // core->add_sink (windbg_sink); #endif @@ -201,8 +201,8 @@ void WSJTXLogging::qt_log_handler (QtMsgType type, QMessageLogContext const& con // Map non-default Qt categories to logger channels, Qt logger // context is mapped to the appropriate logger attributes. auto log = Logger::sys::get (); - std::wstring file; - std::wstring function; + std::string file; + std::string function; if (context.file) { file = context.file; @@ -217,15 +217,15 @@ void WSJTXLogging::qt_log_handler (QtMsgType type, QMessageLogContext const& con << boost::log::add_value ("Line", context.line) << boost::log::add_value ("File", context.file) << boost::log::add_value ("Function", context.function) - << msg.toStdWString (); + << msg.toStdString (); } else { - BOOST_LOG_CHANNEL_SEV (log, std::wstring {context.category}, severity) + BOOST_LOG_CHANNEL_SEV (log, std::string {context.category}, severity) << boost::log::add_value ("Line", context.line) << boost::log::add_value ("File", context.file) << boost::log::add_value ("Function", context.function) - << msg.toStdWString (); + << msg.toStdString (); } if (QtFatalMsg == type) { diff --git a/main.cpp b/main.cpp index c1e7715ae..97aba3a7d 100644 --- a/main.cpp +++ b/main.cpp @@ -66,7 +66,7 @@ namespace } seeding; #endif - void safe_stream_QVariant (boost::log::wrecord_ostream& os, QVariant const& v) + void safe_stream_QVariant (boost::log::record_ostream& os, QVariant const& v) { if (QMetaType::QByteArray == static_cast (v.type ())) { @@ -85,7 +85,7 @@ namespace } else { - os << v.toString ().toStdWString (); + os << v.toString (); } } } @@ -234,7 +234,7 @@ int main(int argc, char *argv[]) } WSJTXLogging lg; - LOG_INFO (program_title (revision ()).toStdWString () << L" - Program startup"); + LOG_INFO (program_title (revision ()) << " - Program startup"); // load UI translations L10nLoader l10n {&a, locale, parser.value (lang_option)}; @@ -323,7 +323,7 @@ int main(int argc, char *argv[]) boost::log::keywords::severity = boost::log::trivial::trace) ) { - boost::log::wrecord_ostream strm (rec); + boost::log::record_ostream strm (rec); strm << "++++++++++++++++++++++++++++ Settings ++++++++++++++++++++++++++++\n"; for (auto const& key: multi_settings.settings ()->allKeys ()) { @@ -333,7 +333,7 @@ int main(int argc, char *argv[]) if (value.canConvert ()) { auto const sequence = value.value (); - strm << key.toStdWString () << ":\n"; + strm << key << ":\n"; for (auto const& item: sequence) { strm << "\t"; @@ -343,7 +343,7 @@ int main(int argc, char *argv[]) } else { - strm << key.toStdWString () << ": "; + strm << key << ": "; safe_stream_QVariant (strm, value); strm << '\n'; }