[LyX/master] Fix Qt deprecation warns for setAutoCompletion()

Scott Kostyshak skostysh at lyx.org
Thu Mar 19 03:17:48 UTC 2020


commit 27ba830b8ef513c8332e15747797844a97807791
Author: Scott Kostyshak <skostysh at lyx.org>
Date:   Wed Mar 18 21:00:09 2020 -0400

    Fix Qt deprecation warns for setAutoCompletion()
    
    This commit fixes a few warnings from Qt 5.14 like the following
    one:
    
      error: ‘void QComboBox::setAutoCompletion(bool)’ is deprecated: Use setCompleter() instead. [-Werror=deprecated-declarations]
    
    We only generated setAutoCompletion() from setting the property in
    the .ui files. There does not seem to be a .ui file property that
    generates setCompleter(). However, the default in both Qt5 [1] and
    Qt4 [2] is to enable case-insensitive autocompletion, which seems to
    be the same type of autocompletion as when we were relying on
    setAutoCompletion(true). Thus, we can remove the properties that set
    autocomplete to true. There is only one file, SearchUi.ui, where we
    were turning off the autocompletion; we now do so using
    setCompleter(0) in GuiSearch::GuiSearch().
    
    [1] https://doc.qt.io/qt-5/qcombobox.html#setCompleter
    [2] https://doc.qt.io/archives/qt-4.8/qcombobox.html#setCompleter
---
 src/frontends/qt/GuiSearch.cpp        |    3 +++
 src/frontends/qt/ui/BibtexUi.ui       |    3 ---
 src/frontends/qt/ui/ListingsUi.ui     |    9 ---------
 src/frontends/qt/ui/SearchUi.ui       |    6 ------
 src/frontends/qt/ui/SendtoUi.ui       |    3 ---
 src/frontends/qt/ui/SpellcheckerUi.ui |    3 ---
 6 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/frontends/qt/GuiSearch.cpp b/src/frontends/qt/GuiSearch.cpp
index 4e0c354..3fffb6e 100644
--- a/src/frontends/qt/GuiSearch.cpp
+++ b/src/frontends/qt/GuiSearch.cpp
@@ -69,6 +69,9 @@ GuiSearch::GuiSearch(GuiView & lv)
 	bc().addReadOnly(replacePB);
 	bc().addReadOnly(replaceallPB);
 
+	findCO->setCompleter(0);
+	replaceCO->setCompleter(0);
+
 	replacePB->setEnabled(false);
 	replaceallPB->setEnabled(false);
 }
diff --git a/src/frontends/qt/ui/BibtexUi.ui b/src/frontends/qt/ui/BibtexUi.ui
index 1439e18..3eac510 100644
--- a/src/frontends/qt/ui/BibtexUi.ui
+++ b/src/frontends/qt/ui/BibtexUi.ui
@@ -277,9 +277,6 @@
         <property name="editable">
          <bool>true</bool>
         </property>
-        <property name="autoCompletion">
-         <bool>true</bool>
-        </property>
         <property name="duplicatesEnabled">
          <bool>false</bool>
         </property>
diff --git a/src/frontends/qt/ui/ListingsUi.ui b/src/frontends/qt/ui/ListingsUi.ui
index 7eaf665..3309649 100644
--- a/src/frontends/qt/ui/ListingsUi.ui
+++ b/src/frontends/qt/ui/ListingsUi.ui
@@ -176,9 +176,6 @@
             <property name="editable">
              <bool>false</bool>
             </property>
-            <property name="autoCompletion">
-             <bool>true</bool>
-            </property>
             <property name="duplicatesEnabled">
              <bool>false</bool>
             </property>
@@ -223,9 +220,6 @@
             <property name="editable">
              <bool>false</bool>
             </property>
-            <property name="autoCompletion">
-             <bool>true</bool>
-            </property>
             <property name="duplicatesEnabled">
              <bool>false</bool>
             </property>
@@ -258,9 +252,6 @@
             <property name="editable">
              <bool>false</bool>
             </property>
-            <property name="autoCompletion">
-             <bool>true</bool>
-            </property>
             <property name="duplicatesEnabled">
              <bool>false</bool>
             </property>
diff --git a/src/frontends/qt/ui/SearchUi.ui b/src/frontends/qt/ui/SearchUi.ui
index 8a94abb..f0b78cc 100644
--- a/src/frontends/qt/ui/SearchUi.ui
+++ b/src/frontends/qt/ui/SearchUi.ui
@@ -57,9 +57,6 @@
          <property name="insertPolicy">
           <enum>QComboBox::InsertAtTop</enum>
          </property>
-         <property name="autoCompletion">
-          <bool>false</bool>
-         </property>
          <property name="duplicatesEnabled">
           <bool>false</bool>
          </property>
@@ -92,9 +89,6 @@
          <property name="insertPolicy">
           <enum>QComboBox::InsertAtTop</enum>
          </property>
-         <property name="autoCompletion">
-          <bool>false</bool>
-         </property>
          <property name="duplicatesEnabled">
           <bool>false</bool>
          </property>
diff --git a/src/frontends/qt/ui/SendtoUi.ui b/src/frontends/qt/ui/SendtoUi.ui
index 4cd8ef4..4e599b7 100644
--- a/src/frontends/qt/ui/SendtoUi.ui
+++ b/src/frontends/qt/ui/SendtoUi.ui
@@ -58,9 +58,6 @@
      <property name="insertPolicy">
       <enum>QComboBox::NoInsert</enum>
      </property>
-     <property name="autoCompletion">
-      <bool>true</bool>
-     </property>
      <property name="duplicatesEnabled">
       <bool>false</bool>
      </property>
diff --git a/src/frontends/qt/ui/SpellcheckerUi.ui b/src/frontends/qt/ui/SpellcheckerUi.ui
index 1b66dc9..18cd17d 100644
--- a/src/frontends/qt/ui/SpellcheckerUi.ui
+++ b/src/frontends/qt/ui/SpellcheckerUi.ui
@@ -34,9 +34,6 @@
      <property name="insertPolicy">
       <enum>QComboBox::InsertAtTop</enum>
      </property>
-     <property name="autoCompletion">
-      <bool>true</bool>
-     </property>
      <property name="duplicatesEnabled">
       <bool>false</bool>
      </property>


More information about the lyx-cvs mailing list