diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/function/VersionCheckThread.cpp | 11 | ||||
| -rw-r--r-- | src/ui/settings/SettingsGeneral.cpp | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/ui/function/VersionCheckThread.cpp b/src/ui/function/VersionCheckThread.cpp index 765ccd2f..bad60ef4 100644 --- a/src/ui/function/VersionCheckThread.cpp +++ b/src/ui/function/VersionCheckThread.cpp @@ -58,13 +58,10 @@ void VersionCheckThread::run() { LOG(INFO) << "latest version from Github" << latest_version; - std::regex re(R"(^[vV](\d+\.)?(\d+\.)?(\*|\d+))"); - auto version_begin = - std::sregex_iterator(latest_version.begin(), latest_version.end(), re); - auto version_end = std::sregex_iterator(); - if (std::distance(version_begin, version_end)) { - std::smatch match = *version_begin; - latest_version = match.str(); + QRegularExpression re(R"(^[vV](\d+\.)?(\d+\.)?(\*|\d+))"); + auto version_match = re.match(latest_version.c_str()); + if (version_match.hasMatch()) { + latest_version = version_match.captured(0).toStdString(); LOG(INFO) << "latest version matched" << latest_version; } else { latest_version = current_version; diff --git a/src/ui/settings/SettingsGeneral.cpp b/src/ui/settings/SettingsGeneral.cpp index 3b767e3a..6b6568a4 100644 --- a/src/ui/settings/SettingsGeneral.cpp +++ b/src/ui/settings/SettingsGeneral.cpp @@ -100,7 +100,7 @@ GeneralTab::GeneralTab(QWidget* parent) : QWidget(parent) { for (const auto& l : lang) { langSelectBox->addItem(l); } - langSelectBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength); + langSelectBox->setSizeAdjustPolicy(QComboBox::AdjustToContents); langBoxLayout->addWidget(langSelectBox); langBoxLayout->addWidget(new QLabel( |