diff --git a/libs/flake/tests/TestSvgParser.h b/libs/flake/tests/TestSvgParser.h --- a/libs/flake/tests/TestSvgParser.h +++ b/libs/flake/tests/TestSvgParser.h @@ -158,7 +158,7 @@ void testMarkersDifferent(); - void testGradientRecoveringTrasnform(); + void testGradientRecoveringTransform(); void testMarkersOnClosedPath(); void testMarkersAngularUnits(); diff --git a/libs/flake/tests/TestSvgParser.cpp b/libs/flake/tests/TestSvgParser.cpp --- a/libs/flake/tests/TestSvgParser.cpp +++ b/libs/flake/tests/TestSvgParser.cpp @@ -2964,7 +2964,7 @@ } -void TestSvgParser::testGradientRecoveringTrasnform() +void TestSvgParser::testGradientRecoveringTransform() { // used for experimenting purposes only! @@ -2984,12 +2984,12 @@ gradient.setColorAt(0.0, Qt::red); gradient.setColorAt(1.0, Qt::blue); - QTransform gradientTrasnform; - gradientTrasnform.shear(0.2, 0); + QTransform gradientTransform; + gradientTransform.shear(0.2, 0); { QBrush brush(gradient); - brush.setTransform(gradientTrasnform); + brush.setTransform(gradientTransform); painter.setBrush(brush); } @@ -3017,7 +3017,7 @@ { gradient.setCoordinateMode(QGradient::LogicalMode); QBrush brush(gradient); - brush.setTransform(gradientTrasnform * gradientToUser * smallShapeTransform.inverted()); + brush.setTransform(gradientTransform * gradientToUser * smallShapeTransform.inverted()); painter.setBrush(brush); painter.setPen(Qt::NoPen); } diff --git a/libs/ui/widgets/kis_cie_tongue_widget.h b/libs/ui/widgets/kis_cie_tongue_widget.h --- a/libs/ui/widgets/kis_cie_tongue_widget.h +++ b/libs/ui/widgets/kis_cie_tongue_widget.h @@ -76,7 +76,7 @@ void drawLabels(); QRgb colorByCoord(double x, double y); - void drawSmallElipse(QPointF xy, int r, int g, int b, int sz); + void drawSmallEllipse(QPointF xy, int r, int g, int b, int sz); void resizeEvent(QResizeEvent* event) override; void paintEvent(QPaintEvent*) override; diff --git a/libs/ui/widgets/kis_cie_tongue_widget.cpp b/libs/ui/widgets/kis_cie_tongue_widget.cpp --- a/libs/ui/widgets/kis_cie_tongue_widget.cpp +++ b/libs/ui/widgets/kis_cie_tongue_widget.cpp @@ -508,7 +508,7 @@ } } -void KisCIETongueWidget::drawSmallElipse(QPointF xy, int r, int g, int b, int sz) +void KisCIETongueWidget::drawSmallEllipse(QPointF xy, int r, int g, int b, int sz) { int icx, icy; @@ -529,9 +529,9 @@ d->painter.setPen(qRgb(80, 80, 80)); d->painter.setRenderHint(QPainter::Antialiasing); if (d->colorModel ==KisCIETongueWidget::RGBA) { - drawSmallElipse((QPointF(d->Primaries[0],d->Primaries[1])), 255, 128, 128, 6); - drawSmallElipse((QPointF(d->Primaries[3],d->Primaries[4])), 128, 255, 128, 6); - drawSmallElipse((QPointF(d->Primaries[6],d->Primaries[7])), 128, 128, 255, 6); + drawSmallEllipse((QPointF(d->Primaries[0],d->Primaries[1])), 255, 128, 128, 6); + drawSmallEllipse((QPointF(d->Primaries[3],d->Primaries[4])), 128, 255, 128, 6); + drawSmallEllipse((QPointF(d->Primaries[6],d->Primaries[7])), 128, 128, 255, 6); int x1, y1, x2, y2, x3, y3; @@ -544,7 +544,7 @@ biasedLine(x3, y3, x1, y1); } /*else if (d->colorModel ==CMYK){ for (i=0; iPrimaries.size();i+++){ - drawSmallElipse((QPointF(d->Primaries[0],d->Primaries[1])), 160, 160, 160, 6);//greyscale for now + drawSmallEllipse((QPointF(d->Primaries[0],d->Primaries[1])), 160, 160, 160, 6);//greyscale for now //int x1, y1, x2, y2; //mapPoint(x1, y1, (QPointF(d->Primaries[i],d->Primaries[i+1])) ); //mapPoint(x2, y2, (QPointF(d->Primaries[i+3],d->Primaries[i+4])) ); @@ -558,7 +558,7 @@ void KisCIETongueWidget::drawWhitePoint() { - drawSmallElipse(QPointF (d->whitePoint[0],d->whitePoint[1]), 255, 255, 255, 8); + drawSmallEllipse(QPointF (d->whitePoint[0],d->whitePoint[1]), 255, 255, 255, 8); } void KisCIETongueWidget::drawGamut() diff --git a/libs/ui/widgets/kis_widget_chooser.h b/libs/ui/widgets/kis_widget_chooser.h --- a/libs/ui/widgets/kis_widget_chooser.h +++ b/libs/ui/widgets/kis_widget_chooser.h @@ -35,11 +35,11 @@ struct Data { Data(const QString& ID): - id(ID), widget(0), label(0), choosen(false) { } + id(ID), widget(0), label(0), chosen(false) { } Data(const Data& d): - id(d.id), widget(d.widget), label(d.label), choosen(d.choosen) { } + id(d.id), widget(d.widget), label(d.label), chosen(d.chosen) { } Data(const QString& ID, QWidget* w, QLabel* l): - id(ID), widget(w), label(l), choosen(false) { } + id(ID), widget(w), label(l), chosen(false) { } friend bool operator == (const Data& a, const Data& b) { return a.id == b.id; @@ -48,7 +48,7 @@ QString id; QWidget* widget; QLabel* label; - bool choosen; + bool chosen; }; typedef QList::iterator Iterator; @@ -86,7 +86,7 @@ protected Q_SLOTS: void slotButtonPressed(); - void slotWidgetChoosen(int index); + void slotWidgetChosen(int index); // QWidget interface protected: @@ -98,7 +98,7 @@ QToolButton* m_arrowButton; QButtonGroup* m_buttons; QFrame* m_popup; - QString m_choosenID; + QString m_chosenID; QList m_widgets; }; diff --git a/libs/ui/widgets/kis_widget_chooser.cpp b/libs/ui/widgets/kis_widget_chooser.cpp --- a/libs/ui/widgets/kis_widget_chooser.cpp +++ b/libs/ui/widgets/kis_widget_chooser.cpp @@ -111,7 +111,7 @@ layout->setSpacing(0); for(Iterator i=m_widgets.begin(); i!=m_widgets.end(); ++i) { - if(i->choosen) { + if(i->chosen) { if (i->label) { layout->addWidget(i->label); } @@ -137,7 +137,7 @@ QList buttons = m_buttons->buttons(); for(Iterator i=m_widgets.begin(); i!=m_widgets.end(); ++i) { - if(!i->choosen) { + if(!i->chosen) { if(row == buttons.size()) { QToolButton* bn = new QToolButton(); @@ -169,7 +169,7 @@ delete m_buttons; m_buttons = group; - connect(m_buttons, SIGNAL(buttonClicked(int)), SLOT(slotWidgetChoosen(int))); + connect(m_buttons, SIGNAL(buttonClicked(int)), SLOT(slotWidgetChosen(int))); return layout; } @@ -179,7 +179,7 @@ Iterator data = std::find(m_widgets.begin(), m_widgets.end(), Data(id)); if(data != m_widgets.end()) { - if(!data->choosen) { + if(!data->chosen) { delete m_popup->layout(); m_popup->setLayout(createPopupLayout()); m_popup->adjustSize(); @@ -196,14 +196,14 @@ QWidget* KisWidgetChooser::chooseWidget(const QString& id) { - QWidget* choosenWidget = 0; + QWidget* chosenWidget = 0; for(Iterator i=m_widgets.begin(); i!=m_widgets.end(); ++i) { if(i->id == id) { - choosenWidget = i->widget; - i->choosen = true; + chosenWidget = i->widget; + i->chosen = true; } - else i->choosen = false; + else i->chosen = false; } delete m_popup->layout(); @@ -216,7 +216,7 @@ KisConfig cfg(false); cfg.setToolbarSlider(m_chooserid, id); - return choosenWidget; + return chosenWidget; } QWidget* KisWidgetChooser::getWidget(const QString& id) const @@ -264,7 +264,7 @@ showPopupWidget(); } -void KisWidgetChooser::slotWidgetChoosen(int index) +void KisWidgetChooser::slotWidgetChosen(int index) { chooseWidget(m_widgets[index].id); m_popup->hide(); diff --git a/plugins/extensions/resourcemanager/resourcemanager.cpp b/plugins/extensions/resourcemanager/resourcemanager.cpp --- a/plugins/extensions/resourcemanager/resourcemanager.cpp +++ b/plugins/extensions/resourcemanager/resourcemanager.cpp @@ -266,7 +266,7 @@ { QStringList resources = importResources(i18n("Import Gradients"), QStringList() << "image/svg+xml" << "application/x-gimp-gradient" - << "applicaition/x-karbon-gradient"); + << "application/x-karbon-gradient"); Q_FOREACH (const QString &res, resources) { d->gradientServer->importResourceFile(res); } diff --git a/plugins/filters/embossfilter/kis_emboss_filter.cpp b/plugins/filters/embossfilter/kis_emboss_filter.cpp --- a/plugins/filters/embossfilter/kis_emboss_filter.cpp +++ b/plugins/filters/embossfilter/kis_emboss_filter.cpp @@ -77,7 +77,7 @@ * d => Emboss value * * Theory => This is an amazing effect. And the theory is very simple to - * understand. You get the diference between the colors and + * understand. You get the difference between the colors and * increase it. After this, get the gray tone */ void KisEmbossFilter::processImpl(KisPaintDeviceSP device, diff --git a/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.h b/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.h --- a/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.h +++ b/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.h @@ -103,14 +103,14 @@ /// Converts from shape coordinates to viewbox coordinates QPointF shapeToViewbox(const QPointF &point) const; - /// Sets if the shape is to be mirrored horizontally before aplying any other transformations + /// Sets if the shape is to be mirrored horizontally before applying any other transformations //NOTE: in the standard nothing is mentioned about the priorities of the transformations" //it's assumed like this because of the behavior shwon in OOo void setMirrorHorizontally(bool mirrorHorizontally); - /// Sets if the shape is to be mirrored vertically before aplying any other transformations + /// Sets if the shape is to be mirrored vertically before applying any other transformations //NOTE: in the standard nothing is mentioned about the priorities of the transformations" - //it's assumed like this because of the behavior shwon in OOo + //it's assumed like this because of the behavior shown in OOo void setMirrorVertically(bool mirrorVertically); // Sets member variable representing draw:path-stretchpoint-x attribute @@ -149,13 +149,13 @@ /// Updates the size and position of an optionally existing text-on-shape text area void updateTextArea(); - /// Enables chaching results + /// Enables caching results void enableResultCache(bool enable); // This function checks if draw:path-stretchpoint-x or draw:path-stretchpoint-y attributes are set. // If the attributes are set the path shape coordinates (m_subpaths) are changed so that the form // of the shape is preserved after stretching. It is needed for example in round-rectangles, to - // have the corners round after stretching. Without it the corners would be eliptical. + // have the corners round after stretching. Without it the corners would be elliptical. // Returns true if any points were actually changed, otherwise false. bool useStretchPoints(const QSizeF &size, qreal &scale); @@ -170,7 +170,7 @@ QPointF m_viewBoxOffset; QStringList m_textArea; QList m_commands; ///< the commands creating the outline - QList m_enhancedHandles; ///< the handles for modifiying the shape + QList m_enhancedHandles; ///< the handles for modifying the shape FormulaStore m_formulae; ///< the formulae ModifierStore m_modifiers; ///< the modifier values ParameterStore m_parameters; ///< the shared parameters @@ -178,7 +178,7 @@ bool m_mirrorHorizontally; /// m_resultChache; ///< cache for intermediate results used when evaluating path + QHash m_resultCache; ///< cache for intermediate results used when evaluating path bool m_cacheResults; ///< indicates if result cache is enabled }; diff --git a/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp b/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp --- a/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp +++ b/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp @@ -66,7 +66,7 @@ m_mirrorHorizontally(rhs.m_mirrorHorizontally), m_pathStretchPointX(rhs.m_pathStretchPointX), m_pathStretchPointY(rhs.m_pathStretchPointY), - m_resultChache(rhs.m_resultChache), + m_resultCache(rhs.m_resultCache), m_cacheResults(rhs.m_cacheResults) { } @@ -223,8 +223,8 @@ // referenced formula case '?': { QString fname = reference.mid(1); - if (m_cacheResults && m_resultChache.contains(fname)) { - res = m_resultChache.value(fname); + if (m_cacheResults && m_resultCache.contains(fname)) { + res = m_resultCache.value(fname); } else { FormulaStore::const_iterator formulaIt = m_formulae.constFind(fname); if (formulaIt != m_formulae.constEnd()) { @@ -232,7 +232,7 @@ if (formula) { res = formula->evaluate(); if (m_cacheResults) { - m_resultChache.insert(fname, res); + m_resultCache.insert(fname, res); } } } @@ -723,7 +723,7 @@ void EnhancedPathShape::enableResultCache(bool enable) { - m_resultChache.clear(); + m_resultCache.clear(); m_cacheResults = enable; }