Skip to content

Commit 14a3f0c

Browse files
author
jef
committedMar 31, 2010
follow up r13213
git-svn-id: http://svn.osgeo.org/qgis/trunk@13215 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 581b6e2 commit 14a3f0c

File tree

8 files changed

+41
-35
lines changed

8 files changed

+41
-35
lines changed
 

‎src/core/qgscoordinatereferencesystem.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,27 @@ CUSTOM_CRS_VALIDATION QgsCoordinateReferenceSystem::mCustomSrsValidation = NULL;
4545
//--------------------------
4646

4747
QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem()
48-
: mMapUnits( QGis::UnknownUnit ),
49-
mIsValidFlag( 0 ),
50-
mValidationHint( 0 )
48+
: mMapUnits( QGis::UnknownUnit )
49+
, mIsValidFlag( 0 )
50+
, mValidationHint( "" )
5151
{
5252
mCRS = OSRNewSpatialReference( NULL );
5353
}
5454

5555
QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( QString theWkt )
56-
: mMapUnits( QGis::UnknownUnit ),
57-
mIsValidFlag( 0 ),
58-
mValidationHint( 0 )
56+
: mMapUnits( QGis::UnknownUnit )
57+
, mIsValidFlag( 0 )
58+
, mValidationHint( "" )
5959
{
6060
mCRS = OSRNewSpatialReference( NULL );
6161
createFromWkt( theWkt );
6262
}
6363

6464

6565
QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( const long theId, CrsType theType )
66-
: mMapUnits( QGis::UnknownUnit ),
67-
mIsValidFlag( 0 ),
68-
mValidationHint( 0 )
66+
: mMapUnits( QGis::UnknownUnit )
67+
, mIsValidFlag( 0 )
68+
, mValidationHint( "" )
6969
{
7070
mCRS = OSRNewSpatialReference( NULL );
7171
createFromId( theId, theType );

‎src/core/qgshttptransaction.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ QgsHttpTransaction::QgsHttpTransaction( QString uri,
4545
QNetworkProxy::ProxyType proxyType,
4646
QString userName,
4747
QString password )
48-
: httpresponsecontenttype( 0 ),
49-
httpurl( uri ),
50-
httphost( proxyHost ),
51-
mError( "" )
48+
: httpresponsecontenttype( "" )
49+
, httpurl( uri )
50+
, httphost( proxyHost )
51+
, mError( "" )
5252
{
5353
QSettings s;
5454
mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt();

‎src/core/qgsmessageoutput.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ QgsMessageOutput::~QgsMessageOutput()
4444
// QgsMessageOutputConsole
4545

4646
QgsMessageOutputConsole::QgsMessageOutputConsole()
47-
: mMessage( NULL )
47+
: mMessage( "" )
4848
{
4949
}
5050

‎src/core/qgsvectorlayer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
9292
};
9393

9494
/** Constructor */
95-
QgsVectorLayer( QString path = 0, QString baseName = 0,
96-
QString providerLib = 0, bool loadDefaultStyleFlag = true );
95+
QgsVectorLayer( QString path = QString::null, QString baseName = QString::null,
96+
QString providerLib = QString::null, bool loadDefaultStyleFlag = true );
9797

9898
/** Destructor */
9999
virtual ~QgsVectorLayer();
@@ -108,7 +108,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
108108
QString dataComment() const;
109109

110110
/** Set the primary display field to be used in the identify results dialog */
111-
void setDisplayField( QString fldName = 0 );
111+
void setDisplayField( QString fldName = "" );
112112

113113
/** Returns the primary display field name used in the identify results dialog */
114114
const QString displayField() const;

‎src/plugins/grass/qgsgrassmapcalc.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class QgsGrassMapcalc: public QMainWindow, private Ui::QgsGrassMapcalcBase,
6666
QStringList checkRegion();
6767
bool inputRegion( struct Cell_head *window, bool all );
6868
QStringList output( int type );
69-
bool hasOutput ( int type ) { return true; }
69+
bool hasOutput( int type ) { return true; }
7070

7171
/** \brief recieves contentsMousePressEvent from view */
7272
void mousePressEvent( QMouseEvent* );
@@ -220,8 +220,8 @@ class QgsGrassMapcalcFunction
220220

221221
QgsGrassMapcalcFunction() {};
222222
QgsGrassMapcalcFunction( int type, QString name, int count = 2,
223-
QString description = 0, QString label = 0,
224-
QString labels = 0, bool drawLabel = true );
223+
QString description = "", QString label = "",
224+
QString labels = "", bool drawLabel = true );
225225
~QgsGrassMapcalcFunction() {};
226226

227227
QString name() { return mName; }
@@ -332,7 +332,7 @@ class QgsGrassMapcalcObject: public QGraphicsRectItem, public QgsGrassMapcalcIte
332332
~QgsGrassMapcalcObject();
333333

334334
// Set map name, constant value or function/operator
335-
void setValue( QString val, QString lab = 0 );
335+
void setValue( QString val, QString lab = "" );
336336

337337
// Set function
338338
void setFunction( QgsGrassMapcalcFunction f );

