Skip to content
Permalink
Browse files

ok is spelled OK

  • Loading branch information
DelazJ authored and 3nids committed Jul 2, 2017
1 parent 7306c13 commit 59e9f796585e69aace335fed94d7bbd5264738e8
Showing with 115 additions and 115 deletions.
  1. +1 −1 INSTALL
  2. +1 −1 NEWS
  3. +1 −1 doc/INSTALL.html
  4. +1 −1 doc/linux.t2t
  5. +1 −1 doc/news.html
  6. +1 −1 doc/news.t2t
  7. +2 −2 external/astyle/ASBeautifier.cpp
  8. +1 −1 external/astyle/ASFormatter.cpp
  9. +1 −1 python/analysis/interpolation/DualEdgeTriangulation.sip
  10. +5 −5 python/core/qgscachedfeatureiterator.sip
  11. +1 −1 python/core/symbology-ng/qgsinvertedpolygonrenderer.sip
  12. +1 −1 python/gui/attributetable/qgsdualview.sip
  13. +1 −1 python/gui/symbology-ng/qgsrendererwidget.sip
  14. +1 −1 src/analysis/interpolation/DualEdgeTriangulation.h
  15. +3 −3 src/app/dwg/libdxfrw/drw_entities.cpp
  16. +1 −1 src/app/dwg/libdxfrw/intern/dxfreader.cpp
  17. +1 −1 src/app/dwg/libdxfrw/intern/dxfwriter.cpp
  18. +1 −1 src/app/dwg/libdxfrw/libdwgr.h
  19. +1 −1 src/app/pluginmanager/qgspluginsortfilterproxymodel.cpp
  20. +1 −1 src/app/qgisapp.h
  21. +1 −1 src/app/qgsfieldcalculator.h
  22. +1 −1 src/app/qgsrastercalcdialog.h
  23. +1 −1 src/app/qgsrasterlayerproperties.cpp
  24. +4 −4 src/app/qgsvectorlayerproperties.cpp
  25. +1 −1 src/core/composer/qgscomposerhtml.cpp
  26. +1 −1 src/core/composer/qgscomposeritem.cpp
  27. +1 −1 src/core/composer/qgscomposition.cpp
  28. +1 −1 src/core/expression/qgsexpressionfunction.cpp
  29. +1 −1 src/core/layertree/qgslayertreemodellegendnode.cpp
  30. +1 −1 src/core/processing/qgsprocessingmodelalgorithm.cpp
  31. +5 −5 src/core/qgscachedfeatureiterator.h
  32. +1 −1 src/core/qgscolorramp.cpp
  33. +2 −2 src/core/qgsproject.cpp
  34. +2 −2 src/core/qgsproviderregistry.cpp
  35. +1 −1 src/core/raster/qgsrasterdrawer.cpp
  36. +3 −3 src/core/raster/qgsrasterpipe.cpp
  37. +2 −2 src/core/simplify/effectivearea.cpp
  38. +1 −1 src/core/symbology-ng/qgscptcityarchive.cpp
  39. +1 −1 src/core/symbology-ng/qgsgraduatedsymbolrenderer.h
  40. +1 −1 src/core/symbology-ng/qgsinvertedpolygonrenderer.h
  41. +1 −1 src/gui/attributetable/qgsdualview.h
  42. +1 −1 src/gui/editorwidgets/qgsrelationreferencewidget.cpp
  43. +2 −2 src/gui/qgsattributeform.cpp
  44. +1 −1 src/gui/qgsmapcanvas.cpp
  45. +2 −2 src/gui/qgsmaplayerstylemanagerwidget.cpp
  46. +1 −1 src/gui/symbology-ng/qgsrendererwidget.h
  47. +1 −1 src/plugins/evis/databaseconnection/evisdatabaselayerfieldselectiongui.cpp
  48. +1 −1 src/plugins/georeferencer/qgsgcpcanvasitem.cpp
  49. +1 −1 src/plugins/grass/qgsgrassutils.cpp
  50. +1 −1 src/plugins/grass/qtermwidget/Session.cpp
  51. +1 −1 src/providers/arcgisrest/qgsafsshareddata.cpp
  52. +1 −1 src/providers/arcgisrest/qgsarcgisrestutils.cpp
  53. +2 −2 src/providers/delimitedtext/qgsdelimitedtextfile.cpp
  54. +1 −1 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  55. +1 −1 src/providers/grass/qgsgrass.cpp
  56. +3 −3 src/providers/grass/qgsgrassimport.cpp
  57. +1 −1 src/providers/grass/qgsgrassrasterprovider.h
  58. +1 −1 src/providers/ogr/qgsogrprovider.cpp
  59. +1 −1 src/providers/oracle/ocispatial/qsql_ocispatial.cpp
  60. +1 −1 src/providers/spatialite/qgsspatialiteconnection.cpp
  61. +1 −1 src/providers/wcs/qgswcsprovider.cpp
  62. +1 −1 src/providers/wfs/qgswfsrequest.cpp
  63. +1 −1 src/providers/wms/qgswmscapabilities.cpp
  64. +1 −1 src/providers/wms/qgswmsprovider.cpp
  65. +2 −2 src/server/services/wms/qgswmsrenderer.cpp
  66. +1 −1 src/ui/qgsoptionsbase.ui
  67. +1 −1 tests/qt_modeltest/modeltest.cpp
  68. +1 −1 tests/src/core/testqgscoordinatereferencesystem.cpp
  69. +2 −2 tests/src/core/testqgsproperty.cpp
  70. +1 −1 tests/src/core/testqgsstringutils.cpp
  71. +1 −1 tests/src/core/testqgsvectorfilewriter.cpp
  72. +6 −6 tests/src/providers/grass/testqgsgrassprovider.cpp
  73. +3 −3 tests/src/python/test_layer_dependencies.py
  74. +4 −4 tests/src/python/test_provider_virtual.py
  75. +1 −1 tests/src/python/test_qgis_local_server.py
  76. +1 −1 tests/src/python/test_qgsgeometry.py
  77. +1 −1 tests/src/python/test_qgsmapcanvas.py
  78. +1 −1 tests/src/python/test_qgspallabeling_base.py
  79. +1 −1 tests/src/python/test_qgsrenderer.py
