1.5 typos in ticket #13647

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));

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 ||

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() ||

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();

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();

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

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

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

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

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()));

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()));

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()));

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()));

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();
 }

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();
 }

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

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)

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();
 }

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();
 }

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());

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());

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();
 

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;
 }

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)

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

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

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);

scribus/guidesdelegate.cpp

@@ -42,7 +42,7 @@ void GuidesDelegate::setModelData(QWidget *editor,
 								  const QModelIndex &index) const
 {
 	ScrSpinBox *w = static_cast<ScrSpinBox*>(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);

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();
 

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

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 OBSERVED>
 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,

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);

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
 {