[QGIS Commit] r13215 - in trunk/qgis/src: core plugins/grass
providers/grass providers/wms
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Mar 31 17:09:08 EDT 2010
Author: jef
Date: 2010-03-31 17:09:08 -0400 (Wed, 31 Mar 2010)
New Revision: 13215
Modified:
trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
trunk/qgis/src/core/qgshttptransaction.cpp
trunk/qgis/src/core/qgsmessageoutput.cpp
trunk/qgis/src/core/qgsvectorlayer.h
trunk/qgis/src/plugins/grass/qgsgrassmapcalc.h
trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
trunk/qgis/src/providers/grass/qgsgrass.h
trunk/qgis/src/providers/wms/qgswmsprovider.cpp
Log:
follow up r13213
Modified: trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
===================================================================
--- trunk/qgis/src/core/qgscoordinatereferencesystem.cpp 2010-03-31 17:17:18 UTC (rev 13214)
+++ trunk/qgis/src/core/qgscoordinatereferencesystem.cpp 2010-03-31 21:09:08 UTC (rev 13215)
@@ -45,17 +45,17 @@
//--------------------------
QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem()
- : mMapUnits( QGis::UnknownUnit ),
- mIsValidFlag( 0 ),
- mValidationHint( 0 )
+ : mMapUnits( QGis::UnknownUnit )
+ , mIsValidFlag( 0 )
+ , mValidationHint( "" )
{
mCRS = OSRNewSpatialReference( NULL );
}
QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( QString theWkt )
- : mMapUnits( QGis::UnknownUnit ),
- mIsValidFlag( 0 ),
- mValidationHint( 0 )
+ : mMapUnits( QGis::UnknownUnit )
+ , mIsValidFlag( 0 )
+ , mValidationHint( "" )
{
mCRS = OSRNewSpatialReference( NULL );
createFromWkt( theWkt );
@@ -63,9 +63,9 @@
QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( const long theId, CrsType theType )
- : mMapUnits( QGis::UnknownUnit ),
- mIsValidFlag( 0 ),
- mValidationHint( 0 )
+ : mMapUnits( QGis::UnknownUnit )
+ , mIsValidFlag( 0 )
+ , mValidationHint( "" )
{
mCRS = OSRNewSpatialReference( NULL );
createFromId( theId, theType );
Modified: trunk/qgis/src/core/qgshttptransaction.cpp
===================================================================
--- trunk/qgis/src/core/qgshttptransaction.cpp 2010-03-31 17:17:18 UTC (rev 13214)
+++ trunk/qgis/src/core/qgshttptransaction.cpp 2010-03-31 21:09:08 UTC (rev 13215)
@@ -45,10 +45,10 @@
QNetworkProxy::ProxyType proxyType,
QString userName,
QString password )
- : httpresponsecontenttype( 0 ),
- httpurl( uri ),
- httphost( proxyHost ),
- mError( "" )
+ : httpresponsecontenttype( "" )
+ , httpurl( uri )
+ , httphost( proxyHost )
+ , mError( "" )
{
QSettings s;
mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt();
Modified: trunk/qgis/src/core/qgsmessageoutput.cpp
===================================================================
--- trunk/qgis/src/core/qgsmessageoutput.cpp 2010-03-31 17:17:18 UTC (rev 13214)
+++ trunk/qgis/src/core/qgsmessageoutput.cpp 2010-03-31 21:09:08 UTC (rev 13215)
@@ -44,7 +44,7 @@
// QgsMessageOutputConsole
QgsMessageOutputConsole::QgsMessageOutputConsole()
- : mMessage( NULL )
+ : mMessage( "" )
{
}
Modified: trunk/qgis/src/core/qgsvectorlayer.h
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.h 2010-03-31 17:17:18 UTC (rev 13214)
+++ trunk/qgis/src/core/qgsvectorlayer.h 2010-03-31 21:09:08 UTC (rev 13215)
@@ -92,8 +92,8 @@
};
/** Constructor */
- QgsVectorLayer( QString path = 0, QString baseName = 0,
- QString providerLib = 0, bool loadDefaultStyleFlag = true );
+ QgsVectorLayer( QString path = QString::null, QString baseName = QString::null,
+ QString providerLib = QString::null, bool loadDefaultStyleFlag = true );
/** Destructor */
virtual ~QgsVectorLayer();
@@ -108,7 +108,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 = "" );
/** Returns the primary display field name used in the identify results dialog */
const QString displayField() const;
Modified: trunk/qgis/src/plugins/grass/qgsgrassmapcalc.h
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmapcalc.h 2010-03-31 17:17:18 UTC (rev 13214)
+++ trunk/qgis/src/plugins/grass/qgsgrassmapcalc.h 2010-03-31 21:09:08 UTC (rev 13215)
@@ -66,7 +66,7 @@
QStringList checkRegion();
bool inputRegion( struct Cell_head *window, bool all );
QStringList output( int type );
- bool hasOutput ( int type ) { return true; }
+ bool hasOutput( int type ) { return true; }
/** \brief recieves contentsMousePressEvent from view */
void mousePressEvent( QMouseEvent* );
@@ -220,8 +220,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 label = "",
+ QString labels = "", bool drawLabel = true );
~QgsGrassMapcalcFunction() {};
QString name() { return mName; }
@@ -332,7 +332,7 @@
~QgsGrassMapcalcObject();
// Set map name, constant value or function/operator
- void setValue( QString val, QString lab = 0 );
+ void setValue( QString val, QString lab = "" );
// Set function
void setFunction( QgsGrassMapcalcFunction f );
Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp 2010-03-31 17:17:18 UTC (rev 13214)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp 2010-03-31 21:09:08 UTC (rev 13215)
@@ -242,7 +242,7 @@
QFile manFile( manPath );
if ( manFile.exists() )
{
- mManualTextBrowser->setOpenExternalLinks ( true );
+ mManualTextBrowser->setOpenExternalLinks( true );
mManualTextBrowser->setSource( QUrl::fromLocalFile( manPath ) );
}
else
@@ -784,7 +784,8 @@
if ( opt->outputType() == type )
{
QString out = opt->value();
- if ( !out.isEmpty() ) {
+ if ( !out.isEmpty() )
+ {
list.append( out );
}
}
@@ -1575,7 +1576,7 @@
//mIface->addRasterLayer( uri, map );
mIface->addRasterLayer( uri, map, "grassraster", QStringList(), QStringList(),
- QString(), QString() );
+ QString(), QString() );
}
}
@@ -2048,10 +2049,13 @@
QgsGrassModuleStandardOptions *options, QString key,
QDomElement &qdesc, QDomElement &gdesc, QDomNode &gnode,
QWidget * parent )
- : QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent ),
- mModuleStandardOptions( options ),
- mGeometryTypeOption( 0 ), mVectorLayerOption( 0 ),
- mRegionButton( 0 ), mUpdate( false ), mRequired( false )
+ : QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent )
+ , mModuleStandardOptions( options )
+ , mGeometryTypeOption( "" )
+ , mVectorLayerOption( "" )
+ , mRegionButton( 0 )
+ , mUpdate( false )
+ , mRequired( false )
{
QgsDebugMsg( "called." );
mGeometryTypeMask = GV_POINT | GV_LINE | GV_AREA;
@@ -2682,8 +2686,10 @@
QgsGrassModuleGdalInput::QgsGrassModuleGdalInput(
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 )
+ : QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent )
+ , mType( type )
+ , mOgrLayerOption( "" )
+ , mOgrWhereOption( "" )
{
if ( mTitle.isEmpty() )
{
Modified: trunk/qgis/src/providers/grass/qgsgrass.h
===================================================================
--- trunk/qgis/src/providers/grass/qgsgrass.h 2010-03-31 17:17:18 UTC (rev 13214)
+++ trunk/qgis/src/providers/grass/qgsgrass.h 2010-03-31 21:09:08 UTC (rev 13215)
@@ -47,8 +47,8 @@
*/
struct Exception : public std::runtime_error
{
- //Exception( const std::string &msg ) : std::runtime_error( msg ) {}
- Exception( const QString &msg ) : std::runtime_error( msg.toUtf8().constData() ) {}
+ //Exception( const std::string &msg ) : std::runtime_error( msg ) {}
+ Exception( const QString &msg ) : std::runtime_error( msg.toUtf8().constData() ) {}
};
//! Get info about the mode
@@ -179,7 +179,7 @@
// ! Get info string from qgis.g.info module
static GRASS_EXPORT QString getInfo( QString info, QString gisdbase,
- QString location, QString mapset = 0, QString map = 0, MapType type = None, double x = 0, double y = 0 );
+ QString location, QString mapset = "", QString map = "", MapType type = None, double x = 0.0, double y = 0.0 );
// ! Get location projection
static GRASS_EXPORT QgsCoordinateReferenceSystem crs( QString gisdbase, QString location );
@@ -199,7 +199,7 @@
static GRASS_EXPORT QString versionString();
// set environment variable
- static GRASS_EXPORT void putEnv (QString name, QString value);
+ static GRASS_EXPORT void putEnv( QString name, QString value );
#if defined(WIN32)
static GRASS_EXPORT QString shortPath( const QString &path );
Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp 2010-03-31 17:17:18 UTC (rev 13214)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp 2010-03-31 21:09:08 UTC (rev 13215)
@@ -76,7 +76,7 @@
, cachedViewExtent( 0 )
, mCoordinateTransform( 0 )
, extentDirty( true )
- , mGetFeatureInfoUrlBase( 0 )
+ , mGetFeatureInfoUrlBase( "" )
, mLayerCount( -1 )
, mTileReqNo( 0 )
, mCacheHits( 0 )
More information about the QGIS-commit
mailing list