Fix various build warnings

qgis · Jul 20, 2020 · ffe8f03 · ffe8f03
1 parent 33fe1ea
commit ffe8f03
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 37 deletions.
diff --git a/src/gui/qgsnewvectortabledialog.cpp b/src/gui/qgsnewvectortabledialog.cpp
@@ -565,7 +565,10 @@ QVariant QgsNewVectorTableFieldModel::data( const QModelIndex &index, int role )
           {
             return field.length();
           }
+          default:
+            break;
         }
+        return QgsFieldModel::data( index, role );
       }
       case Qt::ItemDataRole::TextAlignmentRole:
       {
@@ -577,10 +580,9 @@ QVariant QgsNewVectorTableFieldModel::data( const QModelIndex &index, int role )
             return Qt::AlignmentFlag::AlignVCenter + Qt::AlignmentFlag::AlignHCenter;
           }
           default:
-          {
-            return QgsFieldModel::data( index, role );
-          }
+            break;
         }
+        return QgsFieldModel::data( index, role );
       }
       default:
       {

diff --git a/src/ui/qgsvectorlayersaveasdialogbase.ui b/src/ui/qgsvectorlayersaveasdialogbase.ui
@@ -514,38 +514,4 @@
   <tabstop>mAddToCanvas</tabstop>
  </tabstops>
  <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>QgsVectorLayerSaveAsDialogBase</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>266</x>
-     <y>268</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>QgsVectorLayerSaveAsDialogBase</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>334</x>
-     <y>268</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
 </ui>