150 lines
6.4 KiB
Diff
150 lines
6.4 KiB
Diff
diff -uNr qgis-1.4.0/src/core/qgscoordinatereferencesystem.cpp qgis-1.4.0-qt47/src/core/qgscoordinatereferencesystem.cpp
|
|
--- qgis-1.4.0/src/core/qgscoordinatereferencesystem.cpp 2010-07-08 02:11:17.653725525 +0200
|
|
+++ qgis-1.4.0-qt47/src/core/qgscoordinatereferencesystem.cpp 2010-07-08 02:57:33.313600187 +0200
|
|
@@ -47,7 +47,7 @@
|
|
QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem()
|
|
: mMapUnits( QGis::UnknownUnit ),
|
|
mIsValidFlag( 0 ),
|
|
- mValidationHint( 0 )
|
|
+ mValidationHint()
|
|
{
|
|
mCRS = OSRNewSpatialReference( NULL );
|
|
}
|
|
@@ -55,7 +55,7 @@
|
|
QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( QString theWkt )
|
|
: mMapUnits( QGis::UnknownUnit ),
|
|
mIsValidFlag( 0 ),
|
|
- mValidationHint( 0 )
|
|
+ mValidationHint()
|
|
{
|
|
mCRS = OSRNewSpatialReference( NULL );
|
|
createFromWkt( theWkt );
|
|
@@ -65,7 +65,7 @@
|
|
QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( const long theId, CrsType theType )
|
|
: mMapUnits( QGis::UnknownUnit ),
|
|
mIsValidFlag( 0 ),
|
|
- mValidationHint( 0 )
|
|
+ mValidationHint()
|
|
{
|
|
mCRS = OSRNewSpatialReference( NULL );
|
|
createFromId( theId, theType );
|
|
diff -uNr qgis-1.4.0/src/core/qgshttptransaction.cpp qgis-1.4.0-qt47/src/core/qgshttptransaction.cpp
|
|
--- qgis-1.4.0/src/core/qgshttptransaction.cpp 2010-07-08 02:11:17.634633912 +0200
|
|
+++ qgis-1.4.0-qt47/src/core/qgshttptransaction.cpp 2010-07-08 02:08:03.768600629 +0200
|
|
@@ -45,10 +45,10 @@
|
|
QNetworkProxy::ProxyType proxyType,
|
|
QString userName,
|
|
QString password )
|
|
- : httpresponsecontenttype( 0 ),
|
|
+ : httpresponsecontenttype(),
|
|
httpurl( uri ),
|
|
httphost( proxyHost ),
|
|
- mError( 0 )
|
|
+ mError()
|
|
{
|
|
QSettings s;
|
|
mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt();
|
|
diff -uNr qgis-1.4.0/src/core/qgsmessageoutput.cpp qgis-1.4.0-qt47/src/core/qgsmessageoutput.cpp
|
|
--- qgis-1.4.0/src/core/qgsmessageoutput.cpp 2010-07-08 02:11:17.628600247 +0200
|
|
+++ qgis-1.4.0-qt47/src/core/qgsmessageoutput.cpp 2010-07-08 02:08:40.298600356 +0200
|
|
@@ -44,7 +44,7 @@
|
|
// QgsMessageOutputConsole
|
|
|
|
QgsMessageOutputConsole::QgsMessageOutputConsole()
|
|
- : mMessage( NULL )
|
|
+ : mMessage()
|
|
{
|
|
}
|
|
|
|
diff -uNr qgis-1.4.0/src/core/qgsvectorlayer.h qgis-1.4.0-qt47/src/core/qgsvectorlayer.h
|
|
--- qgis-1.4.0/src/core/qgsvectorlayer.h 2010-07-08 02:11:17.615600358 +0200
|
|
+++ qgis-1.4.0-qt47/src/core/qgsvectorlayer.h 2010-07-08 02:22:35.046600640 +0200
|
|
@@ -91,8 +91,8 @@
|
|
};
|
|
|
|
/** Constructor */
|
|
- QgsVectorLayer( QString path = 0, QString baseName = 0,
|
|
- QString providerLib = 0, bool loadDefaultStyleFlag = true );
|
|
+ QgsVectorLayer( QString path = QString(), QString baseName = QString(),
|
|
+ QString providerLib = QString(), bool loadDefaultStyleFlag = true );
|
|
|
|
/** Destructor */
|
|
virtual ~QgsVectorLayer();
|
|
@@ -107,7 +107,7 @@
|
|
QString dataComment() const;
|
|
|
|
/** Set the primary display field to be used in the identify results dialog */
|
|
- void setDisplayField( QString fldName = 0 );
|
|
+ void setDisplayField( QString fldName = QString() );
|
|
|
|
/** Returns the primary display field name used in the identify results dialog */
|
|
const QString displayField() const;
|
|
diff -uNr qgis-1.4.0/src/plugins/grass/qgsgrassmapcalc.h qgis-1.4.0-qt47/src/plugins/grass/qgsgrassmapcalc.h
|
|
--- qgis-1.4.0/src/plugins/grass/qgsgrassmapcalc.h 2010-07-08 02:11:18.125600853 +0200
|
|
+++ qgis-1.4.0-qt47/src/plugins/grass/qgsgrassmapcalc.h 2010-07-09 12:34:31.686962175 +0200
|
|
@@ -219,8 +219,8 @@
|
|
|
|
QgsGrassMapcalcFunction() {};
|
|
QgsGrassMapcalcFunction( int type, QString name, int count = 2,
|
|
- QString description = 0, QString label = 0,
|
|
- QString labels = 0, bool drawLabel = true );
|
|
+ QString description = QString(), QString label = QString(),
|
|
+ QString labels = QString(), bool drawLabel = true );
|
|
~QgsGrassMapcalcFunction() {};
|
|
|
|
QString name() { return mName; }
|
|
@@ -331,7 +331,7 @@
|
|
~QgsGrassMapcalcObject();
|
|
|
|
// Set map name, constant value or function/operator
|
|
- void setValue( QString val, QString lab = 0 );
|
|
+ void setValue( QString val, QString lab = QString() );
|
|
|
|
// Set function
|
|
void setFunction( QgsGrassMapcalcFunction f );
|
|
diff -uNr qgis-1.4.0/src/plugins/grass/qgsgrassmodule.cpp qgis-1.4.0-qt47/src/plugins/grass/qgsgrassmodule.cpp
|
|
--- qgis-1.4.0/src/plugins/grass/qgsgrassmodule.cpp 2010-07-08 02:11:17.914600309 +0200
|
|
+++ qgis-1.4.0-qt47/src/plugins/grass/qgsgrassmodule.cpp 2010-07-09 13:27:12.574961370 +0200
|
|
@@ -1946,7 +1946,7 @@
|
|
QWidget * parent )
|
|
: QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent ),
|
|
mModuleStandardOptions( options ),
|
|
- mGeometryTypeOption( 0 ), mVectorLayerOption( 0 ),
|
|
+ mGeometryTypeOption( QString() ), mVectorLayerOption( QString() ),
|
|
mRegionButton( 0 ), mUpdate( false ), mRequired( false )
|
|
{
|
|
QgsDebugMsg( "called." );
|
|
@@ -2581,7 +2581,7 @@
|
|
QgsGrassModule *module, int type, QString key, QDomElement &qdesc,
|
|
QDomElement &gdesc, QDomNode &gnode, QWidget * parent )
|
|
: QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent ),
|
|
- mType( type ), mOgrLayerOption( 0 ), mOgrWhereOption( 0 )
|
|
+ mType( type ), mOgrLayerOption( QString() ), mOgrWhereOption( QString() )
|
|
{
|
|
if ( mTitle.isEmpty() )
|
|
{
|
|
diff -uNr qgis-1.4.0/src/providers/wms/qgswmsprovider.cpp qgis-1.4.0-qt47/src/providers/wms/qgswmsprovider.cpp
|
|
--- qgis-1.4.0/src/providers/wms/qgswmsprovider.cpp 2010-07-08 02:11:18.200725039 +0200
|
|
+++ qgis-1.4.0-qt47/src/providers/wms/qgswmsprovider.cpp 2010-07-09 02:13:01.258782364 +0200
|
|
@@ -60,7 +60,7 @@
|
|
cachedPixelHeight( 0 ),
|
|
mCoordinateTransform( 0 ),
|
|
extentDirty( TRUE ),
|
|
- mGetFeatureInfoUrlBase( 0 ),
|
|
+ mGetFeatureInfoUrlBase(),
|
|
mLayerCount( -1 )
|
|
|
|
{
|
|
diff -uNr qgis-1.4.0/src/providers/wms/qgswmsprovider.h qgis-1.4.0-qt47/src/providers/wms/qgswmsprovider.h
|
|
--- qgis-1.4.0/src/providers/wms/qgswmsprovider.h 2010-07-08 02:11:18.200725039 +0200
|
|
+++ qgis-1.4.0-qt47/src/providers/wms/qgswmsprovider.h 2010-07-08 10:49:46.516564676 +0200
|
|
@@ -341,7 +341,7 @@
|
|
* otherwise we contact the host directly.
|
|
*
|
|
*/
|
|
- QgsWmsProvider( QString const & uri = 0 );
|
|
+ QgsWmsProvider( QString const & uri = QString() );
|
|
|
|
//! Destructor
|
|
virtual ~QgsWmsProvider();
|