Skip to content

Commit e5a217a

Browse files
committed
fix some minor typos (unkown -> unknown, stablished -> established, chidren -> children, sigle -> single)
1 parent 4a42435 commit e5a217a

31 files changed

+100
-100
lines changed

apps/pgmodeler-se/src/sourceeditorwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ void SourceEditorWidget::validateSyntax()
230230
{
231231
editor_txt->setPalette(def_editor_pal);
232232
schparser.ignoreEmptyAttributes(true);
233-
schparser.ignoreUnkownAttributes(true);
233+
schparser.ignoreUnknownAttributes(true);
234234
schparser.setSearchPath(QFileInfo(filename).absolutePath());
235235
schparser.loadBuffer(editor_txt->toPlainText());
236236
schparser.getSourceCode({});

libs/libcanvas/src/basetableview.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ void BaseTableView::configureObjectShadow()
520520
BaseObjectView::configureObjectShadow();
521521
}
522522

523-
QList<TableObjectView *> BaseTableView::getSelectedChidren()
523+
QList<TableObjectView *> BaseTableView::getSelectedChildren()
524524
{
525525
return sel_child_objs;
526526
}

libs/libcanvas/src/basetableview.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class __libcanvas BaseTableView: public BaseObjectView {
172172
void configureObjectShadow();
173173

174174
//! \brief Returns a list of selected children objects
175-
QList<TableObjectView *> getSelectedChidren();
175+
QList<TableObjectView *> getSelectedChildren();
176176

177177
//! \brief Clear the selection over all selected children
178178
void clearChildrenSelection();

libs/libcanvas/src/objectsscene.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ void ObjectsScene::handleChildrenSelectionChanged()
982982
if(!tab_view)
983983
return;
984984

985-
if(tab_view->getSelectedChidren().empty())
985+
if(tab_view->getSelectedChildren().empty())
986986
tabs_sel_children.removeAll(tab_view);
987987
else if(!tabs_sel_children.contains(tab_view))
988988
tabs_sel_children.append(tab_view);
@@ -1897,7 +1897,7 @@ QList<QGraphicsItem *> ObjectsScene::selectedItems() const
18971897

18981898
for(auto &tab_view :tabs_sel_children)
18991899
{
1900-
for(auto &tab_obj : tab_view->getSelectedChidren())
1900+
for(auto &tab_obj : tab_view->getSelectedChildren())
19011901
items.append(tab_obj);
19021902
}
19031903

libs/libconnector/src/catalog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ QString Catalog::getCatalogQuery(const QString &qry_type, ObjectType obj_type, b
477477
}
478478

479479
loadCatalogQuery(BaseObject::getSchemaName(obj_type));
480-
schparser.ignoreUnkownAttributes(true);
480+
schparser.ignoreUnknownAttributes(true);
481481
schparser.ignoreEmptyAttributes(true);
482482

483483
attribs[Attributes::PgSqlVersion]=schparser.getPgSQLVersion();
@@ -841,7 +841,7 @@ std::vector<attribs_map> Catalog::getMultipleAttributes(const QString &catalog_s
841841
std::vector<attribs_map> obj_attribs;
842842

843843
loadCatalogQuery(catalog_sch);
844-
schparser.ignoreUnkownAttributes(true);
844+
schparser.ignoreUnknownAttributes(true);
845845
schparser.ignoreEmptyAttributes(true);
846846

847847
attribs[Attributes::PgSqlVersion]=schparser.getPgSQLVersion();
@@ -1026,7 +1026,7 @@ attribs_map Catalog::getServerAttributes()
10261026
attribs_map tuple, attribs_aux;
10271027

10281028
loadCatalogQuery("server");
1029-
schparser.ignoreUnkownAttributes(true);
1029+
schparser.ignoreUnknownAttributes(true);
10301030
schparser.ignoreEmptyAttributes(true);
10311031
sql = schparser.getSourceCode(attribs).simplified();
10321032
connection.executeDMLCommand(sql, res);

libs/libconnector/src/connection.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,11 @@ void Connection::connect()
241241
else if(connection)
242242
{
243243
if(!silence_conn_err)
244-
throw Exception(ErrorCode::ConnectionAlreadyStablished, __PRETTY_FUNCTION__, __FILE__, __LINE__);
244+
throw Exception(ErrorCode::ConnectionAlreadyEstablished, __PRETTY_FUNCTION__, __FILE__, __LINE__);
245245
else
246246
{
247247
QTextStream err(stderr);
248-
err << QT_TR_NOOP("ERROR: trying to open an already stablished connection.") << Qt::endl
248+
err << QT_TR_NOOP("ERROR: trying to open an already established connection.") << Qt::endl
249249
<< "Conn. info: [ " << connection_str << "]" << Qt::endl;
250250
this->close();
251251
}
@@ -260,8 +260,8 @@ void Connection::connect()
260260
if(connection==nullptr || PQstatus(connection)==CONNECTION_BAD)
261261
{
262262
//Raise the error generated by the DBMS
263-
throw Exception(Exception::getErrorMessage(ErrorCode::ConnectionNotStablished)
264-
.arg(PQerrorMessage(connection)), ErrorCode::ConnectionNotStablished,
263+
throw Exception(Exception::getErrorMessage(ErrorCode::ConnectionNotEstablished)
264+
.arg(PQerrorMessage(connection)), ErrorCode::ConnectionNotEstablished,
265265
__PRETTY_FUNCTION__, __FILE__, __LINE__);
266266
}
267267

@@ -375,9 +375,9 @@ QString Connection::getConnectionId(bool host_port_only, bool incl_db_name, bool
375375
return conn_id;
376376
}
377377

378-
bool Connection::isStablished()
378+
bool Connection::isEstablished()
379379
{
380-
return (connection != nullptr);
380+
return connection != nullptr;
381381
}
382382

383383
bool Connection::isConfigured()
@@ -530,7 +530,7 @@ void Connection::switchToDatabase(const QString &dbname)
530530
try
531531
{
532532
//Closing the current connection if it's opened
533-
if(isStablished())
533+
if(isEstablished())
534534
close();
535535

536536
//Change the database name and reconfigure the connection string
@@ -551,7 +551,7 @@ void Connection::switchToDatabase(const QString &dbname)
551551

552552
void Connection::operator = (const Connection &conn)
553553
{
554-
if(this->isStablished())
554+
if(this->isEstablished())
555555
this->close();
556556

557557
this->auto_browse_db=conn.auto_browse_db;

libs/libconnector/src/connection.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class __libconnector Connection {
6161

6262
/*! \brief This static method disable the notice messages when executing commands.
6363
By default all connections are created with notice disabled. To enable it the user
64-
must call Connection::setNoticeEnabled(). Note: connections already stablished
64+
must call Connection::setNoticeEnabled(). Note: already established connections
6565
aren't affected when calling this method the user must disconnect then connect again
6666
to enable output. */
6767
static void disableNoticeOutput(void *, const PGresult *){}
@@ -233,13 +233,13 @@ class __libconnector Connection {
233233
static QStringList getNotices();
234234

235235
/*! \brief Change the current database to the specified db name using the parameters from the current
236-
stablished connection causing the connection to be reset and moved to the new database.
236+
established connection causing the connection to be reset and moved to the new database.
237237
The effect of this is the same by type \c dbname on psql console. In case of errors the method will
238238
raise an exception and switch back to the previous database. */
239239
void switchToDatabase(const QString &dbname);
240240

241-
//! \brief Returns if the connection is stablished
242-
bool isStablished();
241+
//! \brief Returns if the connection is established
242+
bool isEstablished();
243243

244244
//! \brief Returns if the connection is configured (has some attributes set)
245245
bool isConfigured();

libs/libcore/src/baseobject.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ QString BaseObject::getSourceCode(SchemaParser::CodeType def_type, bool reduced_
890890
SchemaParser sch_parser;
891891
QString filename=GlobalAttributes::getSchemaFilePath(GlobalAttributes::AlterSchemaDir, Attributes::Owner);
892892

893-
sch_parser.ignoreUnkownAttributes(true);
893+
sch_parser.ignoreUnknownAttributes(true);
894894
attributes[Attributes::Owner]=sch_parser.getSourceCode(filename, attributes);
895895
}
896896
}
@@ -909,7 +909,7 @@ QString BaseObject::getSourceCode(SchemaParser::CodeType def_type, bool reduced_
909909
else
910910
attributes[Attributes::Comment]=comment;
911911

912-
schparser.ignoreUnkownAttributes(true);
912+
schparser.ignoreUnknownAttributes(true);
913913

914914
attributes[Attributes::Comment]=
915915
schparser.getSourceCode(Attributes::Comment, attributes, def_type);
@@ -921,7 +921,7 @@ QString BaseObject::getSourceCode(SchemaParser::CodeType def_type, bool reduced_
921921

922922
if(def_type==SchemaParser::XmlCode)
923923
{
924-
schparser.ignoreUnkownAttributes(true);
924+
schparser.ignoreUnknownAttributes(true);
925925
attributes[Attributes::AppendedSql]=
926926
schparser.getSourceCode(QString(Attributes::AppendedSql).remove('-'), attributes, def_type);
927927
}
@@ -937,7 +937,7 @@ QString BaseObject::getSourceCode(SchemaParser::CodeType def_type, bool reduced_
937937

938938
if(def_type==SchemaParser::XmlCode)
939939
{
940-
schparser.ignoreUnkownAttributes(true);
940+
schparser.ignoreUnknownAttributes(true);
941941
attributes[Attributes::PrependedSql]=
942942
schparser.getSourceCode(QString(Attributes::PrependedSql).remove('-'), attributes, def_type);
943943
}
@@ -1350,7 +1350,7 @@ QString BaseObject::getDropCode(bool cascade)
13501350

13511351
setBasicAttributes(true);
13521352
schparser.setPgSQLVersion(BaseObject::pgsql_ver, ignore_db_version);
1353-
schparser.ignoreUnkownAttributes(true);
1353+
schparser.ignoreUnknownAttributes(true);
13541354
schparser.ignoreEmptyAttributes(true);
13551355

13561356
attribs=attributes;
@@ -1382,7 +1382,7 @@ QString BaseObject::getAlterCode(QString sch_name, attribs_map &attribs, bool ig
13821382

13831383
schparser.setPgSQLVersion(BaseObject::pgsql_ver, ignore_db_version);
13841384
schparser.ignoreEmptyAttributes(ignore_empty_attribs);
1385-
schparser.ignoreUnkownAttributes(ignore_ukn_attribs);
1385+
schparser.ignoreUnknownAttributes(ignore_ukn_attribs);
13861386
return schparser.getSourceCode(alter_sch_file, attribs);
13871387
}
13881388
catch(Exception &e)
@@ -1472,7 +1472,7 @@ QString BaseObject::getAlterCommentDefinition(BaseObject *object, attribs_map at
14721472
attributes[Attributes::Comment]=comm_obj;
14731473
}
14741474

1475-
schparser.ignoreUnkownAttributes(true);
1475+
schparser.ignoreUnknownAttributes(true);
14761476
schparser.ignoreEmptyAttributes(true);
14771477
return schparser.getSourceCode(Attributes::Comment, attributes, SchemaParser::SqlCode);
14781478
}

libs/libcore/src/databasemodel.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7199,7 +7199,7 @@ BaseRelationship *DatabaseModel::createRelationship()
71997199
rel->setActionType(upd_action, Constraint::UpdateAction);
72007200
rel->setActionType(del_action, Constraint::DeleteAction);
72017201
rel->setSQLDisabled(sql_disabled);
7202-
rel->setSiglePKColumn(single_pk_col);
7202+
rel->setSinglePKColumn(single_pk_col);
72037203
rel->setDeferrable(deferrable);
72047204
rel->setDeferralType(defer_type);
72057205
rel->setCopyOptions(CopyOptions(static_cast<CopyOptions::CopyMode>(attribs[Attributes::CopyMode].toUInt()),
@@ -9339,7 +9339,7 @@ void DatabaseModel::saveObjectsMetadata(const QString &filename, MetaAttrOptions
93399339

93409340
if(obj_type!=ObjectType::Schema || !attribs[Attributes::XPos].isEmpty())
93419341
{
9342-
schparser.ignoreUnkownAttributes(true);
9342+
schparser.ignoreUnknownAttributes(true);
93439343
attribs[Attributes::Position]=
93449344
schparser.getSourceCode(GlobalAttributes::getSchemaFilePath(GlobalAttributes::XMLSchemaDir, Attributes::Position),
93459345
attribs);
@@ -9365,7 +9365,7 @@ void DatabaseModel::saveObjectsMetadata(const QString &filename, MetaAttrOptions
93659365
attribs[Attributes::XPos]=QString::number(pnt.x());
93669366
attribs[Attributes::YPos]=QString::number(pnt.y());
93679367

9368-
schparser.ignoreUnkownAttributes(true);
9368+
schparser.ignoreUnknownAttributes(true);
93699369
attribs[Attributes::Position]+=
93709370
schparser.getSourceCode(GlobalAttributes::getSchemaFilePath(GlobalAttributes::XMLSchemaDir, Attributes::Position),
93719371
attribs);
@@ -9430,7 +9430,7 @@ void DatabaseModel::saveObjectsMetadata(const QString &filename, MetaAttrOptions
94309430
tr("Saving metadata of the object `%1' (%2)")
94319431
.arg(object->getSignature()).arg(object->getTypeName()), enum_t(obj_type));
94329432

9433-
schparser.ignoreUnkownAttributes(true);
9433+
schparser.ignoreUnknownAttributes(true);
94349434

94359435
objs_def += schparser.getSourceCode(
94369436
GlobalAttributes::getSchemaFilePath(GlobalAttributes::XMLSchemaDir,

libs/libcore/src/extension.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ QString Extension::getSourceCode(SchemaParser::CodeType def_type)
162162
obj_attr[Attributes::Type] = BaseObject::getSchemaName(ext_obj.getType());
163163
obj_attr[Attributes::Parent] = ext_obj.getParent();
164164

165-
schparser.ignoreUnkownAttributes(true);
165+
schparser.ignoreUnknownAttributes(true);
166166
schparser.ignoreEmptyAttributes(true);
167167
attributes[Attributes::Objects] += schparser.getSourceCode(Attributes::Object, obj_attr, def_type);
168168
}

0 commit comments

Comments
 (0)