]> git.lyx.org Git - features.git/commitdiff
Fix Qt deprecation warns for setAutoCompletion()
authorScott Kostyshak <skostysh@lyx.org>
Thu, 19 Mar 2020 01:00:09 +0000 (21:00 -0400)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Thu, 18 Jun 2020 13:48:54 +0000 (15:48 +0200)
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
src/frontends/qt/ui/BibtexUi.ui
src/frontends/qt/ui/ListingsUi.ui
src/frontends/qt/ui/SearchUi.ui
src/frontends/qt/ui/SendtoUi.ui
src/frontends/qt/ui/SpellcheckerUi.ui

index 4e0c354fc60efe4164691e3f3a9f36807e47c857..3fffb6ea2b7a2b19aa04b699d8f6e16c6c350180 100644 (file)
@@ -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);
 }
index 1439e1864e382e62e5a20e99f8fbcdfb560d0b53..3eac510d8f34fbed497bd6f49a85155d6bfec647 100644 (file)
         <property name="editable">
          <bool>true</bool>
         </property>
-        <property name="autoCompletion">
-         <bool>true</bool>
-        </property>
         <property name="duplicatesEnabled">
          <bool>false</bool>
         </property>
index 7eaf66544ae1931c9ce9d184def6ef4b2489848c..330964936b9d37d8568551c4f7749ec43cf41c5a 100644 (file)
             <property name="editable">
              <bool>false</bool>
             </property>
-            <property name="autoCompletion">
-             <bool>true</bool>
-            </property>
             <property name="duplicatesEnabled">
              <bool>false</bool>
             </property>
             <property name="editable">
              <bool>false</bool>
             </property>
-            <property name="autoCompletion">
-             <bool>true</bool>
-            </property>
             <property name="duplicatesEnabled">
              <bool>false</bool>
             </property>
             <property name="editable">
              <bool>false</bool>
             </property>
-            <property name="autoCompletion">
-             <bool>true</bool>
-            </property>
             <property name="duplicatesEnabled">
              <bool>false</bool>
             </property>
index 8a94abb0ed74063f0d0db5967738a39f9fce2742..f0b78ccc3cec917849495a543964faa4e57a10ce 100644 (file)
@@ -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>
index 4cd8ef4f75de135d2d7183e1f74c650e50e0f708..4e599b7356a89ccb7f2ab58a4eb0b5f7a79da8ea 100644 (file)
@@ -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>
index 1b66dc9d40e983a6e152ab12a1b9ce79188a3737..18cd17d18e4bfca2c70f49ca906cf26b222c4424 100644 (file)
@@ -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>