Browse Source

Merge pull request #2 from paul70078/master

fixed typo 'shure' to 'sure'
master
Felix Barz 6 years ago
committed by GitHub
parent
commit
133664d257
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      README.md
  2. 2
      doc/binding.dox
  3. 8
      doc/serviceregistry.dox
  4. 2
      doc/widgetspresenter.dox
  5. 2
      src/imports/mvvmcore/qtmvvmcore_plugin.cpp
  6. 2
      src/imports/mvvmdatasynccore/qtmvvmdatasynccore_plugin.cpp
  7. 2
      src/imports/mvvmdatasyncquick/qtmvvmdatasyncquick_plugin.cpp
  8. 2
      src/imports/mvvmquick/AlertDialog.qml
  9. 2
      src/imports/mvvmquick/DialogPresenter.qml
  10. 2
      src/imports/mvvmquick/PopupPresenter.qml
  11. 2
      src/imports/mvvmquick/qtmvvmquick_plugin.cpp
  12. 2
      src/mvvmcore/coreapp.cpp
  13. 2
      src/mvvmcore/serviceregistry.cpp

2
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

2
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.

8
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,

2
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

2
src/imports/mvvmcore/qtmvvmcore_plugin.cpp

@ -57,6 +57,6 @@ void QtMvvmCoreDeclarativeModule::registerTypes(const char *uri)
qmlRegisterSingletonType<QtMvvm::QQmlServiceRegistry>(uri, 1, 1, "ServiceRegistry", createRegistrySingleton);
qmlRegisterSingletonType<QtMvvm::QQmlCoreApp>(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");
}

2
src/imports/mvvmdatasynccore/qtmvvmdatasynccore_plugin.cpp

@ -37,6 +37,6 @@ void QtMvvmDataSyncCoreDeclarativeModule::registerTypes(const char *uri)
qmlRegisterUncreatableType<QtMvvm::DataSyncSettingsEntry>(uri, 1, 1, "DataSyncSettingsEntry", QStringLiteral("Q_GADGETs cannot be created from QML"));
qmlRegisterUncreatableType<QtMvvm::DataSyncSettingsViewModel>(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");
}

2
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");
}

2
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 {

2
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{

2
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{

2
src/imports/mvvmquick/qtmvvmquick_plugin.cpp

@ -52,6 +52,6 @@ void QtMvvmQuickDeclarativeModule::registerTypes(const char *uri)
//Version 1.1
qmlRegisterType<QtMvvm::QQmlViewPlaceholder>(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");
}

2
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("*>()")
};
}

2
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 {

Loading…
Cancel
Save