From c8ddabf364eff2400c61cea395aefe69eb8ba1b3 Mon Sep 17 00:00:00 2001 From: Dimitris Apostolou Date: Sun, 2 Jan 2022 18:28:23 +0200 Subject: [PATCH] Fix typos --- cmake/QuasselVersion.cmake | 2 +- data/stylesheets/DarkMonokai.qss | 12 ++++++------ data/stylesheets/DarkSolarized.qss | 12 ++++++------ dev-notes/DockManager-spec.txt | 2 +- src/client/client.cpp | 2 +- src/client/clientbacklogmanager.cpp | 2 +- src/client/messagemodel.cpp | 8 ++++---- src/client/messagemodel.h | 2 +- src/client/treemodel.cpp | 4 ++-- src/common/aliasmanager.cpp | 2 +- src/common/network.cpp | 2 +- src/common/settings.cpp | 2 +- src/common/settings.h | 2 +- src/common/signalproxy.cpp | 4 ++-- src/common/signalproxy.h | 2 +- src/core/abstractsqlstorage.cpp | 2 +- src/core/authenticator.h | 2 +- src/core/cipher.cpp | 2 +- src/core/core.h | 14 +++++++------- src/core/corebacklogmanager.cpp | 4 ++-- src/core/coreirclisthelper.cpp | 4 ++-- src/core/coresessioneventprocessor.cpp | 4 ++-- src/core/coresessioneventprocessor.h | 10 +++++----- src/core/ldapauthenticator.cpp | 2 +- src/core/ldapauthenticator.h | 2 +- src/core/netsplit.h | 4 ++-- src/core/sqlitestorage.cpp | 2 +- src/core/storage.h | 16 ++++++++-------- src/qtui/chatitem.cpp | 2 +- src/qtui/chatitem.h | 2 +- src/qtui/chatview.cpp | 4 ++-- src/qtui/chatviewsearchcontroller.cpp | 2 +- src/qtui/coreinfodlg.h | 2 +- src/qtui/mainwin.cpp | 2 +- src/qtui/qtuiapplication.cpp | 2 +- src/qtui/qtuiapplication.h | 2 +- .../settingspages/corehighlightsettingspage.cpp | 2 +- .../settingspages/corehighlightsettingspage.h | 2 +- src/qtui/settingspages/highlightsettingspage.cpp | 2 +- src/qtui/settingspages/networkssettingspage.cpp | 6 +++--- src/qtui/topicwidget.cpp | 2 +- src/uisupport/bufferhotlistfilter.cpp | 2 +- src/uisupport/bufferview.cpp | 4 ++-- src/uisupport/contextmenuactionprovider.cpp | 2 +- src/uisupport/settingspage.h | 4 ++-- 45 files changed, 86 insertions(+), 86 deletions(-) diff --git a/cmake/QuasselVersion.cmake b/cmake/QuasselVersion.cmake index 4a124a0a..70483f36 100644 --- a/cmake/QuasselVersion.cmake +++ b/cmake/QuasselVersion.cmake @@ -25,7 +25,7 @@ if (GIT_HEAD) endif() endif() -# If not in a Git repo try to read GIT_HEAD and GIT_DESCRIBE from enviroment +# If not in a Git repo try to read GIT_HEAD and GIT_DESCRIBE from environment if (NOT GIT_HEAD OR NOT GIT_DESCRIBE) if (DEFINED ENV{GIT_HEAD}) set(GIT_HEAD $ENV{GIT_HEAD}) diff --git a/data/stylesheets/DarkMonokai.qss b/data/stylesheets/DarkMonokai.qss index 736bb7fb..1df2dbbd 100644 --- a/data/stylesheets/DarkMonokai.qss +++ b/data/stylesheets/DarkMonokai.qss @@ -37,7 +37,7 @@ ** Quassel stylesheets also support Palette { role: color; } for setting the system ** palette. See the QPalette docs for available roles, and convert them into qss-style ** attributes, so ButtonText would become button-text or see qssparser.cpp In fact, -** qssparser.cpp is the authorative source for Quassel's qss syntax that contains all +** qssparser.cpp is the authoritative source for Quassel's qss syntax that contains all ** the extensions over standard Qt qss syntax. ** See: ** http://qt-project.org/doc/qt-4.8/qpalette.html#ColorRole-enum @@ -80,7 +80,7 @@ Palette { link: #539FA3; link-visited: #845B90; - /* Color of the marker line in the chat view. BG Node that is overlayed on the first new ChatLine. */ + /* Color of the marker line in the chat view. BG Node that is overlaid on the first new ChatLine. */ // 0 -> 0.1 (sharp line) marker-line: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ff0000, stop: 0.1 #ff0000, stop: 0.1 transparent); } @@ -225,7 +225,7 @@ QMainWindow::separator:horizontal:hover { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 palette(window), stop: 0.5 palette(light), stop: 1 palette(window)); } -/* Menu Bar / Context Menues */ +/* Menu Bar / Context Menus */ QMenu { margin: 5px; // A bit of nice padding around menu items. } @@ -424,7 +424,7 @@ ChatLine#netsplit-quit { foreground: #996633; } ChatLine::timestamp { foreground: #707C70; - // Resets the timestemp font during #action and other possible formatting. + // Resets the timestamp font during #action and other possible formatting. font-style: normal; font-weight: normal; } @@ -481,7 +481,7 @@ ChatLine[bg-color="2"] { background: #15a; } ChatLine[fg-color="c"] { foreground: #15f; } ChatLine[bg-color="c"] { background: #15f; } -/* A list of all the colors for easy convienience */ +/* A list of all the colors for easy convenience */ /* ChatLine[fg-color="0"] { foreground: white; } ChatLine[bg-color="0"] { background: white; } @@ -529,7 +529,7 @@ BufferViewDock[active=true] { } /* -** OS X: Workaround Pallete {} bug +** OS X: Workaround Palette {} bug ** - https://stackoverflow.com/questions/19748752/qt-style-qpalettewindowtext-color-reverts-after-application-starts */ diff --git a/data/stylesheets/DarkSolarized.qss b/data/stylesheets/DarkSolarized.qss index 71abb98a..9b8857bf 100644 --- a/data/stylesheets/DarkSolarized.qss +++ b/data/stylesheets/DarkSolarized.qss @@ -37,7 +37,7 @@ ** Quassel stylesheets also support Palette { role: color; } for setting the system ** palette. See the QPalette docs for available roles, and convert them into qss-style ** attributes, so ButtonText would become button-text or see qssparser.cpp In fact, -** qssparser.cpp is the authorative source for Quassel's qss syntax that contains all +** qssparser.cpp is the authoritative source for Quassel's qss syntax that contains all ** the extensions over standard Qt qss syntax. ** See: ** http://qt-project.org/doc/qt-4.8/qpalette.html#ColorRole-enum @@ -80,7 +80,7 @@ Palette { link: #539FA3; link-visited: #845B90; - /* Color of the marker line in the chat view. BG Node that is overlayed on the first new ChatLine. */ + /* Color of the marker line in the chat view. BG Node that is overlaid on the first new ChatLine. */ // 0 -> 0.1 (sharp line) marker-line: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #586e75, stop: 0.1 #586e75, stop: 0.1 transparent); } @@ -230,7 +230,7 @@ QMainWindow::separator:horizontal:hover { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 palette(window), stop: 0.5 palette(light), stop: 1 palette(window)); } -/* Menu Bar / Context Menues */ +/* Menu Bar / Context Menus */ QMenu { margin: 5px; // A bit of nice padding around menu items. } @@ -468,7 +468,7 @@ ChatLine#netsplit-quit { foreground: #586e75; } ChatLine::timestamp { foreground: #586e75; - // Resets the timestemp font during #action and other possible formatting. + // Resets the timestamp font during #action and other possible formatting. font-style: normal; font-weight: normal; } @@ -537,7 +537,7 @@ ChatLine[bg-color="2"] { background: #15a; } ChatLine[fg-color="c"] { foreground: #15f; } ChatLine[bg-color="c"] { background: #15f; } -/* A list of all the colors for easy convienience */ +/* A list of all the colors for easy convenience */ /* ChatLine[fg-color="0"] { foreground: white; } ChatLine[bg-color="0"] { background: white; } @@ -585,7 +585,7 @@ BufferViewDock[active=true] { } /* -** OS X: Workaround Pallete {} bug +** OS X: Workaround Palette {} bug ** - https://stackoverflow.com/questions/19748752/qt-style-qpalettewindowtext-color-reverts-after-application-starts */ diff --git a/dev-notes/DockManager-spec.txt b/dev-notes/DockManager-spec.txt index a8376b65..4e9de7be 100644 --- a/dev-notes/DockManager-spec.txt +++ b/dev-notes/DockManager-spec.txt @@ -1,6 +1,6 @@ DBus Interface Specification -Docky implements the DockManager specificiation as well as a custom DBus specification. +Docky implements the DockManager specification as well as a custom DBus specification. DockManager DBus Interface Specification DBus unique path: net.launchpad.DockManager diff --git a/src/client/client.cpp b/src/client/client.cpp index e8f72e9c..ac0432f0 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -602,7 +602,7 @@ void Client::purgeKnownBufferIds() void Client::bufferRemoved(BufferId bufferId) { // select a sane buffer (status buffer) - /* we have to manually select a buffer because otherwise inconsitent changes + /* we have to manually select a buffer because otherwise inconsistent changes * to the model might occur: * the result of a buffer removal triggers a change in the selection model. * the newly selected buffer might be a channel that hasn't been selected yet diff --git a/src/client/clientbacklogmanager.cpp b/src/client/clientbacklogmanager.cpp index e2326c1e..cb082973 100644 --- a/src/client/clientbacklogmanager.cpp +++ b/src/client/clientbacklogmanager.cpp @@ -132,7 +132,7 @@ BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList& buffer void ClientBacklogManager::checkForBacklog(const QList& bufferIds) { - // we ingore all backlogrequests until we had our initial request + // we ignore all backlogrequests until we had our initial request if (!_initBacklogRequested) { return; } diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp index b7dca4fd..6c93a7f6 100644 --- a/src/client/messagemodel.cpp +++ b/src/client/messagemodel.cpp @@ -127,7 +127,7 @@ void MessageModel::insertMessageGroup(const QList& msglist) Message dayChangeMsg; if (start > 0) { - // check if the preceeding msg is a daychange message and if so if + // check if the preceding msg is a daychange message and if so if // we have to drop or relocate it at the end of this chunk int prevIdx = start - 1; if (messageItemAt(prevIdx)->msgType() == Message::DayChange && messageItemAt(prevIdx)->timestamp() > msglist.at(0).timestamp()) { @@ -150,7 +150,7 @@ void MessageModel::insertMessageGroup(const QList& msglist) // check if we need to insert a daychange message at the end of the this group // if this assert triggers then indexForId() would have found a spot right before a DayChangeMsg - // this should never happen as daychange messages share the msgId with the preceeding message + // this should never happen as daychange messages share the msgId with the preceding message Q_ASSERT(messageItemAt(start)->msgType() != Message::DayChange); QDateTime nextTs = messageItemAt(start)->timestamp(); QDateTime prevTs = msglist.last().timestamp(); @@ -188,7 +188,7 @@ int MessageModel::insertMessagesGracefully(const QList& msglist) /* short description: * 1) first we check where the message with the highest msgId from msglist would be inserted * 2) check that position for dupe - * 3) determine the messageId of the preceeding msg + * 3) determine the messageId of the preceding msg * 4) insert as many msgs from msglist with with msgId larger then the just determined id * those messages are automatically less then the msg of the position we just determined in 1) */ @@ -204,7 +204,7 @@ int MessageModel::insertMessagesGracefully(const QList& msglist) QList::const_iterator iter; if (inOrder) { iter = msglist.constEnd(); - --iter; // this op is safe as we've allready passed an empty check + --iter; // this op is safe as we've already passed an empty check } else { iter = msglist.constBegin(); diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h index 4b9cc394..bee8ebf1 100644 --- a/src/client/messagemodel.h +++ b/src/client/messagemodel.h @@ -112,7 +112,7 @@ private slots: private: void insertMessageGroup(const QList&); - int insertMessagesGracefully(const QList&); // inserts as many contiguous msgs as possible. returns numer of inserted msgs. + int insertMessagesGracefully(const QList&); // inserts as many contiguous msgs as possible. returns number of inserted msgs. int indexForId(MsgId); // QList _messageList; diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp index fde52070..c08737ce 100644 --- a/src/client/treemodel.cpp +++ b/src/client/treemodel.cpp @@ -101,7 +101,7 @@ void AbstractTreeItem::removeAllChilds() childIter = _childItems.begin(); while (childIter != _childItems.end()) { child = *childIter; - child->setTreeItemFlags({}); // disable self deletion, as this would only fuck up consitency and the child gets deleted anyways + child->setTreeItemFlags({}); // disable self deletion, as this would only fuck up consistency and the child gets deleted anyways child->removeAllChilds(); ++childIter; } @@ -517,7 +517,7 @@ void TreeModel::beginRemoveChilds(int firstRow, int lastRow) disconnect(parentItem->child(i), nullptr, this, nullptr); } - // consitency checks + // consistency checks QModelIndex parent = indexByItem(parentItem); Q_ASSERT(firstRow <= lastRow); Q_ASSERT(parentItem->childCount() > lastRow); diff --git a/src/common/aliasmanager.cpp b/src/common/aliasmanager.cpp index 6458dc54..57e73e09 100644 --- a/src/common/aliasmanager.cpp +++ b/src/common/aliasmanager.cpp @@ -193,7 +193,7 @@ void AliasManager::expand(const QString& alias, const BufferInfo& bufferInfo, co command = command.replace(QString("$%1:ident").arg(j), (ircUser && !ircUser->user().isEmpty()) ? ircUser->user() : QString("*")); // Nickname - // Must be replaced last to avoid interferring with more specific aliases + // Must be replaced last to avoid interfering with more specific aliases command = command.replace(QString("$%1").arg(j), params[j - 1]); } command = command.replace("$0", msg); diff --git a/src/common/network.cpp b/src/common/network.cpp index 0cc73cd3..f0a86b28 100644 --- a/src/common/network.cpp +++ b/src/common/network.cpp @@ -844,7 +844,7 @@ void Network::removeCap(const QString& capability) // Remove from the list of available capabilities. _caps.remove(_capLowercase); // Remove it from the acknowledged list if it was previously acknowledged. The SYNC call - // ensures this propogates to the other side. + // ensures this propagates to the other side. // Use removeOne() for speed; no more than one due to contains() check in acknowledgeCap(). _capsEnabled.removeOne(_capLowercase); SYNC(ARG(capability)) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index c537aad3..5a59a4a9 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -22,7 +22,7 @@ #include -const int VERSION = 1; /// Settings version for backwords/forwards incompatible changes +const int VERSION = 1; /// Settings version for backwards/forwards incompatible changes // This is used if no VersionMinor key exists, e.g. upgrading from a Quassel version before this // change. This shouldn't be increased from 1; instead, change the logic in Core::Core() and diff --git a/src/common/settings.h b/src/common/settings.h index ef849797..12a6cc25 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -128,7 +128,7 @@ protected: * Default implementation just returns the given key. * * @param key Key given to notify() - * @returns Key that should be used for notfication + * @returns Key that should be used for notifcation */ virtual QString keyForNotify(const QString& key) const; diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index 3bd7c4d3..e6ac40c2 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -190,7 +190,7 @@ bool SignalProxy::addPeer(Peer* peer) void SignalProxy::removeAllPeers() { Q_ASSERT(proxyMode() == Server || peerCount() <= 1); - // wee need to copy that list since we modify it in the loop + // we need to copy that list since we modify it in the loop QList peers = _peerMap.values(); for (auto peer : peers) { removePeer(peer); @@ -656,7 +656,7 @@ QVariantList SignalProxy::peerData() QVariantMap data; data["id"] = peer->id(); data["clientVersion"] = peer->clientVersion(); - // We explicitly rename this, as, due to the Debian reproducability changes, buildDate isn’t actually the build + // We explicitly rename this, as, due to the Debian reproducibility changes, buildDate isn’t actually the build // date anymore, but on newer clients the date of the last git commit data["clientVersionDate"] = peer->buildDate(); data["remoteAddress"] = peer->address(); diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index 77064fdf..a2b21827 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -283,7 +283,7 @@ private: private: QHash _peerMap; - // containg a list of argtypes for fast access + // contains a list of argtypes for fast access QHash _extendedMetaObjects; std::unordered_multimap, Hash> _attachedSlots; ///< Attached slot objects diff --git a/src/core/abstractsqlstorage.cpp b/src/core/abstractsqlstorage.cpp index fbd34899..6a69c3d2 100644 --- a/src/core/abstractsqlstorage.cpp +++ b/src/core/abstractsqlstorage.cpp @@ -38,7 +38,7 @@ AbstractSqlStorage::AbstractSqlStorage(QObject* parent) AbstractSqlStorage::~AbstractSqlStorage() { - // disconnect the connections, so their deletion is no longer interessting for us + // disconnect the connections, so their deletion is no longer interesting for us QHash::iterator conIter; for (conIter = _connectionPool.begin(); conIter != _connectionPool.end(); ++conIter) { QSqlDatabase::removeDatabase(conIter.value()->name()); diff --git a/src/core/authenticator.h b/src/core/authenticator.h index 8797f5af..6dec048d 100644 --- a/src/core/authenticator.h +++ b/src/core/authenticator.h @@ -40,7 +40,7 @@ public: { IsReady, // ready to go NeedsSetup, // need basic setup (ask the user for input) - NotAvailable // remove the authenticator backend from the list of avaliable authenticators. + NotAvailable // remove the authenticator backend from the list of available authenticators. }; public slots: diff --git a/src/core/cipher.cpp b/src/core/cipher.cpp index efbd88e5..65fecbfd 100644 --- a/src/core/cipher.cpp +++ b/src/core/cipher.cpp @@ -305,7 +305,7 @@ QByteArray Cipher::blowfishCBC(QByteArray cipherText, bool direction) } else { temp = QByteArray::fromBase64(temp); - // supposedly nescessary if we get a truncated message also allows for decryption of 'crazy' + // supposedly necessary if we get a truncated message also allows for decryption of 'crazy' // en/decoding clients that use STANDARDIZED PADDING TECHNIQUES while ((temp.length() % 8) != 0) temp.append('\0'); diff --git a/src/core/core.h b/src/core/core.h index 6e4e4b34..acbac95a 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -194,7 +194,7 @@ public: * * \param user The core user * \param networkInfo a NetworkInfo definition to store the newly created ID in - * \return true if successfull. + * \return true if successful. */ static bool createNetwork(UserId user, NetworkInfo& info); @@ -203,7 +203,7 @@ public: * * \param user The core user * \param networkInfo The Updated NetworkInfo - * \return true if successfull. + * \return true if successful. */ static inline bool updateNetwork(UserId user, const NetworkInfo& info) { return instance()->_storage->updateNetwork(user, info); } @@ -212,7 +212,7 @@ public: * * \param user The core user * \param networkId The network to delete - * \return true if successfull. + * \return true if successful. */ static inline bool removeNetwork(UserId user, const NetworkId& networkId) { @@ -357,7 +357,7 @@ public: * \param networkId The network id * \param type The type of the buffer (StatusBuffer, Channel, etc.) * \param buffer The buffer name (if empty, the net's status buffer is returned) - * \param create Whether or not the buffer should be created if it doesnt exist + * \param create Whether or not the buffer should be created if it doesn't exist * \return The BufferInfo corresponding to the given network and buffer name, or 0 if not found */ static inline BufferInfo bufferInfo( @@ -499,7 +499,7 @@ public: * * \param user The user who is the owner of the buffer * \param bufferId The bufferId - * \return true if successfull + * \return true if successful */ static inline bool removeBuffer(const UserId& user, const BufferId& bufferId) { @@ -511,7 +511,7 @@ public: * \param user The id of the buffer owner * \param bufferId The bufferId * \param newName The new name of the buffer - * \return true if successfull + * \return true if successful */ static inline bool renameBuffer(const UserId& user, const BufferId& bufferId, const QString& newName) { @@ -523,7 +523,7 @@ public: * \param user The id of the buffer owner * \param bufferId1 The bufferId of the remaining buffer * \param bufferId2 The buffer that is about to be removed - * \return true if successfulln + * \return true if successful */ static inline bool mergeBuffersPermanently(const UserId& user, const BufferId& bufferId1, const BufferId& bufferId2) { diff --git a/src/core/corebacklogmanager.cpp b/src/core/corebacklogmanager.cpp index 0d494d81..d26d2787 100644 --- a/src/core/corebacklogmanager.cpp +++ b/src/core/corebacklogmanager.cpp @@ -58,7 +58,7 @@ QVariantList CoreBacklogManager::requestBacklog(BufferId bufferId, MsgId first, last = oldestMessage; } - // only fetch additional messages if they continue seemlessly + // only fetch additional messages if they continue seamlessly // that is, if the list of messages is not truncated by the limit if (last == oldestMessage) { msgList = Core::requestMsgs(coreSession()->user(), bufferId, -1, last, additional); @@ -96,7 +96,7 @@ QVariantList CoreBacklogManager::requestBacklogFiltered(BufferId bufferId, MsgId last = oldestMessage; } - // only fetch additional messages if they continue seemlessly + // only fetch additional messages if they continue seamlessly // that is, if the list of messages is not truncated by the limit if (last == oldestMessage) { msgList = Core::requestMsgsFiltered(coreSession()->user(), bufferId, -1, last, additional, Message::Types{type}, Message::Flags{flags}); diff --git a/src/core/coreirclisthelper.cpp b/src/core/coreirclisthelper.cpp index 118e35c4..927af37b 100644 --- a/src/core/coreirclisthelper.cpp +++ b/src/core/coreirclisthelper.cpp @@ -73,13 +73,13 @@ bool CoreIrcListHelper::dispatchQuery(const NetworkId& netId, const QString& que bool CoreIrcListHelper::endOfChannelList(const NetworkId& netId) { if (_queryTimeoutByNetId.contains(netId)) { - // If we recieved an actual RPL_LISTEND, remove the timer + // If we received an actual RPL_LISTEND, remove the timer int timerId = _queryTimeoutByNetId.take(netId)->timerId(); _queryTimeoutByTimerId.remove(timerId); } if (_queuedQuery.contains(netId)) { - // we're no longer interessted in the current data. drop it and issue a new request. + // we're no longer interested in the current data. drop it and issue a new request. return dispatchQuery(netId, _queuedQuery.take(netId)); } else if (_channelLists.contains(netId)) { diff --git a/src/core/coresessioneventprocessor.cpp b/src/core/coresessioneventprocessor.cpp index f7d129d7..c3dce758 100644 --- a/src/core/coresessioneventprocessor.cpp +++ b/src/core/coresessioneventprocessor.cpp @@ -1197,7 +1197,7 @@ void CoreSessionEventProcessor::processIrcEvent353(IrcEvent* e) return; // param[0] is either "=", "*" or "@" indicating a public, private or secret channel - // we don't use this information at the time beeing + // we don't use this information at the time being QString channelname = e->params()[1]; IrcChannel* channel = e->network()->ircChannel(channelname); @@ -1381,7 +1381,7 @@ void CoreSessionEventProcessor::processIrcEvent432(IrcEventNumeric* e) QString errnick; if (e->params().count() < 2) { - // handle unreal-ircd bug, where unreal ircd doesnt supply a TARGET in ERR_ERRONEUSNICKNAME during registration phase: + // handle unreal-ircd bug, where unreal ircd doesn't supply a TARGET in ERR_ERRONEUSNICKNAME during registration phase: // nick @@@ // :irc.scortum.moep.net 432 @@@ :Erroneous Nickname: Illegal characters // correct server reply: diff --git a/src/core/coresessioneventprocessor.h b/src/core/coresessioneventprocessor.h index 189c78e2..0af071f1 100644 --- a/src/core/coresessioneventprocessor.h +++ b/src/core/coresessioneventprocessor.h @@ -125,18 +125,18 @@ private slots: /** This slot handles a bulk-join after a netsplit is over * \param net The network * \param channel The channel the users joined - * \param users The list of users that joind the channel + * \param users The list of users that joined the channel * \param modes The list of modes the users get set - * \param quitMessage The message we received when the netsplit occured + * \param quitMessage The message we received when the netsplit occurred */ void handleNetsplitJoin(Network* net, const QString& channel, const QStringList& users, const QStringList& modes, const QString& quitMessage); //! Quits after a netsplit - /** This slot handles a bulk-quit after a netsplit occured + /** This slot handles a bulk-quit after a netsplit occurred * \param net The network - * \param channel The channel the users quitted + * \param channel The channel the users quit * \param users The list of users that got split - * \param quitMessage The message we received when the netsplit occured + * \param quitMessage The message we received when the netsplit occurred */ void handleNetsplitQuit(Network* net, const QString& channel, const QStringList& users, const QString& quitMessage); diff --git a/src/core/ldapauthenticator.cpp b/src/core/ldapauthenticator.cpp index a2205115..89b390fc 100644 --- a/src/core/ldapauthenticator.cpp +++ b/src/core/ldapauthenticator.cpp @@ -33,7 +33,7 @@ #include "quassel.h" /* We should use openldap on windows if at all possible, rather than trying to - * write some kind of compatiblity routine. + * write some kind of compatibility routine. #ifdef Q_CC_MSVC #include #include diff --git a/src/core/ldapauthenticator.h b/src/core/ldapauthenticator.h index 6ef8562e..657643f7 100644 --- a/src/core/ldapauthenticator.h +++ b/src/core/ldapauthenticator.h @@ -33,7 +33,7 @@ // Link against LDAP. /* We should use openldap on windows if at all possible, rather than trying to - * write some kind of compatiblity routine. + * write some kind of compatibility routine. #ifdef Q_CC_MSVC #include #include diff --git a/src/core/netsplit.h b/src/core/netsplit.h index 9719a181..8d53fb4f 100644 --- a/src/core/netsplit.h +++ b/src/core/netsplit.h @@ -48,7 +48,7 @@ public: void userQuit(const QString& sender, const QStringList& channels, const QString& msg); //! Remove a user from the netsplit - /** Call this method if a user joined after a netsplit occured. + /** Call this method if a user joined after a netsplit occurred. * * \param sender The sender string of the joined user * \param channel The channel that user shares with us @@ -107,7 +107,7 @@ signals: * for every channel. * \param net The network * \param channel The IRC channel - * \param users A list of all users that quitted in that channel + * \param users A list of all users that quit in that channel * \param quitMessage The Quitmessage and thus the servers that got split */ void netsplitQuit(Network* net, const QString& channel, const QStringList& users, const QString& quitMessage); diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index 5bb5f0a7..3ca0344e 100644 --- a/src/core/sqlitestorage.cpp +++ b/src/core/sqlitestorage.cpp @@ -1401,7 +1401,7 @@ bool SqliteStorage::renameBuffer(const UserId& user, const BufferId& bufferId, c safeExec(query); error = query.lastError().isValid(); - // unexepcted error occured (19 == constraint violation) + // unexpected error occurred (19 == constraint violation) if (error && query.lastError().nativeErrorCode() != QLatin1String{"19"}) { watchQuery(query); } diff --git a/src/core/storage.h b/src/core/storage.h index 2799fc49..ecf90732 100644 --- a/src/core/storage.h +++ b/src/core/storage.h @@ -45,7 +45,7 @@ public: { IsReady, // ready to go NeedsSetup, // need basic setup (ask the user for input) - NotAvailable // remove the storage backend from the list of avaliable backends + NotAvailable // remove the storage backend from the list of available backends }; enum HashVersion @@ -107,7 +107,7 @@ public: //! Makes temp data persistent /** This Method is periodically called by the Quassel Core to make temporary - * data persistant. This reduces the data loss drastically in the + * data persistent. This reduces the data loss drastically in the * unlikely case of a Core crash. */ virtual void sync() = 0; @@ -214,7 +214,7 @@ public: /** * \param user The core user * \param networkInfo The Updated NetworkInfo - * \return true if successfull. + * \return true if successful. */ virtual bool updateNetwork(UserId user, const NetworkInfo& info) = 0; @@ -223,7 +223,7 @@ public: * * \param user The core user * \param networkId The network to delete - * \return true if successfull. + * \return true if successful. */ virtual bool removeNetwork(UserId user, const NetworkId& networkId) = 0; @@ -322,7 +322,7 @@ public: * \param networkId The network id * \param type The type of the buffer (StatusBuffer, Channel, etc.) * \param buffer The buffer name (if empty, the net's status buffer is returned) - * \param create Whether or not the buffer should be created if it doesnt exist + * \param create Whether or not the buffer should be created if it doesn't exist * \return The BufferInfo corresponding to the given network and buffer name, or an invalid BufferInfo if not found */ virtual BufferInfo bufferInfo(UserId user, const NetworkId& networkId, BufferInfo::Type type, const QString& buffer = "", bool create = true) @@ -355,7 +355,7 @@ public: /** This call cannot be reverted! * \param user The user who is the owner of the buffer * \param bufferId The bufferId - * \return true if successfull + * \return true if successful */ virtual bool removeBuffer(const UserId& user, const BufferId& bufferId) = 0; @@ -364,7 +364,7 @@ public: * \param user The id of the buffer owner * \param bufferId The bufferId * \param newName The new name of the buffer - * \return true if successfull + * \return true if successful */ virtual bool renameBuffer(const UserId& user, const BufferId& bufferId, const QString& newName) = 0; @@ -373,7 +373,7 @@ public: * \param user The id of the buffer owner * \param bufferId1 The bufferId of the remaining buffer * \param bufferId2 The buffer that is about to be removed - * \return true if successfull + * \return true if successful */ virtual bool mergeBuffersPermanently(const UserId& user, const BufferId& bufferId1, const BufferId& bufferId2) = 0; diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp index efb10b8a..7ad093db 100644 --- a/src/qtui/chatitem.cpp +++ b/src/qtui/chatitem.cpp @@ -214,7 +214,7 @@ void ChatItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, // layout()->draw(painter, QPointF(0,0), formats, boundingRect()); - // Debuging Stuff + // Debugging Stuff // uncomment partially or all of the following stuff: // // 0) alternativ painter color for debug stuff diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h index bb902748..e212d028 100644 --- a/src/qtui/chatitem.h +++ b/src/qtui/chatitem.h @@ -287,7 +287,7 @@ private: qreal choppedTrailing; }; -//! Acts as a proxy for Action signals targetted at a ContentsChatItem +//! Acts as a proxy for Action signals targeted at a ContentsChatItem /** Since a ChatItem is not a QObject, hence cannot receive signals, we use a static ActionProxy * as a receiver instead. This avoids having to handle ChatItem actions (e.g. context menu entries) * outside the ChatItem. diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp index 3e0b6211..1a24c6ff 100644 --- a/src/qtui/chatview.cpp +++ b/src/qtui/chatview.cpp @@ -112,7 +112,7 @@ bool ChatView::event(QEvent* event) } if (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->device()->type() == QTouchDevice::TouchScreen) { - // Enable scrolling by draging, disable selecting/clicking content + // Enable scrolling by dragging, disable selecting/clicking content setDragMode(QGraphicsView::ScrollHandDrag); setInteractive(false); // if scrollbar is not visible we need to request backlog below else we need to accept @@ -191,7 +191,7 @@ void ChatView::resizeEvent(QResizeEvent* event) // if scrolling to bottom, do it immediately. if (atBottom) { - // we can reduce viewport updates if we scroll to the bottom allready at the beginning + // we can reduce viewport updates if we scroll to the bottom already at the beginning verticalScrollBar()->setValue(verticalScrollBar()->maximum()); } diff --git a/src/qtui/chatviewsearchcontroller.cpp b/src/qtui/chatviewsearchcontroller.cpp index 0b30a16e..90dd0f39 100644 --- a/src/qtui/chatviewsearchcontroller.cpp +++ b/src/qtui/chatviewsearchcontroller.cpp @@ -41,7 +41,7 @@ void ChatViewSearchController::setSearchString(const QString& searchString) _searchString = searchString; if (_scene) { if (!searchString.startsWith(oldSearchString) || oldSearchString.isEmpty()) { - // we can't reuse our all findings... cler the scene and do it all over + // we can't reuse our all findings... clear the scene and do it all over updateHighlights(); } else { diff --git a/src/qtui/coreinfodlg.h b/src/qtui/coreinfodlg.h index 447ea071..c1e3563e 100644 --- a/src/qtui/coreinfodlg.h +++ b/src/qtui/coreinfodlg.h @@ -61,7 +61,7 @@ private slots: void disconnectClicked(int peerId); /** - * Event handler for core unspported Details button + * Event handler for core unsupported Details button */ void on_coreUnsupportedDetails_clicked(); diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 06432cae..84a3a849 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -1695,7 +1695,7 @@ void MainWin::messagesInserted(const QModelIndex& parent, int start, int end) if (hasFocus && bufId == Client::bufferModel()->currentBuffer()) continue; - // only show notifications for higlights or queries + // only show notifications for highlights or queries if (bufType != BufferInfo::QueryBuffer && !(flags & Message::Highlight)) continue; diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp index 997f38b6..4ed05838 100644 --- a/src/qtui/qtuiapplication.cpp +++ b/src/qtui/qtuiapplication.cpp @@ -111,7 +111,7 @@ bool QtUiApplication::migrateSettings() return true; } else if (versionMinor < VERSION_MINOR_CURRENT) { - // We're upgrading - apply the neccessary upgrades from each interim version + // We're upgrading - apply the necessary upgrades from each interim version // curVersion will never equal VERSION_MINOR_CURRENT, as it represents the version before // the most recent applySettingsMigration() call. for (uint curVersion = versionMinor; curVersion < VERSION_MINOR_CURRENT; curVersion++) { diff --git a/src/qtui/qtuiapplication.h b/src/qtui/qtuiapplication.h index 7819b35b..75f10e3f 100644 --- a/src/qtui/qtuiapplication.h +++ b/src/qtui/qtuiapplication.h @@ -54,7 +54,7 @@ protected: private: /** - * Migrate settings if neccessary and possible + * Migrate settings if necessary and possible * * If unsuccessful (major version changed, minor version upgrade failed), returning false, the * settings are in an unknown state and the client should quit. diff --git a/src/qtui/settingspages/corehighlightsettingspage.cpp b/src/qtui/settingspages/corehighlightsettingspage.cpp index 4541b7f2..cb134899 100644 --- a/src/qtui/settingspages/corehighlightsettingspage.cpp +++ b/src/qtui/settingspages/corehighlightsettingspage.cpp @@ -54,7 +54,7 @@ CoreHighlightSettingsPage::CoreHighlightSettingsPage(QWidget* parent) connect(ui.ignoredAdd, &QAbstractButton::clicked, this, [this]() { addNewIgnoredRow(); }); connect(ui.ignoredRemove, &QAbstractButton::clicked, this, &CoreHighlightSettingsPage::removeSelectedIgnoredRows); - // TODO: search for a better signal (one that emits everytime a selection has been changed for one item) + // TODO: search for a better signal (one that emits every time a selection has been changed for one item) connect(ui.highlightTable, &QTableWidget::itemClicked, this, &CoreHighlightSettingsPage::selectHighlightRow); connect(ui.ignoredTable, &QTableWidget::itemClicked, this, &CoreHighlightSettingsPage::selectIgnoredRow); diff --git a/src/qtui/settingspages/corehighlightsettingspage.h b/src/qtui/settingspages/corehighlightsettingspage.h index a4712e87..dc757036 100644 --- a/src/qtui/settingspages/corehighlightsettingspage.h +++ b/src/qtui/settingspages/corehighlightsettingspage.h @@ -89,7 +89,7 @@ private slots: void importRules(); /** - * Event handler for core unspported Details button + * Event handler for core unsupported Details button */ void on_coreUnsupportedDetails_clicked(); diff --git a/src/qtui/settingspages/highlightsettingspage.cpp b/src/qtui/settingspages/highlightsettingspage.cpp index fe0a7b48..53a1fd92 100644 --- a/src/qtui/settingspages/highlightsettingspage.cpp +++ b/src/qtui/settingspages/highlightsettingspage.cpp @@ -85,7 +85,7 @@ HighlightSettingsPage::HighlightSettingsPage(QWidget* parent) connect(ui.add, &QAbstractButton::clicked, this, [this]() { addNewRow(); }); connect(ui.remove, &QAbstractButton::clicked, this, &HighlightSettingsPage::removeSelectedRows); - // TODO: search for a better signal (one that emits everytime a selection has been changed for one item) + // TODO: search for a better signal (one that emits every time a selection has been changed for one item) connect(ui.highlightTable, &QTableWidget::itemClicked, this, &HighlightSettingsPage::selectRow); connect(ui.highlightAllNicks, &QAbstractButton::clicked, this, &HighlightSettingsPage::widgetHasChanged); diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp index a041b28f..dfd1f62f 100644 --- a/src/qtui/settingspages/networkssettingspage.cpp +++ b/src/qtui/settingspages/networkssettingspage.cpp @@ -358,7 +358,7 @@ void NetworksSettingsPage::setItemState(NetworkId id, QListWidgetItem* item) void NetworksSettingsPage::resetNetworkCapStates() { - // Set the status to a blank (invalid) network ID, reseting all UI + // Set the status to a blank (invalid) network ID, resetting all UI setNetworkCapStates(NetworkId()); } @@ -1156,7 +1156,7 @@ NetworkAddDlg::NetworkAddDlg(QStringList exist, QWidget* parent) // Whenever useSSL is toggled, update the port number if not changed from the default connect(ui.useSSL, &QAbstractButton::toggled, this, &NetworkAddDlg::updateSslPort); - // Do NOT call updateSslPort when loading settings, otherwise port settings may be overriden. + // Do NOT call updateSslPort when loading settings, otherwise port settings may be overridden. // If useSSL is later changed to be checked by default, change port's default value, too. if (Client::isCoreFeatureEnabled(Quassel::Feature::VerifyServerSSL)) { @@ -1306,7 +1306,7 @@ ServerEditDlg::ServerEditDlg(const Network::Server& server, QWidget* parent) // Whenever useSSL is toggled, update the port number if not changed from the default connect(ui.useSSL, &QAbstractButton::toggled, this, &ServerEditDlg::updateSslPort); - // Do NOT call updateSslPort when loading settings, otherwise port settings may be overriden. + // Do NOT call updateSslPort when loading settings, otherwise port settings may be overridden. // If useSSL is later changed to be checked by default, change port's default value, too. if (Client::isCoreFeatureEnabled(Quassel::Feature::VerifyServerSSL)) { diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp index c7561090..e9d71b7b 100644 --- a/src/qtui/topicwidget.cpp +++ b/src/qtui/topicwidget.cpp @@ -261,7 +261,7 @@ bool TopicWidget::eventFilter(QObject* obj, QEvent* event) QString TopicWidget::sanitizeTopic(const QString& topic) { // Normally, you don't have new lines in topic messages - // But the use of "plain text" functionnality from Qt replaces + // But the use of "plain text" functionality from Qt replaces // some unicode characters with a new line, which then triggers // a stack overflow later QString result(topic); diff --git a/src/uisupport/bufferhotlistfilter.cpp b/src/uisupport/bufferhotlistfilter.cpp index c7ef0331..6349a472 100644 --- a/src/uisupport/bufferhotlistfilter.cpp +++ b/src/uisupport/bufferhotlistfilter.cpp @@ -47,7 +47,7 @@ bool BufferHotListFilter::filterAcceptsRow(int source_row, const QModelIndex& so if (!firstUnreadMsgId.isValid()) return false; - // filter out statusbuffers (it's accessable as networkitem) + // filter out statusbuffers (it's accessible as networkitem) BufferInfo::Type bufferType = (BufferInfo::Type)sourceModel()->data(source_index, NetworkModel::BufferTypeRole).toInt(); if (bufferType == BufferInfo::StatusBuffer) { NetworkModel::ItemType itemType = (NetworkModel::ItemType)sourceModel()->data(source_index, NetworkModel::ItemTypeRole).toInt(); diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 35c6577f..22d55c21 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -44,8 +44,8 @@ /***************************************** * The TreeView showing the Buffers *****************************************/ -// Please be carefull when reimplementing methods which are used to inform the view about changes to the data -// to be on the safe side: call QTreeView's method aswell (or TreeViewTouch's) +// Please be careful when reimplementing methods which are used to inform the view about changes to the data +// to be on the safe side: call QTreeView's method as well (or TreeViewTouch's) BufferView::BufferView(QWidget* parent) : TreeViewTouch(parent) { diff --git a/src/uisupport/contextmenuactionprovider.cpp b/src/uisupport/contextmenuactionprovider.cpp index b2f05ed2..6b0999d8 100644 --- a/src/uisupport/contextmenuactionprovider.cpp +++ b/src/uisupport/contextmenuactionprovider.cpp @@ -137,7 +137,7 @@ ContextMenuActionProvider::ContextMenuActionProvider(QObject* parent) _nickIgnoreMenuAction->setMenu(ignoreMenu); // These are disabled actions used as descriptions - // They don't need any of the Action fancyness so we use plain QActions + // They don't need any of the Action fanciness so we use plain QActions _ignoreDescriptions << new QAction(tr("Add Ignore Rule"), this); _ignoreDescriptions << new QAction(tr("Existing Rules"), this); foreach (QAction* act, _ignoreDescriptions) diff --git a/src/uisupport/settingspage.h b/src/uisupport/settingspage.h index 1d2f25d7..5b1199ac 100644 --- a/src/uisupport/settingspage.h +++ b/src/uisupport/settingspage.h @@ -83,7 +83,7 @@ public: inline virtual bool isSelectable() const { return true; } //! The key this settings page stores its values under - /** This needs to be overriden to enable automatic loading/saving/hasChanged checking of widgets. + /** This needs to be overridden to enable automatic loading/saving/hasChanged checking of widgets. * The child widgets' values will be stored in client settings under this key. Every widget that * should be automatically handled needs to have a \c settingsKey property set, and should also provide * a \c defaultValue property. @@ -109,7 +109,7 @@ public: */ inline virtual bool aboutToSave() { return true; } - //! sets checked state depending on \checked and stores the value for later comparision + //! sets checked state depending on \checked and stores the value for later comparison static void load(QCheckBox* box, bool checked); static bool hasChanged(QCheckBox* box); static void load(QComboBox* box, int index); -- 2.20.1