mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

use QStringLiteral for constants

Browse source 
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
This commit is contained in:
Rolf Eike Beer 2019-04-01 23:15:23 +02:00 • committed by Dirk Hohndel
parent c4c8094e32
commit ee0acb0d40
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/qthelper.cpp
View file

@ -39,7 +39,10 @@
const char *existing_filename; const char *existing_filename;
static QLocale loc; static QLocale loc;
static const QString DEGREE_SIGNS("dD" UTF8_DEGREE); static inline QString degreeSigns()
{
return QStringLiteral("dD\u00b0");
}
QString weight_string(int weight_in_grams) QString weight_string(int weight_in_grams)
{ {
@ -160,7 +163,7 @@ static bool parseCoord(const QString& txt, int& pos, const QString& positives,
} else if (others.indexOf(txt[pos]) >= 0) { } else if (others.indexOf(txt[pos]) >= 0) {
//we are at the next coordinate. //we are at the next coordinate.
break; break;
} else if (DEGREE_SIGNS.indexOf(txt[pos]) >= 0 || } else if (degreeSigns().indexOf(txt[pos]) >= 0 ||
(txt[pos].isSpace() && !degreesDefined && numberDefined)) { (txt[pos].isSpace() && !degreesDefined && numberDefined)) {
if (!numberDefined) if (!numberDefined)
return false; return false;
@ -232,7 +235,7 @@ bool parseGpsText(const QString &gps_text, double *latitude, double *longitude)
//remove the useless spaces (but keep the ones separating numbers) //remove the useless spaces (but keep the ones separating numbers)
static const QRegExp SPACE_CLEANER("\\s*([" + POS_LAT + NEG_LAT + POS_LON + static const QRegExp SPACE_CLEANER("\\s*([" + POS_LAT + NEG_LAT + POS_LON +
NEG_LON + DEGREE_SIGNS + "'\"\\s])\\s*"); NEG_LON + degreeSigns() + "'\"\\s])\\s*");
const QString normalized = gps_text.trimmed().toUpper().replace(SPACE_CLEANER, "\\1"); const QString normalized = gps_text.trimmed().toUpper().replace(SPACE_CLEANER, "\\1");
if (normalized.isEmpty()) { if (normalized.isEmpty()) {

2
core/settings/qPrefDisplay.cpp
View file

@ -15,7 +15,7 @@ QString qPrefDisplay::st_lastDir;
static const QString st_lastDir_default = ""; static const QString st_lastDir_default = "";
QString qPrefDisplay::st_theme; QString qPrefDisplay::st_theme;
static const QString st_theme_default = "Blue"; static const QString st_theme_default = QStringLiteral("Blue");
QString qPrefDisplay::st_userSurvey; QString qPrefDisplay::st_userSurvey;
static const QString st_userSurvey_default = ""; static const QString st_userSurvey_default = "";

22
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -154,20 +154,20 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
ui.scrollArea_2->viewport()->setPalette(p); ui.scrollArea_2->viewport()->setPalette(p);
// GroupBoxes in Gnome3 looks like I'v drawn them... // GroupBoxes in Gnome3 looks like I'v drawn them...
static const QString gnomeCss( static const QString gnomeCss = QStringLiteral(
"QGroupBox {" "QGroupBox {"
" background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1," "background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,"
" stop: 0 #E0E0E0, stop: 1 #FFFFFF);" "stop: 0 #E0E0E0, stop: 1 #FFFFFF);"
" border: 2px solid gray;" "border: 2px solid gray;"
" border-radius: 5px;" "border-radius: 5px;"
" margin-top: 1ex;" "margin-top: 1ex;"
"}" "}"
"QGroupBox::title {" "QGroupBox::title {"
" subcontrol-origin: margin;" "subcontrol-origin: margin;"
" subcontrol-position: top center;" "subcontrol-position: top center;"
" padding: 0 3px;" "padding: 0 3px;"
" background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1," "background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,"
" stop: 0 #E0E0E0, stop: 1 #FFFFFF);" "stop: 0 #E0E0E0, stop: 1 #FFFFFF);"
"}"); "}");
Q_FOREACH (QGroupBox *box, findChildren<QGroupBox *>()) { Q_FOREACH (QGroupBox *box, findChildren<QGroupBox *>()) {
box->setStyleSheet(gnomeCss); box->setStyleSheet(gnomeCss);