FreeDV
/
freedv-gui
mirror of https://github.com/drowe67/freedv-gui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'v2.0-dev' into merge-2.0-with-master

pull/896/head
Mooneer Salem 2025-06-02 13:03:19 -07:00
parent b23d07cffd 44b3f52d9d
commit 1d70a8ac8f
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/dialogs/freedv_reporter.cpp
View File

@ -539,7 +539,7 @@ void FreeDVReporterDialog::setReporter(std::shared_ptr<FreeDVReporter> reporter)
{ {
// Update status message // Update status message
auto statusMsg = m_statusMessage->GetValue(); auto statusMsg = m_statusMessage->GetValue();
reporter->updateMessage(statusMsg.utf8_string()); reporter->updateMessage((const char*)statusMsg.utf8_str());
} }
} }
@ -649,7 +649,7 @@ void FreeDVReporterDialog::OnSendQSY(wxCommandEvent& event)
void FreeDVReporterDialog::OnOpenWebsite(wxCommandEvent& event) void FreeDVReporterDialog::OnOpenWebsite(wxCommandEvent& event)
{ {
std::string url = "https://" + wxGetApp().appConfiguration.reportingConfiguration.freedvReporterHostname->utf8_string() + "/"; std::string url = std::string("https://") + (const char*)wxGetApp().appConfiguration.reportingConfiguration.freedvReporterHostname->utf8_str() + "/";
wxLaunchDefaultBrowser(url); wxLaunchDefaultBrowser(url);
DeselectItem(); DeselectItem();
} }

2
src/gui/dialogs/freedv_reporter.h
View File

@ -161,7 +161,7 @@ class FreeDVReporterDialog : public wxFrame
{ {
if (reporter_) if (reporter_)
{ {
reporter_->updateMessage(statusMsg.utf8_string()); reporter_->updateMessage((const char*)statusMsg.utf8_str());
} }
} }

4
src/rig_control/HamlibRigController.cpp
View File

@ -37,7 +37,11 @@ HamlibRigController::RigList HamlibRigController::RigList_;
HamlibRigController::RigNameList HamlibRigController::RigNameList_; HamlibRigController::RigNameList HamlibRigController::RigNameList_;
std::mutex HamlibRigController::RigListMutex_; std::mutex HamlibRigController::RigListMutex_;
#if RIGCAPS_NOT_CONST
int HamlibRigController::BuildRigList_(struct rig_caps *rig, rig_ptr_t rigList) {
#else
int HamlibRigController::BuildRigList_(const struct rig_caps *rig, rig_ptr_t rigList) { int HamlibRigController::BuildRigList_(const struct rig_caps *rig, rig_ptr_t rigList) {
#endif // RIGCAPS_NOT_CONST
((HamlibRigController::RigList *)rigList)->push_back(rig); ((HamlibRigController::RigList *)rigList)->push_back(rig);
return 1; return 1;
} }

4
src/rig_control/HamlibRigController.h
View File

@ -107,7 +107,11 @@ private:
static bool RigCompare_(const struct rig_caps *rig1, const struct rig_caps *rig2); static bool RigCompare_(const struct rig_caps *rig1, const struct rig_caps *rig2);
#if RIGCAPS_NOT_CONST
static int BuildRigList_(struct rig_caps *rig, rig_ptr_t);
#else
static int BuildRigList_(const struct rig_caps *rig, rig_ptr_t); static int BuildRigList_(const struct rig_caps *rig, rig_ptr_t);
#endif // RIGCAPS_NOT_CONST
}; };
#endif // HAMLIB_RIG_CONTROLLER_H #endif // HAMLIB_RIG_CONTROLLER_H