From 614f580b79bed1cc19bb84960d8834a3d381fd18 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Fri, 11 Jan 2019 09:09:34 +0200 Subject: [PATCH] Fix minor typos --- core/annotations.h | 2 +- core/area.h | 2 +- core/document.cpp | 4 ++-- core/textdocumentgenerator.h | 2 +- generators/chm/kio-msits/msits.cpp | 2 +- generators/dvi/TeXFontDefinition.cpp | 2 +- generators/dvi/TeXFont_TFM.cpp | 2 +- generators/dvi/anchor.h | 4 ++-- generators/dvi/dviFile.h | 4 ++-- generators/dvi/fontEncoding.h | 2 +- generators/dvi/fontpool.cpp | 2 +- generators/dvi/pageSize.h | 2 +- generators/dvi/special.cpp | 4 ++-- generators/poppler/generator_pdf.h | 2 +- generators/xps/generator_xps.cpp | 2 +- ui/ktreeviewsearchline.cpp | 2 +- ui/pageview.cpp | 4 ++-- ui/pageviewannotator.cpp | 2 +- ui/presentationwidget.cpp | 2 +- ui/signaturepropertiesdialog.cpp | 2 +- ui/thumbnaillist.cpp | 2 +- 21 files changed, 26 insertions(+), 26 deletions(-) diff --git a/core/annotations.h b/core/annotations.h index 914a71696..cd3370c19 100644 --- a/core/annotations.h +++ b/core/annotations.h @@ -737,7 +737,7 @@ class OKULARCORE_EXPORT AnnotationProxy * Called after an existing @p annotation at a given @p page is modified. * * Generator can call @p annotation getters to get the new values. - * @p appearanceChanged tells if a non-visible property was modifed + * @p appearanceChanged tells if a non-visible property was modified * * @note Only called if supports(Modification) == true */ diff --git a/core/area.h b/core/area.h index 235bdc1cf..4c4535d74 100644 --- a/core/area.h +++ b/core/area.h @@ -347,7 +347,7 @@ class OKULARCORE_EXPORT NormalizedRect * performed by accessors based on the value returned by objectType(). Objects * are reparented to this class. * - * Type / Class correspondency tab: + * Type / Class correspondence tab: * - Action : class Action: description of an action * - Image : class Image : description of an image (n/a) * - Annotation: class Annotation: description of an annotation diff --git a/core/document.cpp b/core/document.cpp index 4c144c199..a944e1db3 100644 --- a/core/document.cpp +++ b/core/document.cpp @@ -622,7 +622,7 @@ bool DocumentPrivate::loadDocumentInfo( QFile &infoFile, LoadDocumentInfoFlags l } historyNode = historyNode.nextSibling(); } - // consistancy check + // consistency check if ( m_viewportHistory.isEmpty() ) m_viewportIterator = m_viewportHistory.insert( m_viewportHistory.end(), DocumentViewport() ); } @@ -1788,7 +1788,7 @@ void DocumentPrivate::doContinueAllDocumentSearch(void *pagesToNotifySet, void * if ( !lastMatch ) break; - // add highligh rect to the matches map + // add highlight rect to the matches map (*pageMatches)[page].append(lastMatch); } delete lastMatch; diff --git a/core/textdocumentgenerator.h b/core/textdocumentgenerator.h index ea268d0b8..30ddfd974 100644 --- a/core/textdocumentgenerator.h +++ b/core/textdocumentgenerator.h @@ -124,7 +124,7 @@ class OKULARCORE_EXPORT TextDocumentConverter : public QObject /** * This method can be used to calculate the viewport for a given text block. * - * @note This method should be called at the end of the convertion, because it + * @note This method should be called at the end of the conversion, because it * triggers QTextDocument to do the layout calculation. */ DocumentViewport calculateViewport( QTextDocument *document, const QTextBlock &block ); diff --git a/generators/chm/kio-msits/msits.cpp b/generators/chm/kio-msits/msits.cpp index 50bac0c10..1f92490df 100644 --- a/generators/chm/kio-msits/msits.cpp +++ b/generators/chm/kio-msits/msits.cpp @@ -298,7 +298,7 @@ void ProtocolMSITS::listDir (const QUrl & url) for ( int i = 0; i < listing.size(); i++ ) { - // Strip the direcroty name + // Strip the directory name QString ename = listing[i].mid (striplength); if ( isDirectory ( ename ) ) diff --git a/generators/dvi/TeXFontDefinition.cpp b/generators/dvi/TeXFontDefinition.cpp index 78d7eda90..8e2391c6f 100644 --- a/generators/dvi/TeXFontDefinition.cpp +++ b/generators/dvi/TeXFontDefinition.cpp @@ -210,7 +210,7 @@ void TeXFontDefinition::setDisplayResolution(double _displayResolution_in_dpi) } -/** mark_as_used marks the font, and all the fonts it referrs to, as +/** mark_as_used marks the font, and all the fonts it refers to, as used, i.e. their FONT_IN_USE-flag is set. */ void TeXFontDefinition::mark_as_used() diff --git a/generators/dvi/TeXFont_TFM.cpp b/generators/dvi/TeXFont_TFM.cpp index e35093941..051ab3387 100644 --- a/generators/dvi/TeXFont_TFM.cpp +++ b/generators/dvi/TeXFont_TFM.cpp @@ -144,7 +144,7 @@ glyph* TeXFont_TFM::getGlyph(quint16 characterCode, bool generateCharacterPixmap design_size_in_TeX_points.toDouble() * characterHeight_in_units_of_design_size[characterCode].toDouble() * 100.0/7227.0 + 0.5); - // Just make sure that weired TFM files never lead to giant + // Just make sure that weird TFM files never lead to giant // pixmaps that eat all system memory... if (pixelWidth > 50) pixelWidth = 50; diff --git a/generators/dvi/anchor.h b/generators/dvi/anchor.h index be0709b07..2ffe8e7c0 100644 --- a/generators/dvi/anchor.h +++ b/generators/dvi/anchor.h @@ -18,7 +18,7 @@ /** \brief Page number and vertical position in physical coordinates This very simple class contains a page number and a vertical position -in physical coordiantes. The vertical position is given by the +in physical coordinates. The vertical position is given by the distance from the top of the page. Anchors are completely independent of documents, there is no need for a document to exists that contains the given page, nor does the page number need to be valid. @@ -32,7 +32,7 @@ class Anchor { /** \brief Constructs an anchor that points to an invalid page */ Anchor() {page = 0;} - /** \brief Constructs an snchor that points to a given position on a + /** \brief Constructs an anchor that points to a given position on a given page The class contains no code to make sure in any way that the page diff --git a/generators/dvi/dviFile.h b/generators/dvi/dviFile.h index dcea09d54..91757dc05 100644 --- a/generators/dvi/dviFile.h +++ b/generators/dvi/dviFile.h @@ -65,7 +65,7 @@ class dvifile : public bigEndianByteReader /** This flag is set to "true" during the construction of the dvifile, and is never changed afterwards by the dvifile - class. It is used in kdvi in conjuction with source-specials: + class. It is used in kdvi in conjunction with source-specials: the first time a page with source specials is rendered, KDVI shows an info dialog, and the flag is set to false. That way KDVI ensures that the user is only informed once. */ @@ -103,7 +103,7 @@ class dvifile : public bigEndianByteReader This utility method takes the name of a PDF-file, and attempts to convert it to a PS file. The dvifile internally keeps a list of - converted files, to do two thigs: + converted files, to do two things: - convert files only once. diff --git a/generators/dvi/fontEncoding.h b/generators/dvi/fontEncoding.h index 6fdcaa121..7ac457b96 100644 --- a/generators/dvi/fontEncoding.h +++ b/generators/dvi/fontEncoding.h @@ -17,7 +17,7 @@ * e.g. "8r.enc" * * Explanation of font encodings: TeX was designed to only use - * MetaFont fonts. A DVI file referres to a MetaFont font by giving an + * MetaFont fonts. A DVI file refers to a MetaFont font by giving an * at-most-8-character name, such as 'cmr10'. The DVI previewer would * then locate the associated PK font file (e.g. cmr10.600pk), load * it, and retrieve the character shaped. diff --git a/generators/dvi/fontpool.cpp b/generators/dvi/fontpool.cpp index 002440ee1..effa1a092 100644 --- a/generators/dvi/fontpool.cpp +++ b/generators/dvi/fontpool.cpp @@ -220,7 +220,7 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo { // Set up the kpsewhich process. If pass == 0, look for vf-fonts and // disable automatic font generation as vf-fonts can't be - // generated. If pass == 0, ennable font generation, if it was + // generated. If pass == 0, enable font generation, if it was // enabled globally. // Now generate the command line for the kpsewhich diff --git a/generators/dvi/pageSize.h b/generators/dvi/pageSize.h index 2de3cad68..aab62d649 100644 --- a/generators/dvi/pageSize.h +++ b/generators/dvi/pageSize.h @@ -27,7 +27,7 @@ The main difference to the SimplePageSize class are the following. page width and height. Several units (inch, millimeters, centimeters) are possible. -- It is made sure that page width an hight are always in a reasonable +- It is made sure that page width an height are always in a reasonable range, which is currently set to 5cm .. 50cm - The default constructor provides a locale-depending default. diff --git a/generators/dvi/special.cpp b/generators/dvi/special.cpp index eebf383bc..4642175ba 100644 --- a/generators/dvi/special.cpp +++ b/generators/dvi/special.cpp @@ -570,7 +570,7 @@ void dviRenderer::applicationDoSpecial(char *cp) if (special_command.startsWith(QLatin1String("ps:SDict begin"))) { // Hyperref: start of hyperref rectangle. At this stage it is not - // yet clear if the rectangle will conain a hyperlink, an anchor, + // yet clear if the rectangle will contain a hyperlink, an anchor, // or another type of object. We suspect that this rectangle will // define a hyperlink, allocate a QString and set HTML_href to // point to this string. The string contains the name of the @@ -578,7 +578,7 @@ void dviRenderer::applicationDoSpecial(char *cp) // language--- will be defined only after characters are drawn and // the hyperref rectangle has been closed. We use "glopglyph" as a // temporary name. Since the pointer HTML_href is not NULL, the - // chracter drawing routines will now underline all characters in + // character drawing routines will now underline all characters in // blue to point out that they correspond to a hyperlink. Also, as // soon as characters are drawn, the drawing routines will // allocate a Hyperlink and add it to the top of the vector diff --git a/generators/poppler/generator_pdf.h b/generators/poppler/generator_pdf.h index da77f739e..b168d045a 100644 --- a/generators/poppler/generator_pdf.h +++ b/generators/poppler/generator_pdf.h @@ -114,7 +114,7 @@ class PDFGenerator : public Okular::Generator, public Okular::ConfigInterface, p private: Okular::Document::OpenResult init(QVector & pagesVector, const QString &password); - // create the document synopsis hieracy + // create the document synopsis hierarchy void addSynopsisChildren( QDomNode * parentSource, QDomNode * parentDestination ); // fetch annotations from the pdf file and add they to the page void addAnnotations( Poppler::Page * popplerPage, Okular::Page * page ); diff --git a/generators/xps/generator_xps.cpp b/generators/xps/generator_xps.cpp index d4f022ee5..9b3b31855 100644 --- a/generators/xps/generator_xps.cpp +++ b/generators/xps/generator_xps.cpp @@ -1471,7 +1471,7 @@ QFont XpsFile::getFontByName( const QString &absoluteFileName, float size ) m_fontCache[absoluteFileName] = index; } if ( index == -1 ) { - qCWarning(OkularXpsDebug) << "Requesting uknown font:" << absoluteFileName; + qCWarning(OkularXpsDebug) << "Requesting unknown font:" << absoluteFileName; return QFont(); } diff --git a/ui/ktreeviewsearchline.cpp b/ui/ktreeviewsearchline.cpp index bb1e559ae..ba58775c9 100644 --- a/ui/ktreeviewsearchline.cpp +++ b/ui/ktreeviewsearchline.cpp @@ -259,7 +259,7 @@ bool KTreeViewSearchLine::itemMatches( const QModelIndex &parentIndex, int row, if ( !parentIndex.isValid() && parentIndex != d->treeView->rootIndex() ) return false; - // Contruct a regular expression object with the right options. + // Construct a regular expression object with the right options. QRegExp expression = QRegExp( pattern, d->caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive, d->regularExpression ? QRegExp::RegExp : QRegExp::FixedString ); diff --git a/ui/pageview.cpp b/ui/pageview.cpp index 3d1bec7e8..7d2865703 100644 --- a/ui/pageview.cpp +++ b/ui/pageview.cpp @@ -414,7 +414,7 @@ PageView::PageView( QWidget *parent, Okular::Document *document ) horizontalScrollBar()->setCursor( Qt::ArrowCursor ); horizontalScrollBar()->setSingleStep( 20 ); - // conntect the padding of the viewport to pixmaps requests + // connect the padding of the viewport to pixmaps requests connect(horizontalScrollBar(), &QAbstractSlider::valueChanged, this, &PageView::slotRequestVisiblePixmaps); connect(verticalScrollBar(), &QAbstractSlider::valueChanged, this, &PageView::slotRequestVisiblePixmaps); connect( &d->dragScrollTimer, &QTimer::timeout, this, &PageView::slotDragScroll ); @@ -2243,7 +2243,7 @@ void PageView::mouseMoveEvent( QMouseEvent * e ) break; case Okular::Settings::EnumMouseMode::TextSelect: - // if mouse moves 5 px away from the press point and the document soupports text extraction, do 'textselection' + // if mouse moves 5 px away from the press point and the document supports text extraction, do 'textselection' if ( !d->mouseTextSelecting && !d->mousePressPos.isNull() && d->document->supportsSearching() && ( ( eventPos - d->mouseSelectPos ).manhattanLength() > 5 ) ) { d->mouseTextSelecting = true; diff --git a/ui/pageviewannotator.cpp b/ui/pageviewannotator.cpp index 6082a3c43..6c957e70a 100644 --- a/ui/pageviewannotator.cpp +++ b/ui/pageviewannotator.cpp @@ -1051,7 +1051,7 @@ void PageViewAnnotator::slotToolSelected( int toolID ) m_pageView->displayMessage( tip, QString(), PageViewMessage::Annotation ); } - // consistancy warning + // consistency warning if ( !m_engine ) { qCWarning(OkularUiDebug) << "tools.xml: couldn't find good engine description. check xml."; diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp index 92e144eb2..0d299d165 100644 --- a/ui/presentationwidget.cpp +++ b/ui/presentationwidget.cpp @@ -811,7 +811,7 @@ void PresentationWidget::paintEvent( QPaintEvent * pe ) generatePage(); } - // check painting rect consistancy + // check painting rect consistency QRect r = pe->rect().intersected( QRect( QPoint( 0, 0 ), geometry().size() ) ); if ( r.isNull() ) return; diff --git a/ui/signaturepropertiesdialog.cpp b/ui/signaturepropertiesdialog.cpp index 927d34227..c43b9f4af 100644 --- a/ui/signaturepropertiesdialog.cpp +++ b/ui/signaturepropertiesdialog.cpp @@ -106,7 +106,7 @@ SignaturePropertiesDialog::SignaturePropertiesDialog( Okular::Document *doc, con // button box auto btnBox = new QDialogButtonBox( QDialogButtonBox::Close, this ); - auto certPropBtn = new QPushButton( i18n("Vew Certificate...") ); + auto certPropBtn = new QPushButton( i18n("View Certificate...") ); certPropBtn->setEnabled( !signatureInfo.certificateInfo().isNull() ); btnBox->addButton( certPropBtn, QDialogButtonBox::ActionRole ); connect( btnBox, &QDialogButtonBox::rejected, this, &SignaturePropertiesDialog::reject ); diff --git a/ui/thumbnaillist.cpp b/ui/thumbnaillist.cpp index bb608e2d2..0ed08f934 100644 --- a/ui/thumbnaillist.cpp +++ b/ui/thumbnaillist.cpp @@ -253,7 +253,7 @@ void ThumbnailList::notifySetup( const QVector< Okular::Page * > & pages, int se return; } - // show pages containing hilighted text or bookmarked ones + // show pages containing highlighted text or bookmarked ones //RESTORE THIS int flags = Okular::Settings::filterBookmarks() ? Okular::Page::Bookmark : Okular::Page::Highlight; // if no page matches filter rule, then display all pages