Skip to content
Permalink
Browse files
follow up r13213
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13215 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Mar 31, 2010
1 parent 878aadc commit c6b5341edf6007a2a31d312cf71511c61cb5ef88
@@ -45,27 +45,27 @@ CUSTOM_CRS_VALIDATION QgsCoordinateReferenceSystem::mCustomSrsValidation = NULL;
//--------------------------

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 );
}


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 );
@@ -45,10 +45,10 @@ QgsHttpTransaction::QgsHttpTransaction( QString uri,
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();
@@ -44,7 +44,7 @@ QgsMessageOutput::~QgsMessageOutput()
// QgsMessageOutputConsole

QgsMessageOutputConsole::QgsMessageOutputConsole()
: mMessage( NULL )
: mMessage( "" )
{
}

@@ -92,8 +92,8 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
};

/** 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 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
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;
@@ -66,7 +66,7 @@ class QgsGrassMapcalc: public QMainWindow, private Ui::QgsGrassMapcalcBase,
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 @@ class QgsGrassMapcalcFunction

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 @@ class QgsGrassMapcalcObject: public QGraphicsRectItem, public QgsGrassMapcalcIte
~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 );
@@ -242,7 +242,7 @@ QgsGrassModule::QgsGrassModule( QgsGrassTools *tools, QString moduleName, QgisIn
QFile manFile( manPath );
if ( manFile.exists() )
{
mManualTextBrowser->setOpenExternalLinks ( true );
mManualTextBrowser->setOpenExternalLinks( true );
mManualTextBrowser->setSource( QUrl::fromLocalFile( manPath ) );
}
else
@@ -784,7 +784,8 @@ QStringList QgsGrassModuleStandardOptions::output( int type )
if ( opt->outputType() == type )
{
QString out = opt->value();
if ( !out.isEmpty() ) {
if ( !out.isEmpty() )
{
list.append( out );
}
}
@@ -1575,7 +1576,7 @@ void QgsGrassModule::viewOutput()

//mIface->addRasterLayer( uri, map );
mIface->addRasterLayer( uri, map, "grassraster", QStringList(), QStringList(),
QString(), QString() );
QString(), QString() );
}
}

@@ -2048,10 +2049,13 @@ QgsGrassModuleInput::QgsGrassModuleInput( QgsGrassModule *module,
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 @@ void QgsGrassModuleGroupBoxItem::adjustTitle()
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() )
{
@@ -47,8 +47,8 @@ class QgsGrass
*/
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 @@ class QgsGrass

// ! 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 @@ class QgsGrass
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 );
@@ -76,7 +76,7 @@ QgsWmsProvider::QgsWmsProvider( QString const &uri )
, cachedViewExtent( 0 )
, mCoordinateTransform( 0 )
, extentDirty( true )
, mGetFeatureInfoUrlBase( 0 )
, mGetFeatureInfoUrlBase( "" )
, mLayerCount( -1 )
, mTileReqNo( 0 )
, mCacheHits( 0 )

0 comments on commit c6b5341

Please sign in to comment.