Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/lok-error-detection-pt2 into lp:ubuntu-docviewer-app

Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 202
Merged at revision: 205
Proposed branch: lp:~verzegnassi-stefano/ubuntu-docviewer-app/lok-error-detection-pt2
Merge into: lp:ubuntu-docviewer-app
Diff against target: 18 lines (+4/-4)
1 file modified
src/plugin/libreofficetoolkit-qml-plugin/plugin.cpp (+4/-4)
To merge this branch: bzr merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/lok-error-detection-pt2
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+278260@code.launchpad.net

Commit message

Error detection branch has been merged without a 'fix' as per diff inline comments. Not relevant stuff, just code styling.

Description of the change

Error detection branch has been merged without a 'fix' as per diff inline comments. Not relevant stuff, just code styling.

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/plugin.cpp'
2--- src/plugin/libreofficetoolkit-qml-plugin/plugin.cpp 2015-11-11 19:59:15 +0000
3+++ src/plugin/libreofficetoolkit-qml-plugin/plugin.cpp 2015-11-22 13:39:04 +0000
4@@ -29,10 +29,10 @@
5 Q_ASSERT(uri == QLatin1String("DocumentViewer.LibreOffice"));
6
7 //@uri DocumentViewer.LibreOffice
8- qmlRegisterType <LODocument> (uri, 1, 0, "Document");
9- qmlRegisterType <LOView> (uri, 1, 0, "View");
10- qmlRegisterUncreatableType <LOPartsModel> (uri, 1, 0, "PartsModel", "You shouldn't create LOPartsModel in QML");
11- qmlRegisterUncreatableType <LibreOfficeError> (uri, 1, 0, "Error", "Not creatable as an object, use only to retrieve error enums (e.g. LibreOffice.Error.DocumentNotFound)");
12+ qmlRegisterType<LODocument>(uri, 1, 0, "Document");
13+ qmlRegisterType<LOView>(uri, 1, 0, "View");
14+ qmlRegisterUncreatableType<LOPartsModel>(uri, 1, 0, "PartsModel", "You shouldn't create LOPartsModel in QML");
15+ qmlRegisterUncreatableType<LibreOfficeError>(uri, 1, 0, "Error", "Not creatable as an object, use only to retrieve error enums (e.g. LibreOffice.Error.DocumentNotFound)");
16 }
17
18 void LOPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

Subscribers

People subscribed via source and target branches