Git commit 7894e3764b788bd423c7f8c1202ce8b5c7435e36 by Ralf Habacker, on behalf of Alexander Wilms. Committed on 22/01/2026 at 13:34. Pushed by habacker into branch 'master'.
Fix misspellings found by codespell M +17 -17 ChangeLog M +1 -1 doc/code_import_and_generation.docbook M +1 -1 lib/cppparser/driver.h M +1 -1 maintainer/list-duplicate-xmi-ids M +1 -1 test/import/csharp/CsCodeExample-ClassExample/ComplexNumber.cs M +1 -1 test/import/csharp/CsCodeExample-ClassExample/Person.cs M +1 -1 tools/lint-xmi-files M +3 -3 umbrello/codegenerators/codegenerator.cpp M +1 -1 umbrello/codegenwizard/codegenoptionspage.cpp M +1 -1 umbrello/codeimport/sqlimport.cpp M +2 -2 umbrello/dialogs/codeeditor.cpp M +1 -1 umbrello/dialogs/singlepagedialogbase.cpp M +1 -1 umbrello/model_utils.cpp M +3 -3 umbrello/umlapp.cpp M +4 -4 umbrello/umldoc.cpp M +1 -1 umbrello/umllistview.cpp M +1 -1 umbrello/umlwidgets/associationwidget.cpp M +1 -1 umbrello/umlwidgets/classifierwidget.cpp M +1 -1 umbrello/umlwidgets/widgetbase.cpp https://invent.kde.org/sdk/umbrello/-/commit/7894e3764b788bd423c7f8c1202ce8b5c7435e36 diff --git a/ChangeLog b/ChangeLog index 6cf7b7b6b..1518928c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -123,7 +123,7 @@ version 2.10.80 (4.10.80) * Migrate EntityWidget::draw() to qt4 paint api. (320463) * Migrate DataTypeWidget::draw() to qt4 paint api. (320463) * Migrate ComponentWidget::draw() to qt4 paint api. (320463) -* Removed obsolate call to setY(), which has already been called in UMLWidget::loadFromXMI(). (320463) +* Removed obsolete call to setY(), which has already been called in UMLWidget::loadFromXMI(). (320463) * Crash fix caused by removing a FloatingDashLineWidget from the gui but not from CombinedFragmentWidget::m_dashLines. (320463) * Avoid double painting of FloatingDashLineWidget; it is painted by QGraphicsScene already. (320463) * Fixed FloatingDashLineWidget painting artifacts caused by not set widget height. (320463) @@ -136,13 +136,13 @@ version 2.10.80 (4.10.80) * Migrate BoxWidget::draw() to qt4 paint api. (320463) * Migrate ActivityWidget::draw() to qt4 paint api. (320463) * Migrate ActorWidget::draw() to qt4 paint api. (320463) -* Reenable including of inherited methods on adding messages to sequence diagram. (306785) +* Re-enable including of inherited methods on adding messages to sequence diagram. (306785) * Prevent recursive search loops. (306785) * Cosmetic update of documentation (Yuri Chornoivan) * Import XMI_FILE_VERSION. (Ralf Habacker) * Moved XMI_FILE_VERSION to version.h where app version definition already is. (Ralf Habacker) * Refactored ID::Type related conversion functions similar to other types in basictypes.* (Ralf Habacker) -* Enable guard against resursive inheritance loops to self. (306785) +* Enable guard against recursive inheritance loops to self. (306785) * Fixed synchronous message painting artifacts. (320109) version 2.10.5 @@ -184,7 +184,7 @@ Version 2.10.2 * Move dock windows visible switches to settings menu. (Ralf Habacker) * Add error condition marker to activity diagram.. (Ralf Habacker) * Add activity diagram containing all elements. (Ralf Habacker) -* Size problem fix when flipping fork/join state widget orientiation. (Ralf Habacker) +* Size problem fix when flipping fork/join state widget orientation. (Ralf Habacker) * Crash fix when adding widgets to state diagram. (Ralf Habacker) * Add class diagram containing all elements. (Ralf Habacker) * Increase the border of the 'Fit in view' function, which makes it looking better. (Ralf Habacker) @@ -263,7 +263,7 @@ Version 2.9.0 * category widget drawing problem (301595) * Note widgets get resized when printing (152757) * Note widget text is not editable through doc window (301181) -* umbrello crashs when importing templated java source code (293770) +* umbrello crashes when importing templated java source code (293770) * activity diagram, branch/merge: background fill not disabled (165799) * Umbrello crashed when changing the Package of a class (268469) * Cannot anchor note in state diagram (270597) @@ -301,7 +301,7 @@ Version 2.8.0 * Made printing border calculation more robust * Reuse changed printer settings * Show diagram print settings dialog before print or print preview dialog -* Added msvc2010 preprocesser for idl preprocessing +* Added msvc2010 preprocessor for idl preprocessing * Enabling of cut/copy/paste actions is incorrect (70925) * Segmentation fault when copy&paste of sequence diagram (287179) and therefore also - Copy and paste or drag and drop of a java datatype between folders (280770) @@ -315,7 +315,7 @@ Version 2.8.0 * Copy/Paste of activity, state and use case diagram elements do not create new elements (291557) * Crash on new synchronous message in sequence diagram (168752) * Umbrello crashes with SIGSEGV in Object Flow properties 170596) -* Crash fix in case the path does not fit into the package hierachy we cannot check the imports (200721) +* Crash fix in case the path does not fit into the package hierarchy we cannot check the imports (200721) * Crash fix on importing idl file (203092) * Crash on C++ import with Doxygen: cause Doxygen Braces (228352) * Crash on new entity (entity relationship model) (259404) @@ -778,7 +778,7 @@ Version 1.1.1 Version 1.1 (including 1.1 rc 2) -* Activites can have multiple outgoing associations +* Activities can have multiple outgoing associations * Updated and translated tips file @@ -796,7 +796,7 @@ Version 1.1 (including 1.1 rc 2) Version 1.1 rc 1 -* Pasteing in sequence diagrams now works correctly +* Pasting in sequence diagrams now works correctly * Paste operation now shows dialogue messages when it can't paste everything or at all @@ -844,7 +844,7 @@ Version 1.1 beta 2 * Name changed to Umbrello UML Modeller -* Java filenames have corret capitalisation +* Java filenames have correct capitalisation * Grid is no longer printed @@ -856,11 +856,11 @@ Version 1.1 beta 2 * Sequence and collaboration messages always update when they should -* Consistant position for labels on sequence messages +* Consistent position for labels on sequence messages * Nicer looking selection box -* "New operation" from sequence diagram messages will now be used automaticaly on that message +* "New operation" from sequence diagram messages will now be used automatically on that message * Some improvements in menu consistency @@ -943,15 +943,15 @@ Version 1.0.2 * Correctly deletes message from sequence diagram. -* Recent files list now corectly handled +* Recent files list now correctly handled -* Error on loading files now put Untitled corerctly in the caption. +* Error on loading files now put Untitled correctly in the caption. * Toolbars keep session settings * Added folders for Actors, Use Cases and Concepts to help organisation -* Composition, Implemantation, unidirectional associations and realizations added to class diagrams +* Composition, Implementation, unidirectional associations and realizations added to class diagrams * Generalization, dependency, and unidirectional associations added to use case diagrams. @@ -975,7 +975,7 @@ Version 1.0.1 * fixed printing so print multiple pages is now correct -* popup menu co-ordinates fixes for popup menus and list view +* popup menu coordinates fixes for popup menus and list view * Diagram made bigger @@ -1004,7 +1004,7 @@ if this works) * Removed HTML welcome screen due to loading time. -* Changed the icons setup by KDevelop (someone please desing better ones) +* Changed the icons setup by KDevelop (someone please design better ones) * Has i18n ready to go, just need translators (any takers?) diff --git a/doc/code_import_and_generation.docbook b/doc/code_import_and_generation.docbook index a976f89ee..91e16f426 100644 --- a/doc/code_import_and_generation.docbook +++ b/doc/code_import_and_generation.docbook @@ -27,7 +27,7 @@ MySQL, Pascal, Perl, PHP, PHP5, PostgreSQL, Python, Ruby, Tcl, Vala, and XMLSche In order to generate code with &umbrello;, you first need to create or load a Model containing at least one class. When you are ready to start writing some code, select the <guimenuitem>Code Generation Wizard</guimenuitem> entry from the <guimenuitem>Code</guimenuitem> menu to -start a wizard which will guide you trough the code generation process. +start a wizard which will guide you through the code generation process. </para> <para> The first step is to select the classes for which you want to generate source code. diff --git a/lib/cppparser/driver.h b/lib/cppparser/driver.h index 76ec02a0b..231e94e74 100644 --- a/lib/cppparser/driver.h +++ b/lib/cppparser/driver.h @@ -187,7 +187,7 @@ public: /** * Check to see if a file has been modified - * \param fileName The name of hte file to get the modification state of. An + * \param fileName The name of the file to get the modification state of. An * absolute path should be used. * \return true if the file has been modified * \return false if the file has not been modified diff --git a/maintainer/list-duplicate-xmi-ids b/maintainer/list-duplicate-xmi-ids index 1c109c1bf..a954badd2 100755 --- a/maintainer/list-duplicate-xmi-ids +++ b/maintainer/list-duplicate-xmi-ids @@ -5,7 +5,7 @@ # list lines with duplicate xmi.id's # -# generate list of non uniqe id's +# generate list of non unique id's ids=$(gawk ' $1 ~ /<XMI.extension/ { exclude = 1 diff --git a/test/import/csharp/CsCodeExample-ClassExample/ComplexNumber.cs b/test/import/csharp/CsCodeExample-ClassExample/ComplexNumber.cs index 8a7974de7..d2d4cf133 100644 --- a/test/import/csharp/CsCodeExample-ClassExample/ComplexNumber.cs +++ b/test/import/csharp/CsCodeExample-ClassExample/ComplexNumber.cs @@ -10,7 +10,7 @@ public class ComplexNumber // class set { real = value; } } - public double Imag { get; set; } // Property with hidded field, PascalCase + public double Imag { get; set; } // Property with hidden field, PascalCase public static string Format { get { return "a + b * i"; } } protected const double PI = 3.14; // keyword: const (just for example, in this class Math.PI is used because it has more precision) diff --git a/test/import/csharp/CsCodeExample-ClassExample/Person.cs b/test/import/csharp/CsCodeExample-ClassExample/Person.cs index cb0f7aa92..693623ca4 100644 --- a/test/import/csharp/CsCodeExample-ClassExample/Person.cs +++ b/test/import/csharp/CsCodeExample-ClassExample/Person.cs @@ -7,7 +7,7 @@ public class Address public int Number { get; set; } } -public abstract class Human // keyword: abstract, can not be initialised, only inhereted +public abstract class Human // keyword: abstract, can not be initialised, only inherited { public DateTime BirthDate { get; set; } } diff --git a/tools/lint-xmi-files b/tools/lint-xmi-files index 73edb4aea..9141c1a83 100755 --- a/tools/lint-xmi-files +++ b/tools/lint-xmi-files @@ -1,6 +1,6 @@ #!/bin/bash # @author Ralf Habacker -# @brief lint xmi fils and extract missing dtd elements/attributes from xmllint error messages +# @brief lint xmi files and extract missing dtd elements/attributes from xmllint error messages # # fails also on piped failure diff --git a/umbrello/codegenerators/codegenerator.cpp b/umbrello/codegenerators/codegenerator.cpp index 7b5b0106e..3be8e0f12 100644 --- a/umbrello/codegenerators/codegenerator.cpp +++ b/umbrello/codegenerators/codegenerator.cpp @@ -119,7 +119,7 @@ CodeDocument * CodeGenerator::findCodeDocumentByID(const QString &tag) /** * Add a CodeDocument object to the m_codedocumentVector List. - * @return boolean - will return false if it couldnt add a document + * @return boolean - will return false if it couldn't add a document */ bool CodeGenerator::addCodeDocument(CodeDocument * doc) { @@ -279,7 +279,7 @@ void CodeGenerator::saveToXMI(QXmlStreamWriter& writer) /** * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument. * "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced - * or removed as is apppropriate. + * or removed as is appropriate. */ void CodeGenerator::syncCodeToDocument() { @@ -691,7 +691,7 @@ void CodeGenerator::findObjectsRelated(UMLClassifier *c, UMLPackageList &cList) * Format documentation for output in source files * * @param text the documentation which has to be formatted - * @param linePrefix the prefix which has to be added in the beginnig of each line + * @param linePrefix the prefix which has to be added in the beginning of each line * @param lineWidth the line width used for word-wrapping the documentation * * @return the formatted documentation text diff --git a/umbrello/codegenwizard/codegenoptionspage.cpp b/umbrello/codegenwizard/codegenoptionspage.cpp index 3d79e0c95..eea3ca4bf 100644 --- a/umbrello/codegenwizard/codegenoptionspage.cpp +++ b/umbrello/codegenwizard/codegenoptionspage.cpp @@ -128,7 +128,7 @@ int CodeGenOptionsPage::newLineToInteger(CodeGenerationPolicy::NewLineType value /** * Converts the overwrite policy value to the corresponding widget object. * @param value the overwrite policy - * @return the corresponding widget obeject + * @return the corresponding widget object */ QRadioButton* CodeGenOptionsPage::overwriteToWidget(CodeGenerationPolicy::OverwritePolicy value) { diff --git a/umbrello/codeimport/sqlimport.cpp b/umbrello/codeimport/sqlimport.cpp index 137764554..bcbc187d9 100644 --- a/umbrello/codeimport/sqlimport.cpp +++ b/umbrello/codeimport/sqlimport.cpp @@ -77,7 +77,7 @@ void SQLImport::fillSource(const QString& word) } /** - * Strip qoutes from identifier. + * Strip quotes from identifier. * * @param token string with current token * @return stripped string diff --git a/umbrello/dialogs/codeeditor.cpp b/umbrello/dialogs/codeeditor.cpp index 3457f70e7..61b044b1d 100644 --- a/umbrello/dialogs/codeeditor.cpp +++ b/umbrello/dialogs/codeeditor.cpp @@ -960,7 +960,7 @@ void CodeEditor::updateTextBlockFromText(TextBlock * block) int pstart = m_textBlockList.indexOf(block); QString content; - // Assemble content from editiable paras + // Assemble content from editable paras if (info) { QList<ParaInfo*> list = info->m_paraList; for(ParaInfo * item : list) { @@ -1038,7 +1038,7 @@ void CodeEditor::slotCursorPositionChanged() } - // now check if the current paragraph is really editiable, and if so, + // now check if the current paragraph is really editable, and if so, // do some things bool editPara = isParaEditable(para); if (editPara) { diff --git a/umbrello/dialogs/singlepagedialogbase.cpp b/umbrello/dialogs/singlepagedialogbase.cpp index a2aedee14..a7ed4d0e4 100644 --- a/umbrello/dialogs/singlepagedialogbase.cpp +++ b/umbrello/dialogs/singlepagedialogbase.cpp @@ -62,7 +62,7 @@ SinglePageDialogBase::~SinglePageDialogBase() /** * Apply dialog changes to the related object. * - * This method could be overridden in derived dialogs to suppport post dialog applying. + * This method could be overridden in derived dialogs to support post dialog applying. * * @return true apply succeeds * @return false apply does not succeed diff --git a/umbrello/model_utils.cpp b/umbrello/model_utils.cpp index 74f9a55bf..c582d3adc 100644 --- a/umbrello/model_utils.cpp +++ b/umbrello/model_utils.cpp @@ -513,7 +513,7 @@ UMLPackage* treeViewGetPackageFromCurrent() * Build the diagram name from the tree view. * The function returns a relative path constructed from the folder hierarchy. - * @param id the id of the diaram + * @param id the id of the diagram * @return the constructed diagram name */ QString treeViewBuildDiagramName(Uml::ID::Type id) diff --git a/umbrello/umlapp.cpp b/umbrello/umlapp.cpp index e384b2997..ea5b9177b 100644 --- a/umbrello/umlapp.cpp +++ b/umbrello/umlapp.cpp @@ -232,14 +232,14 @@ void UMLApp::setup() //get a reference to the Code->Active Language and to the Diagram->Zoom menu m_langSelect = findMenu(QStringLiteral("active_lang_menu")); //in case langSelect hasn't been initialized we create the Popup menu. - //it will be hidden, but at least we wont crash if someone takes the entry away from the ui.rc file + //it will be hidden, but at least we won't crash if someone takes the entry away from the ui.rc file if (m_langSelect == nullptr) { m_langSelect = new QMenu(QStringLiteral("active_lang_menu"), this); } m_zoomSelect = findMenu(QStringLiteral("zoom_menu")); //in case zoomSelect hasn't been initialized we create the Popup menu. - //it will be hidden, but at least we wont crash if some one takes the entry away from the ui.rc file + //it will be hidden, but at least we won't crash if some one takes the entry away from the ui.rc file if (m_zoomSelect == nullptr) { m_zoomSelect = new QMenu(QStringLiteral("zoom_menu"), this); } @@ -2449,7 +2449,7 @@ bool UMLApp::activeLanguageIsCaseSensitive() const } /** - * Return the target language depedent scope separator. + * Return the target language dependent scope separator. */ QString UMLApp::activeLanguageScopeSeparator() const { diff --git a/umbrello/umldoc.cpp b/umbrello/umldoc.cpp index d9e8f8040..a2acf641a 100644 --- a/umbrello/umldoc.cpp +++ b/umbrello/umldoc.cpp @@ -152,7 +152,7 @@ void UMLDoc::Private::checkAssociationWidgetsAfterLoad() } } - // Which UMLAssociation has no wigdet ? + // Which UMLAssociation has no widget ? for (UMLAssociation *assoc : associations) { bool found = false; for (AssociationWidget *aw : widgets) { @@ -1235,7 +1235,7 @@ bool UMLDoc::isUnique(const QString &name) const UMLListViewItem *parentItem = nullptr; // check for current item, if its a package, then we do a check on that - // otherwise, if current item exists, find its parent and check if thats + // otherwise, if current item exists, find its parent and check if that's // a package.. if (currentItem) { // its possible that the current item *is* a package, then just @@ -1505,7 +1505,7 @@ void UMLDoc::addAssociation(UMLAssociation *assoc) } pkg->addObject(assoc); - // I don't believe this appropriate, UMLAssociations ARENT UMLWidgets -b.t. + // I don't believe this appropriate, UMLAssociations AREN'T UMLWidgets -b.t. // Q_EMIT sigObjectCreated(o); setModified(true); @@ -1783,7 +1783,7 @@ void UMLDoc::changeCurrentView(Uml::ID::Type id) UMLApp::app()->setDiagramMenuItemsState(true); setModified(true); Q_EMIT sigCurrentViewChanged(); - // when clicking on a tab, the documentation of diagram is upated in docwindow + // when clicking on a tab, the documentation of diagram is updated in docwindow UMLApp::app()->docWindow()->showDocumentation(scene); } else { diff --git a/umbrello/umllistview.cpp b/umbrello/umllistview.cpp index e55635eb1..52ffacd03 100644 --- a/umbrello/umllistview.cpp +++ b/umbrello/umllistview.cpp @@ -1411,7 +1411,7 @@ UMLListViewItem* UMLListView::findItem(Uml::ID::Type id) } /** - * Carries out initalisation of attributes in class. + * Carries out initialisation of attributes in class. * This method is called more than once during an instance's lifetime (by UMLDoc)! * So we must not allocate any memory before freeing the previously allocated one * or do connect()s. diff --git a/umbrello/umlwidgets/associationwidget.cpp b/umbrello/umlwidgets/associationwidget.cpp index cd9ffaf60..fc9cc2f16 100644 --- a/umbrello/umlwidgets/associationwidget.cpp +++ b/umbrello/umlwidgets/associationwidget.cpp @@ -1287,7 +1287,7 @@ void AssociationWidget::cleanup() We do not remove the UMLAssociation from the document. Why? - Well, for example we might be in the middle of a cut/paste. If the UMLAssociation is removed by the cut - then upon pasteing we have a problem. + then upon pasting we have a problem. This is not quite clean yet - there should be a way to explicitly delete a UMLAssociation. The Right Thing would be to have a ListView representation for UMLAssociation. diff --git a/umbrello/umlwidgets/classifierwidget.cpp b/umbrello/umlwidgets/classifierwidget.cpp index 1bb4b6708..785dec11c 100644 --- a/umbrello/umlwidgets/classifierwidget.cpp +++ b/umbrello/umlwidgets/classifierwidget.cpp @@ -678,7 +678,7 @@ QSizeF ClassifierWidget::calculateSize(bool withExtensions /* = true */) const } /** - * Calculcates the size of the templates box in the top left + * Calculates the size of the templates box in the top left * if it exists, returns QSize(0, 0) if it doesn't. * * @return QSize of the templates flap. diff --git a/umbrello/umlwidgets/widgetbase.cpp b/umbrello/umlwidgets/widgetbase.cpp index 2f271726d..a7f60efa4 100644 --- a/umbrello/umlwidgets/widgetbase.cpp +++ b/umbrello/umlwidgets/widgetbase.cpp @@ -614,7 +614,7 @@ void WidgetBase::setHighLighted(bool state) * In case the user cancels the dialog or there are some requirements * not fulfilled the method returns false; true otherwise. * - * @return true - properties has been applyed + * @return true - properties has been applied * @return false - properties has not been applied * */
