diff --git a/INSTALL b/INSTALL index 098a4b010c454c73334f37b99e130b0a63224ffb..f965b5f1afa648dbd9f43cd98225c84dce8d4243 100644 --- a/INSTALL +++ b/INSTALL @@ -17,7 +17,7 @@ To install the appplication, type the following commands in a console, while in mkdir -p build cd build cmake .. - The following options are often usefull to append to the cmake line: + The following options are often useful to append to the cmake line: -DRING_BUILD_DIR=<daemon install location> -DRING_XML_INTERFACES_DIR=<daemon dbus interface definitions directory> -DCMAKE_INSTALL_PREFIX=<install location> @@ -74,7 +74,7 @@ To run tests, you need to rebuild the application with these commands (from the mkdir -p build-test cd build-test cmake .. -DENABLE_TEST=true - The following options are often usefull to append to the cmake line: + The following options are often useful to append to the cmake line: -DRING_BUILD_DIR=<daemon install location> -DRING_XML_INTERFACES_DIR=<daemon dbus interface definitions directory> -DCMAKE_INSTALL_PREFIX=<install location> diff --git a/src/call.cpp b/src/call.cpp index 289459a3a12958c67695618627948873682e50b4..b6a474b4939a0dd879bc0bea12e1538892291629 100644 --- a/src/call.cpp +++ b/src/call.cpp @@ -1088,7 +1088,7 @@ int MediaTypeInference::genId() { } /** - * Everytime new ids are generated (that can be done some time), this map is + * Every time new ids are generated (that can be done some time), this map is * updated to map those type ids to Media::Type * * It could be extended to store some operations into lambdas too, but for @@ -1227,7 +1227,7 @@ void Call::setPeerName(const QString& name) { d_ptr->m_PeerName = name; - // its possible that this is not set at the begining of a call, so we should update the CM here + // its possible that this is not set at the beginning of a call, so we should update the CM here if (peerContactMethod()) peerContactMethod()->incrementAlternativeName(name, startTimeStamp()); } diff --git a/src/callmodel.cpp b/src/callmodel.cpp index 1bd64eb1dcee4d3e1eab4db479b184fc0754b6c6..e3832c0e84ab4f8aef88637f7aab959df6eb9feb 100644 --- a/src/callmodel.cpp +++ b/src/callmodel.cpp @@ -518,7 +518,7 @@ Call* CallModelPrivate::addIncomingCall(const QString& callId) { qDebug() << "New incoming call:" << callId; - // Since november 2015, calls are alowed to be declared with a state change + // Since november 2015, calls are allowed to be declared with a state change // if it has been done, then they should be ignored // contains can be true and contain nullptr if it was accessed without // contains() first diff --git a/src/certificate.cpp b/src/certificate.cpp index 60ae7157046545f744f35c5dcdb67a42d15f83ac..923c67ad0ec90e2a8850ed7af2256f23fe767cdd 100644 --- a/src/certificate.cpp +++ b/src/certificate.cpp @@ -892,7 +892,7 @@ bool Certificate::moveToDotCert() const /** * get the data by role selection * @param role define the role to select - * @return a QVariant object, wich contains the selection + * @return a QVariant object, which contains the selection */ QVariant Certificate::roleData(int role) const diff --git a/src/contactmodel.cpp b/src/contactmodel.cpp index 6b96c3cd89698292df46a508d4774c070c71e60e..781de2e0fa63cf6a3955c0e2b59a497cf4c62eb1 100644 --- a/src/contactmodel.cpp +++ b/src/contactmodel.cpp @@ -223,7 +223,7 @@ ContactModel::addContact(contact::Info contactInfo) switch (profile.type) { case profile::Type::TEMPORARY: - // NOTE: do not set profile::Type::RING, this has to be done when the daemon has emited contactAdded + // NOTE: do not set profile::Type::RING, this has to be done when the daemon has emitted contactAdded #ifndef ENABLE_TEST // The old LRC doesn't like mocks if (auto* account = AccountModel::instance().getById(owner.id.c_str())) account->sendContactRequest(URI(profile.uri.c_str())); diff --git a/src/contactrequest.cpp b/src/contactrequest.cpp index 54c2aad1977705700891365aba776174309ee42c..ae699c739719811021d3e18189ea3b07336340e8 100644 --- a/src/contactrequest.cpp +++ b/src/contactrequest.cpp @@ -118,7 +118,7 @@ ContactRequest::block() /** * get the data by role selection * @param role define the role to select - * @return a QVariant object, wich contains the selection + * @return a QVariant object, which contains the selection */ QVariant ContactRequest::roleData(int role) const diff --git a/src/conversationmodel.cpp b/src/conversationmodel.cpp index 013a06a063e299b1c9ec0ff7875610f090f833b9..f905f04e724495d6b2dbc42ae5ddbeb1faf697f4 100644 --- a/src/conversationmodel.cpp +++ b/src/conversationmodel.cpp @@ -1769,7 +1769,7 @@ void ConversationModel::cancelTransfer(const std::string& convUid, uint64_t interactionId) { // For this action, we change interaction status before effective canceling as daemon will - // emit Finished event code immediatly (before leaving this method) in non-DBus mode. + // emit Finished event code immediately (before leaving this method) in non-DBus mode. auto conversationIdx = pimpl_->indexOf(convUid); interaction::Info itCopy; bool emitUpdated = false; diff --git a/src/credentialmodel.cpp b/src/credentialmodel.cpp index ee75eadb43c88fdeb4f10526d0f69b1108b9f404..b989654283fe19602319f986b8c162b56239424a 100644 --- a/src/credentialmodel.cpp +++ b/src/credentialmodel.cpp @@ -598,7 +598,7 @@ Qt::ItemFlags NewCredentialTypeModel::flags( const QModelIndex& index ) const bool avail = m_smAvailableInProtocol[t][m_pAccount->protocol()]; -#if 0 //TODO it mostly work, but make developement/testing harder, to enable in the last patch +#if 0 //TODO it mostly work, but make development/testing harder, to enable in the last patch switch(t) { case Credential::Type::STUN: avail &= m_pAccount->isSipStunEnabled(); diff --git a/src/database.h b/src/database.h index 320cee0cb209931d944659c92ea8b58d6868c56f..b161e5635be72cecbf63952820cf35aac6e619be 100644 --- a/src/database.h +++ b/src/database.h @@ -53,7 +53,7 @@ public: ~Database(); /** - * A structure wich contains result(s) returned by a database query. + * A structure which contains result(s) returned by a database query. */ struct Result { int nbrOfCols = -1; ///< store the number of columns returned. diff --git a/src/interfaces/itemmodelstateserializeri.h b/src/interfaces/itemmodelstateserializeri.h index e77b7c2540c42407ef13542e2e4cc3392f5f7b5b..410f97dada07ea4790bde2e372f312bee22a3db5 100644 --- a/src/interfaces/itemmodelstateserializeri.h +++ b/src/interfaces/itemmodelstateserializeri.h @@ -60,7 +60,7 @@ public: virtual bool isChecked(const CollectionInterface* backend) const = 0; /** - * Allow to overload the default algoritm used to look for a default + * Allow to overload the default algorithm used to look for a default * collection to store something new. * * @param manager The likes of PersonModel::instance() or CategorizedHistoryModel::instance() diff --git a/src/itembase.cpp b/src/itembase.cpp index fa64013d75f32615552917040fa83b3fd904e5bf..8b947e8e9dae90a3c06d156c764d5850756597e5 100644 --- a/src/itembase.cpp +++ b/src/itembase.cpp @@ -50,7 +50,7 @@ bool ItemBase::save() const return d_ptr->m_pBackend->save(this); } -///Show an implementation dependant dialog to edit the contact +///Show an implementation dependent dialog to edit the contact bool ItemBase::edit() { if (!d_ptr->m_pBackend) diff --git a/src/personmodel.h b/src/personmodel.h index 0f9d875c6f3a5b1f60f013afa9536d26b25227f3..b6bc56c7144e4a578458139383036b878c80a320 100644 --- a/src/personmodel.h +++ b/src/personmodel.h @@ -37,7 +37,7 @@ class PersonItemNode; //Typedef typedef QVector<Person*> PersonList; -///PersonModel: Allow different way to handle contact without poluting the library +///PersonModel: Allow different way to handle contact without polluting the library class LIB_EXPORT PersonModel : public QAbstractItemModel, public CollectionManagerInterface<Person> { #pragma GCC diagnostic push diff --git a/src/phonedirectorymodel.cpp b/src/phonedirectorymodel.cpp index 787272a8966c3d516427463db4634f4226118b8a..fc25d7e37ade409fbb25d2fe24032fcb74114ae4 100644 --- a/src/phonedirectorymodel.cpp +++ b/src/phonedirectorymodel.cpp @@ -813,7 +813,7 @@ void PhoneDirectoryModelPrivate::slotRegisteredNameFound(const Account* account, NameDirectory::LookupStatus status, const QString& address, const QString& name) { if (status != NameDirectory::LookupStatus::SUCCESS) { - // unsuccessfull lookup, so its useless + // unsuccessful lookup, so its useless return; } if (address.isEmpty() || name.isEmpty()) { diff --git a/src/private/vcardutils.cpp b/src/private/vcardutils.cpp index 28c957b320b1b9e33e74103cd28b95f76a3b0bd0..fa20e2d54820a9fce0853aa8b886270c8c72378e 100644 --- a/src/private/vcardutils.cpp +++ b/src/private/vcardutils.cpp @@ -256,7 +256,7 @@ void VCardUtils::addAddress(const Person::Address& addr) .arg(Delimiter::SEPARATOR_TOKEN) .arg(addr.type()); - //First two fiels are left empty for now, they are for Postal box and Extended Address + //First two fields are left empty for now, they are for Postal box and Extended Address QString value = QString("%1%2%3%4%5%6%7%8%9%10%11") .arg(Delimiter::SEPARATOR_TOKEN) .arg(Delimiter::SEPARATOR_TOKEN) diff --git a/src/useractionmodel.cpp b/src/useractionmodel.cpp index 90714c96e6a18ca0e5dc8e34bdb9c7d9d8c30ee2..96711008d4d34ea0e06813464ad819892f9d9624 100644 --- a/src/useractionmodel.cpp +++ b/src/useractionmodel.cpp @@ -290,7 +290,7 @@ const Matrix2D< UAMA, Account::Protocol, bool > UserActionModelPrivate::availabl /** * This matrix define if an action is stateless or stateful. The only state * supported is "checked", but when multiple items are selected, this can - * cause a heterogenous bunch of checked and unchecked elements, this is + * cause a heterogeneous bunch of checked and unchecked elements, this is * called "TRISTATE". */ #define ST UserActionModel::ActionStatfulnessLevel:: diff --git a/src/video/sourcemodel.cpp b/src/video/sourcemodel.cpp index dd8e246ffc82d479eaaec3549eda2eb0fd831e57..8be471522da63372ba5df83108da3860f1a6f854 100644 --- a/src/video/sourcemodel.cpp +++ b/src/video/sourcemodel.cpp @@ -210,7 +210,7 @@ void Video::SourceModel::setUsedIndex(QString &deviceStr) .arg(DRing::Media::VideoProtocolPrefix::SEPARATOR); Video::Device* dev = Video::DeviceModel::instance().getDevice(deviceStr.replace(fullPrefix,"")); if (dev == nullptr) { - // Device not found we dont know what camera is used + // Device not found we don't know what camera is used idx = ExtendedDeviceList::NONE; return; } diff --git a/test/conversationmodeltester.cpp b/test/conversationmodeltester.cpp index 651a6d4a3e1ab95096cbcecf0ea4444890fa4c33..f4e9da12894d8e545045c032a73b48ed44a53d7c 100644 --- a/test/conversationmodeltester.cpp +++ b/test/conversationmodeltester.cpp @@ -743,7 +743,7 @@ ConversationModelTester::testPlaceCall() // Place a call accInfo_.conversationModel->placeCall(firstConversation.uid); - // Get first conversation again and make sure it isn't empty anymore (call suceeded) + // Get first conversation again and make sure it isn't empty anymore (call succeeded) conversations = accInfo_.conversationModel->allFilteredConversations(); CPPUNIT_ASSERT(conversations.size() != 0); auto newConv = accInfo_.conversationModel->filteredConversation(0); diff --git a/test/datatransfertester.h b/test/datatransfertester.h index 7d3f9d72d6f0c5ed9994549b8e882d61dd7e3848..27c16049ab897f7ae4c5df090c4f5ab94f1d36d2 100644 --- a/test/datatransfertester.h +++ b/test/datatransfertester.h @@ -62,7 +62,7 @@ public: */ void testReceivesImage5MbNoPref(); /** - * Receives a new image with a prefedred dir, should accept tranfer + * Receives a new image with a prefedred dir, should accept transfer */ void testReceivesImage5Mb(); /**