Skip to content
Permalink
Browse files

fix merge mistake

  • Loading branch information
etiennesky committed Aug 24, 2012
1 parent c0f7960 commit c836d61e99f7390c0cc1211be50b2eb0bc35f78f
Showing with 11 additions and 11 deletions.
  1. +7 −10 src/gui/qgsrasterlayersaveasdialog.cpp
  2. +4 −1 src/gui/qgsrasterlayersaveasdialog.h
@@ -11,17 +11,14 @@
#include <QSettings>


QgsRasterLayerSaveAsDialog::QgsRasterLayerSaveAsDialog( QgsRasterDataProvider* sourceProvider, const QgsRectangle& currentExtent,
const QgsCoordinateReferenceSystem& layerCrs,
const QgsCoordinateReferenceSystem& currentCrs,
QWidget* parent, Qt::WindowFlags f ):
QgsRasterLayerSaveAsDialog::QgsRasterLayerSaveAsDialog( QgsRasterLayer* rasterLayer,
QgsRasterDataProvider* sourceProvider, const QgsRectangle& currentExtent,
const QgsCoordinateReferenceSystem& layerCrs, const QgsCoordinateReferenceSystem& currentCrs,
QWidget* parent, Qt::WindowFlags f ) :
QDialog( parent, f )
, mRasterLayer( rasterLayer )
, mDataProvider( sourceProvider )
, mCurrentExtent( currentExtent )
, mLayerCrs( layerCrs )
, mCurrentCrs( currentCrs )
, mExtentState( OriginalExtent )
, mRasterLayer( rasterLayer ), mDataProvider( sourceProvider )
, mCurrentExtent( currentExtent ), mLayerCrs( layerCrs )
, mCurrentCrs( currentCrs ), mExtentState( OriginalExtent )
, mResolutionState( OriginalResolution )
{
setupUi( this );
@@ -37,7 +37,10 @@ class GUI_EXPORT QgsRasterLayerSaveAsDialog: public QDialog, private Ui::QgsRast
UserResolution
};

QgsRasterLayerSaveAsDialog( QgsRasterLayer* rasterLayer, QgsRasterDataProvider* sourceProvider, const QgsRectangle& currentExtent, const QgsCoordinateReferenceSystem& layerCrs, const QgsCoordinateReferenceSystem& currentCrs, QWidget* parent = 0, Qt::WindowFlags f = 0 );
QgsRasterLayerSaveAsDialog( QgsRasterLayer* rasterLayer,
QgsRasterDataProvider* sourceProvider, const QgsRectangle& currentExtent,
const QgsCoordinateReferenceSystem& layerCrs, const QgsCoordinateReferenceSystem& currentCrs,
QWidget* parent = 0, Qt::WindowFlags f = 0 );
~QgsRasterLayerSaveAsDialog();

Mode mode() const;

0 comments on commit c836d61

Please sign in to comment.
You can’t perform that action at this time.