From fc5ba5f5f2de1b5f404845d34af45dedaa4416a3 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sun, 21 Oct 2018 18:14:27 +0300 Subject: [PATCH] Fix minor typos --- autotests/qztoolstest.cpp | 4 ++-- .../3rdparty/qtsingleapplication/qtlockedfile.cpp | 4 ++-- src/lib/adblock/adblockmanager.cpp | 2 +- .../databaseencryptedpasswordbackend.cpp | 4 ++-- src/lib/bookmarks/bookmarksimport/htmlimporter.cpp | 2 +- src/lib/data/html/jquery-1.12.4.js | 2 +- src/lib/network/networkmanager.cpp | 4 ++-- src/lib/opensearch/opensearchengine.cpp | 4 ++-- src/lib/other/registerqappassociation.h | 2 +- .../qml/api/bookmarks/qmlbookmarktreenode.h | 2 +- src/lib/plugins/qml/api/tabs/qmltabs.h | 8 ++++---- .../qml/api/userscript/qmlexternaljsobject.cpp | 2 +- .../plugins/qml/api/userscript/qmluserscripts.h | 2 +- src/lib/plugins/qml/api/windows/qmlwindow.h | 2 +- src/lib/preferences/thememanager.cpp | 2 +- src/lib/preferences/thememanager.ui | 2 +- src/lib/tabwidget/combotabbar.cpp | 4 ++-- src/lib/tools/colors.cpp | 2 +- src/lib/tools/colors.h | 2 +- src/plugins/FlashCookieManager/fcm_plugin.h | 2 +- .../3rdparty/mousegesturerecognizer.cpp | 2 +- windows/AllAssociation.nsh | 14 +++++++------- 22 files changed, 37 insertions(+), 37 deletions(-) diff --git a/autotests/qztoolstest.cpp b/autotests/qztoolstest.cpp index 923bd86db..2b55c61f3 100644 --- a/autotests/qztoolstest.cpp +++ b/autotests/qztoolstest.cpp @@ -298,7 +298,7 @@ void QzToolsTest::copyRecursivelyTest() QVERIFY(!QFileInfo(testDir + "-copy").exists()); - // Copy to non-existant target + // Copy to non-existent target QCOMPARE(QzTools::copyRecursively(testDir, testDir + "-copy"), true); QCOMPARE(QFileInfo(testDir + "-copy").isDir(), true); @@ -333,7 +333,7 @@ void QzToolsTest::removeRecursivelyTest() QCOMPARE(QzTools::removeRecursively(testDir + "-copy"), true); QCOMPARE(QFileInfo(testDir + "-copy").exists(), false); - // Remove non-existant path returns success + // Remove non-existent path returns success QCOMPARE(QzTools::removeRecursively(testDir + "-copy"), true); QCOMPARE(QzTools::copyRecursively(testDir, testDir + "-copy2"), true); diff --git a/src/lib/3rdparty/qtsingleapplication/qtlockedfile.cpp b/src/lib/3rdparty/qtsingleapplication/qtlockedfile.cpp index c142a863a..b1d71f725 100644 --- a/src/lib/3rdparty/qtsingleapplication/qtlockedfile.cpp +++ b/src/lib/3rdparty/qtsingleapplication/qtlockedfile.cpp @@ -158,8 +158,8 @@ QtLockedFile::LockMode QtLockedFile::lockMode() const can be locked. If \a block is true, this function will block until the lock is - aquired. If \a block is false, this function returns \e false - immediately if the lock cannot be aquired. + acquired. If \a block is false, this function returns \e false + immediately if the lock cannot be acquired. If this object already has a lock of type \a mode, this function returns \e true immediately. If this object has a lock of a diff --git a/src/lib/adblock/adblockmanager.cpp b/src/lib/adblock/adblockmanager.cpp index 1faa002ef..5de7ecb51 100644 --- a/src/lib/adblock/adblockmanager.cpp +++ b/src/lib/adblock/adblockmanager.cpp @@ -278,7 +278,7 @@ void AdBlockManager::load() } QDir adblockDir(DataPaths::currentProfilePath() + QSL("/adblock")); - // Create if neccessary + // Create if necessary if (!adblockDir.exists()) { QDir(DataPaths::currentProfilePath()).mkdir(QSL("adblock")); } diff --git a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp index 5d4f7aff7..e7dfe185f 100644 --- a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp +++ b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp @@ -141,7 +141,7 @@ void DatabaseEncryptedPasswordBackend::setActive(bool active) if (active) { setAskMasterPasswordState(isMasterPasswordSetted()); if (!isMasterPasswordSetted()) { - // master-password is not setted this backend needs master-password + // master-password is not set this backend needs master-password showMasterPasswordDialog(); } } @@ -575,7 +575,7 @@ void MasterPasswordDialog::reject() QDialog::reject(); if (m_backend->isActive() && !m_backend->isMasterPasswordSetted()) { - // master password not setted + // master password not set QMessageBox::information(this, AutoFill::tr("Warning!"), AutoFill::tr("This backend needs a master password to be set! " "Falkon just switches to its default backend")); diff --git a/src/lib/bookmarks/bookmarksimport/htmlimporter.cpp b/src/lib/bookmarks/bookmarksimport/htmlimporter.cpp index 7d4ba3b91..da1270db6 100644 --- a/src/lib/bookmarks/bookmarksimport/htmlimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/htmlimporter.cpp @@ -77,7 +77,7 @@ BookmarkItem* HtmlImporter::importBookmarks() m_file.close(); // Converting tags to lower case -,- - // For some reason Qt::CaseInsensitive is not everytime insensitive :-D + // For some reason Qt::CaseInsensitive is not every time insensitive :-D bookmarks.replace(QLatin1String("setWindowTitle(tr("Authorisation required")); + dialog->setWindowTitle(tr("Authorization required")); QFormLayout* formLa = new QFormLayout(dialog); @@ -193,7 +193,7 @@ void NetworkManager::proxyAuthentication(const QString &proxyHost, QAuthenticato } QDialog* dialog = new QDialog(parent); - dialog->setWindowTitle(tr("Proxy authorisation required")); + dialog->setWindowTitle(tr("Proxy authorization required")); QFormLayout* formLa = new QFormLayout(dialog); diff --git a/src/lib/opensearch/opensearchengine.cpp b/src/lib/opensearch/opensearchengine.cpp index 08febc1fa..d339d8809 100644 --- a/src/lib/opensearch/opensearchengine.cpp +++ b/src/lib/opensearch/opensearchengine.cpp @@ -68,7 +68,7 @@ are the classes provided for reading and writing OpenSearch descriptions. Default constructed engines need to be filled with the necessary information before - they can be used to peform search requests. First of all, a search engine should have + they can be used to perform search requests. First of all, a search engine should have the metadata including the name and the description. However, the most important are URL templates, which are the construction of URLs but can also contain template parameters, that are replaced with corresponding values @@ -84,7 +84,7 @@ Both types of URLs are constructed by the class, by searchUrl() and suggestionsUrl() functions respectively. However, search requests are supposed to be performed outside the class, while suggestion queries can be executed using the requestSuggestions() - method. The class will take care of peforming the network request and parsing the + method. The class will take care of performing the network request and parsing the JSON response. Both the image request and suggestion queries need network access. The class can diff --git a/src/lib/other/registerqappassociation.h b/src/lib/other/registerqappassociation.h index 169337504..edaa257b2 100644 --- a/src/lib/other/registerqappassociation.h +++ b/src/lib/other/registerqappassociation.h @@ -67,7 +67,7 @@ private: QString _appDesc; QString _UserRootKey; - QHash _fileAssocHash; // (extention, progId) + QHash _fileAssocHash; // (extension, progId) QHash _urlAssocHash; // (protocol, progId) QHash > _assocDescHash; // (progId, (desc, icon)) }; diff --git a/src/lib/plugins/qml/api/bookmarks/qmlbookmarktreenode.h b/src/lib/plugins/qml/api/bookmarks/qmlbookmarktreenode.h index 4bc2532c8..b9cc01421 100644 --- a/src/lib/plugins/qml/api/bookmarks/qmlbookmarktreenode.h +++ b/src/lib/plugins/qml/api/bookmarks/qmlbookmarktreenode.h @@ -80,7 +80,7 @@ public: Root = BookmarkItem::Root, //!< Represents the root bookmark item Url = BookmarkItem::Url, //!< Represents the single bookmark item of type url Folder = BookmarkItem::Folder, //!< Represents the bookmark folder - Separator = BookmarkItem::Separator, //!< Represents the bookmark seperator + Separator = BookmarkItem::Separator, //!< Represents the bookmark separator Invalid = BookmarkItem::Invalid //!< Represents invalid bookmark item }; Q_ENUM(Type) diff --git a/src/lib/plugins/qml/api/tabs/qmltabs.h b/src/lib/plugins/qml/api/tabs/qmltabs.h index f068e95d3..5685e6310 100644 --- a/src/lib/plugins/qml/api/tabs/qmltabs.h +++ b/src/lib/plugins/qml/api/tabs/qmltabs.h @@ -46,7 +46,7 @@ public: */ Q_INVOKABLE bool nextTab(int windowId = -1); /** - * @brief Sets the prvious tab as current tab + * @brief Sets the previous tab as current tab * @param Integer representing the window * @return True if success, else false */ @@ -127,7 +127,7 @@ public: * @brief Stops a tab * @param A JavaScript object containing * - index: - * Integer representing the tab to be stoped + * Integer representing the tab to be stopped * - windowId: * The id of window containing the tab * @return True if success, else false @@ -135,9 +135,9 @@ public: Q_INVOKABLE bool stopTab(const QVariantMap &map); /** * @brief Gets a tab - * @param A JavaScript object contining + * @param A JavaScript object containing * - index: - * Integer representign the index of the tab + * Integer representing the index of the tab * - windowId: * The id of window containing the tab * @return Tab of type [QmlTab](@ref QmlTab) if exists, else null diff --git a/src/lib/plugins/qml/api/userscript/qmlexternaljsobject.cpp b/src/lib/plugins/qml/api/userscript/qmlexternaljsobject.cpp index b69458fb2..cc0629b88 100644 --- a/src/lib/plugins/qml/api/userscript/qmlexternaljsobject.cpp +++ b/src/lib/plugins/qml/api/userscript/qmlexternaljsobject.cpp @@ -34,7 +34,7 @@ QmlExternalJsObject::~QmlExternalJsObject() void QmlExternalJsObject::registerExtraObject(const QVariantMap &map) { if (!map.contains(QSL("id")) || !map.contains(QSL("object"))) { - qWarning() << "Unable to call" << __FUNCTION__ << ": unsufficient parameters"; + qWarning() << "Unable to call" << __FUNCTION__ << ": insufficient parameters"; return; } diff --git a/src/lib/plugins/qml/api/userscript/qmluserscripts.h b/src/lib/plugins/qml/api/userscript/qmluserscripts.h index 0ec22658c..4bc7bb9d0 100644 --- a/src/lib/plugins/qml/api/userscript/qmluserscripts.h +++ b/src/lib/plugins/qml/api/userscript/qmluserscripts.h @@ -44,7 +44,7 @@ public: /** * @brief Checks if the script is in collection * @param object of type QmlUserScript - * @return true if the the script in in collection, else false + * @return true if the script is in collection, else false */ Q_INVOKABLE bool contains(QObject *object) const; /** diff --git a/src/lib/plugins/qml/api/windows/qmlwindow.h b/src/lib/plugins/qml/api/windows/qmlwindow.h index e2fbda17a..41c0ffad2 100644 --- a/src/lib/plugins/qml/api/windows/qmlwindow.h +++ b/src/lib/plugins/qml/api/windows/qmlwindow.h @@ -58,7 +58,7 @@ class QmlWindow : public QObject Q_PROPERTY(QList tabs READ tabs CONSTANT) /** - * @brief checks if the window is focussed + * @brief checks if the window is focused */ Q_PROPERTY(bool focussed READ focussed CONSTANT) diff --git a/src/lib/preferences/thememanager.cpp b/src/lib/preferences/thememanager.cpp index 134765b94..2b6dc4263 100644 --- a/src/lib/preferences/thememanager.cpp +++ b/src/lib/preferences/thememanager.cpp @@ -96,7 +96,7 @@ void ThemeManager::currentChanged() ui->name->setText(currentTheme.name); ui->author->setText(currentTheme.author); - ui->descirption->setText(currentTheme.description); + ui->description->setText(currentTheme.description); ui->license->setHidden(currentTheme.license.isEmpty()); } diff --git a/src/lib/preferences/thememanager.ui b/src/lib/preferences/thememanager.ui index fb56c4c00..33d5c5cd4 100644 --- a/src/lib/preferences/thememanager.ui +++ b/src/lib/preferences/thememanager.ui @@ -89,7 +89,7 @@ - + diff --git a/src/lib/tabwidget/combotabbar.cpp b/src/lib/tabwidget/combotabbar.cpp index 2024f95f7..96168b6ab 100644 --- a/src/lib/tabwidget/combotabbar.cpp +++ b/src/lib/tabwidget/combotabbar.cpp @@ -1522,8 +1522,8 @@ bool TabScrollBar::isScrolling() const void TabScrollBar::animateToValue(int to, QEasingCurve::Type type) { to = qBound(minimum(), to, maximum()); - int lenght = qAbs(to - value()); - int duration = qMin(1500, 200 + lenght / 2); + int length = qAbs(to - value()); + int duration = qMin(1500, 200 + length / 2); m_animation->stop(); m_animation->setEasingCurve(type); diff --git a/src/lib/tools/colors.cpp b/src/lib/tools/colors.cpp index b748405c0..7be53bd36 100644 --- a/src/lib/tools/colors.cpp +++ b/src/lib/tools/colors.cpp @@ -1,5 +1,5 @@ /* - * Bespin library for Qt style, KWin decoration and everythng else + * Bespin library for Qt style, KWin decoration and everything else * Copyright 2007-2012 by Thomas Lübking * * This library is free software; you can redistribute it and/or modify diff --git a/src/lib/tools/colors.h b/src/lib/tools/colors.h index 3c65ac89c..44570dec9 100644 --- a/src/lib/tools/colors.h +++ b/src/lib/tools/colors.h @@ -1,5 +1,5 @@ /* - * Bespin library for Qt style, KWin decoration and everythng else + * Bespin library for Qt style, KWin decoration and everything else * Copyright 2007-2012 by Thomas Lübking * * This library is free software; you can redistribute it and/or modify diff --git a/src/plugins/FlashCookieManager/fcm_plugin.h b/src/plugins/FlashCookieManager/fcm_plugin.h index ef84a1720..37abb97d3 100644 --- a/src/plugins/FlashCookieManager/fcm_plugin.h +++ b/src/plugins/FlashCookieManager/fcm_plugin.h @@ -99,7 +99,7 @@ private: bool m_autoMode; bool m_deleteOnClose; bool m_enableNotification; - QStringList m_blaklist; + QStringList m_blacklist; QStringList m_whitelist; QStringList m_newCookiesList; }; diff --git a/src/plugins/MouseGestures/3rdparty/mousegesturerecognizer.cpp b/src/plugins/MouseGestures/3rdparty/mousegesturerecognizer.cpp index 9effa1109..cf9a16910 100644 --- a/src/plugins/MouseGestures/3rdparty/mousegesturerecognizer.cpp +++ b/src/plugins/MouseGestures/3rdparty/mousegesturerecognizer.cpp @@ -286,7 +286,7 @@ PosList MouseGestureRecognizer::limitDirections(const PosList &positions, bool a } /* - * simplify - joins together contignous movements in the same direction. + * simplify - joins together continuous movements in the same direction. * * Notice! This function expects a list of limited directions. */ diff --git a/windows/AllAssociation.nsh b/windows/AllAssociation.nsh index 8d71ac186..79c6f4455 100644 --- a/windows/AllAssociation.nsh +++ b/windows/AllAssociation.nsh @@ -10,7 +10,7 @@ _____________________________________________________________________________ ; Date: 2012-Nov-18, S. Razi Alavizadeh, v0.1 ; ; Some Codes are based on code taken from: ; ; http://nsis.sourceforge.net/File_Association ; - ; Ability to register protocol and extention associations. ; + ; Ability to register protocol and extension associations. ; ; It supports old association method and new method by using ; ; IApplicationAssociationRegistration APIs. ; ; that needed 'AppAssocReg' plugins, downloadable from: ; @@ -35,7 +35,7 @@ _____________________________________________________________________________ ${RegisterAssociation} "[assoc_name]" "[executable]" "[prog_id]" "[description]" "[icon]" "[type]" -"[assoc_name]" ; assoc_name, which is file format's extention if type is "file" and is protocol's name if type is "protocol". +"[assoc_name]" ; assoc_name, which is file format's extension if type is "file" and is protocol's name if type is "protocol". ; "[executable]" ; executable which opens the file format or is protocol handler. ; @@ -45,18 +45,18 @@ _____________________________________________________________________________ ; "[icon]" ; icon path for this association. ; -"[type]" ; type of association. "file" for extention and "protocol" for protocol handler. +"[type]" ; type of association. "file" for extension and "protocol" for protocol handler. ; ${UnRegisterAssociation} "[assoc_name]" "[prog_id]" "[executable]" "[type]" -"[assoc_name]" ; assoc_name, which is file format's extention if type is "file" and is protocol's name if type is "protocol". +"[assoc_name]" ; assoc_name, which is file format's extension if type is "file" and is protocol's name if type is "protocol". ; "[prog_id]" ; registery internal id for assoc_name ; "[executable]" ; executable which opens the file format or is protocol handler. ; -"[type]" ; type of association. "file" for extention and "protocol" for protocol handler. +"[type]" ; type of association. "file" for extension and "protocol" for protocol handler. ; ${CreateProgId} "[prog_id]" "[executable]" "[description]" "[icon]" @@ -75,9 +75,9 @@ _____________________________________________________________________________ "[prog_id]" ; registery internal id for assoc_name ; -"[assoc_name]" ; assoc_name, which is file format's extention if type is "file" and is protocol's name if type is "protocol". +"[assoc_name]" ; assoc_name, which is file format's extension if type is "file" and is protocol's name if type is "protocol". ; -"[type]" ; type of association. "file" for extention and "protocol" for protocol handler. +"[type]" ; type of association. "file" for extension and "protocol" for protocol handler. ; ${UpdateSystemIcons} ; it has not arguments and just notifies OS for updating icons for new associations.