‎src/plugins/grass/qgsgrassmodule.cpp

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ QgsGrassModule::QgsGrassModule( QgsGrassTools *tools, QString moduleName, QgisIn
242242
QFile manFile( manPath );
243243
if ( manFile.exists() )
244244
{
245-
mManualTextBrowser->setOpenExternalLinks ( true );
245+
mManualTextBrowser->setOpenExternalLinks( true );
246246
mManualTextBrowser->setSource( QUrl::fromLocalFile( manPath ) );
247247
}
248248
else
@@ -784,7 +784,8 @@ QStringList QgsGrassModuleStandardOptions::output( int type )
784784
if ( opt->outputType() == type )
785785
{
786786
QString out = opt->value();
787-
if ( !out.isEmpty() ) {
787+
if ( !out.isEmpty() )
788+
{
788789
list.append( out );
789790
}
790791
}
@@ -1575,7 +1576,7 @@ void QgsGrassModule::viewOutput()
15751576

15761577
//mIface->addRasterLayer( uri, map );
15771578
mIface->addRasterLayer( uri, map, "grassraster", QStringList(), QStringList(),
1578-
QString(), QString() );
1579+
QString(), QString() );
15791580
}
15801581
}
15811582

@@ -2048,10 +2049,13 @@ QgsGrassModuleInput::QgsGrassModuleInput( QgsGrassModule *module,
20482049
QgsGrassModuleStandardOptions *options, QString key,
20492050
QDomElement &qdesc, QDomElement &gdesc, QDomNode &gnode,
20502051
QWidget * parent )
2051-
: QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent ),
2052-
mModuleStandardOptions( options ),
2053-
mGeometryTypeOption( 0 ), mVectorLayerOption( 0 ),
2054-
mRegionButton( 0 ), mUpdate( false ), mRequired( false )
2052+
: QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent )
2053+
, mModuleStandardOptions( options )
2054+
, mGeometryTypeOption( "" )
2055+
, mVectorLayerOption( "" )
2056+
, mRegionButton( 0 )
2057+
, mUpdate( false )
2058+
, mRequired( false )
20552059
{
20562060
QgsDebugMsg( "called." );
20572061
mGeometryTypeMask = GV_POINT | GV_LINE | GV_AREA;
@@ -2682,8 +2686,10 @@ void QgsGrassModuleGroupBoxItem::adjustTitle()
26822686
QgsGrassModuleGdalInput::QgsGrassModuleGdalInput(
26832687
QgsGrassModule *module, int type, QString key, QDomElement &qdesc,
26842688
QDomElement &gdesc, QDomNode &gnode, QWidget * parent )
2685-
: QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent ),
2686-
mType( type ), mOgrLayerOption( 0 ), mOgrWhereOption( 0 )
2689+
: QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent )
2690+
, mType( type )
2691+
, mOgrLayerOption( "" )
2692+
, mOgrWhereOption( "" )
26872693
{
26882694
if ( mTitle.isEmpty() )
26892695
{

‎src/providers/grass/qgsgrass.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class QgsGrass
4747
*/
4848
struct Exception : public std::runtime_error
4949
{
50-
//Exception( const std::string &msg ) : std::runtime_error( msg ) {}
51-
Exception( const QString &msg ) : std::runtime_error( msg.toUtf8().constData() ) {}
50+
//Exception( const std::string &msg ) : std::runtime_error( msg ) {}
51+
Exception( const QString &msg ) : std::runtime_error( msg.toUtf8().constData() ) {}
5252
};
5353

5454
//! Get info about the mode
@@ -179,7 +179,7 @@ class QgsGrass
179179

180180
// ! Get info string from qgis.g.info module
181181
static GRASS_EXPORT QString getInfo( QString info, QString gisdbase,
182-
QString location, QString mapset = 0, QString map = 0, MapType type = None, double x = 0, double y = 0 );
182+
QString location, QString mapset = "", QString map = "", MapType type = None, double x = 0.0, double y = 0.0 );
183183

184184
// ! Get location projection
185185
static GRASS_EXPORT QgsCoordinateReferenceSystem crs( QString gisdbase, QString location );
@@ -199,7 +199,7 @@ class QgsGrass
199199
static GRASS_EXPORT QString versionString();
200200

201201
// set environment variable
202-
static GRASS_EXPORT void putEnv (QString name, QString value);
202+
static GRASS_EXPORT void putEnv( QString name, QString value );
203203

204204
#if defined(WIN32)
205205
static GRASS_EXPORT QString shortPath( const QString &path );

‎src/providers/wms/qgswmsprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ QgsWmsProvider::QgsWmsProvider( QString const &uri )
7676
, cachedViewExtent( 0 )
7777
, mCoordinateTransform( 0 )
7878
, extentDirty( true )
79-
, mGetFeatureInfoUrlBase( 0 )
79+
, mGetFeatureInfoUrlBase( "" )
8080
, mLayerCount( -1 )
8181
, mTileReqNo( 0 )
8282
, mCacheHits( 0 )

0 commit comments

Comments
 (0)
Please sign in to comment.