Skip to content

Commit a155c2c

Browse files
committed
fix build with Qt 4.6 and some warnings
1 parent f723398 commit a155c2c

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/core/qgsdataitem.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,10 @@ bool QgsDataItem::equal( const QgsDataItem *other )
263263
// ---------------------------------------------------------------------
264264

265265
QgsLayerItem::QgsLayerItem( QgsDataItem* parent, QString name, QString path, QString uri, LayerType layerType, QString providerKey )
266-
: QgsDataItem( Layer, parent, name, path ), mUri( uri ), mLayerType( layerType ),
267-
mProviderKey( providerKey )
266+
: QgsDataItem( Layer, parent, name, path )
267+
, mProviderKey( providerKey )
268+
, mUri( uri )
269+
, mLayerType( layerType )
268270
{
269271
switch ( layerType )
270272
{

src/core/qgsdataitem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class CORE_EXPORT QgsDataCollectionItem : public QgsDataItem
183183
{
184184
Q_OBJECT
185185
public:
186-
QgsDataCollectionItem( QgsDataItem* parent, QString name, QString path = 0 );
186+
QgsDataCollectionItem( QgsDataItem* parent, QString name, QString path = QString::null );
187187
~QgsDataCollectionItem();
188188

189189
void setPopulated() { mPopulated = true; }

src/providers/wms/qgswmssourceselect.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555

5656
QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl, bool managerMode, bool embededMode )
5757
: QDialog( parent, fl )
58-
, mCurrentTileset( 0 )
5958
, mManagerMode ( managerMode )
6059
, mEmbededMode( embededMode)
60+
, mCurrentTileset( 0 )
6161
{
6262
setupUi( this );
6363

0 commit comments

Comments
 (0)