ok is spelled OK

qgis · Jul 3, 2017 · 59e9f79 · 59e9f79
1 parent 7306c13
commit 59e9f79
Show file tree

Hide file tree

Showing 79 changed files with 115 additions and 115 deletions.
diff --git a/INSTALL b/INSTALL
@@ -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)
 

diff --git a/NEWS b/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
 

diff --git a/doc/INSTALL.html b/doc/INSTALL.html
@@ -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>

diff --git a/doc/linux.t2t b/doc/linux.t2t
@@ -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)
 

diff --git a/doc/news.html b/doc/news.html
@@ -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

diff --git a/doc/news.t2t b/doc/news.t2t
@@ -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
 

diff --git a/external/astyle/ASBeautifier.cpp b/external/astyle/ASBeautifier.cpp
@@ -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

diff --git a/external/astyle/ASFormatter.cpp b/external/astyle/ASFormatter.cpp
@@ -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
 {

diff --git a/python/analysis/interpolation/DualEdgeTriangulation.sip b/python/analysis/interpolation/DualEdgeTriangulation.sip
@@ -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

diff --git a/python/core/qgscachedfeatureiterator.sip b/python/core/qgscachedfeatureiterator.sip
@@ -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

diff --git a/python/core/symbology-ng/qgsinvertedpolygonrenderer.sip b/python/core/symbology-ng/qgsinvertedpolygonrenderer.sip
@@ -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
 

diff --git a/python/gui/attributetable/qgsdualview.sip b/python/gui/attributetable/qgsdualview.sip
@@ -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

diff --git a/python/gui/symbology-ng/qgsrendererwidget.sip b/python/gui/symbology-ng/qgsrendererwidget.sip
@@ -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

diff --git a/src/analysis/interpolation/DualEdgeTriangulation.h b/src/analysis/interpolation/DualEdgeTriangulation.h
@@ -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 );

diff --git a/src/app/dwg/libdxfrw/drw_entities.cpp b/src/app/dwg/libdxfrw/drw_entities.cpp
@@ -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 );

diff --git a/src/app/dwg/libdxfrw/intern/dxfreader.cpp b/src/app/dwg/libdxfrw/intern/dxfreader.cpp
@@ -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

diff --git a/src/app/dwg/libdxfrw/intern/dxfwriter.cpp b/src/app/dwg/libdxfrw/intern/dxfwriter.cpp
@@ -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

diff --git a/src/app/dwg/libdxfrw/libdwgr.h b/src/app/dwg/libdxfrw/libdwgr.h
@@ -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;}

diff --git a/src/app/pluginmanager/qgspluginsortfilterproxymodel.cpp b/src/app/pluginmanager/qgspluginsortfilterproxymodel.cpp
@@ -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;
   }
 

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -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
       */

diff --git a/src/app/qgsfieldcalculator.h b/src/app/qgsfieldcalculator.h
@@ -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();
 

diff --git a/src/app/qgsrastercalcdialog.h b/src/app/qgsrastercalcdialog.h
@@ -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

diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -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();

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -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();

diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp
@@ -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

diff --git a/src/core/composer/qgscomposeritem.cpp b/src/core/composer/qgscomposeritem.cpp
@@ -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;
   }
 

diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -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 );

diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -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 )
   {

diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -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 );
 

diff --git a/src/core/processing/qgsprocessingmodelalgorithm.cpp b/src/core/processing/qgsprocessingmodelalgorithm.cpp
@@ -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;
 }

diff --git a/src/core/qgscachedfeatureiterator.h b/src/core/qgscachedfeatureiterator.h
@@ -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 )
      */