Fix a few deprecation warnings in Qt 5.14.1

These changes fix a few instances of the following type of warning:

  error: ‘void QListWidget::setItemSelected(const QListWidgetItem*, bool)’ is deprecated: Use QListWidgetItem::setSelected() instead [-Werror=deprecated-declarations]

as well as similar warnings for setItemHidden() and
setItemExpanded(). These are just warnings now, but it is planned to
remove the methods for Qt 6:

  https://bugreports.qt.io/browse/QTBUG-73048

I tested that LyX can still be built against Qt 4.8.7 with this
commit. Indeed, these methods have been deprecated for a while (it
is just that QT_DEPRECATED_WARNINGS was only turned on by default
starting with 5.13.0). See, e.g.,

  https://doc.qt.io/archives/qt-4.7/qlistwidget-obsolete.html

diff --git a/src/frontends/qt/BulletsModule.cpp b/src/frontends/qt/BulletsModule.cpp
index 5cbca093e81ce52c99d91ef2a15a1499fa3c71ef..ef21bd9723ca20cb4c5f61a0d74c1a852631a039 100644 (file)
--- a/src/frontends/qt/BulletsModule.cpp
+++ b/src/frontends/qt/BulletsModule.cpp
@@ -159,7 +159,7 @@ void BulletsModule::selectItem(int font, int character, bool select)
                return;
 
        QListWidget * lw = static_cast<QListWidget *>(bulletpaneSW->widget(font));
-       lw->setItemSelected(lw->item(character), select);
+       lw->item(character)->setSelected(select);
 }
 
 

diff --git a/src/frontends/qt/GuiBranches.cpp b/src/frontends/qt/GuiBranches.cpp
index ab91587098bc2c4f3d28ea2df73d0eb7325df729..b1ef8be3078ab89aa8ca3fed9b9d33c35f6e9d17 100644 (file)
--- a/src/frontends/qt/GuiBranches.cpp
+++ b/src/frontends/qt/GuiBranches.cpp
@@ -144,7 +144,7 @@ void GuiBranches::updateView()
                // restore selected branch
                if (bname == sel_branch) {
                        branchesTW->setCurrentItem(newItem);
-                       branchesTW->setItemSelected(newItem, true);
+                       newItem->setSelected(true);
                }
        }
        unknownPB->setEnabled(!unknown_branches_.isEmpty());

diff --git a/src/frontends/qt/GuiIndices.cpp b/src/frontends/qt/GuiIndices.cpp
index 7c7a61014af6decd03a700daf2174ba882a99d86..5e145f56eb7446622f14487ef82f35774a54cd06 100644 (file)
--- a/src/frontends/qt/GuiIndices.cpp
+++ b/src/frontends/qt/GuiIndices.cpp
@@ -146,7 +146,7 @@ void GuiIndices::updateView()
                // restore selected index
                if (iname == sel_index) {
                        indicesTW->setCurrentItem(newItem);
-                       indicesTW->setItemSelected(newItem, true);
+                       newItem->setSelected(true);
                }
        }
        indicesTW->resizeColumnToContents(0);

diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp
index 91aa3f67f9f91f569a057ce242bd1a1185261e1f..7d269bc10419bc1872db0fec4fc3922e6ca5a6e9 100644 (file)
--- a/src/frontends/qt/GuiPrefs.cpp
+++ b/src/frontends/qt/GuiPrefs.cpp
@@ -3245,7 +3245,7 @@ void PrefShortcuts::on_searchLE_textEdited()
                // show all hidden items
                QTreeWidgetItemIterator it(shortcutsTW, QTreeWidgetItemIterator::Hidden);
                for (; *it; ++it)
-                       shortcutsTW->setItemHidden(*it, isAlwaysHidden(**it));
+                       (*it)->setHidden(isAlwaysHidden(**it));
                // close all categories
                for (int i = 0; i < shortcutsTW->topLevelItemCount(); ++i)
                        shortcutsTW->collapseItem(shortcutsTW->topLevelItem(i));
@@ -3264,8 +3264,8 @@ void PrefShortcuts::on_searchLE_textEdited()
        // show matched items
        for (int i = 0; i < matched.size(); ++i)
                if (!isAlwaysHidden(*matched[i])) {
-                       shortcutsTW->setItemHidden(matched[i], false);
-                       shortcutsTW->setItemExpanded(matched[i]->parent(), true);
+                       matched[i]->setHidden(false);
+                       matched[i]->parent()->setExpanded(true);
                }
 }
 
@@ -3372,7 +3372,7 @@ void PrefShortcuts::shortcutOkPressed()
        if (item) {
                user_bind_.bind(&k, func);
                shortcutsTW->sortItems(0, Qt::AscendingOrder);
-               shortcutsTW->setItemExpanded(item->parent(), true);
+               item->parent()->setExpanded(true);
                shortcutsTW->setCurrentItem(item);
                shortcutsTW->scrollToItem(item);
        } else {

diff --git a/src/frontends/qt/GuiRef.cpp b/src/frontends/qt/GuiRef.cpp
index 0c6b12d46214fcd56f14a449c7335e93113c0416..6f3a34258e4527da55441ef36063167d035115b3 100644 (file)
--- a/src/frontends/qt/GuiRef.cpp
+++ b/src/frontends/qt/GuiRef.cpp
@@ -545,7 +545,7 @@ void GuiRef::redoRefs()
                while (*it) {
                        if ((*it)->text(0) == textToFind) {
                                refsTW->setCurrentItem(*it);
-                               refsTW->setItemSelected(*it, true);
+                               (*it)->setSelected(true);
                                //Make sure selected item is visible
                                refsTW->scrollToItem(*it);
                                last_reference_ = textToFind;