Skip to content

Commit

Permalink
Ok is spelled OK
Browse files Browse the repository at this point in the history
  • Loading branch information
DelazJ authored and 3nids committed Jul 3, 2017
1 parent 59e9f79 commit ab437cd
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -1526,7 +1526,7 @@ under construction.
in ogr provider
- 2004-12-05 [gsherman] 0.6.0rc2 Fixed bug 1079392 that caused QGIS to crash when a query was entered that
resulted in the layer being created with no records. Additional validation
of the SQL query was added to the query builder. When Ok is clicked on
of the SQL query was added to the query builder. When OK is clicked on
the builder dialog, the query is sent to the database and the result
checked to ensure that it will create a valid PostreSQL layer. Added tr
to a number of strings that weren't prepared for translation in the vector
Expand Down
2 changes: 1 addition & 1 deletion doc/news.html
Original file line number Diff line number Diff line change
Expand Up @@ -1695,7 +1695,7 @@ <H1>27. Version 0.6 'Simon'</H1>
in ogr provider
<LI>2004-12-05 [gsherman] 0.6.0rc2 Fixed bug 1079392 that caused QGIS to crash when a query was entered that
resulted in the layer being created with no records. Additional validation
of the SQL query was added to the query builder. When Ok is clicked on
of the SQL query was added to the query builder. When OK is clicked on
the builder dialog, the query is sent to the database and the result
checked to ensure that it will create a valid PostreSQL layer. Added tr
to a number of strings that weren't prepared for translation in the vector
Expand Down
2 changes: 1 addition & 1 deletion doc/news.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ under construction.
in ogr provider
- 2004-12-05 [gsherman] 0.6.0rc2 Fixed bug 1079392 that caused QGIS to crash when a query was entered that
resulted in the layer being created with no records. Additional validation
of the SQL query was added to the query builder. When Ok is clicked on
of the SQL query was added to the query builder. When OK is clicked on
the builder dialog, the query is sent to the database and the result
checked to ensure that it will create a valid PostreSQL layer. Added tr
to a number of strings that weren't prepared for translation in the vector
Expand Down
28 changes: 14 additions & 14 deletions src/app/dwg/libdxfrw/intern/dwgutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -452,28 +452,28 @@ void dwgCompressor::copyCompBytes21( duint8 *cbuf, duint8 *dbuf, duint32 l, duin
{
case 0:
break;
case 1: //Ok
case 1: //OK
dbuf[dix] = cbuf[six];
break;
case 2: //Ok
case 2: //OK
dbuf[dix++] = cbuf[six + 1];
dbuf[dix] = cbuf[six];
break;
case 3: //Ok
case 3: //OK
dbuf[dix++] = cbuf[six + 2];
dbuf[dix++] = cbuf[six + 1];
dbuf[dix] = cbuf[six];
break;
case 4: //Ok
case 4: //OK
for ( int i = 0; i < 4; i++ ) //RLZ is OK, or are inverse?, OK
dbuf[dix++] = cbuf[six++];
break;
case 5: //Ok
case 5: //OK
dbuf[dix++] = cbuf[six + 4];
for ( int i = 0; i < 4; i++ )
dbuf[dix++] = cbuf[six++];
break;
case 6: //Ok
case 6: //OK
dbuf[dix++] = cbuf[six + 5];
for ( int i = 1; i < 5; i++ )
dbuf[dix++] = cbuf[six + i];
Expand All @@ -486,16 +486,16 @@ void dwgCompressor::copyCompBytes21( duint8 *cbuf, duint8 *dbuf, duint32 l, duin
for ( int i = 1; i < 5; i++ )
dbuf[dix++] = cbuf[six + i];
dbuf[dix] = cbuf[six];
case 8: //Ok
case 8: //OK
for ( int i = 0; i < 8; i++ ) //RLZ 4[0],4[4] or 4[4],4[0]
dbuf[dix++] = cbuf[six++];
break;
case 9: //Ok
case 9: //OK
dbuf[dix++] = cbuf[six + 8];
for ( int i = 0; i < 8; i++ )
dbuf[dix++] = cbuf[six++];
break;
case 10: //Ok
case 10: //OK
dbuf[dix++] = cbuf[six + 9];
for ( int i = 1; i < 9; i++ )
dbuf[dix++] = cbuf[six + i];
Expand All @@ -509,20 +509,20 @@ void dwgCompressor::copyCompBytes21( duint8 *cbuf, duint8 *dbuf, duint32 l, duin
dbuf[dix++] = cbuf[six + i];
dbuf[dix] = cbuf[six];
break;
case 12: //Ok
case 12: //OK
for ( int i = 8; i < 12; i++ )
dbuf[dix++] = cbuf[six + i];
for ( int i = 0; i < 8; i++ )
dbuf[dix++] = cbuf[six++];
break;
case 13: //Ok
case 13: //OK
dbuf[dix++] = cbuf[six + 12];
for ( int i = 8; i < 12; i++ )
dbuf[dix++] = cbuf[six + i];
for ( int i = 0; i < 8; i++ )
dbuf[dix++] = cbuf[six++];
break;
case 14: //Ok
case 14: //OK
dbuf[dix++] = cbuf[six + 13];
for ( int i = 9; i < 13; i++ )
dbuf[dix++] = cbuf[six + i];
Expand All @@ -540,13 +540,13 @@ void dwgCompressor::copyCompBytes21( duint8 *cbuf, duint8 *dbuf, duint32 l, duin
dbuf[dix++] = cbuf[six + i];
dbuf[dix] = cbuf[six];
break;
case 16: //Ok
case 16: //OK
for ( int i = 8; i < 16; i++ )
dbuf[dix++] = cbuf[six + i];
for ( int i = 0; i < 8; i++ )
dbuf[dix++] = cbuf[six++];
break;
case 17: //Seems Ok
case 17: //Seems OK
for ( int i = 9; i < 17; i++ )
dbuf[dix++] = cbuf[six + i];
dbuf[dix++] = cbuf[six + 8];
Expand Down
2 changes: 1 addition & 1 deletion src/core/simplify/effectivearea.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ static void tune_areas( EFFECTIVE_AREAS *ea, int avoid_collaps, int set_area, do
//LWDEBUGF( 4, "Check ordering qsort gives, area=%lf and belong to point %d", (( areanode* )tree.key_array[i] )->area, tree.key_array[i] - ea->initial_arealist );
}

// Ok, now we have a minHeap, just need to keep it
// OK, now we have a minHeap, just need to keep it
i = 0;
while ( go_on )
{
Expand Down
6 changes: 3 additions & 3 deletions src/gui/qgsattributeform.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,21 @@ class GUI_EXPORT QgsAttributeForm : public QWidget
const QgsFeature &feature() { return mFeature; }

/**
* Hides the button box (Ok/Cancel) and enables auto-commit
* Hides the button box (OK/Cancel) and enables auto-commit
* \note set Embed in QgsAttributeEditorContext in constructor instead
*/
// TODO QGIS 3.0 - make private
void hideButtonBox();

/**
* Shows the button box (Ok/Cancel) and disables auto-commit
* Shows the button box (OK/Cancel) and disables auto-commit
* \note set Embed in QgsAttributeEditorContext in constructor instead
*/
// TODO QGIS 3.0 - make private
void showButtonBox();

/**
* Disconnects the button box (Ok/Cancel) from the accept/resetValues slots
* Disconnects the button box (OK/Cancel) from the accept/resetValues slots
* If this method is called, you have to create these connections from outside
*/
// TODO QGIS 3.0 - make private
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsmanageconnectionsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ QgsManageConnectionsDialog::QgsManageConnectionsDialog( QWidget *parent, Mode mo
QApplication::postEvent( this, new QCloseEvent() );
}

// use Ok button for starting import and export operations
// use OK button for starting import and export operations
disconnect( buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept );
connect( buttonBox, &QDialogButtonBox::accepted, this, &QgsManageConnectionsDialog::doExportImport );

Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgssearchquerybuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ long QgsSearchQueryBuilder::countRecords( const QString &searchString )

void QgsSearchQueryBuilder::on_btnOk_clicked()
{
// if user hits Ok and there is no query, skip the validation
// if user hits OK and there is no query, skip the validation
if ( txtSQL->text().trimmed().length() > 0 )
{
accept();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qtermwidget/TerminalDisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1922,7 +1922,7 @@ void TerminalDisplay::mouseMoveEvent(QMouseEvent* ev)
ev->y() > dragInfo.start.y() + distance || ev->y() < dragInfo.start.y() - distance)
{
// we've left the drag square, we can start a real drag operation now
emit isBusySelecting(false); // Ok.. we can breath again.
emit isBusySelecting(false); // OK.. we can breath again.

_screenWindow->clearSelection();
doDrag();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qtermwidget/Vt102Emulation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ void Vt102Emulation::initTokenizer()
resetTokenizer();
}

/* Ok, here comes the nasty part of the decoder.
/* OK, here comes the nasty part of the decoder.
Instead of keeping an explicit state, we deduce it from the
token scanned so far. It is then immediately combined with
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/topology/rulesDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ rulesDialog::rulesDialog( const QMap<QString, TopologyRule> &testMap, QgisInterf

connect( mAddTestButton, &QAbstractButton::clicked, this, &rulesDialog::addRule );
connect( mAddTestButton, &QAbstractButton::clicked, mRulesTable, &QTableView::resizeColumnsToContents );
// attempt to add new test when Ok clicked
// attempt to add new test when OK clicked
//connect( buttonBox, SIGNAL( accepted() ), this, SLOT( addTest() ) );
connect( mDeleteTestButton, &QAbstractButton::clicked, this, &rulesDialog::deleteTest );

Expand Down
2 changes: 1 addition & 1 deletion src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ bool QgsDelimitedTextProvider::createSpatialIndex()
if ( mBuildSpatialIndex ) return true; // Already built
if ( mGeomRep == GeomNone ) return false; // Cannot build index - no geometries

// Ok, set the spatial index option, set the Uri parameter so that the index is
// OK, set the spatial index option, set the Uri parameter so that the index is
// rebuilt when theproject is reloaded, and rescan the file to populate the index

mBuildSpatialIndex = true;
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsfieldcalculatorbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<item row="0" column="1">
<widget class="QLabel" name="mEditModeAutoTurnOnLabel">
<property name="text">
<string>You are editing information on this layer but the layer is currently not in edit mode. If you click Ok, edit mode will automatically be turned on.</string>
<string>You are editing information on this layer but the layer is currently not in edit mode. If you click OK, edit mode will automatically be turned on.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
2 changes: 1 addition & 1 deletion tests/src/core/testqgsrasterlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ void TestQgsRasterLayer::buildExternalOverviews()
QVERIFY( mypLayer->isValid() );

//
// Ok now we can go on to test
// OK now we can go on to test
//

QgsRaster::RasterPyramidsFormat myFormatFlag = QgsRaster::PyramidsGTiff;
Expand Down

0 comments on commit ab437cd

Please sign in to comment.