commit 60b539e544789e1a737c1675c596ca59c6693e53
Author: Juergen Spitzmueller <[email protected]>
Date: Tue Aug 9 09:31:46 2022 +0200
Rename function
---
src/frontends/qt/Validator.cpp | 2 +-
src/frontends/qt/qt_helpers.cpp | 10 +++++-----
src/frontends/qt/qt_helpers.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/frontends/qt/Validator.cpp b/src/frontends/qt/Validator.cpp
index baf1011..a59d14d 100644
--- a/src/frontends/qt/Validator.cpp
+++ b/src/frontends/qt/Validator.cpp
@@ -75,7 +75,7 @@ QValidator::State LengthValidator::validate(QString & qtext,
int &) const
if (isValidGlueLength(text, &gl))
return QValidator::Acceptable;
// Also check for localized variant
- if (isValidGlueLength(fromqstr(unlocString(qtext)), &gl))
+ if (isValidGlueLength(fromqstr(unlocLengthString(qtext)), &gl))
return QValidator::Acceptable;
return QValidator::Intermediate;
}
diff --git a/src/frontends/qt/qt_helpers.cpp b/src/frontends/qt/qt_helpers.cpp
index 0cf9c9a..f9112e5 100644
--- a/src/frontends/qt/qt_helpers.cpp
+++ b/src/frontends/qt/qt_helpers.cpp
@@ -100,8 +100,8 @@ string widgetsToLength(QLineEdit const * input, LengthCombo
const * combo)
if (isValidGlueLength(fromqstr(length)))
return fromqstr(length);
// Also try with localized version
- if (isValidGlueLength(fromqstr(unlocString(length))))
- return fromqstr(unlocString(length));
+ if (isValidGlueLength(fromqstr(unlocLengthString(length))))
+ return fromqstr(unlocLengthString(length));
Length::UNIT const unit = combo->currentLengthItem();
@@ -119,8 +119,8 @@ Length widgetsToLength(QLineEdit const * input, QComboBox
const * combo)
if (isValidGlueLength(fromqstr(length)))
return Length(fromqstr(length));
// Also try with localized version
- if (isValidGlueLength(fromqstr(unlocString(length))))
- return Length(fromqstr(unlocString(length)));
+ if (isValidGlueLength(fromqstr(unlocLengthString(length))))
+ return Length(fromqstr(unlocLengthString(length)));
Length::UNIT unit = Length::UNIT_NONE;
QString const item = combo->currentText();
@@ -214,7 +214,7 @@ QString formatLocFPNumber(double d)
}
-QString unlocString(QString const & str)
+QString unlocLengthString(QString const & str)
{
QLocale loc;
QString res = str;
diff --git a/src/frontends/qt/qt_helpers.h b/src/frontends/qt/qt_helpers.h
index 8248de8..34035ae 100644
--- a/src/frontends/qt/qt_helpers.h
+++ b/src/frontends/qt/qt_helpers.h
@@ -73,7 +73,7 @@ void doubleToWidget(QLineEdit * input, std::string const &
value,
QString formatLocFPNumber(double d);
// Method to replace localized decimal separator by dot
-QString unlocString(QString const & str);
+QString unlocLengthString(QString const & str);
/// Method to sort QStrings locale-aware (e.g. in combo widgets)
bool SortLocaleAware(QString const & lhs, QString const & rhs);
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