@@ -383,7 +383,7 @@ tools.

cmake ..

If everything went ok you can finally start to compile. (As usual append a -jX
If everything went OK you can finally start to compile. (As usual append a -jX
where X is the number of available cores option to make to speed up your build
process)

2 NEWS
@@ -2128,7 +2128,7 @@ not need src parameter (this can be obtained from painter->device()).
More work on print system - still only works well on A4 landscape.

Northarrow and copyright label plugins now hidethemselves before emitting
update signals when ok is pressed.
update signals when OK is pressed.

QGSMapCanvas can now return the (last calculated) scale using getScale

@@ -621,7 +621,7 @@ <H3>3.9.1. Install build dependencies</H3>
</PRE></div>

<P>
If everything went ok you can finally start to compile. (As usual append a -jX
If everything went OK you can finally start to compile. (As usual append a -jX
where X is the number of available cores option to make to speed up your build
process)
</P>
@@ -271,7 +271,7 @@ tools.
cmake ..
```

If everything went ok you can finally start to compile. (As usual append a -jX
If everything went OK you can finally start to compile. (As usual append a -jX
where X is the number of available cores option to make to speed up your build
process)

@@ -2350,7 +2350,7 @@ <H1>28. 0.5</H1>
</P>
<P>
Northarrow and copyright label plugins now hidethemselves before emitting
update signals when ok is pressed.
update signals when OK is pressed.
</P>
<P>
QGSMapCanvas can now return the (last calculated) scale using getScale
@@ -2081,7 +2081,7 @@ not need src parameter (this can be obtained from painter->device()).
More work on print system - still only works well on A4 landscape.

Northarrow and copyright label plugins now hidethemselves before emitting
update signals when ok is pressed.
update signals when OK is pressed.

QGSMapCanvas can now return the (last calculated) scale using getScale

@@ -131,7 +131,7 @@ ASBeautifier::ASBeautifier(const ASBeautifier& other) : ASBase(other)
*preprocIndentStack = *other.preprocIndentStack;

// Copy the pointers to vectors.
// This is ok because the original ASBeautifier object
// This is OK because the original ASBeautifier object
// is not deleted until end of job.
beautifierFileType = other.beautifierFileType;
headers = other.headers;
@@ -2611,7 +2611,7 @@ void ASBeautifier::parseCurrentLine(const string& line)
}
isInComment = false;
i++;
blockCommentNoIndent = false; // ok to indent next comment
blockCommentNoIndent = false; // OK to indent next comment
continue;
}
// treat indented preprocessor lines as a line comment
@@ -5291,7 +5291,7 @@ void ASFormatter::convertTabToSpaces()
}

/**
* is it ok to break this block?
* is it OK to break this block?
*/
bool ASFormatter::isOkToBreakBlock(BraceType braceType) const
{
@@ -157,7 +157,7 @@ Returns a value list with the numbers of the four points, which would be affecte
protected:
unsigned int insertEdge( int dual, int next, int point, bool mbreak, bool forced );
%Docstring
Inserts an edge and makes sure, everything is ok with the storage of the edge. The number of the HalfEdge is returned
Inserts an edge and makes sure, everything is OK with the storage of the edge. The number of the HalfEdge is returned
%End
int insertForcedSegment( int p1, int p2, bool breakline );
%Docstring
@@ -33,7 +33,7 @@ class QgsCachedFeatureIterator : QgsAbstractFeatureIterator
%Docstring
Rewind to the beginning of the iterator

:return: bool true if the operation was ok
:return: bool true if the operation was OK
:rtype: bool
%End

@@ -52,7 +52,7 @@ class QgsCachedFeatureIterator : QgsAbstractFeatureIterator
Implementation for fetching a feature.

\param f Will write to this feature
:return: bool true if the operation was ok
:return: bool true if the operation was OK

.. seealso:: bool getFeature( QgsFeature& f )
:rtype: bool
@@ -63,7 +63,7 @@ class QgsCachedFeatureIterator : QgsAbstractFeatureIterator
We have a local special iterator for FilterFids, no need to run the generic.

\param f Will write to this feature
:return: bool true if the operation was ok
:return: bool true if the operation was OK
:rtype: bool
%End

@@ -93,7 +93,7 @@ class QgsCachedFeatureWriterIterator : QgsAbstractFeatureIterator
%Docstring
Rewind to the beginning of the iterator

:return: bool true if the operation was ok
:return: bool true if the operation was OK
:rtype: bool
%End

@@ -112,7 +112,7 @@ class QgsCachedFeatureWriterIterator : QgsAbstractFeatureIterator
Implementation for fetching a feature.

\param f Will write to this feature
:return: bool true if the operation was ok
:return: bool true if the operation was OK

.. seealso:: bool getFeature( QgsFeature& f )
:rtype: bool
@@ -53,7 +53,7 @@ Direct copies are forbidden. Use clone() instead.
\param layer the symbol layer to render, if that makes sense
\param selected whether this feature has been selected (this will add decorations)
\param drawVertexMarker whether this feature has vertex markers (in edit mode usually)
:return: true if the rendering was ok
:return: true if the rendering was OK
:rtype: bool
%End

@@ -190,7 +190,7 @@ class QgsDualView : QStackedWidget
%Docstring
saveEditChanges

:return: true if the saving was ok. false is possible due to connected
:return: true if the saving was OK. false is possible due to connected
validation logic.
:rtype: bool
%End
@@ -18,7 +18,7 @@ WORKFLOW:
- find out which widget to use
- instantiate it and set in stacked widget
- on any change of renderer type, create some default (dummy?) version and change the stacked widget
- when clicked ok/apply, get the renderer from active widget and clone it for the layer
- when clicked OK/Apply, get the renderer from active widget and clone it for the layer
%End

%TypeHeaderCode
@@ -133,7 +133,7 @@ class ANALYSIS_EXPORT DualEdgeTriangulation: public Triangulation
QColor mBreakEdgeColor;
//! Pointer to the decorator using this triangulation. It it is used directly, mDecorator equals this
Triangulation *mDecorator = nullptr;
//! Inserts an edge and makes sure, everything is ok with the storage of the edge. The number of the HalfEdge is returned
//! Inserts an edge and makes sure, everything is OK with the storage of the edge. The number of the HalfEdge is returned
unsigned int insertEdge( int dual, int next, int point, bool mbreak, bool forced );
//! Inserts a forced segment between the points with the numbers p1 and p2 into the triangulation and returns the number of a HalfEdge belonging to this forced edge or -100 in case of failure
int insertForcedSegment( int p1, int p2, bool breakline );
@@ -376,7 +376,7 @@ bool DRW_Entity::parseDwg( DRW::Version version, dwgBuffer *buf, dwgBuffer *strB
QgsDebugMsg( QString( "haveNextLinks (forced): %1" ).arg( haveNextLinks ) );
}
//ENC color
color = buf->getEnColor( version, color24, transparency ); //BS or CMC //ok for R14 or negate
color = buf->getEnColor( version, color24, transparency ); //BS or CMC //OK for R14 or negate
ltypeScale = buf->getBitDouble(); //BD
QgsDebugMsg( QString( " entity color:%1 ltScale:%2" ).arg( color ).arg( ltypeScale ) );

@@ -2244,7 +2244,7 @@ bool DRW_Hatch::parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs )

QgsDebugMsg( "***************************** parsing hatch *********************************************" );

//Gradient data, RLZ: is ok or if grad > 0 continue read ?
//Gradient data, RLZ: is OK or if grad > 0 continue read ?
if ( version > DRW::AC1015 ) //2004+
{
dint32 isGradient = buf->getBitLong();
@@ -2675,7 +2675,7 @@ bool DRW_Spline::parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs )
else
{
QgsDebugMsg( QString( "spline, unknown scenario %1" ).arg( scenario ) );
return false; //RLZ: from doc only 1 or 2 are ok ?
return false; //RLZ: from doc only 1 or 2 are OK ?
}

RESERVE( knotslist, nknots );
@@ -83,7 +83,7 @@ bool dxfReader::readRec( int *codeData )
else if ( code == 1071 ) //TODO this is an int 32b
readInt32();
else if ( skip )
//skip safely this dxf entry ( ok for ascii dxf)
//skip safely this dxf entry ( OK for ascii dxf)
readString();
else
//break in binary files because the conduct is unpredictable
@@ -82,7 +82,7 @@
else if (code == 1071) //TODO this is an int 32b
readInt32();
else if (skip)
//skip safely this dxf entry ( ok for ascii dxf)
//skip safely this dxf entry ( OK for ascii dxf)
readString();
else
//break in binary files because the conduct is unpredictable
@@ -27,7 +27,7 @@ class dwgR
public:
explicit dwgR( const char *name );
~dwgR();
//read: return true if all ok
//read: return true if all OK
bool read( DRW_Interface *interface_, bool ext );
bool getPreview();
DRW::Version getVersion() {return version;}
@@ -61,7 +61,7 @@ bool QgsPluginSortFilterProxyModel::filterByStatus( QModelIndex &index ) const
if ( mAcceptedStatuses.contains( QStringLiteral( "invalid" ) )
&& sourceModel()->data( index, PLUGIN_ERROR_ROLE ).toString().isEmpty() )
{
// Don't accept if the "invalid" filter is set and the plugin is ok
// Don't accept if the "invalid" filter is set and the plugin is OK
return false;
}

@@ -188,7 +188,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow

/** Open a raster or vector file; ignore other files.
Used to process a commandline argument, FileOpen or Drop event.
Set interactive to true if it is ok to ask the user for information (mostly for
Set interactive to true if it is OK to ask the user for information (mostly for
when a vector layer has sublayers and we want to ask which sublayers to use).
\returns true if the file is successfully opened
*/
@@ -45,7 +45,7 @@ class APP_EXPORT QgsFieldCalculator: public QDialog, private Ui::QgsFieldCalcula
void on_mButtonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }

private slots:
//! Sets the ok button enabled / disabled
//! Sets the OK button enabled / disabled
void setOkButtonState();
void setPrecisionMinMax();

@@ -52,7 +52,7 @@ class APP_EXPORT QgsRasterCalcDialog: public QDialog, private Ui::QgsRasterCalcD
void on_mCurrentLayerExtentButton_clicked();
void on_mExpressionTextEdit_textChanged();
void on_mOutputLayerLineEdit_textChanged( const QString &text );
//! Enables ok button if calculator expression is valid and output file path exists
//! Enables OK button if calculator expression is valid and output file path exists
void setAcceptButtonState();

//calculator buttons
@@ -1708,7 +1708,7 @@ void QgsRasterLayerProperties::loadDefaultStyle_clicked()
{
bool defaultLoadedFlag = false;
QString myMessage = mRasterLayer->loadDefaultStyle( defaultLoadedFlag );
//reset if the default style was loaded ok only
//reset if the default style was loaded OK only
if ( defaultLoadedFlag )
{
syncToLayer();
@@ -804,10 +804,10 @@ void QgsVectorLayerProperties::loadDefaultStyle_clicked()

QString myMessage = mLayer->loadNamedStyle( mLayer->styleURI(), defaultLoadedFlag, true );
// QString myMessage = layer->loadDefaultStyle( defaultLoadedFlag );
//reset if the default style was loaded ok only
//reset if the default style was loaded OK only
if ( defaultLoadedFlag )
{
// all worked ok so no need to inform user
// all worked OK so no need to inform user
syncToLayer();
}
else
@@ -881,7 +881,7 @@ void QgsVectorLayerProperties::loadStyle_clicked()
{
myMessage = mLayer->loadNamedStyle( myFileName, defaultLoadedFlag );
}
//reset if the default style was loaded ok only
//reset if the default style was loaded OK only
if ( defaultLoadedFlag )
{
syncToLayer();
@@ -999,7 +999,7 @@ void QgsVectorLayerProperties::saveStyleAs( StyleType styleType )
myMessage = mLayer->saveNamedStyle( myOutputFileName, defaultLoadedFlag );
}

//reset if the default style was loaded ok only
//reset if the default style was loaded OK only
if ( defaultLoadedFlag )
{
syncToLayer();
@@ -408,7 +408,7 @@ double QgsComposerHtml::findNearbyPageBreak( double yPos )
std::sort( candidates.begin(), candidates.end(), candidateSort );
//first candidate is now the largest row with smallest number of changes

//ok, now take the mid point of the best candidate position
//OK, now take the mid point of the best candidate position
//we do this so that the spacing between text lines is likely to be split in half
//otherwise the html will be broken immediately above a line of text, which
//looks a little messy
@@ -835,7 +835,7 @@ bool QgsComposerItem::shouldDrawItem() const
{
if ( ( mComposition && mComposition->plotStyle() == QgsComposition::Preview ) || !mComposition )
{
//preview mode or no composition, so ok to draw item
//preview mode or no composition, so OK to draw item
return true;
}

@@ -1600,7 +1600,7 @@ void QgsComposition::selectNextByZOrder( ZValueDirection direction )
return;
}

//ok, found a good target item
//OK, found a good target item
setAllDeselected();
selectedItem->setSelected( true );
emit selectedItemChanged( selectedItem );
@@ -1711,7 +1711,7 @@ static QVariant fcnSegmentsToLines( const QVariantList &values, const QgsExpress

QList< QgsLineString * > linesToProcess = QgsGeometryUtils::extractLineStrings( geom.geometry() );

//ok, now we have a complete list of segmentized lines from the geometry
//OK, now we have a complete list of segmentized lines from the geometry
QgsMultiLineString *ml = new QgsMultiLineString();
Q_FOREACH ( QgsLineString *line, linesToProcess )
{
@@ -60,7 +60,7 @@ QgsLayerTreeModelLegendNode::ItemMetrics QgsLayerTreeModelLegendNode::draw( cons

double textHeight = settings.fontHeightCharacterMM( symbolLabelFont, QChar( '0' ) );
// itemHeight here is not really item height, it is only for symbol
// vertical alignment purpose, i.e. ok take single line height
// vertical alignment purpose, i.e. OK take single line height
// if there are more lines, thos run under the symbol
double itemHeight = qMax( static_cast< double >( settings.symbolSize().height() ), textHeight );

@@ -535,7 +535,7 @@ QVariantMap QgsProcessingModelAlgorithm::processAlgorithm( const QVariantMap &pa
feedback->pushDebugInfo( QObject::tr( "OK. Execution took %1 s (%2 outputs)." ).arg( childTime.elapsed() / 1000.0 ).arg( results.count() ) );
}
}
feedback->pushDebugInfo( QObject::tr( "Model processed ok. Executed %1 algorithms total in %2 s." ).arg( executed.count() ).arg( totalTime.elapsed() / 1000.0 ) );
feedback->pushDebugInfo( QObject::tr( "Model processed OK. Executed %1 algorithms total in %2 s." ).arg( executed.count() ).arg( totalTime.elapsed() / 1000.0 ) );

return finalResults;
}
@@ -42,7 +42,7 @@ class CORE_EXPORT QgsCachedFeatureIterator : public QgsAbstractFeatureIterator
/**
* Rewind to the beginning of the iterator
*
* \returns bool true if the operation was ok
* \returns bool true if the operation was OK
*/
virtual bool rewind() override;

@@ -60,7 +60,7 @@ class CORE_EXPORT QgsCachedFeatureIterator : public QgsAbstractFeatureIterator
* Implementation for fetching a feature.
*
* \param f Will write to this feature
* \returns bool true if the operation was ok
* \returns bool true if the operation was OK
*
* \see bool getFeature( QgsFeature& f )
*/
@@ -70,7 +70,7 @@ class CORE_EXPORT QgsCachedFeatureIterator : public QgsAbstractFeatureIterator
* We have a local special iterator for FilterFids, no need to run the generic.
*
* \param f Will write to this feature
* \returns bool true if the operation was ok
* \returns bool true if the operation was OK
*/
virtual bool nextFeatureFilterFids( QgsFeature &f ) override { return fetchFeature( f ); }

@@ -102,7 +102,7 @@ class CORE_EXPORT QgsCachedFeatureWriterIterator : public QgsAbstractFeatureIter
/**
* Rewind to the beginning of the iterator
*
* \returns bool true if the operation was ok
* \returns bool true if the operation was OK
*/
virtual bool rewind() override;

@@ -119,7 +119,7 @@ class CORE_EXPORT QgsCachedFeatureWriterIterator : public QgsAbstractFeatureIter
* Implementation for fetching a feature.
*
* \param f Will write to this feature
* \returns bool true if the operation was ok
* \returns bool true if the operation was OK
*
* \see bool getFeature( QgsFeature& f )
*/

0 comments on commit 59e9f79

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