diff --git a/src/actioncollection.cpp b/src/actioncollection.cpp --- a/src/actioncollection.cpp +++ b/src/actioncollection.cpp @@ -488,7 +488,7 @@ GlobalInstances::actionExtender().editPerson(p); - // The editor wont save if the name isn't set, so it can be used to check + // The editor won't save if the name isn't set, so it can be used to check // if cancel was clicked. col->editor()->addExisting(p); } diff --git a/src/callview/imageprovider.cpp b/src/callview/imageprovider.cpp --- a/src/callview/imageprovider.cpp +++ b/src/callview/imageprovider.cpp @@ -167,7 +167,7 @@ // I give up, every month, the daemon manage to break their SHM // memory model. From now on, ring-kde copy the frame. It's slow, - // but wont cause surprise SIGSEGV (2015) + // but won't cause surprise SIGSEGV (2015) if (!fb->m_pFrameCopy) { fb->m_pFrameCopy = new char[fb->m_Frame.size]; fb->m_FrameSize = fb->m_Frame.size; diff --git a/src/configurator/peerprofile.ui b/src/configurator/peerprofile.ui --- a/src/configurator/peerprofile.ui +++ b/src/configurator/peerprofile.ui @@ -37,7 +37,7 @@ - Ignore the new contact informations + Ignore the new contact information diff --git a/src/contactview/mainpage.cpp b/src/contactview/mainpage.cpp --- a/src/contactview/mainpage.cpp +++ b/src/contactview/mainpage.cpp @@ -197,7 +197,7 @@ d_ptr->m_lTimers << t; } - // Keep a strong reference because QML wont + // Keep a strong reference because QML won't d_ptr->m_Invididual = cm->individual(); d_ptr->m_CallsModel = cm->individual()->eventAggregate()->unsortedListView(); Q_ASSERT(d_ptr->m_CallsModel); diff --git a/src/proxies/deduplicateproxy.cpp b/src/proxies/deduplicateproxy.cpp --- a/src/proxies/deduplicateproxy.cpp +++ b/src/proxies/deduplicateproxy.cpp @@ -56,7 +56,7 @@ /** * Useful when there is a main filter role, but some items need to be kept. * - * If any role added to this list is different, the index wont be hidden + * If any role added to this list is different, the index won't be hidden * * For example using this proxy to create instant messaging thread if they * come from the same person, but also create different threads if the date diff --git a/src/qmlwidgets/plugin.cpp b/src/qmlwidgets/plugin.cpp --- a/src/qmlwidgets/plugin.cpp +++ b/src/qmlwidgets/plugin.cpp @@ -61,7 +61,7 @@ qmlRegisterType(QStringLiteral("qrc:/OutlineButton.qml"), uri, 1, 0, "OutlineButton"); qmlRegisterUncreatableType("Ring", 1,0, - "QuickListViewSections", "QuickListViewSections cannot be instanciated" + "QuickListViewSections", "QuickListViewSections cannot be instantiated" ); // qmlRegisterType(uri, 1, 0, "QuickListViewSections"); } diff --git a/src/qmlwidgets/treeview2.h b/src/qmlwidgets/treeview2.h --- a/src/qmlwidgets/treeview2.h +++ b/src/qmlwidgets/treeview2.h @@ -136,7 +136,7 @@ /// Assume each column has the same width (for performance) Q_PROPERTY(bool uniformColumnWidth READ hasUniformColumnWidth WRITE setUniformColumnColumnWidth) /// The view can be collapsed - Q_PROPERTY(bool collapsable READ isCollapsable WRITE setCollapsable) + Q_PROPERTY(bool collapsible READ isCollapsible WRITE setCollapsible) /// Expand all elements by default Q_PROPERTY(bool autoExpand READ isAutoExpand WRITE setAutoExpand) /// The maximum depth of a tree (for performance) @@ -167,8 +167,8 @@ bool hasUniformColumnWidth() const; void setUniformColumnColumnWidth(bool value); - bool isCollapsable() const; - void setCollapsable(bool value); + bool isCollapsible() const; + void setCollapsible(bool value); bool isAutoExpand() const; void setAutoExpand(bool value); diff --git a/src/qmlwidgets/treeview2.cpp b/src/qmlwidgets/treeview2.cpp --- a/src/qmlwidgets/treeview2.cpp +++ b/src/qmlwidgets/treeview2.cpp @@ -207,7 +207,7 @@ bool m_UniformRowHeight {false}; bool m_UniformColumnWidth {false}; - bool m_Collapsable {true }; + bool m_Collapsible {true }; bool m_AutoExpand {false}; int m_MaxDepth { -1 }; int m_CacheBuffer { 10 }; @@ -377,14 +377,14 @@ d_ptr->m_UniformColumnWidth = value; } -bool TreeView2::isCollapsable() const +bool TreeView2::isCollapsible() const { - return d_ptr->m_Collapsable; + return d_ptr->m_Collapsible; } -void TreeView2::setCollapsable(bool value) +void TreeView2::setCollapsible(bool value) { - d_ptr->m_Collapsable = value; + d_ptr->m_Collapsible = value; } bool TreeView2::isAutoExpand() const @@ -753,7 +753,7 @@ if (prev) bridgeGap(prev, e, true); - // This is required before ::ATTACH because otherwise ::down() wont work + // This is required before ::ATTACH because otherwise ::down() won't work if ((!pitem->m_pFirstChild) || e->m_Index.row() <= pitem->m_pFirstChild->m_Index.row()) { e->m_pNext = pitem->m_pFirstChild; pitem->m_pFirstChild = e; @@ -978,7 +978,7 @@ const QModelIndex &destination, int row) { //FIXME list only - // Before moving them, set a temporary now/col value because it wont be set + // Before moving them, set a temporary now/col value because it won't be set // on the index until before slotRowsMoved2 is called (but after this // method returns //TODO do not use the hashmap, it is already known if (parent == destination) { @@ -1007,7 +1007,7 @@ const QModelIndex &destination, int row) { //FIXME list only - // Before moving them, set a temporary now/col value because it wont be set + // Before moving them, set a temporary now/col value because it won't be set // on the index until before slotRowsMoved2 is called (but after this // method returns //TODO do not use the hashmap, it is already known if (parent == destination) { diff --git a/src/ringapplication.cpp b/src/ringapplication.cpp --- a/src/ringapplication.cpp +++ b/src/ringapplication.cpp @@ -431,8 +431,8 @@ m_StartPhone = value; } -#define QML_TYPE(name) qmlRegisterUncreatableType(AppName, 1,0, #name, #name "cannot be instanciated"); -#define QML_NS(name) qmlRegisterUncreatableMetaObject( name :: staticMetaObject, #name, 1, 0, #name, "Namespaces cannot be instanciated" ); +#define QML_TYPE(name) qmlRegisterUncreatableType(AppName, 1,0, #name, #name "cannot be instantiated"); +#define QML_NS(name) qmlRegisterUncreatableMetaObject( name :: staticMetaObject, #name, 1, 0, #name, "Namespaces cannot be instantiated" ); #define QML_CRTYPE(name) qmlRegisterType(AppName, 1,0, #name); #define QML_SINGLETON(name) RingApplication::engine()->rootContext()->setContextProperty(QStringLiteral(#name), &name::instance()); #define QML_SINGLETON2(name) RingApplication::engine()->rootContext()->setContextProperty(QStringLiteral(#name), name::instance()); @@ -545,7 +545,7 @@ } qmlRegisterUncreatableType<::Media::Media>( - AppName, 1,0, "Media", QStringLiteral("cannot be instanciated") + AppName, 1,0, "Media", QStringLiteral("cannot be instantiated") ); RingApplication::engine()->rootContext()->setContextProperty(