Merge branch 'master' into qstring-refactor

Signed-off-by: Integral <[email protected]>
nextcloud · Oct 28, 2024 · f209227 · f209227
2 parents e81a0d2 + ad492ef
commit f209227
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
-    - uses: cpp-linter/[email protected].2
+    - uses: cpp-linter/[email protected].3
       id: linter
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
@@ -63,8 +63,7 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent)
             const auto serverObject = serverJson.toObject();
             const auto serverName = serverObject.value("name").toString();
             const auto serverUrl = serverObject.value("url").toString();
-            const auto serverDisplayString = QStringLiteral("%1 (%2)").arg(serverName, serverUrl);
-            _ui.comboBox->addItem(serverDisplayString, serverUrl);
+            _ui.comboBox->addItem(serverName, serverUrl);
         }
     } else if (theme->forceOverrideServerUrl()) {
         _ui.comboBox->hide();