From ea47a2e864b974dec0cd40d967d121273285a7d7 Mon Sep 17 00:00:00 2001 From: Paul Goetzinger Date: Wed, 15 Aug 2018 11:06:27 +0200 Subject: [PATCH] fixed typo 'shure' to 'sure' --- README.md | 2 +- doc/binding.dox | 2 +- doc/serviceregistry.dox | 8 ++++---- doc/widgetspresenter.dox | 2 +- src/imports/mvvmcore/qtmvvmcore_plugin.cpp | 2 +- .../mvvmdatasynccore/qtmvvmdatasynccore_plugin.cpp | 2 +- .../mvvmdatasyncquick/qtmvvmdatasyncquick_plugin.cpp | 2 +- src/imports/mvvmquick/AlertDialog.qml | 2 +- src/imports/mvvmquick/DialogPresenter.qml | 2 +- src/imports/mvvmquick/PopupPresenter.qml | 2 +- src/imports/mvvmquick/qtmvvmquick_plugin.cpp | 2 +- src/mvvmcore/coreapp.cpp | 2 +- src/mvvmcore/serviceregistry.cpp | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index af371fb..47b8d1f 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ The most important part is to know how to add new ViewModels and Views. #### Create the ViewModel - Add a new c++ class to your core project. Let it inherit from `QtMvvm::ViewModel` -- Make shure the Constructor has the following signature: `Q_INVOKABLE MyClass(QObject *parent);` +- Make sure the Constructor has the following signature: `Q_INVOKABLE MyClass(QObject *parent);` - See [`examples/mvvmcore/SampleCore/sampleviewmodel.h`](examples/mvvmcore/SampleCore/sampleviewmodel.h) for an example ViewModel #### Create the View for QtWidgets diff --git a/doc/binding.dox b/doc/binding.dox index 171a8ca..b3d376e 100644 --- a/doc/binding.dox +++ b/doc/binding.dox @@ -50,7 +50,7 @@ To control the directions, i.e. which properties should trigger an update on cha only get updated, use the `type` parameter. @attention Unlike the QML variant, this binding **does not handle binding loops**. THis means if -you use a two way binding, make shure change signals are only emitted when the value does actually +you use a two way binding, make sure change signals are only emitted when the value does actually change. Otherwise your application is caught up in a binding loop and will eventually crash. Using two seperate one way bindings will not prevent this. diff --git a/doc/serviceregistry.dox b/doc/serviceregistry.dox index f981e25..1b909fd 100644 --- a/doc/serviceregistry.dox +++ b/doc/serviceregistry.dox @@ -134,7 +134,7 @@ automatically injected on construction. If the service is registered as weak, registering another service for the same interface will not throw an exception but instead discard (and delete) this one. -@attention Make shure to register TInterface via QtMvvm::registerInterfaceConverter, otherwise +@attention Make sure to register TInterface via QtMvvm::registerInterfaceConverter, otherwise injection for the interface is not possible. In addition to this, TService must have an invokable constructor with the following signature: `Q_INVOKABLE explicit TService(QObject *parent = nullptr);` @@ -172,7 +172,7 @@ of this function. If the service is registered as weak, registering another service for the same interface will not throw an exception but instead discard (and delete) this one. -@attention Make shure to register TInterface via QtMvvm::registerInterfaceConverter, otherwise +@attention Make sure to register TInterface via QtMvvm::registerInterfaceConverter, otherwise injection for the interface is not possible. @sa ServiceRegistry::registerPlugin, ServiceRegistry::registerObject, @@ -198,7 +198,7 @@ registry. No DI is performed on the passed service. If the service is registered as weak, registering another service for the same interface will not throw an exception but instead discard (and delete) this one. -@attention Make shure to register TInterface via QtMvvm::registerInterfaceConverter, otherwise +@attention Make sure to register TInterface via QtMvvm::registerInterfaceConverter, otherwise injection for the interface is not possible. @sa ServiceRegistry::registerPlugin, ServiceRegistry::registerObject, @@ -276,7 +276,7 @@ performed on the passed service. If the service is registered as weak, registering another service for the same TService will not throw an exception but instead discard (and delete) this one. -@attention Make shure to register TInterface via QtMvvm::registerInterfaceConverter, otherwise +@attention Make sure to register TInterface via QtMvvm::registerInterfaceConverter, otherwise injection for the interface is not possible. @sa ServiceRegistry::registerInterface, ServiceRegistry::registerPlugin, diff --git a/doc/widgetspresenter.dox b/doc/widgetspresenter.dox index b9a2d9e..9940862 100644 --- a/doc/widgetspresenter.dox +++ b/doc/widgetspresenter.dox @@ -124,7 +124,7 @@ it is presented as QMdiSubWindow. For all other cases, showForeground() is calle @param view The view to be presented This method is called by tryPresent() to simply show a standard window. The method however -does not only show the window, but also makes shure it becomes the currently active +does not only show the window, but also makes sure it becomes the currently active foreground window. @sa WidgetsPresenter::tryPresent diff --git a/src/imports/mvvmcore/qtmvvmcore_plugin.cpp b/src/imports/mvvmcore/qtmvvmcore_plugin.cpp index 5a876de..9fa319d 100644 --- a/src/imports/mvvmcore/qtmvvmcore_plugin.cpp +++ b/src/imports/mvvmcore/qtmvvmcore_plugin.cpp @@ -57,6 +57,6 @@ void QtMvvmCoreDeclarativeModule::registerTypes(const char *uri) qmlRegisterSingletonType(uri, 1, 1, "ServiceRegistry", createRegistrySingleton); qmlRegisterSingletonType(uri, 1, 1, "CoreApp", createCoreAppSingleton); - // Check to make shure no module update is forgotten + // Check to make sure no module update is forgotten static_assert(VERSION_MAJOR == 1 && VERSION_MINOR == 1, "QML module version needs to be updated"); } diff --git a/src/imports/mvvmdatasynccore/qtmvvmdatasynccore_plugin.cpp b/src/imports/mvvmdatasynccore/qtmvvmdatasynccore_plugin.cpp index 92c546d..8e2f977 100644 --- a/src/imports/mvvmdatasynccore/qtmvvmdatasynccore_plugin.cpp +++ b/src/imports/mvvmdatasynccore/qtmvvmdatasynccore_plugin.cpp @@ -37,6 +37,6 @@ void QtMvvmDataSyncCoreDeclarativeModule::registerTypes(const char *uri) qmlRegisterUncreatableType(uri, 1, 1, "DataSyncSettingsEntry", QStringLiteral("Q_GADGETs cannot be created from QML")); qmlRegisterUncreatableType(uri, 1, 1, "DataSyncSettingsViewModel", QStringLiteral("ViewModels cannot be created from QML")); - // Check to make shure no module update is forgotten + // Check to make sure no module update is forgotten static_assert(VERSION_MAJOR == 1 && VERSION_MINOR == 1, "QML module version needs to be updated"); } diff --git a/src/imports/mvvmdatasyncquick/qtmvvmdatasyncquick_plugin.cpp b/src/imports/mvvmdatasyncquick/qtmvvmdatasyncquick_plugin.cpp index f1fc7c0..d544e18 100644 --- a/src/imports/mvvmdatasyncquick/qtmvvmdatasyncquick_plugin.cpp +++ b/src/imports/mvvmdatasyncquick/qtmvvmdatasyncquick_plugin.cpp @@ -26,6 +26,6 @@ void QtMvvmDataSyncQuickDeclarativeModule::registerTypes(const char *uri) //Version 1.1 qmlRegisterModule(uri, 1, 1); - // Check to make shure no module update is forgotten + // Check to make sure no module update is forgotten static_assert(VERSION_MAJOR == 1 && VERSION_MINOR == 1, "QML module version needs to be updated"); } diff --git a/src/imports/mvvmquick/AlertDialog.qml b/src/imports/mvvmquick/AlertDialog.qml index 6976167..de6f81c 100644 --- a/src/imports/mvvmquick/AlertDialog.qml +++ b/src/imports/mvvmquick/AlertDialog.qml @@ -6,7 +6,7 @@ import QtQuick.Window 2.2 * * @extends QtQuick.Controls.Dialog * - * @details This version basically adjusts size and makes shure the dialog always appears in + * @details This version basically adjusts size and makes sure the dialog always appears in * center of the application. It even takes a possible input method into accout */ Dialog { diff --git a/src/imports/mvvmquick/DialogPresenter.qml b/src/imports/mvvmquick/DialogPresenter.qml index 270b89b..71e3f3c 100644 --- a/src/imports/mvvmquick/DialogPresenter.qml +++ b/src/imports/mvvmquick/DialogPresenter.qml @@ -62,7 +62,7 @@ QtObject { * * As soon as there is at least a single open dialog, this property gets false. Only when * no dialogs are show is it true. This property is always updated from within the - * closeAction() method, so you can be shure that it is true after the last dialog was + * closeAction() method, so you can be sure that it is true after the last dialog was * closed that way. * * @accessors{ diff --git a/src/imports/mvvmquick/PopupPresenter.qml b/src/imports/mvvmquick/PopupPresenter.qml index 6b49f57..40a887e 100644 --- a/src/imports/mvvmquick/PopupPresenter.qml +++ b/src/imports/mvvmquick/PopupPresenter.qml @@ -61,7 +61,7 @@ QtObject { * * As soon as there is at least a single open popup, this property gets false. Only when * no popups are show is it true. This property is always updated from within the - * closeAction() method, so you can be shure that it is true after the last popup was + * closeAction() method, so you can be sure that it is true after the last popup was * closed that way. * * @accessors{ diff --git a/src/imports/mvvmquick/qtmvvmquick_plugin.cpp b/src/imports/mvvmquick/qtmvvmquick_plugin.cpp index 516d753..dcb324e 100644 --- a/src/imports/mvvmquick/qtmvvmquick_plugin.cpp +++ b/src/imports/mvvmquick/qtmvvmquick_plugin.cpp @@ -52,6 +52,6 @@ void QtMvvmQuickDeclarativeModule::registerTypes(const char *uri) //Version 1.1 qmlRegisterType(uri, 1, 1, "ViewPlaceholder"); - // Check to make shure no module update is forgotten + // Check to make sure no module update is forgotten static_assert(VERSION_MAJOR == 1 && VERSION_MINOR == 1, "QML module version needs to be updated"); } diff --git a/src/mvvmcore/coreapp.cpp b/src/mvvmcore/coreapp.cpp index 712ae04..3626202 100644 --- a/src/mvvmcore/coreapp.cpp +++ b/src/mvvmcore/coreapp.cpp @@ -288,7 +288,7 @@ const QMetaObject *CoreAppPrivate::getContainer(const QMetaObject *metaObject) c throw PresenterException { QByteArrayLiteral("Unabled to find the qtmvvm_container_viewmodel of type \"") + cInfo.value() + QByteArrayLiteral("\" for viewmodel of type \"") + metaObject->className() + - QByteArrayLiteral("\" - Make shure to register the container via qRegisterMetaType<") + cInfo.value() + + QByteArrayLiteral("\" - Make sure to register the container via qRegisterMetaType<") + cInfo.value() + QByteArrayLiteral("*>()") }; } diff --git a/src/mvvmcore/serviceregistry.cpp b/src/mvvmcore/serviceregistry.cpp index 955673a..b9c8aca 100644 --- a/src/mvvmcore/serviceregistry.cpp +++ b/src/mvvmcore/serviceregistry.cpp @@ -120,7 +120,7 @@ QObject *ServiceRegistryPrivate::constructInjectedLocked(const QMetaObject *meta if(!instance) { throw ServiceConstructionException(QByteArrayLiteral("Failed to construct object of type ") + metaObject->className() + - QByteArrayLiteral(" - make shure there is an invokable constructor of the format: Q_INVOKABLE MyClass(QObject*)")); + QByteArrayLiteral(" - make sure there is an invokable constructor of the format: Q_INVOKABLE MyClass(QObject*)")); } try {