diff --git a/scribus/actionmanager.cpp b/scribus/actionmanager.cpp index 715c88cd27..b221163f68 100644 --- a/scribus/actionmanager.cpp +++ b/scribus/actionmanager.cpp @@ -2519,7 +2519,7 @@ void ActionManager::handleMultipleSelections(bool isMultiple) void ActionManager::languageChangeActions() { - //Here we mangle the URL based on the current GUI language, returning English if we dont get one of these hard coded options. + //Here we mangle the URL based on the current GUI language, returning English if we don't get one of these hard coded options. //CB TODO make more flexible one day. QString language="EN"; QString langpref(ScCore->getGuiLanguage().left(2)); diff --git a/scribus/appmodehelper.cpp b/scribus/appmodehelper.cpp index bff39fb942..a129f10726 100644 --- a/scribus/appmodehelper.cpp +++ b/scribus/appmodehelper.cpp @@ -91,7 +91,7 @@ void AppModeHelper::setApplicationMode(ScribusMainWindow* scmw, ScribusDoc* doc, return; } - //disconnect the tools actions so we dont fire them off + //disconnect the tools actions so we don't fire them off a_actMgr->disconnectModeActions(); setModeActionsPerMode(newMode); @@ -101,7 +101,7 @@ void AppModeHelper::setApplicationMode(ScribusMainWindow* scmw, ScribusDoc* doc, if (!doc->m_Selection->isEmpty()) currItem = doc->m_Selection->itemAt(0); - //Ugly hack but I have absolutly no idea about how to do this in another way + //Ugly hack but I have absolutely no idea about how to do this in another way if (UndoManager::undoEnabled() && currItem && oldMode != newMode && (newMode == modeEditMeshPatch || oldMode == modeEditMeshPatch || newMode == modeEditMeshGradient || oldMode == modeEditMeshGradient || newMode == modeEditGradientVectors || oldMode == modeEditGradientVectors || diff --git a/scribus/canvasgesture_resize.cpp b/scribus/canvasgesture_resize.cpp index 8ef871f3d9..4a57095132 100644 --- a/scribus/canvasgesture_resize.cpp +++ b/scribus/canvasgesture_resize.cpp @@ -507,7 +507,7 @@ void ResizeGesture::mouseMoveEvent(QMouseEvent *m) { adjustBounds(m); FPoint where = m_canvas->globalToCanvas(m->globalPos()); - if (// directly after a create the shape of an item isnt really usable, so we fix here + if (// directly after a create the shape of an item isn't really usable, so we fix here m_origBounds.width() < 20 || m_origBounds.height() < 20 || // and if we resize outside of the current canvas dimensions, we need to enlarge it where.x() < m_doc->minCanvasCoordinate.x() || where.y() < m_doc->minCanvasCoordinate.y() || diff --git a/scribus/canvasmode.cpp b/scribus/canvasmode.cpp index b9c746ddb5..c4aae6bc1b 100644 --- a/scribus/canvasmode.cpp +++ b/scribus/canvasmode.cpp @@ -1402,7 +1402,7 @@ void CanvasMode::commonkeyPressEvent_NormalNodeEdit(QKeyEvent *e) bool resizingsmaller=(resizing && (buttonModifiers & Qt::ShiftModifier)); double resizeBy=1.0; //CB with control locked out due to the requirement of moveby of 0.01, we cannot support - //resizeby 10 units unless we move to supporting modifier keys that most people dont have. + //resizeby 10 units unless we move to supporting modifier keys that most people don't have. //if (buttonModifiers & Qt::ControlModifier) // resizeBy*=10.0; resizeBy/=m_doc->unitRatio(); diff --git a/scribus/canvasmode.h b/scribus/canvasmode.h index 2cc0860162..055f607bce 100644 --- a/scribus/canvasmode.h +++ b/scribus/canvasmode.h @@ -110,7 +110,7 @@ class SCRIBUS_API CanvasMode : public QObject virtual bool handleKeyEvents() { return false; } /** - Sets appropiate values for this canvas mode + Sets appropriate values for this canvas mode */ virtual void updateViewMode(CanvasViewMode* viewmode); @@ -141,7 +141,7 @@ class SCRIBUS_API CanvasMode : public QObject QCursor modeCursor(); void setModeCursor(); - /** main canvas modes dont have a delegate */ + /** main canvas modes don't have a delegate */ virtual CanvasMode* delegate() { return 0; } ScribusView* view() const { return m_view; } virtual ~CanvasMode(); diff --git a/scribus/canvasmode_drawbezier.cpp b/scribus/canvasmode_drawbezier.cpp index 62a4fe4f61..a8f292d176 100644 --- a/scribus/canvasmode_drawbezier.cpp +++ b/scribus/canvasmode_drawbezier.cpp @@ -453,7 +453,7 @@ void BezierMode::mouseReleaseEvent(QMouseEvent *m) // { // m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0)->ItemNr); // } - //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas + //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas m_view->m_ScMW->zoomSpinBox->clearFocus(); m_view->m_ScMW->pageSelector->clearFocus(); if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action diff --git a/scribus/canvasmode_drawcalligraphic.cpp b/scribus/canvasmode_drawcalligraphic.cpp index b58c57b61b..8f40be5e1c 100644 --- a/scribus/canvasmode_drawcalligraphic.cpp +++ b/scribus/canvasmode_drawcalligraphic.cpp @@ -322,7 +322,7 @@ void CalligraphicMode::mouseReleaseEvent(QMouseEvent *m) { m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0)); } - //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas + //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas m_view->m_ScMW->zoomSpinBox->clearFocus(); m_view->m_ScMW->pageSelector->clearFocus(); if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action diff --git a/scribus/canvasmode_drawfreehand.cpp b/scribus/canvasmode_drawfreehand.cpp index 884cbdc389..0a92ae2d51 100644 --- a/scribus/canvasmode_drawfreehand.cpp +++ b/scribus/canvasmode_drawfreehand.cpp @@ -309,7 +309,7 @@ void FreehandMode::mouseReleaseEvent(QMouseEvent *m) { m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0)); } - //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas + //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas m_view->m_ScMW->zoomSpinBox->clearFocus(); m_view->m_ScMW->pageSelector->clearFocus(); if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action diff --git a/scribus/canvasmode_edit.cpp b/scribus/canvasmode_edit.cpp index 11fe0e07f3..adfe8e5864 100644 --- a/scribus/canvasmode_edit.cpp +++ b/scribus/canvasmode_edit.cpp @@ -444,7 +444,7 @@ void CanvasMode_Edit::mouseMoveEvent(QMouseEvent *m) currItem->itemText.deselectAll(); currItem->HasSel = false; m_view->slotSetCurs(m->globalPos().x(), m->globalPos().y()); - //Make sure we dont go here if the old cursor position was not set + //Make sure we don't go here if the old cursor position was not set if (oldCp!=-1 && currItem->itemText.length() > 0) { if (currItem->itemText.cursorPosition() < oldCp) @@ -932,7 +932,7 @@ void CanvasMode_Edit::mouseReleaseEvent(QMouseEvent *m) { m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0)); } - //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas + //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas m_view->m_ScMW->zoomSpinBox->clearFocus(); m_view->m_ScMW->pageSelector->clearFocus(); if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action diff --git a/scribus/canvasmode_editgradient.cpp b/scribus/canvasmode_editgradient.cpp index 6fa3e90d9a..afa7e29152 100644 --- a/scribus/canvasmode_editgradient.cpp +++ b/scribus/canvasmode_editgradient.cpp @@ -286,7 +286,7 @@ void CanvasMode_EditGradient::mouseDoubleClickEvent(QMouseEvent *m) m_view->Deselect(false); m_doc->m_Selection->addItem(currItem); currItem->isSingleSel = true; - //CB FIXME dont call this if the added item is item 0 + //CB FIXME don't call this if the added item is item 0 if (!m_doc->m_Selection->primarySelectionIs(currItem)) currItem->emitAllToGUI(); m_view->updateContents(currItem->getRedrawBounding(m_canvas->scale())); diff --git a/scribus/canvasmode_editmeshgradient.cpp b/scribus/canvasmode_editmeshgradient.cpp index ab337442a7..63ca136ee1 100644 --- a/scribus/canvasmode_editmeshgradient.cpp +++ b/scribus/canvasmode_editmeshgradient.cpp @@ -546,7 +546,7 @@ void CanvasMode_EditMeshGradient::mouseDoubleClickEvent(QMouseEvent *m) m_view->Deselect(false); m_doc->m_Selection->addItem(currItem); currItem->isSingleSel = true; - //CB FIXME dont call this if the added item is item 0 + //CB FIXME don't call this if the added item is item 0 if (!m_doc->m_Selection->primarySelectionIs(currItem)) currItem->emitAllToGUI(); m_view->updateContents(currItem->getRedrawBounding(m_canvas->scale())); diff --git a/scribus/canvasmode_editmeshpatch.cpp b/scribus/canvasmode_editmeshpatch.cpp index 438bca08ab..ac91f7ce53 100644 --- a/scribus/canvasmode_editmeshpatch.cpp +++ b/scribus/canvasmode_editmeshpatch.cpp @@ -545,7 +545,7 @@ void CanvasMode_EditMeshPatch::mouseDoubleClickEvent(QMouseEvent *m) m_view->Deselect(false); m_doc->m_Selection->addItem(currItem); currItem->isSingleSel = true; - //CB FIXME dont call this if the added item is item 0 + //CB FIXME don't call this if the added item is item 0 if (!m_doc->m_Selection->primarySelectionIs(currItem)) currItem->emitAllToGUI(); m_view->updateContents(currItem->getRedrawBounding(m_canvas->scale())); diff --git a/scribus/canvasmode_editweldpoint.cpp b/scribus/canvasmode_editweldpoint.cpp index aa1333bbcf..87c229a829 100644 --- a/scribus/canvasmode_editweldpoint.cpp +++ b/scribus/canvasmode_editweldpoint.cpp @@ -322,7 +322,7 @@ void CanvasMode_EditWeldPoint::mouseDoubleClickEvent(QMouseEvent *m) m_view->Deselect(false); m_doc->m_Selection->addItem(currItem); currItem->isSingleSel = true; - //CB FIXME dont call this if the added item is item 0 + //CB FIXME don't call this if the added item is item 0 if (!m_doc->m_Selection->primarySelectionIs(currItem)) currItem->emitAllToGUI(); m_view->updateContents(currItem->getRedrawBounding(m_canvas->scale())); diff --git a/scribus/canvasmode_framelinks.cpp b/scribus/canvasmode_framelinks.cpp index 0615151186..0d39d5a2ff 100644 --- a/scribus/canvasmode_framelinks.cpp +++ b/scribus/canvasmode_framelinks.cpp @@ -313,7 +313,7 @@ void CanvasMode_FrameLinks::mouseReleaseEvent(QMouseEvent *m) m_view->MidButt = false; for (int i = 0; i < m_doc->m_Selection->count(); ++i) m_doc->m_Selection->itemAt(i)->checkChanges(true); - //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas + //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas m_view->m_ScMW->zoomSpinBox->clearFocus(); m_view->m_ScMW->pageSelector->clearFocus(); } diff --git a/scribus/canvasmode_magnifier.cpp b/scribus/canvasmode_magnifier.cpp index b6fafc02cb..8b296c7546 100644 --- a/scribus/canvasmode_magnifier.cpp +++ b/scribus/canvasmode_magnifier.cpp @@ -238,7 +238,7 @@ void CanvasMode_Magnifier::mouseReleaseEvent(QMouseEvent *m) m_canvas->m_viewMode.operItemMoving = false; m_canvas->m_viewMode.operItemResizing = false; m_view->MidButt = false; - //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas + //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas m_view->m_ScMW->zoomSpinBox->clearFocus(); m_view->m_ScMW->pageSelector->clearFocus(); } diff --git a/scribus/canvasmode_nodeedit.cpp b/scribus/canvasmode_nodeedit.cpp index c263604f60..d5fdefa420 100644 --- a/scribus/canvasmode_nodeedit.cpp +++ b/scribus/canvasmode_nodeedit.cpp @@ -486,7 +486,7 @@ void CanvasMode_NodeEdit::mouseReleaseEvent(QMouseEvent *m) { m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0)); } - //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas + //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas m_view->m_ScMW->zoomSpinBox->clearFocus(); m_view->m_ScMW->pageSelector->clearFocus(); if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action diff --git a/scribus/canvasmode_normal.cpp b/scribus/canvasmode_normal.cpp index 644380c8b3..5d85f6c4f6 100644 --- a/scribus/canvasmode_normal.cpp +++ b/scribus/canvasmode_normal.cpp @@ -184,7 +184,7 @@ void CanvasMode_Normal::mouseDoubleClickEvent(QMouseEvent *m) m_view->Deselect(false); m_doc->m_Selection->addItem(currItem); currItem->isSingleSel = true; - //CB FIXME dont call this if the added item is item 0 + //CB FIXME don't call this if the added item is item 0 if (!m_doc->m_Selection->primarySelectionIs(currItem)) currItem->emitAllToGUI(); m_view->updateContents(currItem->getRedrawBounding(m_canvas->scale())); @@ -933,7 +933,7 @@ void CanvasMode_Normal::mousePressEvent(QMouseEvent *m) m_dragConstrainInitPtX = qRound(currItem->xPos()); m_dragConstrainInitPtY = qRound(currItem->yPos()); - // dont call SeleItem() without need here: + // don't call SeleItem() without need here: m_frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(),mousePointDoc.y()), currItem); //#6797 if (m_frameResizeHandle <= 0 || m->modifiers() != Qt::NoModifier) @@ -1284,7 +1284,7 @@ void CanvasMode_Normal::mouseReleaseEvent(QMouseEvent *m) m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0)); } } - //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas + //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas m_view->m_ScMW->zoomSpinBox->clearFocus(); m_view->m_ScMW->pageSelector->clearFocus(); if (m_doc->m_Selection->count() > 0) diff --git a/scribus/canvasmode_objimport.cpp b/scribus/canvasmode_objimport.cpp index 55abf441e3..4ebea498b8 100644 --- a/scribus/canvasmode_objimport.cpp +++ b/scribus/canvasmode_objimport.cpp @@ -206,7 +206,7 @@ void CanvasMode_ObjImport::mouseReleaseEvent(QMouseEvent *m) m_canvas->m_viewMode.operItemMoving = false; m_canvas->m_viewMode.operItemResizing = false; m_view->MidButt = false; - //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas + //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas m_view->m_ScMW->zoomSpinBox->clearFocus(); m_view->m_ScMW->pageSelector->clearFocus(); } diff --git a/scribus/canvasmode_rotate.cpp b/scribus/canvasmode_rotate.cpp index abb942e4cf..1d6ec0a173 100644 --- a/scribus/canvasmode_rotate.cpp +++ b/scribus/canvasmode_rotate.cpp @@ -370,7 +370,7 @@ void CanvasMode_Rotate::mouseReleaseEvent(QMouseEvent *m) } for (int i = 0; i < m_doc->m_Selection->count(); ++i) m_doc->m_Selection->itemAt(i)->checkChanges(true); - //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas + //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas m_view->m_ScMW->zoomSpinBox->clearFocus(); m_view->m_ScMW->pageSelector->clearFocus(); } diff --git a/scribus/collapsedtablepainter.cpp b/scribus/collapsedtablepainter.cpp index 9100e041c5..6eea803efa 100644 --- a/scribus/collapsedtablepainter.cpp +++ b/scribus/collapsedtablepainter.cpp @@ -490,7 +490,7 @@ void CollapsedTablePainter::paintBorder(const TableBorder& border, const QPointF QPointF lineStart, lineEnd; foreach (const TableBorderLine& line, border.borderLines()) { - // Adjust line start and ends by line width multipled by offset factors. + // Adjust line start and ends by line width multiplied by offset factors. lineStart.setX(start.x() + line.width() * startOffsetFactors.x()); lineStart.setY(start.y() + line.width() * startOffsetFactors.y()); lineEnd.setX(end.x() + line.width() * endOffsetFactors.x()); diff --git a/scribus/collapsedtablepainterex.cpp b/scribus/collapsedtablepainterex.cpp index 00fca80e31..8fc7009f85 100644 --- a/scribus/collapsedtablepainterex.cpp +++ b/scribus/collapsedtablepainterex.cpp @@ -467,7 +467,7 @@ void CollapsedTablePainterEx::paintBorder(const TableBorder& border, const QPoin QPointF lineStart, lineEnd; foreach (const TableBorderLine& line, border.borderLines()) { - // Adjust line start and ends by line width multipled by offset factors. + // Adjust line start and ends by line width multiplied by offset factors. lineStart.setX(start.x() + line.width() * startOffsetFactors.x()); lineStart.setY(start.y() + line.width() * startOffsetFactors.y()); lineEnd.setX(end.x() + line.width() * endOffsetFactors.x()); diff --git a/scribus/colorblind.h b/scribus/colorblind.h index 59fdb3f02d..d466bf3a24 100644 --- a/scribus/colorblind.h +++ b/scribus/colorblind.h @@ -145,7 +145,7 @@ class SCRIBUS_API VisionDefectColor : public QObject, public QColor */ void init(); - /*! \brief This function performs initialisations that are dependant + /*! \brief This function performs initialisations that are dependent on the type of color deficiency (see defectMode). */ void setupDefect(); diff --git a/scribus/fileloader.cpp b/scribus/fileloader.cpp index cf7d65c64f..227758dd6b 100644 --- a/scribus/fileloader.cpp +++ b/scribus/fileloader.cpp @@ -202,7 +202,7 @@ bool FileLoader::loadPage(ScribusDoc* currDoc, int PageToLoad, bool Mpage, QStri } } if (ret) - ret = postLoad(currDoc); // FIXME: return false if user doesnt want to replace fonts?? + ret = postLoad(currDoc); // FIXME: return false if user doesn't want to replace fonts?? return ret; } diff --git a/scribus/fonts/cff.cpp b/scribus/fonts/cff.cpp index 0fdacb59d5..0455c471fa 100644 --- a/scribus/fonts/cff.cpp +++ b/scribus/fonts/cff.cpp @@ -975,7 +975,7 @@ namespace cff { break; case cff_varnt_Delta: result += "Delta"; - /* fall thru */ + /* fall through */ case cff_varnt_Array: result += "["; for (int i = 0; i < var.array.length(); ++i) diff --git a/scribus/fonts/ftface.cpp b/scribus/fonts/ftface.cpp index fa5c0e7290..cd195e0d5e 100644 --- a/scribus/fonts/ftface.cpp +++ b/scribus/fonts/ftface.cpp @@ -30,7 +30,7 @@ FT_Library FtFace::m_library = NULL; canRender(unicode) -> CharMap cache? -> loadChar/Glyph -> !broken Glyphs: width status - -1000 unkown + -1000 unknown -2000 broken >= 0 ok, outline valid CharMap: unicode -> glyph index diff --git a/scribus/fonts/scface.cpp b/scribus/fonts/scface.cpp index ffcc5289fb..42b9278d0e 100644 --- a/scribus/fonts/scface.cpp +++ b/scribus/fonts/scface.cpp @@ -126,7 +126,7 @@ FPoint ScFace::ScFaceData::glyphOrigin(gid_type gl, qreal sz) const canRender(unicode) -> CharMap cache? -> loadChar/Glyph -> !broken Glyphs: width status - -1000 unkown + -1000 unknown -2000 broken >= 0 ok, outline valid CharMap: unicode -> glyph index diff --git a/scribus/fonts/scface_ps.h b/scribus/fonts/scface_ps.h index 1e0034d07a..03426d77ae 100644 --- a/scribus/fonts/scface_ps.h +++ b/scribus/fonts/scface_ps.h @@ -57,7 +57,7 @@ class ScFace_postscript : public FtFace { // re-initialize: ScFaceData::load() just clears caches, // FtFace::load() skips FT_New_Face if m_face is already defined. - // dont mind checking glyphs again for now (PS files have only 255 glyphs max, anyway) + // don't mind checking glyphs again for now (PS files have only 255 glyphs max, anyway) FtFace::load(); } // Ascent = tmp.setNum(face->ascender); diff --git a/scribus/guidesdelegate.cpp b/scribus/guidesdelegate.cpp index 6e8e32296b..d696660ee4 100644 --- a/scribus/guidesdelegate.cpp +++ b/scribus/guidesdelegate.cpp @@ -42,7 +42,7 @@ void GuidesDelegate::setModelData(QWidget *editor, const QModelIndex &index) const { ScrSpinBox *w = static_cast(editor); - // When user exit widget, editor value may not be commited at this point + // When user exit widget, editor value may not be committed at this point // so we have to get value from widget text double value = w->valueFromText(w->text()); model->setData(index, value, Qt::EditRole); diff --git a/scribus/guidesmodel.h b/scribus/guidesmodel.h index 6469ae1153..247349e477 100644 --- a/scribus/guidesmodel.h +++ b/scribus/guidesmodel.h @@ -56,7 +56,7 @@ class GuidesModel : public QAbstractTableModel #endif signals: - /*! \brief Signal emmitted when the user finish the editation of one value. + /*! \brief Signal emitted when the user finishes editing one value. */ void valueChanged(); diff --git a/scribus/hyphenator.h b/scribus/hyphenator.h index abbc66d627..1dc4249b34 100644 --- a/scribus/hyphenator.h +++ b/scribus/hyphenator.h @@ -46,7 +46,7 @@ class SCRIBUS_API Hyphenator : public QObject private: - /*! Embeded reference to the \see ScribusDoc filled by \a dok */ + /*! Embedded reference to the \see ScribusDoc filled by \a dok */ ScribusDoc *m_doc; /*! Reference to the hyphen dictionary structure. */ HyphenDict *m_hdict; @@ -85,7 +85,7 @@ public slots: \brief Writes actual hyphen configuration into \a doc object. \date \author Franz Schmid - \param Wordlen lenght of the word. + \param Wordlen length of the word. \param Autom is automatic flag. \param ACheck AutoCheck flag. \param Num HyCount diff --git a/scribus/observable.h b/scribus/observable.h index 5e551d3a86..227d547280 100644 --- a/scribus/observable.h +++ b/scribus/observable.h @@ -81,7 +81,7 @@ struct Private_Memento : public UpdateMemento /** - Implement this interface if you want to observe an observable but dont want to derive from QObject + Implement this interface if you want to observe an observable but don't want to derive from QObject */ template class SCRIBUS_API Observer { @@ -97,7 +97,7 @@ class SCRIBUS_API Observer { An MassObservable is basically just the source of a changed() signal. Observers can register via the Qt signal/slot mechanism or via the above interface. - The difference to Observable (below) is that a MassObservable doesnt report changes to + The difference to Observable (below) is that a MassObservable doesn't report changes to itself but to a bunch of SingleObservables. When you call update() on the SingleObservable, it will tell the associated MassObservable to notify all observers with the "changed" signal, diff --git a/scribus/pageitem.h b/scribus/pageitem.h index 1cf2cabea2..46495fa543 100644 --- a/scribus/pageitem.h +++ b/scribus/pageitem.h @@ -1072,7 +1072,7 @@ class SCRIBUS_API PageItem : public QObject, public UndoObject, public SaxIO, pu bool textFlowUsesImageClipping() const { return (textFlowModeVal == TextFlowUsesImageClipping); } /** - * @brief To be called carefully because it eventually triggers a relayout of long text frames strings, but neccesarily when you change the document. + * @brief To be called carefully because it eventually triggers a relayout of long text frames strings, but necessarily when you change the document. * @param allItems While you generally want to check for items below, it can happen that you want to update full range of text frames (e.g. when shuffle items order). Default to false. */ void checkTextFlowInteractions(bool allItems = false); diff --git a/scribus/pageitem_latexframe.h b/scribus/pageitem_latexframe.h index 794a8f95e1..f17c5fa236 100644 --- a/scribus/pageitem_latexframe.h +++ b/scribus/pageitem_latexframe.h @@ -38,7 +38,7 @@ class LatexConfigParser; class QTimer; /** @brief Displays all kinds of content generated by external programs. - Named LatexFrame because it initally only showed the output of Latex. + Named LatexFrame because it initially only showed the output of Latex. */ class SCRIBUS_API PageItem_LatexFrame : public PageItem_ImageFrame { diff --git a/scribus/pageitem_textframe.cpp b/scribus/pageitem_textframe.cpp index a0f20de87a..ac2bcbe5a3 100644 --- a/scribus/pageitem_textframe.cpp +++ b/scribus/pageitem_textframe.cpp @@ -2119,12 +2119,12 @@ void PageItem_TextFrame::layout() //FIX ME - that should be paragraph style`s properties //if set then indent is add to possible line start point (after overflow) //if not then indent is calculated from column left edge - //if you dont agree that adding indent to overflow should be default behaviour + //if you don't agree that adding indent to overflow should be default behaviour //then change it to false bool addIndent2overflow = false; // should be addIndent2Overflow = style.addIndent2Overlow(); bool addFirstIndent2overflow = true; // should be addFirstIndent2Overflow = style.addFirstIndent2Overlow(); //if first line indent is negative and left indent should not be added to overflow - //then dont add first line ident either + //then don't add first line ident either if ((style.firstIndent() < 0) && !addIndent2overflow) addFirstIndent2overflow = false; @@ -2272,7 +2272,7 @@ void PageItem_TextFrame::layout() else /*if (current.startOfCol)*/ { //FIX ME - that is ugly hack I must made, because simply expression - //current.yPos += diff; stop working, dont know why (compiler bug?) + //current.yPos += diff; stop working, don't know why (compiler bug?) float YPOS = (float) current.yPos + (float) diff + 0.01; current.yPos = (double) YPOS; if (current.hasDropCap && diff > DropCapDrop) @@ -2832,7 +2832,7 @@ void PageItem_TextFrame::layout() // end of column if (current.isEndOfCol(desc)) { - //check if realy line extends bottom margin + //check if really line extends bottom margin current.updateHeightMetrics(itemText); if (current.isEndOfCol(current.line.descent)) { @@ -4986,7 +4986,7 @@ void PageItem_TextFrame::deleteSelectedTextFromFrame(/*bool findNotes*/) if (isNoteFrame()/* && findNotes*/) { //find and delete notes - //if marks are in notes then they will be deleted further while note is physicaly deleted + //if marks are in notes then they will be deleted further while note is physically deleted for (int i=start; i < stop; ++i) { if (i == itemText.length()) diff --git a/scribus/pdflib_core.h b/scribus/pdflib_core.h index 61464fc226..5f84ab14ef 100644 --- a/scribus/pdflib_core.h +++ b/scribus/pdflib_core.h @@ -49,7 +49,7 @@ class ScText; * This is not public API and is not exported in Scribus's symbol table on supporting * platforms. Do not include this header, use pdflib.h instead. Including this header * from anywhere except pdflib.cpp may cause linker errors and other problems, - * and is totally pointless since all the interfaces that are publically + * and is totally pointless since all the interfaces that are publicly * visible are presented by PDFlib anyway. * *@author Franz Schmid diff --git a/scribus/prefsmanager.cpp b/scribus/prefsmanager.cpp index 629b57841e..1c118f9846 100644 --- a/scribus/prefsmanager.cpp +++ b/scribus/prefsmanager.cpp @@ -125,7 +125,7 @@ void PrefsManager::setup() if (m_importingFrom12) convert12Preferences(); //<>CB } @@ -814,7 +814,7 @@ bool PrefsManager::copyOldPreferences() bool retVal=false; if (existsPrefs150[0] && existsPrefs150[2]) return retVal; - //Only check for these three as they will be autocreated if they dont exist. + //Only check for these three as they will be autocreated if they don't exist. if( (existsPrefs135[0] && !existsPrefs140[0]) || (existsPrefs135[2] && !existsPrefs140[2]) ) { // Now always return false @@ -2298,7 +2298,7 @@ bool PrefsManager::ReadPref(QString ho) appPrefs.verifierPrefs.curCheckProfile = dc.attribute("CurrentProfile", CommonStrings::PostScript); appPrefs.verifierPrefs.showPagesWithoutErrors = static_cast(dc.attribute("ShowPagesWithoutErrors", "0").toInt()); appPrefs.verifierPrefs.showNonPrintingLayerErrors = static_cast(dc.attribute("ShowNonPrintingLayerErrors", "0").toInt()); - //#2516 work around old values until people wont have them anymore, not that these + //#2516 work around old values until people won't have them anymore, not that these //translated strings should be going into prefs anyway! if ((appPrefs.verifierPrefs.curCheckProfile == tr("PostScript")) || ((appPrefs.verifierPrefs.curCheckProfile == tr("Postscript")) || diff --git a/scribus/qtiocompressor.cpp b/scribus/qtiocompressor.cpp index 913a2c9bda..29e836f915 100644 --- a/scribus/qtiocompressor.cpp +++ b/scribus/qtiocompressor.cpp @@ -259,7 +259,7 @@ QtIOCompressor::QtIOCompressor(QIODevice *device, int compressionLevel, int buff {} /*! - Destroys the QtIOCompressor, closing it if neccesary. + Destroys the QtIOCompressor, closing it if necessary. */ QtIOCompressor::~QtIOCompressor() { @@ -319,7 +319,7 @@ bool QtIOCompressor::isSequential() const If the underlying device is not opened, this function will open it in a suitable mode. If this happens the device will also be closed when close() is called. - If the underlying device is already opened, its openmode must be compatable with \a mode. + If the underlying device is already opened, its openmode must be compatible with \a mode. Returns true on success, false on error. diff --git a/scribus/sampleitem.h b/scribus/sampleitem.h index 3e924fabfd..13b28e5d85 100644 --- a/scribus/sampleitem.h +++ b/scribus/sampleitem.h @@ -51,7 +51,7 @@ class SCRIBUS_API SampleItem : QObject /*! \brief Set whole Scribus paragraph style in one. \param aStyle Paragraph style to set.*/ void setStyle(const ParagraphStyle& aStyle); - /*! \brief Folowing methods set only one style characteristic */ + /*! \brief Following methods set only one style characteristic */ void setLineSpaMode(int lineSpaMode); void setLineSpa(double lineSpa); void setTextAlignment(int textAlignment); diff --git a/scribus/sclayer.cpp b/scribus/sclayer.cpp index 52bb1cbf9a..356a22a3b3 100644 --- a/scribus/sclayer.cpp +++ b/scribus/sclayer.cpp @@ -7,9 +7,9 @@ for which a new license (GPL+exception) is in place. #include "sclayer.h" -#include //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates +#include //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instantiation of templates #include -#include //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates +#include //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instantiation of templates #include ScLayer::ScLayer(void) diff --git a/scribus/sclayer.h b/scribus/sclayer.h index c37bf92157..cd2001dbd6 100644 --- a/scribus/sclayer.h +++ b/scribus/sclayer.h @@ -10,7 +10,7 @@ for which a new license (GPL+exception) is in place. #include #include #include -#include //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates +#include //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instantiation of templates #include "scribusapi.h" diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp index 91fbb7f71d..b397d23123 100644 --- a/scribus/scribus.cpp +++ b/scribus/scribus.cpp @@ -1520,7 +1520,7 @@ void ScribusMainWindow::specialActionKeyEvent(int unicodevalue) else if (unicodevalue==SpecialChars::SHYPHEN.unicode()) //ignore the char as we use an attribute if the text item, for now. { // this code is currently dead since unicodeSoftHyphen - // doesnt have unicodevalue == -1 any more + // doesn't have unicodevalue == -1 any more if (currItem->itemText.cursorPosition() > 1) { #if 0 @@ -2556,7 +2556,7 @@ void ScribusMainWindow::SwitchWin() rebuildLayersList(); updateLayerMenu(); setLayerMenuText(doc->activeLayerName()); - //Do not set this!, it doesnt get valid pointers unless its in EditClip mode and its not + //Do not set this!, it doesn't get valid pointers unless its in EditClip mode and its not //if we are switching windows #4357 //nodePalette->setDoc(doc, view); slotChangeUnit(doc->unitIndex(), false); @@ -4226,7 +4226,7 @@ bool ScribusMainWindow::DoFileClose() updateLayerMenu(); updateTableMenuActions(); rebuildScrapbookMenu(); - //not running view's togglePreview as we dont want to affect the doc settings. + //not running view's togglePreview as we don't want to affect the doc settings. scrActions["viewPreviewMode"]->setChecked(false); appModeHelper->setPreviewMode(false); return true; @@ -8095,8 +8095,8 @@ void ScribusMainWindow::slotStoryEditor(bool fromTable) PageItem *currItemSE = storyEditor->currentItem(); ScribusDoc *currDocSE = storyEditor->currentDocument(); storyEditor->activFromApp = true; - //CB shouldnt these be after the if? - //Why are we resetting the doc and item in this case. My original code didnt do this. + //CB shouldn't these be after the if? + //Why are we resetting the doc and item in this case. My original code didn't do this. storyEditor->setCurrentDocumentAndItem(doc, i2); if (i2 == currItemSE && doc == currDocSE) { @@ -8995,7 +8995,7 @@ void ScribusMainWindow::managePaints() doc->PageColors = dia->m_colorList; if (dia->replaceColorMap.isEmpty()) { - // invalidate all charstyles, as replaceNamedResources() wont do it if all maps are empty + // invalidate all charstyles, as replaceNamedResources() won't do it if all maps are empty const StyleSet dummy; doc->redefineCharStyles(dummy, false); } diff --git a/scribus/scribus.h b/scribus/scribus.h index a8fed5b8d1..46b96508c0 100644 --- a/scribus/scribus.h +++ b/scribus/scribus.h @@ -559,7 +559,7 @@ public slots: void slotInsertMarkNote(); void slotInsertMarkIndex() { insertMark(MARKIndexType); } void slotEditMark(); - //connected to signal emited by actions when "Update Marks" menu item is triggered + //connected to signal emitted by actions when "Update Marks" menu item is triggered void slotUpdateMarks(); bool editMarkDlg(Mark *mrk, PageItem_TextFrame* currItem = NULL); void testQTQuick2_1(); diff --git a/scribus/scribusdoc.cpp b/scribus/scribusdoc.cpp index d344c1e3fe..65496e64f7 100644 --- a/scribus/scribusdoc.cpp +++ b/scribus/scribusdoc.cpp @@ -7171,7 +7171,7 @@ void ScribusDoc::copyPage(int pageNumberToCopy, int existingPage, int whereToIns destination->setOrientation(from->orientation()); destination->m_pageSize = from->m_pageSize; //CB: Can possibly partially use the code from applyMasterPage here instead of runnin all of this again.. - //TODO make a fucntion to do this margin stuff and use elsewhere too + //TODO make a function to do this margin stuff and use elsewhere too destination->initialMargins.setTop(from->initialMargins.top()); destination->initialMargins.setBottom(from->initialMargins.bottom()); if (pageSets()[m_docPrefsData.docSetupPrefs.pagePositioning].Columns == 1) @@ -15483,7 +15483,7 @@ void ScribusDoc::itemSelection_convertItemsTo(const PageItem::ItemType newType, uint selectedItemCount=itemSelection->count(); if (selectedItemCount == 0) return; - //Create our copy selection as our item *s will be invalidated as we go through the loop and the selection index wont work + //Create our copy selection as our item *s will be invalidated as we go through the loop and the selection index won't work //convertItemTo does this Selection tmpSel(*itemSelection); tmpSel.disconnectAllItemsFromGUI(); @@ -16656,7 +16656,7 @@ void ScribusDoc::updateNumbers(bool updateNumerations) else if (style.numOther()) { ParagraphStyle preStyle = item->itemText.paragraphStyle(pos -1); - //reset counter if prev style hasnt numeration or has other numeration + //reset counter if prev style hasn't numeration or has other numeration if (!preStyle.hasNum() || (preStyle.numName() != style.numName())) resetNums = true; } @@ -17309,7 +17309,7 @@ void ScribusDoc::setUndoDelNote(TextNote *note) void ScribusDoc::updateItemNotesNums(PageItem_TextFrame* frame, NotesStyle* nStyle, int &num) { //update marks strings in master text and in notes frame (only numbers!) - //check if notes schould be added or removed from notes frame + //check if notes should be added or removed from notes frame int noteNum = num; int index = 0; bool doUpdate = false; @@ -17987,7 +17987,7 @@ void ScribusDoc::delNoteFrame(PageItem_NoteFrame* nF, bool removeMarks, bool for bool ScribusDoc::validateNSet(NotesStyle NS, QString newName) { - //check if choosen numbering type is avaiable with choosen range, prefix and suffix + //check if chosen numbering type is available with chosen range, prefix and suffix QString errStr; foreach (NotesStyle* NS2, m_docNotesStylesList) { diff --git a/scribus/scribusdoc.h b/scribus/scribusdoc.h index 621ce4bde3..b92cffd565 100644 --- a/scribus/scribusdoc.h +++ b/scribus/scribusdoc.h @@ -1652,7 +1652,7 @@ public slots: * Explanation * master frame - text frame with marks for notes * notesframe - frame with notes - * master & note mark - master is mark in "master" text, note mark is at begining of note in noteframe + * master & note mark - master is mark in "master" text, note mark is at beginning of note in noteframe */ //return page where endnotesframe should be located depending of notes style range and location of master mark @@ -1698,7 +1698,7 @@ public slots: bool eraseMark(Mark* mrk, bool fromText=false, PageItem* item=NULL, bool force = false); //force is used only for deleting non-unique marks by MarksManager void setUndoDelMark(Mark* mrk); //invalidate all text frames where given mark will found - //usefull spacially for varaible text marks after changing its text definition + //useful spacially for varaible text marks after changing its text definition //if forceUpdate then found master frames are relayouted bool invalidateVariableTextFrames(Mark* mrk, bool forceUpdate = false); //returns if any text was changed diff --git a/scribus/selection.h b/scribus/selection.h index cbe2fc0386..52a7c88f9c 100644 --- a/scribus/selection.h +++ b/scribus/selection.h @@ -74,7 +74,7 @@ class SCRIBUS_API Selection : public QObject * @brief Add an item to the selection. * If its added to a GUI selection selection and its item 0, its connected to the GUI too * @param item Item to add - * @param ignoreGUI Dont connect Item To GUI even if this is a GUI selection + * @param ignoreGUI Don't connect Item To GUI even if this is a GUI selection * @return If the item was added */ bool addItem(PageItem *item, bool ignoreGUI=false); diff --git a/scribus/tableborder.h b/scribus/tableborder.h index 7583cb29a6..9607257679 100644 --- a/scribus/tableborder.h +++ b/scribus/tableborder.h @@ -73,7 +73,7 @@ class SCRIBUS_API TableBorderLine Qt::PenStyle m_style; /// The color of the table border line. QString m_color; - /// Ths shade of the table border line + /// The shade of the table border line double m_shade; }; Q_DECLARE_TYPEINFO(TableBorderLine, Q_MOVABLE_TYPE); diff --git a/scribus/tocgenerator.cpp b/scribus/tocgenerator.cpp index c58ae77807..daca3f9fcf 100644 --- a/scribus/tocgenerator.cpp +++ b/scribus/tocgenerator.cpp @@ -90,7 +90,7 @@ void TOCGenerator::generateDefault() //Item not on a page, continue if (currentDocItem->OwnPage == -1) continue; - //If we dont want to list non printing frames and this one is set to not print, continue + //If we don't want to list non printing frames and this one is set to not print, continue if (!tocSetupIt->listNonPrintingFrames && !currentDocItem->printEnabled()) continue; diff --git a/scribus/transaction.h b/scribus/transaction.h index b77bdb5f06..8faaa8f9c7 100644 --- a/scribus/transaction.h +++ b/scribus/transaction.h @@ -63,7 +63,7 @@ class SCRIBUS_API Transaction { /** Automatically commits if forgotten. - Override as appropiate. Since the superclass destructor is called last, you + Override as appropriate. Since the superclass destructor is called last, you can cancel in the subclass destructor; the commit here then will do nothing. Don't forget to set m_data to NULL if you free the m_data pointer! */ diff --git a/scribus/ui/aboutplugins.cpp b/scribus/ui/aboutplugins.cpp index e4891b5a86..e165b5e74a 100644 --- a/scribus/ui/aboutplugins.cpp +++ b/scribus/ui/aboutplugins.cpp @@ -69,7 +69,7 @@ void AboutPlugins::displayPlugin(QListWidgetItem* currItem, QListWidgetItem* pre html += ""; html += QString("").arg( tr("Filename:")).arg(fi.completeBaseName()); html += QString("").arg( tr("Version:")).arg(about->version); -// As we dont allow users to disable plugins, hide this +// As we don't allow users to disable plugins, hide this // QString ena; // ena = pluginManager.enabled(name) ? CommonStrings::trYes : CommonStrings::trNo; // html += QString("").arg( tr("Enabled:")).arg(ena); diff --git a/scribus/ui/helpbrowser.cpp b/scribus/ui/helpbrowser.cpp index 30388bf8e4..63df79529f 100644 --- a/scribus/ui/helpbrowser.cpp +++ b/scribus/ui/helpbrowser.cpp @@ -564,7 +564,7 @@ void HelpBrowser::loadMenu() { if (!language.isEmpty()) { - //Check if we can load, eg "de" when "de_CH" docs dont exist + //Check if we can load, eg "de" when "de_CH" docs don't exist QString baseHelpMenuFile3 = QDir::toNativeSeparators(baseHelpDir + language.left(2) + "/menu.xml"); QString altHelpMenuFile3 = QDir::toNativeSeparators(altHelpDir + "doc/" + language.left(2) + "/menu.xml"); QFileInfo fi3 = QFileInfo(baseHelpMenuFile3); diff --git a/scribus/ui/helpbrowser.h b/scribus/ui/helpbrowser.h index 37c00e025c..795eadd145 100644 --- a/scribus/ui/helpbrowser.h +++ b/scribus/ui/helpbrowser.h @@ -162,11 +162,11 @@ protected slots: \author Petr Vanek */ void find(); - /*! \brief Find next occurences of the text in one document. + /*! \brief Find next occurrences of the text in one document. \author Petr Vanek */ void findNext(); - /*! \brief Find previous occurences of the text in one document. + /*! \brief Find previous occurrences of the text in one document. \author Petr Vanek */ void findPrevious(); diff --git a/scribus/ui/notesstyleseditor.cpp b/scribus/ui/notesstyleseditor.cpp index a5e9ffd58c..1632a65ac6 100644 --- a/scribus/ui/notesstyleseditor.cpp +++ b/scribus/ui/notesstyleseditor.cpp @@ -280,7 +280,7 @@ void NotesStylesEditor::on_ApplyButton_clicked() } else { - //remeber current NStyle + //remember current NStyle QString currNS = NSlistBox->currentText(); NotesStyle* NS = NULL; diff --git a/scribus/ui/pageitemattributes.cpp b/scribus/ui/pageitemattributes.cpp index 94422ef739..c5a66096f1 100644 --- a/scribus/ui/pageitemattributes.cpp +++ b/scribus/ui/pageitemattributes.cpp @@ -239,7 +239,7 @@ void PageItemAttributes::updateTable() void PageItemAttributes::okClicked() { - //Qt hack as we will lose data if the user hasnt left a cell + //Qt hack as we will lose data if the user hasn't left a cell //http://www.qtforum.org/thread.php?threadid=9078 if (attributesTable->rowCount()>0 && attributesTable->currentRow()!=-1) { diff --git a/scribus/ui/pageitemsetterbase.h b/scribus/ui/pageitemsetterbase.h index f0a5ae20c9..60d354f3ba 100644 --- a/scribus/ui/pageitemsetterbase.h +++ b/scribus/ui/pageitemsetterbase.h @@ -35,7 +35,7 @@ class Selection; * properties of a page item. * * note about dragging: -* this base class is expected to handle propper dragging, droppers +* this base class is expected to handle proper dragging, droppers * must ask the pageitemsettersmanager a clone of a dropped setter based * on the name. * diff --git a/scribus/ui/pagepalette_masterpages.cpp b/scribus/ui/pagepalette_masterpages.cpp index 4599655fa2..ad8aaf6c37 100644 --- a/scribus/ui/pagepalette_masterpages.cpp +++ b/scribus/ui/pagepalette_masterpages.cpp @@ -400,7 +400,7 @@ void PagePalette_MasterPages::importPage() m_doc->setCurrentPage(m_doc->addMasterPage(nr, MasterPageName2)); qApp->processEvents(); //CB TODO: If we are loading to a new name, we rely on doc->onpage in - //FileLoader::PasteItem as this call doesnt pass in the new destination page + //FileLoader::PasteItem as this call doesn't pass in the new destination page m_doc->scMW()->loadPage(dia->getFromDoc(), dia->getMasterPageNameItem(), true, MasterPageName2); qApp->processEvents(); diff --git a/scribus/ui/prefs_keyboardshortcuts.cpp b/scribus/ui/prefs_keyboardshortcuts.cpp index 7581db80c5..30fbbfea07 100644 --- a/scribus/ui/prefs_keyboardshortcuts.cpp +++ b/scribus/ui/prefs_keyboardshortcuts.cpp @@ -395,7 +395,7 @@ void Prefs_KeyboardShortcuts::insertActions() void Prefs_KeyboardShortcuts::applySearch( const QString & newss ) { - //Must run this as if newss is not empty and we go to the next for loop, the set visible doesnt work + //Must run this as if newss is not empty and we go to the next for loop, the set visible doesn't work for (QList::iterator it=lviToMenuMap.begin(); it!=lviToMenuMap.end(); ++it) (*it)->setHidden(false); if (newss.isEmpty()) @@ -404,7 +404,7 @@ void Prefs_KeyboardShortcuts::applySearch( const QString & newss ) it.key()->setHidden(false); return; } - //Seem to need to do this.. isOpen doesnt seem to do what it says + //Seem to need to do this.. isOpen doesn't seem to do what it says for (QMap::iterator it=lviToActionMap.begin(); it!=lviToActionMap.end(); ++it) { if (it.key()->text(0).contains(newss, Qt::CaseInsensitive)) diff --git a/scribus/ui/printdialog.cpp b/scribus/ui/printdialog.cpp index 61a867bf22..3fea6d0ac9 100644 --- a/scribus/ui/printdialog.cpp +++ b/scribus/ui/printdialog.cpp @@ -175,7 +175,7 @@ void PrintDialog::SetOptions() { delete cdia; // if options was canceled delete dia cdia = 0; // so that getoptions() in the okButtonClicked() will get - // the default values from the last succesful run + // the default values from the last successful run } #elif defined(_WIN32) diff --git a/scribus/ui/propertiespalette.cpp b/scribus/ui/propertiespalette.cpp index 9f18230ad2..ebf3031cf7 100644 --- a/scribus/ui/propertiespalette.cpp +++ b/scribus/ui/propertiespalette.cpp @@ -368,10 +368,10 @@ void PropertiesPalette::setCurrentItem(PageItem *i) { if (!m_ScMW || m_ScMW->scriptIsRunning()) return; - //CB We shouldnt really need to process this if our item is the same one + //CB We shouldn't really need to process this if our item is the same one //maybe we do if the item has been changed by scripter.. but that should probably //set some status if so. - //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL. + //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL. //if (m_item == i) // return; diff --git a/scribus/ui/propertiespalette_group.cpp b/scribus/ui/propertiespalette_group.cpp index e53cd97098..1745ffb140 100644 --- a/scribus/ui/propertiespalette_group.cpp +++ b/scribus/ui/propertiespalette_group.cpp @@ -273,10 +273,10 @@ void PropertiesPalette_Group::setCurrentItem(PageItem *item) { if (!m_ScMW || m_ScMW->scriptIsRunning()) return; - //CB We shouldnt really need to process this if our item is the same one + //CB We shouldn't really need to process this if our item is the same one //maybe we do if the item has been changed by scripter.. but that should probably //set some status if so. - //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL. + //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL. //if (m_item == i) // return; diff --git a/scribus/ui/propertiespalette_image.cpp b/scribus/ui/propertiespalette_image.cpp index 8f786413f1..33aa7bccab 100644 --- a/scribus/ui/propertiespalette_image.cpp +++ b/scribus/ui/propertiespalette_image.cpp @@ -439,10 +439,10 @@ void PropertiesPalette_Image::setCurrentItem(PageItem *item) { if (!m_ScMW || m_ScMW->scriptIsRunning()) return; - //CB We shouldnt really need to process this if our item is the same one + //CB We shouldn't really need to process this if our item is the same one //maybe we do if the item has been changed by scripter.. but that should probably //set some status if so. - //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL. + //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL. //if (m_item == i) // return; @@ -557,7 +557,7 @@ void PropertiesPalette_Image::handleLocalScale() return; if ((m_haveDoc) && (m_haveItem)) { - //CB Dont pass in the scale to the offset change as its taken from the new scale + //CB Don't pass in the scale to the offset change as its taken from the new scale m_doc->itemSelection_SetImageScaleAndOffset(imageXScaleSpinBox->value() / 100.0 / m_item->pixm.imgInfo.xres * 72.0, imageYScaleSpinBox->value() / 100.0 / m_item->pixm.imgInfo.yres * 72.0, imageXOffsetSpinBox->value() / m_unitRatio, imageYOffsetSpinBox->value() / m_unitRatio); imgDpiX->showValue(qRound(720.0 / m_item->imageXScale()) / 10.0); imgDpiY->showValue(qRound(720.0 / m_item->imageYScale()) / 10.0); @@ -570,7 +570,7 @@ void PropertiesPalette_Image::handleLocalDpi() return; if ((m_haveDoc) && (m_haveItem)) { - //CB Dont pass in the scale to the offset change as its taken from the new scale + //CB Don't pass in the scale to the offset change as its taken from the new scale m_doc->itemSelection_SetImageScaleAndOffset(72.0 / imgDpiX->value(), 72.0 / imgDpiY->value(), imageXOffsetSpinBox->value() / m_unitRatio, imageYOffsetSpinBox->value() / m_unitRatio); imageXScaleSpinBox->showValue(m_item->imageXScale() * 100 / 72.0 * m_item->pixm.imgInfo.xres); diff --git a/scribus/ui/propertiespalette_line.cpp b/scribus/ui/propertiespalette_line.cpp index 6c9be0bc98..5bab20deee 100644 --- a/scribus/ui/propertiespalette_line.cpp +++ b/scribus/ui/propertiespalette_line.cpp @@ -241,10 +241,10 @@ void PropertiesPalette_Line::setCurrentItem(PageItem *item) { if (!m_ScMW || m_ScMW->scriptIsRunning()) return; - //CB We shouldnt really need to process this if our item is the same one + //CB We shouldn't really need to process this if our item is the same one //maybe we do if the item has been changed by scripter.. but that should probably //set some status if so. - //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL. + //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL. //if (m_item == i) // return; diff --git a/scribus/ui/propertiespalette_shape.cpp b/scribus/ui/propertiespalette_shape.cpp index 7d8e7d2771..475974346a 100644 --- a/scribus/ui/propertiespalette_shape.cpp +++ b/scribus/ui/propertiespalette_shape.cpp @@ -321,10 +321,10 @@ void PropertiesPalette_Shape::setCurrentItem(PageItem *item) { if (!m_ScMW || m_ScMW->scriptIsRunning()) return; - //CB We shouldnt really need to process this if our item is the same one + //CB We shouldn't really need to process this if our item is the same one //maybe we do if the item has been changed by scripter.. but that should probably //set some status if so. - //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL. + //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL. //if (m_item == i) // return; diff --git a/scribus/ui/propertiespalette_text.cpp b/scribus/ui/propertiespalette_text.cpp index b8fd24a302..11756b9527 100644 --- a/scribus/ui/propertiespalette_text.cpp +++ b/scribus/ui/propertiespalette_text.cpp @@ -295,10 +295,10 @@ void PropertiesPalette_Text::setCurrentItem(PageItem *i) { if (!m_ScMW || m_ScMW->scriptIsRunning()) return; - //CB We shouldnt really need to process this if our item is the same one + //CB We shouldn't really need to process this if our item is the same one //maybe we do if the item has been changed by scripter.. but that should probably //set some status if so. - //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL. + //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL. //if (m_item == i) // return; diff --git a/scribus/ui/propertiespalette_xyz.cpp b/scribus/ui/propertiespalette_xyz.cpp index e5108223e3..a3e3aa8e16 100644 --- a/scribus/ui/propertiespalette_xyz.cpp +++ b/scribus/ui/propertiespalette_xyz.cpp @@ -282,10 +282,10 @@ void PropertiesPalette_XYZ::setCurrentItem(PageItem *i) { if (!m_ScMW || m_ScMW->scriptIsRunning()) return; - //CB We shouldnt really need to process this if our item is the same one + //CB We shouldn't really need to process this if our item is the same one //maybe we do if the item has been changed by scripter.. but that should probably //set some status if so. - //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL. + //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL. //if (m_item == i) // return; @@ -505,7 +505,7 @@ void PropertiesPalette_XYZ::handleSelectionChanged() flipV->setChecked(false); } - //CB Why cant we do this for lines? + //CB Why can't we do this for lines? // flipH->setEnabled((itemType !=-1) && (itemType !=5)); // flipV->setEnabled((itemType !=-1) && (itemType !=5)); flipH->setEnabled(itemType !=-1); diff --git a/scribus/ui/propertywidget_advanced.cpp b/scribus/ui/propertywidget_advanced.cpp index 8d2681da63..ff2e4e010a 100644 --- a/scribus/ui/propertywidget_advanced.cpp +++ b/scribus/ui/propertywidget_advanced.cpp @@ -90,10 +90,10 @@ void PropertyWidget_Advanced::setCurrentItem(PageItem *item) { if (!m_ScMW || m_ScMW->scriptIsRunning()) return; - //CB We shouldnt really need to process this if our item is the same one + //CB We shouldn't really need to process this if our item is the same one //maybe we do if the item has been changed by scripter.. but that should probably //set some status if so. - //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL. + //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL. //if (m_item == i) // return; diff --git a/scribus/ui/propertywidget_distance.cpp b/scribus/ui/propertywidget_distance.cpp index adad5f3df4..5ff04bc16b 100644 --- a/scribus/ui/propertywidget_distance.cpp +++ b/scribus/ui/propertywidget_distance.cpp @@ -101,10 +101,10 @@ void PropertyWidget_Distance::setCurrentItem(PageItem *item) { if (!m_ScMW || m_ScMW->scriptIsRunning()) return; - //CB We shouldnt really need to process this if our item is the same one + //CB We shouldn't really need to process this if our item is the same one //maybe we do if the item has been changed by scripter.. but that should probably //set some status if so. - //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL. + //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL. //if (m_item == i) // return; diff --git a/scribus/ui/propertywidget_optmargins.cpp b/scribus/ui/propertywidget_optmargins.cpp index 205d61c104..70d7b9a3c1 100644 --- a/scribus/ui/propertywidget_optmargins.cpp +++ b/scribus/ui/propertywidget_optmargins.cpp @@ -65,10 +65,10 @@ void PropertyWidget_OptMargins::setCurrentItem(PageItem *item) { if (!m_ScMW || m_ScMW->scriptIsRunning()) return; - //CB We shouldnt really need to process this if our item is the same one + //CB We shouldn't really need to process this if our item is the same one //maybe we do if the item has been changed by scripter.. but that should probably //set some status if so. - //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL. + //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL. //if (m_item == i) // return; diff --git a/scribus/ui/propertywidget_pathtext.cpp b/scribus/ui/propertywidget_pathtext.cpp index ba81a715ce..b68e59fdde 100644 --- a/scribus/ui/propertywidget_pathtext.cpp +++ b/scribus/ui/propertywidget_pathtext.cpp @@ -81,10 +81,10 @@ void PropertyWidget_PathText::setCurrentItem(PageItem *item) { if (!m_ScMW || m_ScMW->scriptIsRunning()) return; - //CB We shouldnt really need to process this if our item is the same one + //CB We shouldn't really need to process this if our item is the same one //maybe we do if the item has been changed by scripter.. but that should probably //set some status if so. - //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL. + //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL. //if (m_item == i) // return; diff --git a/scribus/ui/propertywidget_textcolor.cpp b/scribus/ui/propertywidget_textcolor.cpp index bcf30e3e7d..090320b3a8 100644 --- a/scribus/ui/propertywidget_textcolor.cpp +++ b/scribus/ui/propertywidget_textcolor.cpp @@ -88,10 +88,10 @@ void PropertyWidget_TextColor::setCurrentItem(PageItem *item) { if (!m_ScMW || m_ScMW->scriptIsRunning()) return; - //CB We shouldnt really need to process this if our item is the same one + //CB We shouldn't really need to process this if our item is the same one //maybe we do if the item has been changed by scripter.. but that should probably //set some status if so. - //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL. + //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL. //if (m_item == i) // return; diff --git a/scribus/ui/resourcemanager.cpp b/scribus/ui/resourcemanager.cpp index 1b6d3d52a8..5f496ea546 100644 --- a/scribus/ui/resourcemanager.cpp +++ b/scribus/ui/resourcemanager.cpp @@ -630,12 +630,12 @@ void ResourceManager::downloadFilesFinished() QFile dledFile(fn); QFileInfo fi(dledFile); if (!dledFile.exists()) - qDebug()<<"File doesnt exist"<open(fn)) - qDebug()<<"Zip file doesnt open"<files()); @@ -672,12 +672,12 @@ void ResourceManager::downloadFilesFinished() QFile dledFile(fn); QFileInfo fi(dledFile); if (!dledFile.exists()) - qDebug()<<"File doesnt exist"<open(fn)) - qDebug()<<"Zip file doesnt open"<files()); diff --git a/scribus/ui/scdockpalette.h b/scribus/ui/scdockpalette.h index 956b18b512..feade7f1f2 100644 --- a/scribus/ui/scdockpalette.h +++ b/scribus/ui/scdockpalette.h @@ -52,7 +52,7 @@ class SCRIBUS_API ScDockPalette : public QDockWidget virtual void setFontSize(); signals: - /** @brief Let the action for this palette know when something changes and it hasnt caused it */ + /** @brief Let the action for this palette know when something changes and it hasn't caused it */ void paletteShown(bool); protected: diff --git a/scribus/ui/scrpalettebase.h b/scribus/ui/scrpalettebase.h index 3b4b99cc1b..8086eb5f31 100644 --- a/scribus/ui/scrpalettebase.h +++ b/scribus/ui/scrpalettebase.h @@ -54,7 +54,7 @@ class SCRIBUS_API ScrPaletteBase : public QDialog int exec(QWidget* newParent); signals: - /** @brief Let the action for this palette know when something changes and it hasnt caused it */ + /** @brief Let the action for this palette know when something changes and it hasn't caused it */ void paletteShown(bool); protected: diff --git a/scribus/ui/scrspinbox.cpp b/scribus/ui/scrspinbox.cpp index 3c63c2ccae..967b2e5848 100644 --- a/scribus/ui/scrspinbox.cpp +++ b/scribus/ui/scrspinbox.cpp @@ -364,7 +364,7 @@ bool ScrSpinBox::eventFilter( QObject* watched, QEvent* event ) */ if ( event->type() == QEvent::Wheel ) { - //If read only dont spin + //If read only don't spin if (isReadOnly()) return false; QWheelEvent* k = (QWheelEvent*)event; diff --git a/scribus/ui/smlinestyle.cpp b/scribus/ui/smlinestyle.cpp index 8fb175e5f1..5058e64644 100644 --- a/scribus/ui/smlinestyle.cpp +++ b/scribus/ui/smlinestyle.cpp @@ -281,7 +281,7 @@ bool SMLineStyle::isDefaultStyle(const QString &stylename) const void SMLineStyle::setDefaultStyle(bool ids) { - /* we dont have default line styles yet + /* we don't have default line styles yet Q_ASSERT(m_selection.count() == 1); if (m_selection.count() != 1) return; diff --git a/scribus/ui/storyeditor.cpp b/scribus/ui/storyeditor.cpp index 37a4a31aa7..a148221c36 100644 --- a/scribus/ui/storyeditor.cpp +++ b/scribus/ui/storyeditor.cpp @@ -1846,7 +1846,7 @@ void StoryEditor::buildGUI() m_smartSelection = prefsManager->appPrefs.storyEditorPrefs.smartTextSelection; initActions(); ActionManager::initUnicodeActions(&seActions, this, &unicodeCharActionNames); - seActions["unicodeSoftHyphen"]->setEnabled(false);//CB TODO doesnt work in SE yet. + seActions["unicodeSoftHyphen"]->setEnabled(false);//CB TODO doesn't work in SE yet. buildMenus(); setWindowIcon(IconManager::instance()->loadPixmap("AppIcon.png")); @@ -2239,7 +2239,7 @@ bool StoryEditor::eventFilter( QObject* ob, QEvent* ev ) activFromApp = true; if (m_item != NULL) { - //set to false otherwise some dialog properties wont be set correctly + //set to false otherwise some dialog properties won't be set correctly if (m_item->itemText.length() == 0) m_firstSet = false; disconnectSignals(); @@ -2914,7 +2914,7 @@ void StoryEditor::PasteAvail() void StoryEditor::updateTextFrame() { - //Return immediately if we dont have to update the frame + //Return immediately if we don't have to update the frame if (!m_textChanged) return; PageItem *nextItem = m_item; diff --git a/scribus/ui/stylemanager.cpp b/scribus/ui/stylemanager.cpp index fb745143ed..ffb1c6b112 100644 --- a/scribus/ui/stylemanager.cpp +++ b/scribus/ui/stylemanager.cpp @@ -589,7 +589,7 @@ void StyleManager::slotScrap() void StyleManager::slotNew() { -//#5334: Dont open into edit mdoe until user has selected a style type +//#5334: Don't open into edit mdoe until user has selected a style type // if (!m_isEditMode) // slotOk(); // switch to edit mode for a new style @@ -897,7 +897,7 @@ void StyleManager::addNewType(StyleItem *item, bool loadFromDoc) else { bool postpone = false; - // search if parent is in remaing styles + // search if parent is in remaining styles for (int j = i+1; j < styles.count(); ++j) { if (styles[j].first == styles[i].second) diff --git a/scribus/ui/tabruler.h b/scribus/ui/tabruler.h index 9d8892a762..19d5c980f5 100644 --- a/scribus/ui/tabruler.h +++ b/scribus/ui/tabruler.h @@ -127,7 +127,7 @@ public slots: void setCustomFillChar(const QString &txt); signals: - /*! This signal is emited when is something changed in the tab ruler dialog/widget. + /*! This signal is emitted when something is changed in the tab ruler dialog/widget. 4/11/2005 pv */ void tabrulerChanged(); diff --git a/scribus/ui/unicodesearch.h b/scribus/ui/unicodesearch.h index b5a374b64d..245bd91b03 100644 --- a/scribus/ui/unicodesearch.h +++ b/scribus/ui/unicodesearch.h @@ -124,7 +124,7 @@ class SCRIBUS_API UnicodeChooseButton : public QPushButton virtual void changeEvent(QEvent *e); signals: - //! \brief Signal transfering the chosen character as QString + //! \brief Signal transferring the chosen character as QString void chosenUnicode(const QString &); public slots: diff --git a/scribus/undogui.h b/scribus/undogui.h index e5c8982940..69d3ab12b7 100644 --- a/scribus/undogui.h +++ b/scribus/undogui.h @@ -406,7 +406,7 @@ public slots: /** @brief Remove the last (oldest) item from the undo stack representation. */ void popBack(); - /** @brief Recieve prefsChanged() signal to update shortcuts. */ + /** @brief Receive prefsChanged() signal to update shortcuts. */ void updateFromPrefs(); signals: diff --git a/scribus/undotransaction.cpp b/scribus/undotransaction.cpp index 73e47d4e36..d127f6654b 100644 --- a/scribus/undotransaction.cpp +++ b/scribus/undotransaction.cpp @@ -135,7 +135,7 @@ bool UndoTransaction::commit() UM->transactions_.erase(UM->transactions_.begin() + stackLevel); } - if (tmps->sizet() > 0) // are there any actions inside the commited transaction + if (tmps->sizet() > 0) // are there any actions inside the committed transaction { if (tmps->getName().isEmpty()) tmps->useActionName(); diff --git a/scribus/units.cpp b/scribus/units.cpp index 658dc239be..3feb41d167 100644 --- a/scribus/units.cpp +++ b/scribus/units.cpp @@ -30,7 +30,7 @@ for which a new license (GPL+exception) is in place. double unitGetRatioFromIndex(const int index) { //PT, MM, IN, P, CM, C (Cicero) - //NOTE: Calling functions that divide by this value will crash on divide by 0. They shouldnt be getting + //NOTE: Calling functions that divide by this value will crash on divide by 0. They shouldn't be getting // a zero value if they are accessing here with a correct index. if (indexUNITMAX) return 0; @@ -211,7 +211,7 @@ const QStringList unitGetTextUnitList() suffixList.append( QObject::tr( "Picas (p)" ) ); suffixList.append( QObject::tr( "Centimeters (cm)" ) ); suffixList.append( QObject::tr( "Cicero (c)" ) ); - //Here for completeness, dont use! + //Here for completeness, don't use! //suffixList.append( QObject::tr( "°" ) ); //suffixList.append( QObject::tr( "%" ) ); return QStringList(suffixList); @@ -317,7 +317,7 @@ double pts2value(double unitValue, int unit) case 3: case 6: case 7: - ret = unitValue; //dont multiply by 1 + ret = unitValue; //don't multiply by 1 break; default: ret = unitValue * unitGetRatioFromIndex(unit); @@ -338,7 +338,7 @@ double value2pts(double unitValue, int unit) case 3: case 6: case 7: - ret = unitValue; // dont divide by 1 + ret = unitValue; // don't divide by 1 break; default: ret = unitValue / unitGetRatioFromIndex(unit); diff --git a/scribus/util_printer.cpp b/scribus/util_printer.cpp index c78851821c..322d46ece9 100644 --- a/scribus/util_printer.cpp +++ b/scribus/util_printer.cpp @@ -145,7 +145,7 @@ bool PrinterUtil::getPrinterMarginValues(const QString& printerName, const QStri ppd = ppdOpenFile(filename); if (ppd!=NULL) { - ppd_size_t *size; // page size data, null if printer doesnt support selected size + ppd_size_t *size; // page size data, null if printer doesn't support selected size size = ppdPageSize(ppd, pageSize.toLocal8Bit().constData()); if (size!=NULL) {
%1%2
%1%2
%1%2