From ab877c429f843a479b5f5c6a166e83d27546bb3f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 10 Apr 2021 23:57:12 +0200 Subject: [PATCH] (Qt) Use string append() where possible --- ui/drivers/qt/qt_dialogs.cpp | 29 +++++++++++++++++++---------- ui/drivers/qt/qt_downloads.cpp | 5 +++-- ui/drivers/qt/qt_playlist.cpp | 2 +- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ui/drivers/qt/qt_dialogs.cpp b/ui/drivers/qt/qt_dialogs.cpp index f7a5a90e54..c38bf79244 100644 --- a/ui/drivers/qt/qt_dialogs.cpp +++ b/ui/drivers/qt/qt_dialogs.cpp @@ -1745,20 +1745,29 @@ void ShaderParamsDialog::onShaderLoadPresetClicked() if (!menu_shader) return; - filter = "Shader Preset ("; + filter.append("Shader Preset ("); /* NOTE: Maybe we should have a way to get a list * of all shader types instead of hard-coding this? */ if (video_shader_is_supported(RARCH_SHADER_CG)) - filter += QLatin1Literal(" *") + ".cgp"; + { + filter.append(QLatin1Literal(" *")); + filter.append(".cgp"); + } if (video_shader_is_supported(RARCH_SHADER_GLSL)) - filter += QLatin1Literal(" *") + ".glslp"; + { + filter.append(QLatin1Literal(" *")); + filter.append(".glslp"); + } if (video_shader_is_supported(RARCH_SHADER_SLANG)) - filter += QLatin1Literal(" *") + ".slangp"; + { + filter.append(QLatin1Literal(" *")); + filter.append(".slangp"); + } - filter += ")"; + filter.append(")"); path = QFileDialog::getOpenFileName( this, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET), @@ -1895,20 +1904,20 @@ void ShaderParamsDialog::onShaderAddPassClicked() if (!menu_shader) return; - filter = "Shader ("; + filter.append("Shader ("); /* NOTE: Maybe we should have a way to get a list * of all shader types instead of hard-coding this? */ if (video_shader_is_supported(RARCH_SHADER_CG)) - filter += QLatin1Literal(" *.cg"); + filter.append(QLatin1Literal(" *.cg")); if (video_shader_is_supported(RARCH_SHADER_GLSL)) - filter += QLatin1Literal(" *.glsl"); + filter.append(QLatin1Literal(" *.glsl")); if (video_shader_is_supported(RARCH_SHADER_SLANG)) - filter += QLatin1Literal(" *.slang"); + filter.append(QLatin1Literal(" *.slang")); - filter += ")"; + filter.append(")"); path = QFileDialog::getOpenFileName( this, diff --git a/ui/drivers/qt/qt_downloads.cpp b/ui/drivers/qt/qt_downloads.cpp index 8abf0dd401..27eafc060b 100644 --- a/ui/drivers/qt/qt_downloads.cpp +++ b/ui/drivers/qt/qt_downloads.cpp @@ -945,9 +945,10 @@ void MainWindow::downloadNextPlaylistThumbnail( m_playlistThumbnailDownloadProgressDialog->setValue(m_playlistThumbnailDownloadProgressDialog->maximum() - m_pendingPlaylistThumbnails.count()); { - QString labelText = QString(msg_hash_to_str(MSG_DOWNLOADING)) + "...\n"; + QString labelText = QString(msg_hash_to_str(MSG_DOWNLOADING)) + "...\n"; + QString labelText2 = QString(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_DOWNLOAD_PLAYLIST_THUMBNAIL_PROGRESS)).arg(m_downloadedThumbnails).arg(m_failedThumbnails); - labelText += QString(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_DOWNLOAD_PLAYLIST_THUMBNAIL_PROGRESS)).arg(m_downloadedThumbnails).arg(m_failedThumbnails); + labelText.append(labelText2); m_playlistThumbnailDownloadProgressDialog->setLabelText(labelText); } diff --git a/ui/drivers/qt/qt_playlist.cpp b/ui/drivers/qt/qt_playlist.cpp index e82fae36a8..5fb34742fc 100644 --- a/ui/drivers/qt/qt_playlist.cpp +++ b/ui/drivers/qt/qt_playlist.cpp @@ -454,7 +454,7 @@ void MainWindow::addFilesToPlaylist(QStringList files) if (selectedDatabase.isEmpty()) selectedDatabase = QFileInfo(currentPlaylistPath).fileName(); else - selectedDatabase += ".lpl"; + selectedDatabase.append(".lpl"); dialog.reset(new QProgressDialog(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_GATHERING_LIST_OF_FILES), "Cancel", 0, 0, this)); dialog->setWindowModality(Qt::ApplicationModal);