From 3b73357d2f038c7e16510eb8eb543ae89f08e297 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan
Date: Mon, 24 Jun 2013 13:46:16 +0300
Subject: [PATCH] Fix some typos found by Krazy2
---
TODO | 2 +-
core/annotations.cpp | 4 ++--
core/bookmarkmanager.h | 2 +-
core/document.cpp | 6 +++---
core/fileprinter.cpp | 2 +-
core/textdocumentsettings.cpp | 2 +-
generators/chm/lib/libchmfile.h | 14 +++++++-------
generators/dvi/dviFile.cpp | 2 +-
generators/poppler/synctex/synctex_parser_utils.c | 2 +-
ui/pageview.cpp | 2 +-
10 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/TODO b/TODO
index c96e3e5c7..49925f107 100644
--- a/TODO
+++ b/TODO
@@ -201,7 +201,7 @@ Done (newest features come first):
-> ADD: page preloading
-> FIX: smarter memory management / prioritize queries
-> ADD: type ahead search in pageview (type '/' then the word to search..) (JakubS)
--> FIX: scroll page if the the searched string is not visible
+-> FIX: scroll page if the searched string is not visible
-> FIX: use a global Viewport over the document (linked views, real link following, location restoring, etc)
-> FIX: wrong zoom buttons order (BR74248) (check consistancy with kdvi/kviewshell/kghostview/.. (not konq))
-> ADD: presentation: cursor modes: hidden, visible, hidden with delay (Tobias)
diff --git a/core/annotations.cpp b/core/annotations.cpp
index 132d38868..be4faeb32 100644
--- a/core/annotations.cpp
+++ b/core/annotations.cpp
@@ -65,7 +65,7 @@ static double distanceSqr( double x, double y, double xScale, double yScale, con
* (not squared!), returns the final distance
*
* @warning The returned distance is not exact:
- * We calculate an (exact) squared distance to the ideal (centered) line, and then substract
+ * We calculate an (exact) squared distance to the ideal (centered) line, and then subtract
* the squared width of the pen:
* a^2 - b^2 where a = "distance from idealized 0-width line" b = "pen width"
* For an exact result, we would want to calculate "(a - b)^2" but that would require
@@ -78,7 +78,7 @@ static double distanceSqr( double x, double y, double xScale, double yScale, con
*
* In other words, this approximation will estimate the distance to be slightly more than it actually is
* for as long as we are far "outside" the line, becoming more accurate the closer we get to the line
- * boundary. Trivially, it also fullfills (a1 < a2) => ((a1^2 - b^2) < (a2^2 - b^2)) making it monotonic.
+ * boundary. Trivially, it also fulfils (a1 < a2) => ((a1^2 - b^2) < (a2^2 - b^2)) making it monotonic.
* "Inside" of the drawn line, the distance is 0 anyway.
*/
static double strokeDistance( double distance, double penWidth )
diff --git a/core/bookmarkmanager.h b/core/bookmarkmanager.h
index d1dc2cf5b..e24efc66d 100644
--- a/core/bookmarkmanager.h
+++ b/core/bookmarkmanager.h
@@ -144,7 +144,7 @@ class OKULAR_EXPORT BookmarkManager : public QObject
bool isBookmarked( int page ) const;
/**
- * Return whether the the given @p viewport is bookmarked.
+ * Return whether the given @p viewport is bookmarked.
* @since 0.15 (KDE 4.9)
*/
bool isBookmarked( const DocumentViewport &viewport ) const;
diff --git a/core/document.cpp b/core/document.cpp
index f1f062bb4..ef796856f 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -2124,8 +2124,8 @@ bool Document::openDocument( const QString & docFile, const KUrl& url, const KMi
if ( offers.isEmpty() )
{
// There's still no offers, do a final mime search based on the filename
- // We need this becuase sometimes (e.g. when downloading from a webserver) the mimetype we
- // use is the one feeded by the server, that may be wrong
+ // We need this because sometimes (e.g. when downloading from a webserver) the mimetype we
+ // use is the one fed by the server, that may be wrong
newmime = KMimeType::findByUrl( docFile );
if ( newmime->name() != mime->name() )
{
@@ -2794,7 +2794,7 @@ void Document::requestPixmaps( const QLinkedList< PixmapRequest * > & requests,
}
// 1. [CLEAN STACK] remove previous requests of requesterID
- // FIXME This asumes all requests come from the same observer, that is true atm but not enforced anywhere
+ // FIXME This assumes all requests come from the same observer, that is true atm but not enforced anywhere
DocumentObserver *requesterObserver = requests.first()->observer();
QSet< int > requestedPages;
{
diff --git a/core/fileprinter.cpp b/core/fileprinter.cpp
index c8ecc6a8a..fe6700aa9 100644
--- a/core/fileprinter.cpp
+++ b/core/fileprinter.cpp
@@ -599,7 +599,7 @@ QStringList FilePrinter::optionOrientation( QPrinter &printer, QPrinter::Orienta
{
// portrait and landscape options rotate the document according to the document orientation
// If we want to print a landscape document as one would expect it, we have to pass the
- // portrait option so that the document is not rotated additionaly
+ // portrait option so that the document is not rotated additionally
if ( printer.orientation() == documentOrientation ) {
// the user wants the document printed as is
return QStringList("-o") << "portrait";
diff --git a/core/textdocumentsettings.cpp b/core/textdocumentsettings.cpp
index fd5150eb9..4187534c5 100644
--- a/core/textdocumentsettings.cpp
+++ b/core/textdocumentsettings.cpp
@@ -32,7 +32,7 @@ TextDocumentSettingsWidget::TextDocumentSettingsWidget( QWidget *parent )
d->mUi->setupUi( this );
- // @notice I think this will be usefull in future.
+ // @notice I think this will be useful in future.
#define ADD_WIDGET( property, widget, objectName, labelName ) \
d->property = new widget( this ); \
d->property->setObjectName( QString::fromUtf8( objectName ) ); \
diff --git a/generators/chm/lib/libchmfile.h b/generators/chm/lib/libchmfile.h
index a8ecf9e8c..cb739ac79 100644
--- a/generators/chm/lib/libchmfile.h
+++ b/generators/chm/lib/libchmfile.h
@@ -152,11 +152,11 @@ class LCHMFile
/*!
* \brief Retrieves the content from url in current chm file to QString.
- * \param str A string where the retreived content should be stored.
- * \param url An URL in chm file to retreive content from. Must be absolute.
+ * \param str A string where the retrieved content should be stored.
+ * \param url An URL in chm file to retrieve content from. Must be absolute.
* \return true if the content is successfully received; false otherwise.
*
- * This function retreives the file content (mostly for HTML pages) from the chm archive
+ * This function retrieves the file content (mostly for HTML pages) from the chm archive
* opened by load() function. Because the content in chm file is not stored in Unicode, it
* will be recoded according to current encoding. Do not use for binary data.
*
@@ -167,11 +167,11 @@ class LCHMFile
/*!
* \brief Retrieves the content from url in current chm file to QByteArray.
- * \param data A data array where the retreived content should be stored.
- * \param url An URL in chm file to retreive content from. Must be absolute.
+ * \param data A data array where the retrieved content should be stored.
+ * \param url An URL in chm file to retrieve content from. Must be absolute.
* \return true if the content is successfully received; false otherwise.
*
- * This function retreives the file content from the chm archive opened by load()
+ * This function retrieves the file content from the chm archive opened by load()
* function. The content is not encoded.
*
* \sa getFileContentAsString()
@@ -182,7 +182,7 @@ class LCHMFile
/*!
* \brief Retrieves the content size.
* \param size A pointer where the size will be stored.
- * \param url An URL in chm file to retreive content from. Must be absolute.
+ * \param url An URL in chm file to retrieve content from. Must be absolute.
* \return true if the content size is successfully stored; false otherwise.
*
* \ingroup dataretrieve
diff --git a/generators/dvi/dviFile.cpp b/generators/dvi/dviFile.cpp
index d1113ae7f..357fbef00 100644
--- a/generators/dvi/dviFile.cpp
+++ b/generators/dvi/dviFile.cpp
@@ -394,7 +394,7 @@ QString dvifile::convertPDFtoPS(const QString &PDFFilename, QString *converrorms
"on your system, or cannot be found in the current search path.
"
"What you can do: The program pdf2ps is normally "
"contained in distributions of the ghostscript PostScript interpreter system. If "
- "ghostscipt is not installed on your system, you could install it now. "
+ "ghostscript is not installed on your system, you could install it now. "
"If you are sure that ghostscript is installed, try to use pdf2ps "
"from the command line to check if it really works.
PATH: %2
", PDFFilename, getenv("PATH"));
have_complainedAboutMissingPDF2PS = true;
diff --git a/generators/poppler/synctex/synctex_parser_utils.c b/generators/poppler/synctex/synctex_parser_utils.c
index 3dd764fb8..03da40970 100644
--- a/generators/poppler/synctex/synctex_parser_utils.c
+++ b/generators/poppler/synctex/synctex_parser_utils.c
@@ -334,7 +334,7 @@ char * _synctex_merge_strings(const char * first,...) {
/* The purpose of _synctex_get_name is to find the name of the synctex file.
* There is a list of possible filenames from which we return the most recent one and try to remove all the others.
- * With two runs of pdftex or xetex we are sure the the synctex file is really the most appropriate.
+ * With two runs of pdftex or xetex we are sure the synctex file is really the most appropriate.
*/
int _synctex_get_name(const char * output, const char * build_directory, char ** synctex_name_ref, synctex_io_mode_t * io_mode_ref)
{
diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index b51d1d4ac..16b00abcf 100644
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@@ -1203,7 +1203,7 @@ void PageView::notifyPageChanged( int pageNumber, int changedFlags )
AnnotWindow *w = *it;
it = d->m_annowindows.erase( it );
// Need to delete after removing from the list
- // otherwise deleting will call slotAnnotationWindowDestroyed wich will mess
+ // otherwise deleting will call slotAnnotationWindowDestroyed which will mess
// the list and the iterators
delete w;
}