Commit e71daa6c authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Fix minor typos

parent c48aa354
......@@ -448,7 +448,7 @@ void ComposerViewBase::slotEmailAddressResolved(KJob *job)
mExpandedReplyTo << r->email();
break;
case MessageComposer::Recipient::Undefined:
Q_ASSERT(!"Unknown recpient type!");
Q_ASSERT(!"Unknown recipient type!");
break;
}
}
......@@ -489,7 +489,7 @@ void ComposerViewBase::slotEmailAddressResolved(KJob *job)
}
Q_ASSERT(m_composers.isEmpty()); //composers should be empty. The caller of this function
//checks for emptyness before calling it
//checks for emptiness before calling it
//so just ensure it actually is empty
//and document it
// we first figure out if we need to create multiple messages with different crypto formats
......
......@@ -68,7 +68,7 @@ enum Result {
\section Step 2: Lookup and check per-recipient crypto preferences / Opportunistic Encryption
First, \c checkSigningPreferences() goes through all recipient's
signing perferences, to determine whether or not to sign. It also
signing preferences, to determine whether or not to sign. It also
takes into account the available signing keys and whether or not
the user explicitly requested signing.
......
......@@ -37,7 +37,7 @@ namespace MessageComposer {
class RichTextComposerNg;
/** Controls signature (the footer thing, not the crypto thing) operations
* happening on a KMEditor triggerd by identity selection or menu actions.
* happening on a KMEditor triggered by identity selection or menu actions.
* @since 4.5
*/
class SignatureControllerPrivate;
......
......@@ -192,7 +192,7 @@ void SkeletonMessageJobPrivate::doStart()
message->setHeader(extra);
}
// Request Delevery Confirmation
// Request Delivery Confirmation
{
if (globalPart->requestDeleveryConfirmation()) {
//TODO fix me multi address
......
......@@ -103,7 +103,7 @@ RecipientsEditor::RecipientsEditor(RecipientLineFactory *lineFactory, QWidget *p
connect(this, &RecipientsEditor::lineAdded, this, &RecipientsEditor::slotLineAdded);
connect(this, &RecipientsEditor::lineDeleted, this, &RecipientsEditor::slotLineDeleted);
addData(); // one defaut line
addData(); // one default line
}
RecipientsEditor::~RecipientsEditor()
......
......@@ -63,8 +63,8 @@ void StringUtilTest::test_SmartQuote_data()
// 40
// ↓
QTest::newRow("4") << " Space at start, but also two lines in this long sentennce."
<< " Space at start, but also two lines in\nthis long sentennce.";
QTest::newRow("4") << " Space at start, but also two lines in this long sentence."
<< " Space at start, but also two lines in\nthis long sentence.";
QTest::newRow("5") << " Space at start and end. "
<< " Space at start and end.";
......
......@@ -30,7 +30,7 @@ class Message;
namespace MessageCore {
/**
* @short Contains some static functions for nagivating in KMime::Node trees.
* @short Contains some static functions for navigating in KMime::Node trees.
*/
namespace NodeHelper {
/**
......
......@@ -52,7 +52,7 @@ public:
};
/**
* Defines the features a mailinglist can suppport.
* Defines the features a mailinglist can support.
*/
enum Feature {
None = 0 << 0, ///< No mailing list fields exist.
......
......@@ -163,7 +163,7 @@ Q_REQUIRED_RESULT MESSAGECORE_EXPORT QString guessEmailAddressFromLoginName(cons
* Relayouts the given string so that the invidual lines don't exceed the given
* maximal length.
*
* As the name of the function implies, it it smart, which means it deals with quoting
* As the name of the function implies, it is smart, which means it deals with quoting
* correctly. This means if a line already starts with quote characters and needs to be
* broken, the same quote characters are prepended to the next line as well.
*
......
......@@ -153,8 +153,8 @@ bool Aggregation::load(QDataStream &stream)
return false;
}
stream >> val; // Formely contained message sorting
stream >> val; // Formely contained message sort direction
stream >> val; // Formerly contained message sorting
stream >> val; // Formerly contained message sort direction
stream >> val;
mFillViewStrategy = (FillViewStrategy)val;
......
......@@ -227,7 +227,7 @@ public:
/**
* Enumerates the thread leader determination methods compatible with the specified Threading
* and the specified Gouping options.
* and the specified Grouping options.
* The returned descriptors are pairs in that the first item is the localized description
* of the option value and the second item is the integer option value itself.
* If the returned list is empty then the value of the option is meaningless in the current context.
......
......@@ -89,12 +89,12 @@ public:
Q_REQUIRED_RESULT Type type() const;
/**
* The initial expand status we have to honor when attacching to the viewable root.
* The initial expand status we have to honor when attaching to the viewable root.
*/
Q_REQUIRED_RESULT InitialExpandStatus initialExpandStatus() const;
/**
* Set the initial expand status we have to honor when attacching to the viewable root.
* Set the initial expand status we have to honor when attaching to the viewable root.
*/
void setInitialExpandStatus(InitialExpandStatus initialExpandStatus);
......@@ -111,7 +111,7 @@ public:
/**
* Makes this item viewable, that is, notifies its existence to any listener
* attacched to the "rowsInserted()" signal, most notably QTreeView.
* attached to the "rowsInserted()" signal, most notably QTreeView.
*
* This will also make all the children viewable.
*/
......
......@@ -25,7 +25,7 @@
#include "MessageCore/StringUtil"
// See the MessageList::ItemPrivate::insertChildItem() function below for an explaination of this macro.
// See the MessageList::ItemPrivate::insertChildItem() function below for an explanation of this macro.
#if __GNUC__ >= 3 //krazy:exclude=cpp
#define GCC_DONT_INLINE_THIS __attribute__((noinline))
#else
......@@ -248,7 +248,7 @@ public:
int mThisItemIndexGuess; ///< The guess for the index in the parent's child list
Item::Type mType : 4; ///< The type of this item
Item::InitialExpandStatus mInitialExpandStatus : 4; ///< The expand status we have to honor when we attach to the viewable root
bool mIsViewable : 1; ///< Is this item attacched to the viewable root ?
bool mIsViewable : 1; ///< Is this item attached to the viewable root ?
bool mUseReceiver : 1; ///< senderOrReceiver() returns receiver rather than sender
};
......
......@@ -47,9 +47,9 @@ class Widget;
* is created automatically when the first MessageList::Widget object is created
* and destroyed automatically when the last MessageList::Widget object is destroyed.
*
* This class takes care of loading/storing/mantaining the settings for the
* This class takes care of loading/storing/maintaining the settings for the
* whole MessageList framework. It also keeps track of all the existing
* MessageList::Widget objects and takes care of uptdating them when settings change.
* MessageList::Widget objects and takes care of updating them when settings change.
*/
class Manager : public QObject
{
......
......@@ -109,7 +109,7 @@ Q_GLOBAL_STATIC(QTimer, _k_heartBeatTimer)
* Pass 2 scans the list of messages that haven't been attached in
* the first pass and performs perfect and reference based threading.
* Since grouping of messages may depend on the "shape" of the thread
* then certain threads aren't attacched to the view yet.
* then certain threads aren't attached to the view yet.
* Unassigned messages get stuffed into a list waiting for Pass3
* or directly to a list waiting for Pass4 (that is, Pass3 may be skipped
* if there is no hope to find an imperfect parent by subject based threading).
......@@ -117,7 +117,7 @@ Q_GLOBAL_STATIC(QTimer, _k_heartBeatTimer)
* Pass 3 scans the list of messages that haven't been attached in
* the first and second passes and performs subject based threading.
* Since grouping of messages may depend on the "shape" of the thread
* then certain threads aren't attacched to the view yet.
* then certain threads aren't attached to the view yet.
* Anything unattached gets stuffed into the list waiting for Pass4.
*
* Pass 4 scans the unattached threads and puts them in the appropriate
......@@ -159,7 +159,7 @@ public:
Pass1Update = 2, ///< Update messages
Pass2 = 3, ///< Thread everything by using caches, try to attach more to the view
Pass3 = 4, ///< Do more threading (this time try to guess), try to attach more to the view
Pass4 = 5, ///< Attach anything is still unattacched
Pass4 = 5, ///< Attach anything is still unattached
Pass5 = 6, ///< Eventually Re-sort group headers and remove the empty ones
LastIndex = 7 ///< Keep this at the end, needed to get the size of the enum
};
......@@ -873,7 +873,7 @@ void Model::setStorageModel(StorageModel *storageModel, PreSelectionMode preSele
// The larger this time, the greater the number of messages per second that this
// engine can process but also greater time with frozen UI -> less interactivity.
// Reasonable values start at 50 msecs. Values larger than 300 msecs are very likely
// to be percieved by the user as UI non-reactivity.
// to be perceived by the user as UI non-reactivity.
//
// - The number of messages processed in each job step subchunk.
//
......@@ -1031,7 +1031,7 @@ void Model::setPreSelectionMode(PreSelectionMode preSelect)
// It's governed by the following goals:
//
// - Be flexible: allow different configurations from "unsorted flat list" to a "grouped and threaded
// list with different sorting algorightms applied to each aggregation level"
// list with different sorting algorithms applied to each aggregation level"
// - Be reasonably fast
// - Be non blocking: UI shouldn't freeze while the algorithm is running
// - Be interruptible: user must be able to abort the execution and just switch to another folder in the middle
......@@ -1464,7 +1464,7 @@ void ModelPrivate::attachMessageToGroupHeader(MessageItem *mi)
// This function may be also called to re-group a message.
// That is, to eventually find a new group for a message that has changed
// its properties (but was already attacched to a group).
// its properties (but was already attached to a group).
// So it may happen that we find out that in fact re-grouping wasn't really
// needed because the message is already in the correct group.
if (mi->parent() == ghi) {
......@@ -1878,10 +1878,10 @@ bool ModelPrivate::handleItemPropertyChanges(int propertyChangeMask, Item *paren
// place in that ActionItemStatus may be set).
if (parent->type() == Item::InvisibleRoot) {
// item is either a message or a group attacched to the root.
// item is either a message or a group attached to the root.
// It might need resorting.
if (item->type() == Item::GroupHeader) {
// item is a group header attacched to the root.
// item is a group header attached to the root.
if (
(
// max date changed
......@@ -1962,7 +1962,7 @@ bool ModelPrivate::handleItemPropertyChanges(int propertyChangeMask, Item *paren
}
if (parent->type() == Item::GroupHeader) {
// item is a message attacched to a GroupHeader.
// item is a message attached to a GroupHeader.
// It might need re-grouping or re-sorting (within the same group)
// Check re-grouping here.
......@@ -1990,7 +1990,7 @@ bool ModelPrivate::handleItemPropertyChanges(int propertyChangeMask, Item *paren
}
// Re-grouping wasn't needed. Re-sorting might be.
} // else item is a message attacched to another message and might need re-sorting only.
} // else item is a message attached to another message and might need re-sorting only.
// Check if message needs re-sorting.
......@@ -2071,7 +2071,7 @@ void ModelPrivate::messageDetachedUpdateParentProperties(Item *oldParent, Messag
Item *grandParent = oldParent->parent();
// If there is no grandParent then oldParent isn't attacched to the view.
// If there is no grandParent then oldParent isn't attached to the view.
// Re-sorting / re-grouping isn't needed for sure.
if (!grandParent) {
break; // from the for(;;) loop
......@@ -2088,7 +2088,7 @@ void ModelPrivate::messageDetachedUpdateParentProperties(Item *oldParent, Messag
} // for(;;) loop
// If the last message was removed from a group header then this group will need an update
// for sure. We will need to remove it (unless a message is attacched back to it)
// for sure. We will need to remove it (unless a message is attached back to it)
if (oldParent->type() == Item::GroupHeader) {
if (oldParent->childItemCount() == 0) {
mGroupHeadersThatNeedUpdate.insert(static_cast< GroupHeaderItem * >(oldParent), static_cast< GroupHeaderItem * >(oldParent));
......@@ -2122,7 +2122,7 @@ void ModelPrivate::propagateItemPropertiesToParent(Item *item)
Item *grandParent = pParent->parent();
// If there is no grandParent then pParent isn't attacched to the view.
// If there is no grandParent then pParent isn't attached to the view.
// Re-sorting / re-grouping isn't needed for sure.
if (!grandParent) {
break; // from the for(;;) loop
......@@ -2550,7 +2550,7 @@ ModelPrivate::ViewItemJobResult ModelPrivate::viewItemJobStepInternalForJobPass4
// In this pass we scan mUnassignedMessageListForPass4 which now
// contains both items with parents and items without parents.
// We scan mUnassignedMessageList for messages without parent (the ones that haven't been
// attacched to the viewable tree yet) and find a suitable group for them. Then we simply
// attached to the viewable tree yet) and find a suitable group for them. Then we simply
// clear mUnassignedMessageList.
// We call this pass "Grouping"
......@@ -2606,8 +2606,8 @@ ModelPrivate::ViewItemJobResult ModelPrivate::viewItemJobStepInternalForJobPass3
// If we're here, then threading is requested for sure.
auto mi = mUnassignedMessageListForPass3[curIndex];
if ((!mi->parent()) || (mi->threadingStatus() == MessageItem::ParentMissing)) {
// Parent is missing (either "physically" with the item being not attacched or "logically"
// with the item being attacched to a group or directly to the root.
// Parent is missing (either "physically" with the item being not attached or "logically"
// with the item being attached to a group or directly to the root.
if (mi->subjectIsPrefixed()) {
// We can try to guess it
auto mparent = guessMessageParent(mi);
......@@ -2670,7 +2670,7 @@ ModelPrivate::ViewItemJobResult ModelPrivate::viewItemJobStepInternalForJobPass3
ModelPrivate::ViewItemJobResult ModelPrivate::viewItemJobStepInternalForJobPass2(ViewItemJob *job, const QElapsedTimer &elapsedTimer)
{
// In this pass we scan the mUnassignedMessageList and try to do construct the threads.
// If some thread leader message got attacched to the viewable tree in Pass1Fill then
// If some thread leader message got attached to the viewable tree in Pass1Fill then
// we'll also attach all of its children too. The thread leaders we were unable
// to attach in Pass1Fill and their children (which we find here) will make it to the small Pass3
......@@ -2895,7 +2895,7 @@ ModelPrivate::ViewItemJobResult ModelPrivate::viewItemJobStepInternalForJobPass1
mUnassignedMessageListForPass4.append(mi);
} else {
// Check if this item is a perfect parent for some imperfectly threaded
// message (that is actually attacched to it, but not necessairly to the
// message (that is actually attached to it, but not necessarily to the
// viewable root). If it is, then remove the imperfect child from its
// current parent rebuild the hierarchy on the fly.
bool needsImmediateReAttach = false;
......@@ -3452,7 +3452,7 @@ ModelPrivate::ViewItemJobResult ModelPrivate::viewItemJobStepInternalForJob(View
// It attempts to process messages until a timeout forces it to return to the caller.
// A macro would improve readability here but since this is a good point
// to place debugger breakpoints then we need it explicited.
// to place debugger breakpoints then we need it explicitely.
// A (template) helper would need to pass many parameters and would not be inlined...
if (job->currentPass() == ViewItemJob::Pass1Fill) {
......
......@@ -118,7 +118,7 @@ public:
/**
* Returns true if the view is currently loading, that is
* it's in the first (possibly lenghty) job batch after attacching to a StorageModel.
* it's in the first (possibly lenghty) job batch after attaching to a StorageModel.
*/
bool isLoading() const;
......
......@@ -281,7 +281,7 @@ public:
Item *mRootItem;
/**
* The view we're attacched to. Shallow pointer (the View owns us).
* The view we're attached to. Shallow pointer (the View owns us).
*/
View *mView;
......
......@@ -47,7 +47,7 @@ public:
public:
/**
* Returns true if this ModelInvariantIndex is valid, that is, it has been attacched
* Returns true if this ModelInvariantIndex is valid, that is, it has been attached
* to a ModelInvariantRowMapper. Returns false otherwise.
* An invalid index will always map to the current row -1 (which is invalid as QModelIndex row).
*/
......
......@@ -210,7 +210,7 @@ ModelInvariantIndex *ModelInvariantRowMapperPrivate::modelIndexRowToModelInvaria
// if ( potentialPreviousModelIndexRow >= shift->mMinimumRowIndex )
// previousIndexRow = potentialPreviousModelIndexRow;
//
// or by simplyfying...
// or by simplifying...
int potentialPreviousModelIndexRow = previousIndexRow - shift->mShift;
if (potentialPreviousModelIndexRow >= shift->mMinimumRowIndex) {
......
......@@ -77,7 +77,7 @@ public:
/**
* This method should use the inner model implementation to fill in the
* base data for the specified MessageItem from the underlying storage slot at
* the specified row index. Must return true if the data fetch was succesfull
* the specified row index. Must return true if the data fetch was successful
* and false otherwise. For base data we intend: subject, sender, receiver,
* senderOrReceiver, size, date, encryption state, signature state and status.
* If bUseReceiver is true then the "senderOrReceiver"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment