diff --git a/ChangeLog b/ChangeLog index 280cff126..5bc50dcce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ * User can export / import the configuration of the texts and texts group of an element. * Element editor : element informations (manufacturer, reference etc...) can be created directly from the element editor. For that go to the widget "Element Property" * Element editor : it is no longer required to have a text field, for save the edited element. -* Fix crash occured by the conductor and shape "ghost". +* Fix crash occurred by the conductor and shape "ghost". * Dissociate fonts policy and size for independent text item and for summarry pages (foliolist), add a 2 button in config page for open Qfontdialog widget and choose policy for independent text item Possiblility to overide defaut settings by adding in QElectroTech.conf * Basic shape add new CustomDashLine style with Dash Pattern (<< 10 << 10 ); diff --git a/sources/ElementsCollection/elementcollectionhandler.cpp b/sources/ElementsCollection/elementcollectionhandler.cpp index 6348a4391..894d385ab 100644 --- a/sources/ElementsCollection/elementcollectionhandler.cpp +++ b/sources/ElementsCollection/elementcollectionhandler.cpp @@ -321,7 +321,7 @@ ElementsLocation ElementCollectionHandler::copy(ElementsLocation &source, Elemen * @param parent : parent of the dir to create * @param name : name of directorie to create * @param name_list : translations of the directorie name - * @return : ElementsLocation that represent the new directorie, location can be null if an error was occured + * @return : ElementsLocation that represent the new directorie, location can be null if an error was occurred */ ElementsLocation ElementCollectionHandler::createDir(ElementsLocation &parent, const QString &name, const NamesList &name_list) { @@ -357,7 +357,7 @@ ElementsLocation ElementCollectionHandler::createDir(ElementsLocation &parent, c return created_dir; } else { - qDebug() << "ElementCollectionHandler::createDir : error was occured at creation of new directories in file system. "; + qDebug() << "ElementCollectionHandler::createDir : error was occurred at creation of new directories in file system. "; return ElementsLocation(); } } @@ -367,7 +367,7 @@ ElementsLocation ElementCollectionHandler::createDir(ElementsLocation &parent, c return created_dir; } else { - qDebug() << "ElementCollectionHandler::createDir : error was occured at creation of new directories in embbeded collection."; + qDebug() << "ElementCollectionHandler::createDir : error was occurred at creation of new directories in embbeded collection."; return ElementsLocation(); } } diff --git a/sources/editor/qetelementeditor.cpp b/sources/editor/qetelementeditor.cpp index f1e2ece10..2433a1bd0 100644 --- a/sources/editor/qetelementeditor.cpp +++ b/sources/editor/qetelementeditor.cpp @@ -688,7 +688,7 @@ void QETElementEditor::slot_updateInformations() /** * @brief QETElementEditor::checkElement * Do several check about element. - * If error is occured return false + * If error is occurred return false */ bool QETElementEditor::checkElement() { @@ -1135,7 +1135,7 @@ void QETElementEditor::slot_reload() /** * @brief QETElementEditor::slot_save * Save the current editing element. - * If the filepath or location is unknow, use save_as instead + * If the filepath or location is unknown, use save_as instead * @return true if save with success */ bool QETElementEditor::slot_save() diff --git a/sources/qet.cpp b/sources/qet.cpp index 5498827d3..8abe1d8b5 100644 --- a/sources/qet.cpp +++ b/sources/qet.cpp @@ -554,7 +554,7 @@ QString QET::titleBlockColumnLengthToString(const TitleBlockColumnLength &icl) @param filepath Path to the file to be written @param error_message If non-zero, will contain an error message explaining what happened when this function returns false. - @return false if an error occured, true otherwise + @return false if an error occurred, true otherwise */ bool QET::writeXmlFile(QDomDocument &xml_doc, const QString &filepath, QString *error_message) { QFile file(filepath); diff --git a/sources/qetproject.cpp b/sources/qetproject.cpp index e5e08d2d5..9e84e6378 100644 --- a/sources/qetproject.cpp +++ b/sources/qetproject.cpp @@ -957,7 +957,7 @@ ElementsLocation QETProject::importElement(ElementsLocation &location) Integrate a title block template into this project. @param src_tbt The location of the title block template to be integrated into this project @param handler - @return the name of the template after integration, or an empty QString if a problem occured. + @return the name of the template after integration, or an empty QString if a problem occurred. */ QString QETProject::integrateTitleBlockTemplate(const TitleBlockTemplateLocation &src_tbt, MoveTitleBlockTemplatesHandler *handler) { TitleBlockTemplateLocation dst_tbt(src_tbt.name(), &titleblocks_); diff --git a/sources/qetxml.cpp b/sources/qetxml.cpp index 3440f5ea7..288535ac0 100644 --- a/sources/qetxml.cpp +++ b/sources/qetxml.cpp @@ -40,7 +40,7 @@ QDomElement QETXML::penToXml(QDomDocument &parent_document,QPen pen) case Qt::DashDotLine : style = "DashDotLine"; break; case Qt::DashDotDotLine : style = "DashDotDotLine"; break; case Qt::CustomDashLine : style = "CustomDashLine"; break; - default : style = "Unknow"; break; + default : style = "Unknown"; break; } element.setAttribute("style", style); @@ -110,7 +110,7 @@ QDomElement QETXML::brushToXml(QDomDocument &parent_document, QBrush brush) case Qt::BDiagPattern : style = "BDiagPattern"; break; case Qt::FDiagPattern : style = "FDiagPattern"; break; case Qt::DiagCrossPattern : style = "DiagCrossPattern"; break; - default : style = "Unknow"; break; + default : style = "Unknown"; break; } element.setAttribute("style", style); @@ -147,7 +147,7 @@ QBrush QETXML::brushFromXml(const QDomElement &element) else if (style == "BDiagPattern") brush.setStyle(Qt::BDiagPattern); else if (style == "FDiagPattern") brush.setStyle(Qt::FDiagPattern); else if (style == "DiagCrossPattern") brush.setStyle(Qt::DiagCrossPattern); - else if (style == "Unknow") brush.setStyle(Qt::NoBrush); + else if (style == "Unknown") brush.setStyle(Qt::NoBrush); brush.setColor(QColor(element.attribute("color", "#000000"))); return brush; @@ -230,7 +230,7 @@ QDomElement QETXML::fileSystemElementToXmlCollectionElement(QDomDocument &docume * @param xml_document : An XML document to be exported * @param file_path : Path to the file to be written * @param error_message : If non-zero, will contain an error message explaining what happened when this function returns false. - * @return false if an error occured, true otherwise + * @return false if an error occurred, true otherwise */ bool QETXML::writeXmlFile(const QDomDocument &xml_document, const QString &file_path, QString *error_message) { diff --git a/sources/titleblock/qettemplateeditor.cpp b/sources/titleblock/qettemplateeditor.cpp index 2be72b4ef..da539d990 100644 --- a/sources/titleblock/qettemplateeditor.cpp +++ b/sources/titleblock/qettemplateeditor.cpp @@ -242,7 +242,7 @@ bool QETTitleBlockTemplateEditor::edit(QETProject *project, const QString &templ /** @param file_path Path of the template file to edit. - @return false if a problem occured while opening the template, true otherwise. + @return false if a problem occurred while opening the template, true otherwise. */ bool QETTitleBlockTemplateEditor::edit(const QString &file_path) { // get title block template object from the file, edit it @@ -268,7 +268,7 @@ bool QETTitleBlockTemplateEditor::edit(const QString &file_path) { /** @param tbt Title block template to be edited - @return false if a problem occured while opening the template, true otherwise. + @return false if a problem occurred while opening the template, true otherwise. */ bool QETTitleBlockTemplateEditor::editCopyOf(const TitleBlockTemplate *tbt) { if (!tbt) return(false); @@ -277,7 +277,7 @@ bool QETTitleBlockTemplateEditor::editCopyOf(const TitleBlockTemplate *tbt) { /** @param tbt Title block template to be directly edited - @return false if a problem occured while opening the template, true otherwise. + @return false if a problem occurred while opening the template, true otherwise. */ bool QETTitleBlockTemplateEditor::edit(TitleBlockTemplate *tbt) { if (!tbt) return(false); diff --git a/sources/titleblock/templatescollection.cpp b/sources/titleblock/templatescollection.cpp index f4588c779..8be9872f3 100644 --- a/sources/titleblock/templatescollection.cpp +++ b/sources/titleblock/templatescollection.cpp @@ -229,7 +229,7 @@ QDomElement TitleBlockTemplatesProjectCollection::getTemplateXmlDescription(cons existing one. @param xml_elmt An \ XML element describing the template. Its "name" attribute must equal to template_name. - @return false if a problem occured, true otherwise + @return false if a problem occurred, true otherwise */ bool TitleBlockTemplatesProjectCollection::setTemplateXmlDescription(const QString &template_name, const QDomElement &xml_elmt) { // check basic stuff