Skip to content

Commit

Permalink
indentation update
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jan 9, 2015
1 parent abb2510 commit 73a2858
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion python/gui/qgsscalewidget.sip
Expand Up @@ -11,7 +11,7 @@ class QgsScaleWidget : QWidget
public:
QgsScaleWidget( QWidget* parent = 0 );
~QgsScaleWidget();

//! shows a button to set the scale to the current scale of the map canvas next to the combobox
//! @note the map canvas must be defined to show the button
void setShowCurrentScaleButton( bool showCurrentScaleButton );
Expand Down
6 changes: 3 additions & 3 deletions src/app/qgsoptions.cpp
Expand Up @@ -1452,14 +1452,14 @@ void QgsOptions::on_mBoldGroupBoxTitleChkBx_clicked( bool chkd )
mStyleSheetBuilder->buildStyleSheet( mStyleSheetNewOpts );
}

void QgsOptions::on_leProjectGlobalCrs_crsChanged(QgsCoordinateReferenceSystem crs)
void QgsOptions::on_leProjectGlobalCrs_crsChanged( QgsCoordinateReferenceSystem crs )
{
mDefaultCrs = crs;
}

void QgsOptions::on_leLayerGlobalCrs_crsChanged(QgsCoordinateReferenceSystem crs)
void QgsOptions::on_leLayerGlobalCrs_crsChanged( QgsCoordinateReferenceSystem crs )
{
mLayerDefaultCrs = crs;
mLayerDefaultCrs = crs;
}

void QgsOptions::on_lstGdalDrivers_itemDoubleClicked( QTreeWidgetItem * item, int column )
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsoptions.h
Expand Up @@ -64,9 +64,9 @@ class APP_EXPORT QgsOptions : public QgsOptionsDialogBase, private Ui::QgsOption
void on_pbnTemplateFolderBrowse_pressed();
void on_pbnTemplateFolderReset_pressed();
//! Slot called when user chooses to change the project wide projection.
void on_leProjectGlobalCrs_crsChanged(QgsCoordinateReferenceSystem crs);
void on_leProjectGlobalCrs_crsChanged( QgsCoordinateReferenceSystem crs );
//! Slot called when user chooses to change the default 'on the fly' projection.
void on_leLayerGlobalCrs_crsChanged(QgsCoordinateReferenceSystem crs);
void on_leLayerGlobalCrs_crsChanged( QgsCoordinateReferenceSystem crs );
void on_lstGdalDrivers_itemDoubleClicked( QTreeWidgetItem * item, int column );
void on_pbnEditCreateOptions_pressed();
void on_pbnEditPyramidsOptions_pressed();
Expand Down
2 changes: 1 addition & 1 deletion src/customwidgets/qgiscustomwidgets.cpp
Expand Up @@ -62,7 +62,7 @@ QList<QDesignerCustomWidgetInterface*> QgisCustomWidgets::customWidgets() const
}

#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( customwidgetsplugin, QgisCustomWidgets )
Q_EXPORT_PLUGIN2( customwidgetsplugin, QgisCustomWidgets )
#endif


2 changes: 1 addition & 1 deletion src/customwidgets/qgiscustomwidgets.h
Expand Up @@ -25,7 +25,7 @@ class QgisCustomWidgets : public QObject, public QDesignerCustomWidgetCollection
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.qgis.CustomWidgets")
Q_PLUGIN_METADATA( IID "org.qgis.CustomWidgets" )
#endif
Q_INTERFACES( QDesignerCustomWidgetCollectionInterface )

Expand Down
18 changes: 9 additions & 9 deletions src/gui/qgsscalewidget.h
Expand Up @@ -34,36 +34,36 @@ class GUI_EXPORT QgsScaleWidget : public QWidget
Q_PROPERTY( bool showCurrentScaleButton READ showCurrentScaleButton WRITE setShowCurrentScaleButton )

public:
explicit QgsScaleWidget(QWidget *parent = 0);
explicit QgsScaleWidget( QWidget *parent = 0 );

virtual ~QgsScaleWidget();

//! shows a button to set the scale to the current scale of the map canvas next to the combobox
//! @note the map canvas must be defined to show the button
void setShowCurrentScaleButton( bool showCurrentScaleButton );
bool showCurrentScaleButton(){ return mShowCurrentScaleButton;}
bool showCurrentScaleButton() { return mShowCurrentScaleButton;}

//! set the map canvas associated to the current button
void setMapCanvas( QgsMapCanvas* canvas );

//! Function to read the selected scale as text
QString scaleString(){return mScaleComboBox->scaleString();}
QString scaleString() { return mScaleComboBox->scaleString(); }
//! Function to set the selected scale from text
bool setScaleString( QString scaleTxt ){return mScaleComboBox->setScaleString(scaleTxt);}
bool setScaleString( QString scaleTxt ) { return mScaleComboBox->setScaleString( scaleTxt ); }
//! Function to read the selected scale as double
double scale(){return mScaleComboBox->scale();}
double scale() { return mScaleComboBox->scale();}
//! Function to set the selected scale from double
void setScale( double scale ){return mScaleComboBox->setScale(scale);}
void setScale( double scale ) { return mScaleComboBox->setScale( scale ); }

//! Helper function to convert a double to scale string
// Performs rounding, so an exact representation is not to
// be expected.
static QString toString( double scale ){return QgsScaleComboBox::toString(scale);}
static QString toString( double scale ) { return QgsScaleComboBox::toString( scale ); }
//! Helper function to convert a scale string to double
static double toDouble( QString scaleString, bool *ok = NULL ){return QgsScaleComboBox::toDouble(scaleString, ok);}
static double toDouble( QString scaleString, bool *ok = 0 ) { return QgsScaleComboBox::toDouble( scaleString, ok ); }

public slots:
void updateScales( const QStringList &scales = QStringList() ){return mScaleComboBox->updateScales(scales);}
void updateScales( const QStringList &scales = QStringList() ) { return mScaleComboBox->updateScales( scales ); }

//! assign the current scale from the map canvas
void setScaleFromCanvas();
Expand Down

0 comments on commit 73a2858

Please sign in to comment.