#3403 refactor: fix lots of build warnings

pbek · pbek · commit aba015d483f7 · 2025-12-03T21:34:42.000+01:00
Signed-off-by: Patrizio Bekerle &lt;patrizio@bekerle.com&gt;
diff --git a/src/dialogs/linkdialog.cpp b/src/dialogs/linkdialog.cpp
@@ -80,7 +80,7 @@ LinkDialog::~LinkDialog() {
 
 void LinkDialog::on_searchLineEdit_textChanged(const QString &arg1) {
     // search notes when at least 2 characters were entered
-    if (arg1.count() >= 2) {
+    if (arg1.size() >= 2) {
         QVector<QString> noteNameList = Note::searchAsNameList(arg1, true);
         this->firstVisibleNoteListRow = -1;
 
diff --git a/src/dialogs/scriptrepositorydialog.cpp b/src/dialogs/scriptrepositorydialog.cpp
@@ -385,10 +385,11 @@ void ScriptRepositoryDialog::on_installButton_clicked() {
 
     // check if platform is supported
     if (!infoJson.platformSupported &&
-        QMessageBox::information(this, tr("Platform not supported!"),
-                                 tr("Your platform is not supported by this script!\n"
-                                    "Do you want to install it anyway?"),
-                                 tr("Install"), tr("Cancel"), QString(), 0, 1) != 0) {
+        QMessageBox::question(this, tr("Platform not supported!"),
+                              tr("Your platform is not supported by this script!\n"
+                                 "Do you want to install it anyway?"),
+                              QMessageBox::Yes | QMessageBox::No,
+                              QMessageBox::No) == QMessageBox::No) {
         return;
     }
 
diff --git a/src/dialogs/settingsdialog.cpp b/src/dialogs/settingsdialog.cpp
@@ -2061,11 +2061,12 @@ void SettingsDialog::on_legacyOwnCloudCalendarRadioButton_toggled(bool checked)
 }
 
 void SettingsDialog::on_reinitializeDatabaseButton_clicked() {
-    if (QMessageBox::information(this, tr("Database"),
-                                 tr("Do you really want to clear the local database? "
-                                    "This will also remove your configured note "
-                                    "folders and your cached todo items!"),
-                                 tr("Clear &database"), tr("&Cancel"), QString(), 1) == 0) {
+    if (QMessageBox::question(this, tr("Database"),
+                              tr("Do you really want to clear the local database? "
+                                 "This will also remove your configured note "
+                                 "folders and your cached todo items!"),
+                              QMessageBox::Yes | QMessageBox::Cancel,
+                              QMessageBox::Cancel) == QMessageBox::Yes) {
         DatabaseService::reinitializeDiskDatabase();
         NoteFolder::migrateToNoteFolders();
 
@@ -2133,11 +2134,12 @@ void SettingsDialog::on_appMetricsCheckBox_toggled(bool checked) {
  * Allows the user to clear all settings and the database and exit the app
  */
 void SettingsDialog::on_clearAppDataAndExitButton_clicked() {
-    if (QMessageBox::information(this, tr("Clear app data and exit"),
-                                 tr("Do you really want to clear all settings, remove the "
-                                    "database and exit QOwnNotes?\n\n"
-                                    "Your notes will stay intact!"),
-                                 tr("Clear and &exit"), tr("&Cancel"), QString(), 1) == 0) {
+    if (QMessageBox::question(this, tr("Clear app data and exit"),
+                              tr("Do you really want to clear all settings, remove the "
+                                 "database and exit QOwnNotes?\n\n"
+                                 "Your notes will stay intact!"),
+                              QMessageBox::Yes | QMessageBox::Cancel,
+                              QMessageBox::Cancel) == QMessageBox::Yes) {
         SettingsService settings;
         settings.clear();
         DatabaseService::removeDiskDatabase();
@@ -3146,7 +3148,7 @@ void SettingsDialog::on_shortcutSearchLineEdit_textChanged(const QString &arg1)
         ui->shortcutTreeWidget->findItems(QString(), Qt::MatchContains | Qt::MatchRecursive);
 
     // search text if at least one character was entered
-    if (arg1.count() >= 1) {
+    if (arg1.size() >= 1) {
         // search for items in the description
         QList<QTreeWidgetItem *> foundItems =
             ui->shortcutTreeWidget->findItems(arg1, Qt::MatchContains | Qt::MatchRecursive);
@@ -3605,12 +3607,13 @@ void SettingsDialog::on_applyToolbarButton_clicked() {
 }
 
 void SettingsDialog::on_resetToolbarPushButton_clicked() {
-    if (QMessageBox::information(this, tr("Reset toolbars and exit"),
-                                 tr("Do you really want to reset all toolbars? "
-                                    "The application will be closed in the process, the "
-                                    "default toolbars will be restored when you start it "
-                                    "again."),
-                                 tr("Reset and &exit"), tr("&Cancel"), QLatin1String(""), 1) == 0) {
+    if (QMessageBox::question(this, tr("Reset toolbars and exit"),
+                              tr("Do you really want to reset all toolbars? "
+                                 "The application will be closed in the process, the "
+                                 "default toolbars will be restored when you start it "
+                                 "again."),
+                              QMessageBox::Yes | QMessageBox::Cancel,
+                              QMessageBox::Cancel) == QMessageBox::Yes) {
         SettingsService settings;
 
         // remove all settings in the group
@@ -3642,7 +3645,7 @@ void SettingsDialog::on_searchLineEdit_textChanged(const QString &arg1) {
         ui->settingsTreeWidget->findItems(QString(), Qt::MatchContains | Qt::MatchRecursive);
 
     // search text if at least one character was entered
-    if (arg1.count() >= 1) {
+    if (arg1.size() >= 1) {
         QList<int> pageIndexList;
 
         // search in the tree widget items themselves
diff --git a/src/dialogs/tododialog.cpp b/src/dialogs/tododialog.cpp
@@ -664,7 +664,7 @@ void TodoDialog::on_newItemEdit_textChanged() {
         QLatin1String(""), Qt::MatchContains | Qt::MatchRecursive);
 
     // search todo item if at least 2 characters were entered
-    if (arg1.count() >= 2) {
+    if (arg1.size() >= 2) {
         QList<QString> uidList =
             CalendarItem::searchAsUidList(arg1, ui->todoListSelector->currentText());
 
@@ -707,7 +707,7 @@ void TodoDialog::searchForSearchLineTextInNoteTextEdit() {
 void TodoDialog::searchInDescriptionTextEdit(QString &str) {
     QList<QTextEdit::ExtraSelection> extraSelections;
 
-    if (str.count() >= 2) {
+    if (str.size() >= 2) {
         ui->descriptionEdit->moveCursor(QTextCursor::Start);
         QColor color = QColor(0, 180, 0, 100);
 
diff --git a/src/dialogs/updatedialog.cpp b/src/dialogs/updatedialog.cpp
@@ -491,11 +491,11 @@ bool UpdateDialog::initializeLinuxUpdateProcess(const QString &filePath) {
         return false;
     }
 
-    if (QMessageBox::information(
+    if (QMessageBox::question(
             this, tr("Restart application"),
             tr("You now can restart the application to complete the update process.") +
                 Utils::Misc::appendSingleAppInstanceTextIfNeeded(),
-            tr("Restart"), tr("Cancel"), QString(), 0, 1) == 0) {
+            QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Yes) == QMessageBox::Yes) {
         Utils::Misc::restartApplication();
     }
 
diff --git a/src/main.cpp b/src/main.cpp
@@ -44,7 +44,11 @@ void loadTranslations(QTranslator *translator, const QString &locale) {
     //    loadTranslation(translator[0], "qt_" + QLocale::system().name(),
     //                       QLibraryInfo::location(QLibraryInfo::TranslationsPath));
     loadTranslation(translator[1], "qt_" + locale,
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+                    QLibraryInfo::path(QLibraryInfo::TranslationsPath));
+#else
                     QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+#endif
     QString appPath = QCoreApplication::applicationDirPath();
     loadTranslation(translator[2], "qt_" + locale, appPath + "/translations");
     loadTranslation(translator[3], appPath + "/../src/languages/QOwnNotes_" + locale);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -180,8 +180,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
             &MainWindow::showNoteEditTabWidgetContextMenu);
 
     // Set the two shortcuts for the "increase note text size" action
-    const QList<QKeySequence> shortcuts = {QKeySequence(Qt::CTRL + Qt::Key_Plus),
-                                           QKeySequence(Qt::CTRL + Qt::Key_Equal)};
+    const QList<QKeySequence> shortcuts = {QKeySequence(Qt::CTRL | Qt::Key_Plus),
+                                           QKeySequence(Qt::CTRL | Qt::Key_Equal)};
     ui->action_Increase_note_text_size->setShortcuts(shortcuts);
 
     initTreeWidgets();
@@ -3808,22 +3808,19 @@ QString MainWindow::selectOwnCloudNotesFolder() {
         updateCurrentFolderTooltip();
     } else {
         if (this->notesPath.isEmpty()) {
-            switch (QMessageBox::information(
-                this, tr("No folder was selected"),
-                Utils::Misc::replaceOwnCloudText(tr("You have to select your ownCloud notes "
-                                                    "folder to make this software work!")),
-                tr("&Retry"), tr("&Exit"), QString(), 0, 1)) {
-                case 0:
-                    selectOwnCloudNotesFolder();
-                    break;
-                case 1:
-                default:
-                    // No other way to quit the application worked
-                    // in the constructor
-                    // Waqar144: this doesn't seem very wise...
-                    QTimer::singleShot(0, this, SLOT(quitApp()));
-                    QTimer::singleShot(100, this, SLOT(quitApp()));
-                    break;
+            if (QMessageBox::question(
+                    this, tr("No folder was selected"),
+                    Utils::Misc::replaceOwnCloudText(tr("You have to select your ownCloud notes "
+                                                        "folder to make this software work!")),
+                    QMessageBox::Retry | QMessageBox::Close,
+                    QMessageBox::Retry) == QMessageBox::Retry) {
+                selectOwnCloudNotesFolder();
+            } else {
+                // No other way to quit the application worked
+                // in the constructor
+                // Waqar144: this doesn't seem very wise...
+                QTimer::singleShot(0, this, SLOT(quitApp()));
+                QTimer::singleShot(100, this, SLOT(quitApp()));
             }
         }
     }
@@ -5281,11 +5278,12 @@ bool MainWindow::showRestartNotificationIfNeeded(bool force) {
 
     qApp->setProperty("needsRestart", false);
 
-    if (QMessageBox::information(this, tr("Restart application"),
-                                 tr("You may need to restart the application to let the "
-                                    "changes take effect.") +
-                                     Utils::Misc::appendSingleAppInstanceTextIfNeeded(),
-                                 tr("Restart"), tr("Cancel"), QString(), 0, 1) == 0) {
+    if (QMessageBox::question(this, tr("Restart application"),
+                              tr("You may need to restart the application to let the "
+                                 "changes take effect.") +
+                                  Utils::Misc::appendSingleAppInstanceTextIfNeeded(),
+                              QMessageBox::Yes | QMessageBox::Cancel,
+                              QMessageBox::Yes) == QMessageBox::Yes) {
         storeSettings();
         Utils::Misc::restartApplication();
 
@@ -5759,7 +5757,7 @@ void MainWindow::filterNotesBySearchLineEditText(bool searchInNote) {
     ui->noteTreeWidget->setColumnCount(1);
 
     // search notes when at least 2 characters were entered
-    if (searchText.count() >= 2) {
+    if (searchText.size() >= 2) {
         if (searchInNote) {
             // open search dialog
             doSearchInNote(searchText);
@@ -7155,7 +7153,7 @@ void MainWindow::gotoNextNote() {
  * Activate the context menu in the currently focused widget
  */
 void MainWindow::activateContextMenu() {
-    auto *event = new QContextMenuEvent(QContextMenuEvent::Keyboard, QPoint());
+    auto *event = new QContextMenuEvent(QContextMenuEvent::Keyboard, QPoint(), QPoint());
     QApplication::postEvent(focusWidget(), event);
 }
 
@@ -11190,7 +11188,7 @@ void MainWindow::noteEditCursorPositionChanged() {
 
     if (!selectedText.isEmpty()) {
         const QString textAdd = QStringLiteral(" (") +
-                                tr("%n selected", "Characters selected", selectedText.count()) +
+                                tr("%n selected", "Characters selected", selectedText.size()) +
                                 QStringLiteral(")");
         text += textAdd;
         toolTip += textAdd;
@@ -12379,12 +12377,12 @@ bool MainWindow::nextCloudDeckCheck() {
     NextcloudDeckService nextcloudDeckService(this);
 
     if (!nextcloudDeckService.isEnabled()) {
-        if (QMessageBox::warning(
+        if (QMessageBox::question(
                 nullptr, QObject::tr("Nextcloud Deck support disabled!"),
                 QObject::tr(
                     "Nextcloud Deck support is not enabled or the settings are invalid.<br />"
                     "Please check your <strong>Nextcloud</strong> configuration in the settings!"),
-                QObject::tr("Open &settings"), QObject::tr("&Cancel"), QString(), 0, 1) == 0) {
+                QMessageBox::Open | QMessageBox::Cancel, QMessageBox::Open) == QMessageBox::Open) {
             openSettingsDialog(SettingsDialog::OwnCloudPage);
         }
 
diff --git a/src/services/owncloudservice.cpp b/src/services/owncloudservice.cpp
@@ -1158,8 +1158,9 @@ void OwnCloudService::showOwnCloudMessage(QString headline, QString message,
     }
 
     if (withSettingsButton) {
-        if (QMessageBox::warning(nullptr, headline, message, tr("Open &settings"), tr("&Cancel"),
-                                 QString(), 0, 1) == 0) {
+        if (QMessageBox::question(nullptr, headline, message,
+                                  QMessageBox::Open | QMessageBox::Cancel,
+                                  QMessageBox::Open) == QMessageBox::Open) {
 #ifndef INTEGRATION_TESTS
             MainWindow *mainWindow = MainWindow::instance();
 
@@ -1350,7 +1351,11 @@ QList<CalDAVCalendarData> OwnCloudService::parseCalendarData(QString &data) {
     QDomDocument doc;
     qDebug() << __func__ << " - 'data': " << data;
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    doc.setContent(data, QDomDocument::ParseOption::UseNamespaceProcessing);
+#else
     doc.setContent(data, true);
+#endif
 
     QDomNodeList errorNodes = doc.elementsByTagNameNS(NS_DAV, QStringLiteral("error"));
 
@@ -1466,7 +1471,11 @@ QList<CalDAVCalendarData> OwnCloudService::parseCalendarData(QString &data) {
 
 void OwnCloudService::loadTodoItems(const QString &calendarName, QString &data) {
     QDomDocument doc;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    doc.setContent(data, QDomDocument::ParseOption::UseNamespaceProcessing);
+#else
     doc.setContent(data, true);
+#endif
 
     // fetch all urls that are currently in the calendar
     QList<QUrl> calendarItemUrlRemoveList = CalendarItem::fetchAllUrlsByCalendar(calendarName);
@@ -1927,7 +1936,11 @@ void OwnCloudService::updateNoteShareStatus(QDomNodeList &dataElements, bool upd
 
 void OwnCloudService::loadDirectory(QString &data) {
     QDomDocument doc;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    doc.setContent(data, QDomDocument::ParseOption::UseNamespaceProcessing);
+#else
     doc.setContent(data, true);
+#endif
 
     if (data.isEmpty()) {
         showOwnCloudServerErrorMessage(QString(), false);
@@ -2430,7 +2443,11 @@ QString OwnCloudService::fetchNoteFileId(const Note &note) {
             QString data = QString(reply->readAll());
 
             QDomDocument doc;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            doc.setContent(data, QDomDocument::ParseOption::UseNamespaceProcessing);
+#else
             doc.setContent(data, true);
+#endif
 
             // Parse the WebDAV XML response to get the file ID
             QDomNodeList responseNodes =
diff --git a/src/services/scriptingservice.cpp b/src/services/scriptingservice.cpp
@@ -1269,7 +1269,7 @@ void ScriptingService::noteTextEditSetSelection(int start, int end) {
         QTextCursor c = textEdit->textCursor();
 
         start = std::max<int>(start, 0);
-        end = std::min<int>(end, textEdit->toPlainText().count());
+        end = std::min<int>(end, textEdit->toPlainText().size());
 
         c.setPosition(start);
         c.setPosition(end, QTextCursor::KeepAnchor);
@@ -1296,7 +1296,7 @@ void ScriptingService::noteTextEditSetCursorPosition(int position) {
     MainWindow *mainWindow = MainWindow::instance();
     if (mainWindow != nullptr) {
         QOwnNotesMarkdownTextEdit *textEdit = mainWindow->activeNoteTextEdit();
-        position = std::min<int>(position, textEdit->toPlainText().count());
+        position = std::min<int>(position, textEdit->toPlainText().size());
         QTextCursor c = textEdit->textCursor();
 
         if (position < 0) {
diff --git a/src/utils/gui.cpp b/src/utils/gui.cpp
@@ -82,7 +82,7 @@ void Utils::Gui::searchForTextInTreeWidget(QTreeWidget *treeWidget, const QStrin
         treeWidget->findItems("", Qt::MatchContains | Qt::MatchRecursive);
 
     // search text if at least one character was entered
-    if (text.count() >= 1) {
+    if (text.size() >= 1) {
         int searchColumnCount =
             searchFlags & TreeWidgetSearchFlag::AllColumnsSearch ? treeWidget->columnCount() : 1;
 
@@ -143,7 +143,7 @@ void Utils::Gui::searchForTextInListWidget(QListWidget *listWidget, const QStrin
         listWidget->findItems("", Qt::MatchContains | Qt::MatchRecursive);
 
     // search text if at least one character was entered
-    if (text.count() >= 1) {
+    if (text.size() >= 1) {
         // hide all not found items
         Q_FOREACH (QListWidgetItem *item, allItems) {
             bool show = item->text().contains(text, Qt::CaseInsensitive);
@@ -586,7 +586,7 @@ bool Utils::Gui::autoFormatTableAtCursor(QPlainTextEdit *textEdit) {
 
         const QStringList &stringList = nextBlockText.split(QStringLiteral("|"));
         tableTextList.append(stringList);
-        endPosition = block.position() + nextBlockText.count();
+        endPosition = block.position() + nextBlockText.size();
         maxColumns = std::max(maxColumns, (int)stringList.count());
     }
 
@@ -619,7 +619,7 @@ bool Utils::Gui::autoFormatTableAtCursor(QPlainTextEdit *textEdit) {
                 continue;
             }
 
-            maxTextLength = std::max((int)text.count(), maxTextLength);
+            maxTextLength = std::max((int)text.size(), maxTextLength);
         }
 
         // a minimum of 3 headline separator characters are needed for
diff --git a/src/utils/misc.cpp b/src/utils/misc.cpp

Original file line number	Diff line number	Diff line change
`@@ -491,11 +491,11 @@ bool UpdateDialog::initializeLinuxUpdateProcess(const QString &filePath) {`
`491`	`491`	`return false;`
`492`	`492`	`}`
`493`	`493`
`494`		`- if (QMessageBox::information(`
	`494`	`+ if (QMessageBox::question(`
`495`	`495`	`this, tr("Restart application"),`
`496`	`496`	`tr("You now can restart the application to complete the update process.") +`
`497`	`497`	`Utils::Misc::appendSingleAppInstanceTextIfNeeded(),`
`498`		`- tr("Restart"), tr("Cancel"), QString(), 0, 1) == 0) {`
	`498`	`+ QMessageBox::Yes \| QMessageBox::Cancel, QMessageBox::Yes) == QMessageBox::Yes) {`
`499`	`499`	`Utils::Misc::restartApplication();`
`500`	`500`	`}`
`501`	`501`