fix build with Qt 4.6 and some warnings

qgis · May 23, 2011 · a155c2c · a155c2c
1 parent f723398
commit a155c2c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -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 )
   {

diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -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; }

diff --git a/src/providers/wms/qgswmssourceselect.cpp b/src/providers/wms/qgswmssourceselect.cpp
@@ -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 );