[QGIS Commit] r14687 - in trunk/qgis/src: app core

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-11-15 11:15:08 -0800 (Mon, 15 Nov 2010)
New Revision: 14687

Modified:
   trunk/qgis/src/app/qgssinglesymboldialog.cpp
   trunk/qgis/src/app/qgsvectorlayerproperties.cpp
   trunk/qgis/src/core/qgis.h
Log:
fix build errors

Modified: trunk/qgis/src/app/qgssinglesymboldialog.cpp
===================================================================
--- trunk/qgis/src/app/qgssinglesymboldialog.cpp	2010-11-15 17:06:08 UTC (rev 14686)
+++ trunk/qgis/src/app/qgssinglesymboldialog.cpp	2010-11-15 19:15:08 UTC (rev 14687)
@@ -646,10 +646,6 @@
 
 void QgsSingleSymbolDialog::symbolChanged( const QModelIndex &current, const QModelIndex &previous )
 {
-  QAbstractItemModel *m = lstSymbols->model();
-  QgsDebugMsg( QString( "symbol changed to %1:%2" ).arg( current.row() ).arg( m->data( current, Qt::UserRole ).toString() ) );
-  // m->setData( current, Qt::UserRole+1, Qt::cyan );
-  // m->setData( previous, Qt::UserRole+1, Qt::white );
   emit settingsChanged();
 }
 

Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2010-11-15 17:06:08 UTC (rev 14686)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2010-11-15 19:15:08 UTC (rev 14687)
@@ -54,6 +54,7 @@
 #include <QSettings>
 #include <QComboBox>
 #include <QCheckBox>
+#include <QHeaderView>
 
 #include "qgsrendererv2propertiesdialog.h"
 #include "qgsstylev2.h"

Modified: trunk/qgis/src/core/qgis.h
===================================================================
--- trunk/qgis/src/core/qgis.h	2010-11-15 17:06:08 UTC (rev 14686)
+++ trunk/qgis/src/core/qgis.h	2010-11-15 19:15:08 UTC (rev 14687)
@@ -30,6 +30,7 @@
 #ifdef WIN32
 #include <float.h>
 #define isnan(f) _isnan(f)
+#define isinf(f) (!_isfinite(f) && !_isnan(f))
 #endif
 
 /** \ingroup core