Skip to content

Commit

Permalink
fix build with Qt 4.6 and some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed May 23, 2011
1 parent f723398 commit a155c2c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions src/core/qgsdataitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,10 @@ bool QgsDataItem::equal( const QgsDataItem *other )
// ---------------------------------------------------------------------

QgsLayerItem::QgsLayerItem( QgsDataItem* parent, QString name, QString path, QString uri, LayerType layerType, QString providerKey )
: QgsDataItem( Layer, parent, name, path ), mUri( uri ), mLayerType( layerType ),
mProviderKey( providerKey )
: QgsDataItem( Layer, parent, name, path )
, mProviderKey( providerKey )
, mUri( uri )
, mLayerType( layerType )
{
switch ( layerType )
{
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsdataitem.h
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class CORE_EXPORT QgsDataCollectionItem : public QgsDataItem
{
Q_OBJECT
public:
QgsDataCollectionItem( QgsDataItem* parent, QString name, QString path = 0 );
QgsDataCollectionItem( QgsDataItem* parent, QString name, QString path = QString::null );
~QgsDataCollectionItem();

void setPopulated() { mPopulated = true; }
Expand Down
2 changes: 1 addition & 1 deletion src/providers/wms/qgswmssourceselect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@

QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl, bool managerMode, bool embededMode )
: QDialog( parent, fl )
, mCurrentTileset( 0 )
, mManagerMode ( managerMode )
, mEmbededMode( embededMode)
, mCurrentTileset( 0 )
{
setupUi( this );

Expand Down

0 comments on commit a155c2c

Please sign in to comment.