Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/internalApiClassName into lp:ubuntu-ui-toolkit/staging

  1. internalApiClassName
  2. Merge into staging
Proposed by Cris Dywan
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1781
Merged at revision: 1787
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/internalApiClassName
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 635 lines (+182/-60)
9 files modified
apicheck/apicheck.cpp (+10/-0)
components.api (+50/-50)
tests/api/Extinct/Animals/AnimalModule.pro (+1/-1)
tests/api/Extinct/Animals/plugin/plugin.cpp (+2/-0)
tests/api/Extinct/Animals/plugin/plugin.pri (+2/-0)
tests/api/Extinct/Animals/plugin/tarpan.cpp (+59/-0)
tests/api/Extinct/Animals/plugin/tarpan.h (+46/-0)
tests/api/Extinct/Animals/qmldir (+1/-1)
tests/api/components.api (+11/-8)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/internalApiClassName
Reviewer Review Type Date Requested Status
Zsombor Egri Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+280856@code.launchpad.net

Commit message

Include filename derived QML class name in .api

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1781
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2672/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1398
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1398/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1396

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2672/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Good to see these, so we can detect whether we screwed up thing or not in the AP tests.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apicheck/apicheck.cpp'
2--- apicheck/apicheck.cpp 2015-12-02 09:22:28 +0000
3+++ apicheck/apicheck.cpp 2015-12-18 15:28:54 +0000
4@@ -484,6 +484,10 @@
5 writeMetaContent(&object, mainMeta, &knownAttributes);
6
7 object["namespace"] = nameSpace;
8+ // The QML class name derived from the filename is used by AP.
9+ QString className(QFileInfo(filename).baseName());
10+ if (typeName != className)
11+ object["className"] = className;
12 json->insert(id, object);
13 }
14
15@@ -552,6 +556,10 @@
16 return;
17 }
18
19+ // The C++ class is used by AP.
20+ QString className(meta->className());
21+ if (!(isSingleton || isUncreatable || exportStrings.empty()))
22+ object["className"] = className;
23 json->insert(id, object);
24 }
25
26@@ -1102,6 +1110,8 @@
27 QString signature(exports);
28 if (object.contains("namespace"))
29 signature = object.take("namespace").toString() + "." + signature;
30+ if (object.contains("className"))
31+ signature += " " + object.take("className").toString();
32 QString prototype(object.take("prototype").toString());
33 if (!prototype.isEmpty())
34 signature += ": " + convertToId(prototype);
35
36=== modified file 'components.api'
37--- components.api 2015-12-17 13:48:23 +0000
38+++ components.api 2015-12-18 15:28:54 +0000
39@@ -3,12 +3,12 @@
40 signal clicked()
41 signal pressAndHold()
42 property bool pressed
43-Ubuntu.Components.AbstractButton 1.3: ActionItem
44+Ubuntu.Components.AbstractButton 1.3 UCAbstractButton: ActionItem
45 readonly property bool hovered
46 signal clicked()
47 signal pressAndHold()
48 readonly property bool pressed
49-Ubuntu.Components.Action 1.3 1.0 0.1: QtObject
50+Ubuntu.Components.Action 1.3 1.0 0.1 UCAction: QtObject
51 property string description
52 property bool enabled
53 property string iconName
54@@ -40,12 +40,12 @@
55 property string overflowIconName
56 property url overflowIconSource
57 property string overflowText
58-Ubuntu.Components.ActionContext 1.0 0.1: QtObject
59+Ubuntu.Components.ActionContext 1.0 0.1 UCActionContext: QtObject
60 default property list<Action> actions
61 property bool active
62 function addAction(Action action)
63 function removeAction(Action action)
64-Ubuntu.Components.ActionItem 1.0 0.1: StyledItem
65+Ubuntu.Components.ActionItem 1.0 0.1 UCActionItem: StyledItem
66 property Action action
67 property string iconName
68 property url iconSource
69@@ -59,7 +59,7 @@
70 Ubuntu.Components.ActionList 1.3: QtObject
71 property list<Action> actions
72 default property list<Action> children
73-Ubuntu.Components.ActionManager 1.0 0.1: QtObject
74+Ubuntu.Components.ActionManager 1.0 0.1 UCActionManager: QtObject
75 default property list<Action> actions
76 readonly property ActionContext globalContext
77 property list<ActionContext> localContexts
78@@ -90,7 +90,7 @@
79 function var removePages(var page)
80 property Page primaryPage
81 property var primaryPageSource
82-Ubuntu.Components.Alarm 1.0 0.1: QtObject
83+Ubuntu.Components.Alarm 1.0 0.1 UCAlarm: QtObject
84 property QDateTime date
85 property DaysOfWeek daysOfWeek
86 property bool enabled
87@@ -144,17 +144,17 @@
88 Fail
89 InProgress
90 Ready
91-Ubuntu.Components.AlarmModel 1.0 0.1: QAbstractListModel
92+Ubuntu.Components.AlarmModel 1.0 0.1 UCAlarmModel: QAbstractListModel
93 readonly property int count
94 function refresh() 1.0
95 function UCAlarm* get(int index)
96-Ubuntu.Components.Argument 1.0 0.1: QtObject
97+Ubuntu.Components.Argument 1.0 0.1 UCArgument: QtObject
98 property string help
99 function var at(int i)
100 property string name
101 property bool required
102 property QStringList valueNames
103-Ubuntu.Components.Arguments 1.0 0.1: QtObject
104+Ubuntu.Components.Arguments 1.0 0.1 UCArguments: QtObject
105 default property list<Argument> arguments
106 property Argument defaultArgument
107 readonly property bool error
108@@ -175,7 +175,7 @@
109 property var icon
110 property bool iconFrame
111 property bool progression
112-Ubuntu.Components.BottomEdge 1.3: StyledItem
113+Ubuntu.Components.BottomEdge 1.3 UCBottomEdge: StyledItem
114 readonly property BottomEdgeRegion activeRegion
115 property Component contentComponent
116 readonly property Item contentItem
117@@ -205,7 +205,7 @@
118 Committed
119 Hidden
120 Revealed
121-Ubuntu.Components.BottomEdgeHint 1.3: ActionItem
122+Ubuntu.Components.BottomEdgeHint 1.3 UCBottomEdgeHint: ActionItem
123 property int deactivateTimeout
124 property Flickable flickable
125 signal clicked()
126@@ -216,7 +216,7 @@
127 Hidden
128 Inactive
129 Locked
130-Ubuntu.Components.BottomEdgeRegion 1.3: QtObject
131+Ubuntu.Components.BottomEdgeRegion 1.3 UCBottomEdgeRegion: QtObject
132 property Component contentComponent
133 property url contentUrl
134 property bool enabled
135@@ -225,7 +225,7 @@
136 signal exited()
137 signal dragEnded()
138 property double to
139-Ubuntu.Components.Styles.BottomEdgeStyle 1.3: Item
140+Ubuntu.Components.Styles.BottomEdgeStyle 1.3 UCBottomEdgeStyle: Item
141 property Item contentItem
142 property Item panel
143 property Animation panelAnimation
144@@ -299,22 +299,22 @@
145 Ubuntu.Components.Popups.ComposerSheet 1.3: SheetBase
146 signal cancelClicked()
147 signal confirmClicked()
148-Ubuntu.Layouts.ConditionalLayout 1.0 0.1: QtObject
149+Ubuntu.Layouts.ConditionalLayout 1.0 0.1 ULConditionalLayout: QtObject
150 default property Component layout
151 property string name
152 property QQmlBinding when
153-Ubuntu.PerformanceMetrics.CpuUsage 1.0 0.1: Item
154+Ubuntu.PerformanceMetrics.CpuUsage 1.0 0.1 UPMCpuUsage: Item
155 readonly property UPMGraphModel graphModel
156 property int period
157 property int samplingInterval
158-Ubuntu.Components.CrossFadeImage 1.0 0.1: Item
159+Ubuntu.Components.CrossFadeImage 1.0 0.1 CrossFadeImage10: Item
160 property int fadeDuration
161 property int fillMode
162 readonly property bool running
163 property url source
164 property QSizeF sourceSize
165 readonly property int status
166-Ubuntu.Components.CrossFadeImage 1.1: Item
167+Ubuntu.Components.CrossFadeImage 1.1 CrossFadeImage11: Item
168 property int fadeDuration
169 property string fadeStyle
170 property int fillMode
171@@ -468,7 +468,7 @@
172 readonly property bool enabled
173 function play(var customEffect)
174 function play()
175-Ubuntu.Components.ListItems.Header 1.0 0.1: Item
176+Ubuntu.Components.ListItems.Header 1.0 0.1 ListItemHeader: Item
177 property string text
178 Ubuntu.Components.Header 1.0 0.1: AppHeader
179 property string _for_autopilot
180@@ -486,9 +486,9 @@
181 property var tabsModel
182 property string title
183 property bool useDeprecatedToolbar
184-Ubuntu.Components.ListItems.Header 1.3: Item
185+Ubuntu.Components.ListItems.Header 1.3 ListItemHeader: Item
186 property string text
187-Ubuntu.Components.Header 1.3: StyledItem
188+Ubuntu.Components.Header 1.3 UCHeader: StyledItem
189 property bool exposed
190 property Flickable flickable
191 readonly property bool moving
192@@ -498,12 +498,12 @@
193 property string name
194 Ubuntu.Components.Icon 1.1: Icon
195 property url source
196-Ubuntu.Components.InverseMouse 1.0 0.1: Mouse
197-Ubuntu.Components.InverseMouseArea 1.0 0.1: MouseArea
198+Ubuntu.Components.InverseMouse 1.0 0.1 UCInverseMouse: Mouse
199+Ubuntu.Components.InverseMouseArea 1.0 0.1 InverseMouseAreaType: MouseArea
200 function bool contains(QPointF point)
201 property Item sensingArea
202 property bool topmostItem
203-Ubuntu.Layouts.ItemLayout 1.0 0.1: Item
204+Ubuntu.Layouts.ItemLayout 1.0 0.1 ULItemLayout: Item
205 property string item
206 Ubuntu.Components.ListItems.ItemSelector 1.0 0.1: Empty
207 property bool colourImage
208@@ -531,7 +531,7 @@
209 property int selectedIndex
210 Ubuntu.Components.Label 1.0 0.1: Text
211 property string fontSize
212-Ubuntu.Components.Label 1.3: Text
213+Ubuntu.Components.Label 1.3 UCLabel: Text
214 property string fontSize
215 property TextSize textSize
216 Ubuntu.Components.Label.TextSize: Enum
217@@ -541,10 +541,10 @@
218 XLarge
219 XSmall
220 XxSmall
221-Ubuntu.Layouts.Layouts 1.0 0.1: Item
222+Ubuntu.Layouts.Layouts 1.0 0.1 ULLayouts: Item
223 readonly property string currentLayout
224 property list<ConditionalLayout> layouts
225-Ubuntu.Components.ListItem 1.3 1.2: StyledItem
226+Ubuntu.Components.ListItem 1.3 1.2 UCListItem: StyledItem
227 property Action action
228 property color color
229 readonly property Item contentItem
230@@ -567,7 +567,7 @@
231 property bool swipeEnabled 1.3
232 readonly property bool swiped 1.3
233 property ListItemActions trailingActions
234-Ubuntu.Components.ListItemActions 1.2: QtObject
235+Ubuntu.Components.ListItemActions 1.2 UCListItemActions: QtObject
236 property list<Action> actions
237 default property list<QtObject> data
238 property Component delegate
239@@ -582,11 +582,11 @@
240 Dropped
241 Moving
242 Started
243-Ubuntu.Components.ListItemLayout 1.3: SlotsLayout
244+Ubuntu.Components.ListItemLayout 1.3 UCListItemLayout: SlotsLayout
245 readonly property Label subtitle
246 readonly property Label summary
247 readonly property Label title
248-Ubuntu.Components.Styles.ListItemStyle 1.3 1.2: Item
249+Ubuntu.Components.Styles.ListItemStyle 1.3 1.2 UCListItemStyle: Item
250 readonly property bool animatePanels
251 property Item dragPanel
252 property PropertyAnimation dropAnimation
253@@ -595,7 +595,7 @@
254 function swipeEvent(SwipeEvent event)
255 function rebound()
256 property Animation snapAnimation
257-Ubuntu.Components.LiveTimer 1.3: QtObject
258+Ubuntu.Components.LiveTimer 1.3 LiveTimer: QtObject
259 property Frequency frequency
260 signal trigger()
261 property QDateTime relativeTime
262@@ -609,7 +609,7 @@
263 property bool automaticOrientation
264 default property list<QtObject> contentsItem
265 property bool useDeprecatedToolbar
266-Ubuntu.Components.MainView 1.2: MainViewBase
267+Ubuntu.Components.MainView 1.2 MainView12: MainViewBase
268 property bool automaticOrientation
269 default property list<QtObject> contentsItem
270 Ubuntu.Components.MainView 1.3: MainViewBase
271@@ -620,14 +620,14 @@
272 function double lerp(double delta, double from, double to)
273 function double projectValue(double x, double xmin, double xmax, double ymin, double ymax)
274 function double clampAndProject(double x, double xmin, double xmax, double ymin, double ymax)
275-Ubuntu.Components.MimeData 1.0 0.1: QtObject
276+Ubuntu.Components.MimeData 1.0 0.1 QQuickMimeData: QtObject
277 property color color
278 property var data
279 readonly property QStringList formats
280 property string html
281 property string text
282 property list<url> urls
283-Ubuntu.Components.Mouse 1.0 0.1: QtObject
284+Ubuntu.Components.Mouse 1.0 0.1 UCMouse: QtObject
285 readonly property Qt.MouseButtons acceptedButtons
286 property int clickAndHoldThreshold
287 property bool enabled
288@@ -707,12 +707,12 @@
289 property int orientationAngle
290 readonly property bool rotating
291 property bool transitionEnabled
292-Ubuntu.Components.Page 1.0 0.1: PageTreeNode
293+Ubuntu.Components.Page 1.0 0.1 Page10: PageTreeNode
294 property list<Action> actions
295 property Flickable flickable
296 property string title
297 property Item tools
298-Ubuntu.Components.Page 1.1: Page10
299+Ubuntu.Components.Page 1.1 Page11: Page10
300 readonly property PageHeadConfiguration head
301 Ubuntu.Components.Page 1.3: PageTreeNode
302 property Flickable flickable
303@@ -810,7 +810,7 @@
304 function var push(var page, var properties)
305 function var pop()
306 function var clear()
307-Ubuntu.Components.PageTreeNode 1.3: StyledItem
308+Ubuntu.Components.PageTreeNode 1.3 UCPageTreeNode: StyledItem
309 property bool active
310 readonly property Item activeLeafNode
311 property bool isLeaf
312@@ -965,7 +965,7 @@
313 property double value
314 Ubuntu.Components.ProgressionSlot 1.3: Icon
315 property url source
316-Ubuntu.Components.ProportionalShape 1.3: UbuntuShape
317+Ubuntu.Components.ProportionalShape 1.3 UCProportionalShape: UbuntuShape
318 Ubuntu.Components.PullToRefresh 1.1: StyledItem
319 property Component content
320 signal refresh()
321@@ -984,7 +984,7 @@
322 property double activationThreshold
323 property Component defaultContent
324 property bool releaseToRefresh
325-Ubuntu.PerformanceMetrics.RenderingTimes 1.0 0.1: Item
326+Ubuntu.PerformanceMetrics.RenderingTimes 1.0 0.1 UPMRenderingTimes: Item
327 readonly property UPMGraphModel graphModel
328 signal frameRendered(qlonglong renderTime)
329 property int period
330@@ -1004,7 +1004,7 @@
331 property list<Action> actions
332 property var model
333 property int selectedIndex
334-Ubuntu.Components.ServiceProperties 1.1: QtObject
335+Ubuntu.Components.ServiceProperties 1.1 UCServiceProperties: QtObject
336 property string adaptorInterface 1.1
337 readonly property string error 1.1
338 property string path 1.1
339@@ -1062,7 +1062,7 @@
340 property bool overrideVerticalPositioning
341 readonly property SlotsLayoutPadding padding
342 property SlotsLayout.UCSlotPosition position
343-Ubuntu.Components.SlotsLayout 1.3: Item
344+Ubuntu.Components.SlotsLayout 1.3 UCSlotsLayout: Item
345 property Item mainSlot
346 readonly property SlotsLayoutPadding padding
347 Ubuntu.Components.SlotsLayout.UCSlotPosition: Enum
348@@ -1078,7 +1078,7 @@
349 Ubuntu.Components.SortBehavior 1.1: QtObject
350 property Qt.SortOrder order
351 property string property
352-Ubuntu.Components.SortFilterModel 1.1: QSortFilterProxyModel
353+Ubuntu.Components.SortFilterModel 1.1 QSortFilterProxyModelQML: QSortFilterProxyModel
354 readonly property int count
355 readonly property FilterBehavior filter
356 function QVariantMap get(int row)
357@@ -1099,10 +1099,10 @@
358 property var icon
359 property bool iconFrame
360 property bool progression
361-Ubuntu.Components.StateSaver 1.0 0.1: QtObject
362-Ubuntu.Components.StyleHints 1.3: QtObject
363+Ubuntu.Components.StateSaver 1.0 0.1 UCStateSaver: QtObject
364+Ubuntu.Components.StyleHints 1.3 UCStyleHints: QtObject
365 property bool ignoreUnknownProperties
366-Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1: Item
367+Ubuntu.Components.StyledItem 1.3 1.3 1.1 1.0 0.1 UCStyledItemBase: Item
368 property bool activeFocusOnPress 1.3
369 readonly property bool keyNavigationFocus 1.3
370 signal activeFocusOnTabChanged2() 1.3
371@@ -1115,7 +1115,7 @@
372 property string subText
373 Ubuntu.Components.ListItems.Subtitled 1.3: Base
374 property string subText
375-Ubuntu.Components.SwipeArea 1.3: Item
376+Ubuntu.Components.SwipeArea 1.3 UCSwipeArea: Item
377 property Direction direction
378 readonly property double distance
379 readonly property bool dragging
380@@ -1447,9 +1447,9 @@
381 readonly property int selectionStart
382 property QValidator validator
383 property int verticalAlignment
384-Ubuntu.PerformanceMetrics.TextureFromImage 1.0 0.1: Item
385+Ubuntu.PerformanceMetrics.TextureFromImage 1.0 0.1 UPMTextureFromImage: Item
386 property QImage image
387-Ubuntu.Components.ThemeSettings 1.3: QtObject
388+Ubuntu.Components.ThemeSettings 1.3 UCTheme: QtObject
389 property string name
390 property QtObject palette
391 readonly property ThemeSettings parentTheme
392@@ -1559,14 +1559,14 @@
393 readonly property color warmGrey
394 Ubuntu.Components.UbuntuListView 1.0 0.1: ListView
395 property int expandedIndex
396-Ubuntu.Components.UbuntuListView 1.1: UbuntuListView
397+Ubuntu.Components.UbuntuListView 1.1 UbuntuListView11: UbuntuListView
398 readonly property PullToRefresh pullToRefresh
399 Ubuntu.Components.UbuntuListView 1.3: ListView
400 property int expandedIndex
401 readonly property PullToRefresh pullToRefresh
402 Ubuntu.Components.UbuntuNumberAnimation 1.0 0.1: PropertyAnimation
403 Ubuntu.Components.UbuntuNumberAnimation 1.3: PropertyAnimation
404-Ubuntu.Components.UbuntuShape 1.3 1.2 1.0 0.1 Shape 1.0 0.1: Item
405+Ubuntu.Components.UbuntuShape 1.3 1.2 1.0 0.1 Shape 1.0 0.1 UCUbuntuShape: Item
406 property Aspect aspect 1.3
407 property color backgroundColor 1.3
408 property BackgroundMode backgroundMode 1.3
409@@ -1612,7 +1612,7 @@
410 Ubuntu.Components.UbuntuShape.WrapMode: Enum
411 Repeat
412 Transparent
413-Ubuntu.Components.UbuntuShapeOverlay 1.2: UbuntuShape
414+Ubuntu.Components.UbuntuShapeOverlay 1.2 UCUbuntuShapeOverlay: UbuntuShape
415 property color overlayColor
416 property QRectF overlayRect
417 Ubuntu.Test.UbuntuTestCase 1.0 0.1: TestCase
418
419=== modified file 'tests/api/Extinct/Animals/AnimalModule.pro'
420--- tests/api/Extinct/Animals/AnimalModule.pro 2015-11-30 15:39:52 +0000
421+++ tests/api/Extinct/Animals/AnimalModule.pro 2015-12-18 15:28:54 +0000
422@@ -8,7 +8,7 @@
423 QML_FILES += \
424 Andrewsarchus.qml \
425 Paratriisodon.qml \
426- gigantophis.qml \
427+ Gigantophis.qml \
428 test.qml \
429 digger.js \
430
431
432=== renamed file 'tests/api/Extinct/Animals/gigantophis.qml' => 'tests/api/Extinct/Animals/Gigantophis.qml'
433=== modified file 'tests/api/Extinct/Animals/plugin/plugin.cpp'
434--- tests/api/Extinct/Animals/plugin/plugin.cpp 2015-12-11 10:38:46 +0000
435+++ tests/api/Extinct/Animals/plugin/plugin.cpp 2015-12-18 15:28:54 +0000
436@@ -17,6 +17,7 @@
437 */
438
439 #include "plugin.h"
440+#include "tarpan.h"
441 #include "smilodon.h"
442 #include "pangaea.h"
443 #include "rune.h"
444@@ -50,6 +51,7 @@
445 {
446 Q_ASSERT(uri == QLatin1String("Extinct.Animals"));
447
448+ qmlRegisterType<EATarpan>();
449 qmlRegisterType<EASmilodon>(uri, 1, 0, "Smilodon");
450 qmlRegisterType<EASmilodon>(uri, 0, 1, "ScimitarCat");
451
452
453=== modified file 'tests/api/Extinct/Animals/plugin/plugin.pri'
454--- tests/api/Extinct/Animals/plugin/plugin.pri 2015-12-02 09:22:28 +0000
455+++ tests/api/Extinct/Animals/plugin/plugin.pri 2015-12-18 15:28:54 +0000
456@@ -13,6 +13,7 @@
457
458 HEADERS += \
459 $$PWD/plugin.h \
460+ $$PWD/tarpan.h \
461 $$PWD/smilodon.h \
462 $$PWD/pangaea.h \
463 $$PWD/rune.h \
464@@ -21,6 +22,7 @@
465
466 SOURCES += \
467 $$PWD/plugin.cpp \
468+ $$PWD/tarpan.cpp \
469 $$PWD/smilodon.cpp \
470 $$PWD/pangaea.cpp \
471 $$PWD/rune.cpp \
472
473=== added file 'tests/api/Extinct/Animals/plugin/tarpan.cpp'
474--- tests/api/Extinct/Animals/plugin/tarpan.cpp 1970-01-01 00:00:00 +0000
475+++ tests/api/Extinct/Animals/plugin/tarpan.cpp 2015-12-18 15:28:54 +0000
476@@ -0,0 +1,59 @@
477+/*
478+ * Copyright 2015 Canonical Ltd.
479+ *
480+ * This program is free software; you can redistribute it and/or modify
481+ * it under the terms of the GNU Lesser General Public License as published by
482+ * the Free Software Foundation; version 3.
483+ *
484+ * This program is distributed in the hope that it will be useful,
485+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
486+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
487+ * GNU Lesser General Public License for more details.
488+ *
489+ * You should have received a copy of the GNU Lesser General Public License
490+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
491+ *
492+ * Author: Christian Dywan <christian.dywan@canonical.com>
493+ */
494+
495+#include "tarpan.h"
496+
497+/*!
498+ * \qmltype EATarpan
499+ * \instantiates EATarpan
500+ * \inqmlmodule Extinct.Animals 1.0
501+ * \ingroup ubuntu-commandline
502+ * \brief The Tarpan class specifies the behavior of a Eurasian wild horse.
503+ */
504+
505+EATarpan::EATarpan(QObject *parent) :
506+ QObject(parent)
507+{
508+}
509+
510+/*!
511+ * \qmlproperty string EATarpan::name
512+ *
513+ * Name identifying the wild horse.
514+ *
515+ */
516+QString EATarpan::name() const
517+{
518+ return m_name;
519+}
520+
521+void EATarpan::setName(const QString &name)
522+{
523+ m_name = name;
524+ Q_EMIT(nameChanged());
525+}
526+
527+/*!
528+ * \qmlmethod string EATarpan::kick()
529+ *
530+ * A generous kick, commonly towards someone's groin area.
531+ *
532+ */
533+void EATarpan::kick() const
534+{
535+}
536
537=== added file 'tests/api/Extinct/Animals/plugin/tarpan.h'
538--- tests/api/Extinct/Animals/plugin/tarpan.h 1970-01-01 00:00:00 +0000
539+++ tests/api/Extinct/Animals/plugin/tarpan.h 2015-12-18 15:28:54 +0000
540@@ -0,0 +1,46 @@
541+/*
542+ * Copyright 2015 Canonical Ltd.
543+ *
544+ * This program is free software; you can redistribute it and/or modify
545+ * it under the terms of the GNU Lesser General Public License as published by
546+ * the Free Software Foundation; version 3.
547+ *
548+ * This program is distributed in the hope that it will be useful,
549+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
550+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
551+ * GNU Lesser General Public License for more details.
552+ *
553+ * You should have received a copy of the GNU Lesser General Public License
554+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
555+ *
556+ * Author: Christian Dywan <christian.dywan@canonical.com>
557+ */
558+
559+#ifndef UCTARPAN_H
560+#define UCTARPAN_H
561+
562+#include <QtCore/QObject>
563+#include <QtCore/QString>
564+
565+class EATarpan : public QObject
566+{
567+ Q_OBJECT
568+
569+ Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
570+
571+public:
572+ explicit EATarpan(QObject *parent = 0);
573+
574+ QString name() const;
575+ void setName(const QString &name);
576+
577+ Q_INVOKABLE void kick() const;
578+
579+Q_SIGNALS:
580+ void nameChanged();
581+
582+private:
583+ QString m_name;
584+};
585+
586+#endif // UCTARPAN_H
587
588=== modified file 'tests/api/Extinct/Animals/qmldir'
589--- tests/api/Extinct/Animals/qmldir 2015-12-02 09:22:28 +0000
590+++ tests/api/Extinct/Animals/qmldir 2015-12-18 15:28:54 +0000
591@@ -1,7 +1,7 @@
592 module Extinct.Animals
593 plugin ExtinctAnimals
594 Titanoboa 4.2 test.qml
595-Gigantophis 4.3 gigantophis.qml
596+Gigantophis 4.3 Gigantophis.qml
597 internal WoollyMammoth mammoth.qml
598 MonsterSnake 3.1 test.qml
599 Excavator 1.0 digger.js
600
601=== modified file 'tests/api/components.api'
602--- tests/api/components.api 2015-12-11 10:38:46 +0000
603+++ tests/api/components.api 2015-12-18 15:28:54 +0000
604@@ -1,9 +1,12 @@
605-Extinct.Animals.Andrewsarchus 2.0: Item
606- property double saggitalCrestSize
607- property double skullSize
608-Extinct.Animals.AndrewsarchusMongoliensis 2.5: Item
609- property double saggitalCrestSize
610- property double skullSize
611+Extinct.Animals.Andrewsarchus 2.0 Paratriisodon: Item
612+ property double saggitalCrestSize
613+ property double skullSize
614+Extinct.Animals.AndrewsarchusMongoliensis 2.5 Paratriisodon: Item
615+ property double saggitalCrestSize
616+ property double skullSize
617+EATarpan: QtObject
618+ function kick()
619+ property string name
620 Extinct.Animals.Europe 4.1: QtObject
621 Extinct.Animals.Europe 4.2: Europe
622 readonly property ushort era 4.2
623@@ -23,10 +26,10 @@
624 Extinct.Animals.Pangaea.ModernContinent: Enum
625 America
626 Europe
627-Extinct.Animals.Smilodon 1.0 ScimitarCat 0.1: QtObject
628+Extinct.Animals.Smilodon 1.0 ScimitarCat 0.1 EASmilodon: QtObject
629 function string paw(int i)
630 property string name
631-Extinct.Animals.Titanoboa 4.2 MonsterSnake 3.1: Item
632+Extinct.Animals.Titanoboa 4.2 MonsterSnake 3.1 test: Item
633 property string bar
634 property var basket
635 property url bazz

Subscribers

People subscribed via source and target branches