diff options
author | Olivier Goffart <olivier@woboq.com> | 2017-02-23 16:54:17 +0300 |
---|---|---|
committer | Markus Goetz <markus@woboq.com> | 2017-02-23 16:54:17 +0300 |
commit | 7bfe0613827aa7cee93a77ccbedab9b07ea9ca78 (patch) | |
tree | 585a4921dcf43b67495e14525905a662a4fb38ae /src/gui/folderwizard.cpp | |
parent | 13332529022b0e1f6f02ec3a62d2233fce3f8d9c (diff) |
Verify that all strings are properly escaped (#5558)
- I checked every occurence of a '%2' and make correct use of the
QString::arg overload that takes several argument instead of chaining
them, because the first argument can contains a '%1'
- I tried to look for every label that they either use plain text or richtext
and escape the user provided strings in there.
Diffstat (limited to 'src/gui/folderwizard.cpp')
-rw-r--r-- | src/gui/folderwizard.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp index b786591c0..8a15c8739 100644 --- a/src/gui/folderwizard.cpp +++ b/src/gui/folderwizard.cpp @@ -65,7 +65,7 @@ FolderWizardLocalPath::FolderWizardLocalPath(const AccountPtr& account) connect(_ui.localFolderChooseBtn, SIGNAL(clicked()), this, SLOT(slotChooseLocalFolder())); _ui.localFolderChooseBtn->setToolTip(tr("Click to select a local folder to sync.")); - QString defaultPath = QString::fromLatin1( "%1/%2").arg( QDir::homePath() ).arg(Theme::instance()->appName() ); + QString defaultPath = QDir::homePath() + QLatin1Char('/') + Theme::instance()->appName(); _ui.localFolderLineEdit->setText( QDir::toNativeSeparators( defaultPath ) ); _ui.localFolderLineEdit->setToolTip(tr("Enter the path to the local folder.")); @@ -441,7 +441,8 @@ bool FolderWizardRemotePath::isComplete() const if (QDir::cleanPath(dir) == QDir::cleanPath(curDir)) { warnStrings.append(tr("This folder is already being synced.")); } else if (dir.startsWith(curDir + QLatin1Char('/'))) { - warnStrings.append(tr("You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.").arg(curDir).arg(dir)); + warnStrings.append(tr("You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.").arg( + Utility::escape(curDir), Utility::escape(dir))); } if (curDir == QLatin1String("/")) { |