Fix for postgis edits not commited, fix for ticket #162 'crash when y…

…ou select 'delete attribute' at attribute table' git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5599 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 14, 2006 · d817182 · d817182
1 parent 40fe6f6
commit d817182
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/gui/qgsdelattrdialog.cpp b/src/gui/qgsdelattrdialog.cpp
@@ -19,18 +19,19 @@
 #include "qgsfield.h"
 #include <Q3Header>
 
-QgsDelAttrDialog::QgsDelAttrDialog(Q3Header* header): QgsDelAttrDialogBase()
+QgsDelAttrDialog::QgsDelAttrDialog(Q3Header* header): QDialog()
 {
-    QObject::connect((QObject*)mOkButton, SIGNAL(clicked()), this, SLOT(accept()));
-    QObject::connect((QObject*)mCancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+  setupUi(this);
+  QObject::connect(mOkButton, SIGNAL(clicked(bool)), this, SLOT(accept()));
+  QObject::connect(mCancelButton, SIGNAL(clicked(bool)), this, SLOT(reject()));
 
-    //insert attribute names into the QListView
-    if(header)
+  //insert attribute names into the QListView
+  if(header)
     {
-	listBox2->clear();
-	for(int i=1;i<header->count();++i)
+      listBox2->clear();
+      for(int i=1;i<header->count();++i)
 	{
-	    listBox2->insertItem(header->label(i));
+	  listBox2->insertItem(header->label(i));
 	}
     }
 }

diff --git a/src/gui/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
@@ -2448,7 +2448,7 @@ bool QgsVectorLayer::commitChanges()
      Therefore the error messages become a bit complicated to generate.
    */
 
-  if(dataProvider)
+  if(!dataProvider)
   {
     return FALSE;
   }

diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -29,6 +29,7 @@
 
 #include "qgshttptransaction.h"
 
+#include <cmath>
 #include <q3url.h>
 #include <Q3Picture>
 
@@ -1944,7 +1945,7 @@ bool QgsWmsProvider::calculateExtent()
 
     //make sure extent does not contain 'inf' or 'nan'
     if(!std::isfinite(extent.xMin()) || !std::isfinite((int)extent.yMin()) || !std::isfinite(extent.xMax()) || \
-!std::isfinite((int)extent.yMax()))
+       !std::isfinite((int)extent.yMax()))
       {
 	continue;
       }