diff --git a/README_PACKAGERS.md b/README_PACKAGERS.md --- a/README_PACKAGERS.md +++ b/README_PACKAGERS.md @@ -19,7 +19,7 @@ There are four forks of 3rd party libraries that are relevant and cannot be replaced by system libraries: -* plugins/impex/raw/3rdparty contains a fork of kdcraw. Upstread removed most functionality from this library and is in general unable to provide a stable API. The library has been renamed to avoid conflicts with upstream kdcraw. +* plugins/impex/raw/3rdparty contains a fork of kdcraw. Upstream removed most functionality from this library and is in general unable to provide a stable API. The library has been renamed to avoid conflicts with upstream kdcraw. * plugins/impex/xcf/3rdparty contains the xcftools code. This has never been released as a library diff --git a/krita/doc/strokes/strokes_documentation.org b/krita/doc/strokes/strokes_documentation.org --- a/krita/doc/strokes/strokes_documentation.org +++ b/krita/doc/strokes/strokes_documentation.org @@ -691,7 +691,7 @@ pxoxy of the node we process (=KisNodeProgressProxy=). Our processings framework provides even easier way of doing this. You just need to instantiate a =ProgressHelper= object and ask it to - greate a =KoUpdater= object for you. And all is done. You can see + create a =KoUpdater= object for you. And all is done. You can see an example in =KisTransformProcessingVisitor= class. ** Testing diff --git a/plugins/assistants/Assistants/kis_assistant_tool.cc b/plugins/assistants/Assistants/kis_assistant_tool.cc --- a/plugins/assistants/Assistants/kis_assistant_tool.cc +++ b/plugins/assistants/Assistants/kis_assistant_tool.cc @@ -340,12 +340,12 @@ if (visibleRect.contains(uiMousePosition)) { newAssistantAllowed = false; assistant->setSnappingActive(!assistant->isSnappingActive()); // toggle - assistant->uncache();//this updates the chache of the assistant, very important. + assistant->uncache();//this updates the cache of the assistant, very important. assistantSelected(assistant); // whatever handle is the closest contains the selected assistant } } - if (newAssistantAllowed==true){//don't make a new assistant when I'm just toogling visiblity// + if (newAssistantAllowed==true){//don't make a new assistant when I'm just toggling visibility// QString key = m_options.availableAssistantsComboBox->model()->index( m_options.availableAssistantsComboBox->currentIndex(), 0 ).data(Qt::UserRole).toString(); m_newAssistant = toQShared(KisPaintingAssistantFactoryRegistry::instance()->get(key)->createPaintingAssistant()); m_internalMode = MODE_CREATION; diff --git a/plugins/dockers/advancedcolorselector/kis_color_selector.cpp b/plugins/dockers/advancedcolorselector/kis_color_selector.cpp --- a/plugins/dockers/advancedcolorselector/kis_color_selector.cpp +++ b/plugins/dockers/advancedcolorselector/kis_color_selector.cpp @@ -261,7 +261,7 @@ } } - // reset the currect color after resizing the widget + // reset the correct color after resizing the widget setColor(m_lastRealColor); KisColorSelectorBase::resizeEvent(e); diff --git a/plugins/extensions/pykrita/plugin/version_checker.h b/plugins/extensions/pykrita/plugin/version_checker.h --- a/plugins/extensions/pykrita/plugin/version_checker.h +++ b/plugins/extensions/pykrita/plugin/version_checker.h @@ -202,8 +202,8 @@ , undefined , less , less_or_equal - , greather - , greather_or_equal + , greater + , greater_or_equal , not_equal , equal , last__ @@ -230,7 +230,7 @@ switch (m_op) { case less: return left < m_rhs; - case greather: + case greater: return left > m_rhs; case equal: return left == m_rhs; @@ -238,7 +238,7 @@ return left != m_rhs; case less_or_equal: return left <= m_rhs; - case greather_or_equal: + case greater_or_equal: return left >= m_rhs; default: Q_ASSERT(!"Sanity check"); @@ -257,7 +257,7 @@ case less: result = " < "; break; - case greather: + case greater: result = " > "; break; case equal: @@ -269,7 +269,7 @@ case less_or_equal: result = " <= "; break; - case greather_or_equal: + case greater_or_equal: result = " >= "; break; default: @@ -292,7 +292,7 @@ lookup_next_char = true; break; case '>': - checker.m_op = greather; + checker.m_op = greater; lookup_next_char = true; break; case '=': diff --git a/plugins/extensions/qmic/QMic.cpp b/plugins/extensions/qmic/QMic.cpp --- a/plugins/extensions/qmic/QMic.cpp +++ b/plugins/extensions/qmic/QMic.cpp @@ -352,7 +352,7 @@ } if (m.isAttached()) { if (!m.lock()) { - dbgPlugins << "Could not lock memeory segment" << m.error() << m.errorString(); + dbgPlugins << "Could not lock memory segment" << m.error() << m.errorString(); } dbgPlugins << "Memory segment" << key << m.size() << m.constData() << m.data(); gmic_image *gimg = new gmic_image(); @@ -366,10 +366,10 @@ dbgPlugins << "created gmic image" << gimg->name << gimg->_width << gimg->_height; if (!m.unlock()) { - dbgPlugins << "Could not unlock memeory segment" << m.error() << m.errorString(); + dbgPlugins << "Could not unlock memory segment" << m.error() << m.errorString(); } if (!m.detach()) { - dbgPlugins << "Could not detach from memeory segment" << m.error() << m.errorString(); + dbgPlugins << "Could not detach from memory segment" << m.error() << m.errorString(); } images.append(gimg); } diff --git a/plugins/filters/blur/kis_gaussian_blur_filter.cpp b/plugins/filters/blur/kis_gaussian_blur_filter.cpp --- a/plugins/filters/blur/kis_gaussian_blur_filter.cpp +++ b/plugins/filters/blur/kis_gaussian_blur_filter.cpp @@ -101,7 +101,7 @@ QVariant value; /** - * NOTE: integer devision by two is done on purpose, + * NOTE: integer division by two is done on purpose, * because the kernel size is always odd */ const int halfWidth = _config->getProperty("horizRadius", value) ? KisGaussianKernel::kernelSizeFromRadius(t.scale(value.toFloat())) / 2 : 5; diff --git a/plugins/filters/convertheightnormalmap/kis_convert_height_to_normal_map_filter.cpp b/plugins/filters/convertheightnormalmap/kis_convert_height_to_normal_map_filter.cpp --- a/plugins/filters/convertheightnormalmap/kis_convert_height_to_normal_map_filter.cpp +++ b/plugins/filters/convertheightnormalmap/kis_convert_height_to_normal_map_filter.cpp @@ -146,7 +146,7 @@ QVariant value; /** - * NOTE: integer devision by two is done on purpose, + * NOTE: integer division by two is done on purpose, * because the kernel size is always odd */ const int halfWidth = _config->getProperty("horizRadius", value) ? KisEdgeDetectionKernel::kernelSizeFromRadius(t.scale(value.toFloat())) / 2 : 5; diff --git a/plugins/filters/edgedetection/kis_edge_detection_filter.cpp b/plugins/filters/edgedetection/kis_edge_detection_filter.cpp --- a/plugins/filters/edgedetection/kis_edge_detection_filter.cpp +++ b/plugins/filters/edgedetection/kis_edge_detection_filter.cpp @@ -135,7 +135,7 @@ QVariant value; /** - * NOTE: integer devision by two is done on purpose, + * NOTE: integer division by two is done on purpose, * because the kernel size is always odd */ const int halfWidth = _config->getProperty("horizRadius", value) ? KisEdgeDetectionKernel::kernelSizeFromRadius(t.scale(value.toFloat())) / 2 : 5; diff --git a/plugins/flake/textshape/kotext/KoInlineObject.h b/plugins/flake/textshape/kotext/KoInlineObject.h --- a/plugins/flake/textshape/kotext/KoInlineObject.h +++ b/plugins/flake/textshape/kotext/KoInlineObject.h @@ -169,7 +169,7 @@ const QRectF &rect, const QTextInlineObject &object, int posInDocument, const QTextCharFormat &format) = 0; /** - * Overwrite this if you are interrested in propertychanges. + * Overwrite this if you are interested in propertychanges. * @param property the property id that has been changed, one from the Property enum. * You should ignore all properties you don't use as new properties can be added at any time. * @param value the new value of the property wrapped in a QVariant. Properties can be a lot of diff --git a/plugins/flake/textshape/kotext/KoSectionModel.h b/plugins/flake/textshape/kotext/KoSectionModel.h --- a/plugins/flake/textshape/kotext/KoSectionModel.h +++ b/plugins/flake/textshape/kotext/KoSectionModel.h @@ -22,7 +22,7 @@ * semantics of operation to handle it right way. * 2) Model(Tree) Level: on this level we should update KoSectionModel * right way, so it in any moment represents the actual tree - * of sections. Tree is builded easily: + * of sections. Tree is built easily: * One section is son of another, if it is directly nested in it. * As text editing commands have access to change Formatting Level, * they are declared as friend classes of KoSectionModel to be able diff --git a/plugins/flake/textshape/kotext/KoTextEditor_undo.cpp b/plugins/flake/textshape/kotext/KoTextEditor_undo.cpp --- a/plugins/flake/textshape/kotext/KoTextEditor_undo.cpp +++ b/plugins/flake/textshape/kotext/KoTextEditor_undo.cpp @@ -169,7 +169,7 @@ } if (newState == NoOp && !commandStack.isEmpty()) { //Calling updateState to NoOp when the commandStack isn't empty means that the current headCommand on the commandStack is finished. Further UndoTextCommands do not belong to it. So we pop it. - //If after poping the headCommand we still have some commands on the commandStack means we have not finished with the highest "macro". In that case we need to stay in the "Custom" state. + //If after popping the headCommand we still have some commands on the commandStack means we have not finished with the highest "macro". In that case we need to stay in the "Custom" state. //On the contrary, an empty commandStack means we have finished with the "macro". In that case, we set the editor to NoOp state. A signal from the QTextDocument should also generate a new headCommand. debugText << "we are in a macro and update the state to NoOp. this means that the command on top of the commandStack is finished. we should pop it"; debugText << "commandStack count before: " << commandStack.count(); diff --git a/plugins/flake/textshape/kotext/KoTextLocator.h b/plugins/flake/textshape/kotext/KoTextLocator.h --- a/plugins/flake/textshape/kotext/KoTextLocator.h +++ b/plugins/flake/textshape/kotext/KoTextLocator.h @@ -56,7 +56,7 @@ /// return the word in which the locator is inserted. QString word() const; - /// Add a text reference that is interrested in knowing when this locator is laid-out in a differen position. + /// Add a text reference that is interested in knowing when this locator is laid-out in a different position. void addListener(KoTextReference *reference); /// Remove a reference from the listeners. void removeListener(KoTextReference *reference); diff --git a/plugins/flake/textshape/kotext/Mainpage.dox b/plugins/flake/textshape/kotext/Mainpage.dox --- a/plugins/flake/textshape/kotext/Mainpage.dox +++ b/plugins/flake/textshape/kotext/Mainpage.dox @@ -33,7 +33,7 @@ * created QTextDocument with KoText. This has the implication that all * the extra content is stored inside the document. We add QTextFormat * based properties for that as can be seen in the styles (see - * KoParagraphStyle::Properities for instance), and we allow managers to + * KoParagraphStyle::Properties for instance), and we allow managers to * be stored on the document too. So for example a KoStyleManager will * be stored as a property on the QTextDocument and you can access that * using the KoTextDocument API. Note that you can use the diff --git a/plugins/flake/textshape/kotext/opendocument/KoTextSharedLoadingData.cpp b/plugins/flake/textshape/kotext/opendocument/KoTextSharedLoadingData.cpp --- a/plugins/flake/textshape/kotext/opendocument/KoTextSharedLoadingData.cpp +++ b/plugins/flake/textshape/kotext/opendocument/KoTextSharedLoadingData.cpp @@ -246,7 +246,7 @@ parentStyles.insert(parastyle, styleElem->attributeNS(KoXmlNS::style, "parent-style-name")); // TODO check if it a know style set the styleid so that the custom styles are kept during copy and paste - // in case styles are not added to the style manager they have to be deleted after loading to avoid leaking memeory + // in case styles are not added to the style manager they have to be deleted after loading to avoid leaking memory if (styleManager) { styleManager->add(parastyle); } else { @@ -387,7 +387,7 @@ d->tableStylesDotXmlStyles.insert(it->first, it->second); } // TODO check if it a know style set the styleid so that the custom styles are kept during copy and paste - // in case styles are not added to the style manager they have to be deleted after loading to avoid leaking memeory + // in case styles are not added to the style manager they have to be deleted after loading to avoid leaking memory if (styleManager) { styleManager->add(it->second); } else { @@ -427,7 +427,7 @@ d->tableColumnStylesDotXmlStyles.insert(it->first, it->second); } // TODO check if it a know style set the styleid so that the custom styles are kept during copy and paste - // in case styles are not added to the style manager they have to be deleted after loading to avoid leaking memeory + // in case styles are not added to the style manager they have to be deleted after loading to avoid leaking memory if (styleManager) { styleManager->add(it->second); } else { @@ -467,7 +467,7 @@ d->tableRowStylesDotXmlStyles.insert(it->first, it->second); } // TODO check if it a know style set the styleid so that the custom styles are kept during copy and paste - // in case styles are not added to the style manager they have to be deleted after loading to avoid leaking memeory + // in case styles are not added to the style manager they have to be deleted after loading to avoid leaking memory if (styleManager) { styleManager->add(it->second); } else { @@ -507,7 +507,7 @@ d->tableCellStylesDotXmlStyles.insert(it->first, it->second); } // TODO check if it a know style set the styleid so that the custom styles are kept during copy and paste - // in case styles are not added to the style manager they have to be deleted after loading to avoid leaking memeory + // in case styles are not added to the style manager they have to be deleted after loading to avoid leaking memory if (styleManager) { styleManager->add(it->second); } else { @@ -547,7 +547,7 @@ d->sectionStylesDotXmlStyles.insert(it->first, it->second); } // TODO check if it a know style set the styleid so that the custom styles are kept during copy and paste - // in case styles are not added to the style manager they have to be deleted after loading to avoid leaking memeory + // in case styles are not added to the style manager they have to be deleted after loading to avoid leaking memory if (styleManager) { styleManager->add(it->second); } else { @@ -687,7 +687,7 @@ for (; it != tableTemplates.end(); ++it) { d->tableTemplates.insert(it->first, it->second); - // in case templates are not added to the style manager they have to be deleted after loading to avoid leaking memeory + // in case templates are not added to the style manager they have to be deleted after loading to avoid leaking memory if (styleManager) { styleManager->add(it->second); } else { diff --git a/plugins/flake/textshape/kotext/styles/KoListLevelProperties.h b/plugins/flake/textshape/kotext/styles/KoListLevelProperties.h --- a/plugins/flake/textshape/kotext/styles/KoListLevelProperties.h +++ b/plugins/flake/textshape/kotext/styles/KoListLevelProperties.h @@ -141,7 +141,7 @@ qreal minimumDistance() const; /// sets the margin of the list - void setMargin(qreal vlaue); + void setMargin(qreal value); /// returns the margin of the list qreal margin() const; diff --git a/plugins/flake/textshape/textlayout/ListItemsHelper.cpp b/plugins/flake/textshape/textlayout/ListItemsHelper.cpp --- a/plugins/flake/textshape/textlayout/ListItemsHelper.cpp +++ b/plugins/flake/textshape/textlayout/ListItemsHelper.cpp @@ -475,7 +475,7 @@ qreal counterSpacing = 0; if (format.boolProperty(KoListStyle::AlignmentMode)) { - // for aligmentmode spacing should be 0 + // for AlignmentMode spacing should be 0 counterSpacing = 0; } else { if (listStyle != KoListStyle::None) { diff --git a/plugins/flake/textshape/textlayout/Mainpage.dox b/plugins/flake/textshape/textlayout/Mainpage.dox --- a/plugins/flake/textshape/textlayout/Mainpage.dox +++ b/plugins/flake/textshape/textlayout/Mainpage.dox @@ -33,7 +33,7 @@ * created QTextDocument with KoText. This has the implication that all * the extra content is stored inside the document. We add QTextFormat * based properties for that as can be seen in the styles (see - * KoParagraphStyle::Properities for instance), and we allow managers to + * KoParagraphStyle::Properties for instance), and we allow managers to * be stored on the document too. So for example a KoStyleManager will * be stored as a property on the QTextDocument and you can access that * using the KoTextDocument API. Note that you can use the diff --git a/plugins/impex/jpeg/kis_jpeg_converter.cc b/plugins/impex/jpeg/kis_jpeg_converter.cc --- a/plugins/impex/jpeg/kis_jpeg_converter.cc +++ b/plugins/impex/jpeg/kis_jpeg_converter.cc @@ -88,7 +88,7 @@ ( *( cinfo->err->format_message ) ) ( cinfo, jpegLastErrorMsg ); /* Jump to the setjmp point */ - throw std::runtime_error( jpegLastErrorMsg ); // or your preffered exception ... + throw std::runtime_error( jpegLastErrorMsg ); // or your preferred exception ... } J_COLOR_SPACE getColorTypeforColorSpace(const KoColorSpace * cs) diff --git a/plugins/impex/xcf/3rdparty/xcftools/utils.c b/plugins/impex/xcf/3rdparty/xcftools/utils.c --- a/plugins/impex/xcf/3rdparty/xcftools/utils.c +++ b/plugins/impex/xcf/3rdparty/xcftools/utils.c @@ -148,7 +148,7 @@ */ if( fputc('\0', f) != EOF && fflush(f) == 0 ) - errno = EIO ; /* Argh, everything succeds. Just call it an I/O error */ + errno = EIO ; /* Argh, everything succeeds. Just call it an I/O error */ } } FatalUnexpected(_("!Error writing file %s"),name); diff --git a/plugins/impex/xcf/3rdparty/xcftools/xcf-general.c b/plugins/impex/xcf/3rdparty/xcftools/xcf-general.c --- a/plugins/impex/xcf/3rdparty/xcftools/xcf-general.c +++ b/plugins/impex/xcf/3rdparty/xcftools/xcf-general.c @@ -60,7 +60,7 @@ ncolors = xcfL(ptr+8) ; if( ncolors > 256 ) FatalBadXCF("Colormap has %" PRIu32 " entries",ncolors); - /* Surprise! Some older verion of the Gimp computed the wrong length + /* Surprise! Some older version of the Gimp computed the wrong length * word, and the _reader_ always just reads three bytes per color * and ignores the length tag! Duplicate this so we too can read * the buggy XCF files. diff --git a/plugins/python/comics_project_management_tools/comics_project_manager_docker.py b/plugins/python/comics_project_management_tools/comics_project_manager_docker.py --- a/plugins/python/comics_project_management_tools/comics_project_manager_docker.py +++ b/plugins/python/comics_project_management_tools/comics_project_manager_docker.py @@ -184,12 +184,14 @@ """ This is a Krita docker called 'Comics Manager'. -It allows people to create comics project files, load those files, add pages, remove pages, move pages, manage the metadata, -and finally export the result. - -The logic behind this docker is that it is very easy to get lost in a comics project due to the massive amount of files. -By having a docker that gives the user quick access to the pages and also allows them to do all of the meta-stuff, like -meta data, but also reordering the pages, the chaos of managing the project should take up less time, and more time can be focussed on actual writing and drawing. +It allows people to create comics project files, load those files, add pages, +remove pages, move pages, manage the metadata, and finally export the result. + +The logic behind this docker is that it is very easy to get lost in a comics +project due to the massive amount of files. By having a docker that gives the +user quick access to the pages and also allows them to do all of the meta-stuff, +like meta data, but also reordering the pages, the chaos of managing the project +should take up less time, and more time can be focused on actual writing and drawing. """ @@ -593,9 +595,10 @@ self.add_new_page(templateUrl) """ - This function always asks for a template showing the new template window. This allows users to have multiple different - templates created for back covers, spreads, other and have them accesible, while still having the convenience of a singular - "add page" that adds a default. + This function always asks for a template showing the new template window. + This allows users to have multiple different templates created for back covers, + spreads, other and have them accessible, while still having the convenience of + a singular "add page" that adds a default. """ def slot_add_new_page_from_template(self): @@ -673,7 +676,7 @@ self.pagesModel.appendRow(newPageItem) """ - Write to the json configuratin file. + Write to the json configuration file. This also checks the current state of the pages list. """ @@ -734,8 +737,9 @@ self.slot_write_config() """ - An attempt at making the description editable from the comic pages list. It is currently not working because ZipFile - has no overwrite mechanism, and I don't have the energy to write one yet. + An attempt at making the description editable from the comic pages list. + It is currently not working because ZipFile has no overwrite mechanism, + and I don't have the energy to write one yet. """ def slot_write_description(self, index): @@ -827,7 +831,8 @@ """ Resize all the pages in the pages list. - It will show a dialog with the options for resizing. Then, it will try to pop up a progress dialog while resizing. + It will show a dialog with the options for resizing. + Then, it will try to pop up a progress dialog while resizing. The progress dialog shows the remaining time and pages. """ diff --git a/plugins/tools/basictools/kis_tool_gradient.cc b/plugins/tools/basictools/kis_tool_gradient.cc --- a/plugins/tools/basictools/kis_tool_gradient.cc +++ b/plugins/tools/basictools/kis_tool_gradient.cc @@ -231,7 +231,7 @@ m_cmbShape->addItem(i18nc("the gradient will be drawn bilinearly", "Bi-Linear")); m_cmbShape->addItem(i18nc("the gradient will be drawn radially", "Radial")); m_cmbShape->addItem(i18nc("the gradient will be drawn in a square around a centre", "Square")); - m_cmbShape->addItem(i18nc("the gradient will be drawn as an assymmetric cone", "Conical")); + m_cmbShape->addItem(i18nc("the gradient will be drawn as an asymmetric cone", "Conical")); m_cmbShape->addItem(i18nc("the gradient will be drawn as a symmetric cone", "Conical Symmetric")); m_cmbShape->addItem(i18nc("the gradient will be drawn in a selection outline", "Shaped")); addOptionWidgetOption(m_cmbShape, m_lbShape); diff --git a/plugins/tools/basictools/kis_tool_move.cc b/plugins/tools/basictools/kis_tool_move.cc --- a/plugins/tools/basictools/kis_tool_move.cc +++ b/plugins/tools/basictools/kis_tool_move.cc @@ -280,7 +280,7 @@ void KisToolMove::requestUndoDuringStroke() { - // we shouldn't cancel the stroke on Ctrl+Z, becasue it will not only + // we shouldn't cancel the stroke on Ctrl+Z, because it will not only // cancel the stroke, but also undo the previous command, which we haven't // yet pushed to the stack } diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp --- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp +++ b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp @@ -217,7 +217,7 @@ QRectF outlineDocRect = currentImage()->pixelToDocument(outlinePixelRect); // This adjusted call is needed as we paint with a 3 pixel wide brush and the pen is outside the bounds of the path - // Pen uses view coordinates so we have to zoom the document value to match 2 pixel in view coordiates + // Pen uses view coordinates so we have to zoom the document value to match 2 pixel in view coordinates // See BUG 275829 qreal zoomX; qreal zoomY; diff --git a/sdk/tests/KisRectsCollisionsTracker.h b/sdk/tests/KisRectsCollisionsTracker.h --- a/sdk/tests/KisRectsCollisionsTracker.h +++ b/sdk/tests/KisRectsCollisionsTracker.h @@ -51,7 +51,7 @@ Q_FOREACH (const QRect &rc, m_rectsInProgress) { if (rc != rect && rect.intersects(rc)) { - ENTER_FUNCTION() << "FAIL: concurrect access from" << rect << "to" << rc << tag; + ENTER_FUNCTION() << "FAIL: concurrent access from" << rect << "to" << rc << tag; return false; } }