Skip to content
Permalink
Browse files
fix typos
  • Loading branch information
jef-n committed May 25, 2015
1 parent 6a6b3b4 commit 98c601d1ba52e76c1fb834ef35d8a5b6dbee5279
@@ -135,7 +135,7 @@ class QGis
static double fromUnitToUnitFactor( QGis::UnitType fromUnit, QGis::UnitType toUnit );

/** Converts a string to a double in a permissive way, eg allowing for incorrect
* numbers of digits between thousand seperators
* numbers of digits between thousand separators
* @param string string to convert
* @param ok will be set to true if conversion was successful
* @returns string converted to double if possible
@@ -145,7 +145,7 @@ class QGis
static double permissiveToDouble( QString string, bool& ok );

/** Converts a string to an integer in a permissive way, eg allowing for incorrect
* numbers of digits between thousand seperators
* numbers of digits between thousand separators
* @param string string to convert
* @param ok will be set to true if conversion was successful
* @returns string converted to int if possible
@@ -90,7 +90,7 @@ class CORE_EXPORT QgsEffectStack : public QgsPaintEffect
*/
bool insertEffect( const int index, QgsPaintEffect* effect );

/** Replaces the effect at a speficied position within the stack.
/** Replaces the effect at a specified position within the stack.
* @param index position of effect to replace
* @param effect QgsPaintEffect to replace with. Ownership of the effect will be
* transferred to the stack object.
@@ -187,14 +187,14 @@ double QGis::fromUnitToUnitFactor( QGis::UnitType fromUnit, QGis::UnitType toUni

double QGis::permissiveToDouble( QString string, bool &ok )
{
//remove any thousands seperators
//remove any thousands separators
string.remove( QLocale::system().groupSeparator() );
return QLocale::system().toDouble( string, &ok );
}

int QGis::permissiveToInt( QString string, bool &ok )
{
//remove any thousands seperators
//remove any thousands separators
string.remove( QLocale::system().groupSeparator() );
return QLocale::system().toInt( string, &ok );
}
@@ -252,7 +252,7 @@ class CORE_EXPORT QGis
static double fromUnitToUnitFactor( QGis::UnitType fromUnit, QGis::UnitType toUnit );

/** Converts a string to a double in a permissive way, eg allowing for incorrect
* numbers of digits between thousand seperators
* numbers of digits between thousand separators
* @param string string to convert
* @param ok will be set to true if conversion was successful
* @returns string converted to double if possible
@@ -262,7 +262,7 @@ class CORE_EXPORT QGis
static double permissiveToDouble( QString string, bool& ok );

/** Converts a string to an integer in a permissive way, eg allowing for incorrect
* numbers of digits between thousand seperators
* numbers of digits between thousand separators
* @param string string to convert
* @param ok will be set to true if conversion was successful
* @returns string converted to int if possible
@@ -834,7 +834,7 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface
*/
static bool geometryRequiresPreparation( const QgsGeometry *geometry, const QgsRenderContext &context, const QgsCoordinateTransform *ct, QgsGeometry *clipGeometry = 0 );

/** Splits a text string to a list of seperate lines, using a specified wrap character.
/** Splits a text string to a list of separate lines, using a specified wrap character.
* The text string will be split on either newline characters or the wrap character.
* @param text text string to split
* @param wrapCharacter additional character to wrap on
@@ -37,7 +37,7 @@ class GUI_EXPORT QgsBlendModeComboBox : public QComboBox
//! Function to set the selected blend mode from QPainter::CompositionMode
void setBlendMode( QPainter::CompositionMode blendMode );
private:
//! Returns a list of grouped blend modes (with seperators)
//! Returns a list of grouped blend modes (with separators)
QStringList blendModesList() const;

//! Used to map blend modes across to their corresponding
@@ -104,14 +104,14 @@ class GUI_EXPORT QgsHistogramWidget : public QWidget, private Ui::QgsHistogramWi
*/
QBrush brush() const { return mBrush; }

/** Sets the graduated ranges associated with the histogram. If set, the ranges will be used to colour the histogram
/** Sets the graduated ranges associated with the histogram. If set, the ranges will be used to color the histogram
* bars and for showing vertical dividers at the histogram breaks.
* @param ranges graduated range list
* @see graduatedRanges
*/
void setGraduatedRanges( const QgsRangeList& ranges );

/** Returns the graduated ranges associated with the histogram. If set, the ranges will be used to colour the histogram
/** Returns the graduated ranges associated with the histogram. If set, the ranges will be used to color the histogram
* bars and for showing vertical dividers at the histogram breaks.
* @returns graduated range list
* @see setGraduatedRanges
@@ -928,7 +928,7 @@ void DL_Dxf::addTextStyle(DL_CreationInterface* creationInterface) {
name,
// flags
getIntValue(70, 0),
// fixed text heigth:
// fixed text height:
getRealValue(40, 0.0),
// width factor:
getRealValue(41, 0.0),
@@ -301,7 +301,7 @@ QString QgsPostgresFeatureIterator::whereClauseRect()
.arg( mConn->majorVersion() < 2 ? "intersects" : "st_intersects" )
.arg( mConn->majorVersion() < 2 ? "curvetoline" : "st_curvetoline" )
.arg( QgsPostgresConn::quotedIdentifier( mSource->mGeometryColumn ) )
.arg( castToPatch ? "::geometry" : "" )
.arg( castToGeometry ? "::geometry" : "" )
.arg( qBox );
}

@@ -84,7 +84,7 @@ void TestQGis::permissiveToDouble()
result = QGis::permissiveToDouble( QString( "a" ), ok );
QVERIFY( !ok );

//messy input (invalid thousand seperator position), should still be converted
//messy input (invalid thousand separator position), should still be converted
ok = false;
result = QGis::permissiveToDouble( QString( "10%0100" ).arg( QLocale::system().groupSeparator() ), ok );
QVERIFY( ok );
@@ -112,7 +112,7 @@ void TestQGis::permissiveToInt()
result = QGis::permissiveToInt( QString( "a" ), ok );
QVERIFY( !ok );

//messy input (invalid thousand seperator position), should still be converted
//messy input (invalid thousand separator position), should still be converted
ok = false;
result = QGis::permissiveToInt( QString( "10%0100" ).arg( QLocale::system().groupSeparator() ), ok );
QVERIFY( ok );
@@ -96,7 +96,7 @@ void TestQgsScaleComboBox::basic()
QCOMPARE( s->scaleString(), QString( "1:%1" ).arg( str ) );
QCOMPARE( s->scale(), ( double ) 1.0 / ( double ) 1000000.0 );

// Testing conversion from number to "1:x,000" with wonky seperators
// Testing conversion from number to "1:x,000" with wonky separators
//(eg four digits between thousands, which should be fixed automatically)
l->setText( "" );
str = QString( "1%010000%01000" ).arg( QLocale::system().groupSeparator() );

0 comments on commit 98c601d

Please sign in to comment.