Skip to content
Permalink
Browse files
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
  • Loading branch information
mhugent committed Jul 14, 2006
1 parent 40fe6f6 commit d8171822163d87d7382d9af95c567c167ec35867
Showing with 12 additions and 10 deletions.
  1. +9 −8 src/gui/qgsdelattrdialog.cpp
  2. +1 −1 src/gui/qgsvectorlayer.cpp
  3. +2 −1 src/providers/wms/qgswmsprovider.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));
}
}
}
@@ -2448,7 +2448,7 @@ bool QgsVectorLayer::commitChanges()
Therefore the error messages become a bit complicated to generate.
*/

if(dataProvider)
if(!dataProvider)
{
return FALSE;
}
@@ -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;
}

0 comments on commit d817182

Please sign in to comment.