OIF-qml

Merge lp:~fginther/oif-qml/oif-qml-rename into lp:oif-qml

  1. oif-qml-rename
  2. Merge into trunk
Proposed by Francis Ginther
Status: Merged
Approved by: Chase Douglas
Approved revision: 117
Merged at revision: 117
Proposed branch: lp:~fginther/oif-qml/oif-qml-rename
Merge into: lp:oif-qml
Diff against target: 843 lines (+134/-134)
28 files modified
CMakeLists.txt (+3/-3)
COPYING (+1/-1)
Doxyfile.in (+4/-4)
examples/camera/camera.qml (+2/-2)
examples/eventprinter/eventprinter.qml (+5/-5)
examples/turbine/turbine.qml (+2/-2)
formatting/cpplint.py (+2/-2)
src/CMakeLists.txt (+24/-24)
src/attributes.h (+3/-3)
src/continuousgesturearea.h (+3/-3)
src/device.h (+5/-5)
src/geissingleton.h (+3/-3)
src/gesture.h (+3/-3)
src/gesturearea.h (+5/-5)
src/gestureevent.h (+5/-5)
src/instantaneousgesturearea.h (+3/-3)
src/oif_plugin.cpp (+11/-11)
src/oif_plugin.h (+4/-4)
src/oifdragarea.cpp (+2/-2)
src/oifdragarea.h (+7/-7)
src/oifpincharea.cpp (+4/-4)
src/oifpincharea.h (+7/-7)
src/oifrotatearea.cpp (+4/-4)
src/oifrotatearea.h (+7/-7)
src/oiftaparea.cpp (+2/-2)
src/oiftaparea.h (+7/-7)
src/qmldir (+1/-1)
src/touch.h (+5/-5)
To merge this branch: bzr merge lp:~fginther/oif-qml/oif-qml-rename
Reviewer Review Type Date Requested Status
Chase Douglas (community) Approve
Review via email: mp+116562@code.launchpad.net

Commit message

Removed references to legacy project name.

Description of the change

Removed references to legacy project name.

To post a comment you must log in.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

LGTM :).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-04-24 14:46:26 +0000
3+++ CMakeLists.txt 2012-07-24 22:53:21 +0000
4@@ -1,4 +1,4 @@
5-project(utouch-qml)
6+project(oif-qml)
7 cmake_minimum_required(VERSION 2.8)
8
9 # Build flags
10@@ -10,14 +10,14 @@
11 find_package(PkgConfig REQUIRED)
12 find_package(Doxygen)
13
14-pkg_check_modules(UTOUCH_GEIS REQUIRED libutouch-geis)
15+pkg_check_modules(GEIS REQUIRED libgeis)
16
17 include_directories(
18 ${QT_INCLUDE_DIR}
19 ${QT_QTCORE_INCLUDE_DIR}
20 ${QT_QTGUI_INCLUDE_DIR}
21 ${QT_QTDECLARATIVE_INCLUDE_DIR}
22- ${UTOUCH_GEIS_INCLUDE_DIRS}
23+ ${GEIS_INCLUDE_DIRS}
24 )
25
26 # Source
27
28=== modified file 'COPYING'
29--- COPYING 2011-07-20 21:20:32 +0000
30+++ COPYING 2012-07-24 22:53:21 +0000
31@@ -1,4 +1,4 @@
32-uTouch-qml: a QML plugin for providing uTouch gesture events
33+oif-qml: a QML plugin for providing Open Input Framework gesture events
34
35 Copyright (C) 2011 Canonical, Ltd.
36
37
38=== modified file 'Doxyfile.in'
39--- Doxyfile.in 2011-08-02 18:12:05 +0000
40+++ Doxyfile.in 2012-07-24 22:53:21 +0000
41@@ -25,7 +25,7 @@
42 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
43 # by quotes) that should identify the project.
44
45-PROJECT_NAME = uTouch-qml
46+PROJECT_NAME = oif-qml
47
48 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
49 # This could be handy for archiving the generated documentation or
50@@ -37,7 +37,7 @@
51 # for a project that appears at the top of each page and should give viewer
52 # a quick idea about the purpose of the project. Keep the description short.
53
54-PROJECT_BRIEF = "A QML plugin for the uTouch gesture stack"
55+PROJECT_BRIEF = "A QML plugin for the Open Input Framework gesture stack"
56
57 # With the PROJECT_LOGO tag one can specify an logo or icon that is
58 # included in the documentation. The maximum height of the logo should not
59@@ -1013,13 +1013,13 @@
60 # be used to specify the file name of the resulting .qch file.
61 # The path specified is relative to the HTML output folder.
62
63-QCH_FILE = ../qch/utouch-qml.qch
64+QCH_FILE = ../qch/oif-qml.qch
65
66 # The QHP_NAMESPACE tag specifies the namespace to use when generating
67 # Qt Help Project output. For more information please see
68 # http://doc.trolltech.com/qthelpproject.html#namespace
69
70-QHP_NAMESPACE = com.canonical.utouch.utouch-qml
71+QHP_NAMESPACE = com.canonical.oif.oif-qml
72
73 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
74 # Qt Help Project output. For more information please see
75
76=== modified file 'examples/camera/camera.qml'
77--- examples/camera/camera.qml 2011-07-25 22:41:25 +0000
78+++ examples/camera/camera.qml 2012-07-24 22:53:21 +0000
79@@ -1,6 +1,6 @@
80 import QtQuick 1.0
81 import QtMultimediaKit 1.1
82-import uTouch 1.0
83+import oif 1.0
84
85 Item {
86 width: 500
87@@ -14,7 +14,7 @@
88 transform: Rotation { origin.x: camera.width/2; origin.y: camera.height/2; axis { x: 0; y: 1; z: 0 } angle: camera.angle}
89 }
90
91- UTouchRotateArea {
92+ OIFRotateArea {
93 id: rotate
94
95 anchors.fill: parent
96
97=== modified file 'examples/eventprinter/eventprinter.qml'
98--- examples/eventprinter/eventprinter.qml 2011-07-25 23:38:41 +0000
99+++ examples/eventprinter/eventprinter.qml 2012-07-24 22:53:21 +0000
100@@ -1,5 +1,5 @@
101 import QtQuick 1.0
102-import uTouch 1.0
103+import oif 1.0
104
105 Rectangle {
106 width: 500
107@@ -46,7 +46,7 @@
108 console.log("")
109 }
110
111- UTouchDragArea {
112+ OIFDragArea {
113 anchors.fill: parent
114
115 subscription {
116@@ -72,7 +72,7 @@
117 console.log("Drag Centroid: (" + centroid.current.x + ", " + centroid.current.y + ")\n")
118 }
119
120- UTouchPinchArea {
121+ OIFPinchArea {
122 anchors.fill: parent
123
124 subscription {
125@@ -104,7 +104,7 @@
126 console.log("Pinch Radius: " + radius.current + "\n")
127 }
128
129- UTouchRotateArea {
130+ OIFRotateArea {
131 anchors.fill: parent
132
133 subscription {
134@@ -136,7 +136,7 @@
135 console.log("Rotate Angle: " + angle.current + "\n")
136 }
137
138- UTouchTapArea {
139+ OIFTapArea {
140 anchors.fill: parent
141
142 subscription {
143
144=== modified file 'examples/turbine/turbine.qml'
145--- examples/turbine/turbine.qml 2011-07-25 23:38:41 +0000
146+++ examples/turbine/turbine.qml 2012-07-24 22:53:21 +0000
147@@ -1,5 +1,5 @@
148 import QtQuick 1.0
149-import uTouch 1.0
150+import oif 1.0
151
152 Item {
153 width: 1000
154@@ -16,7 +16,7 @@
155 }
156 }
157
158- UTouchRotateArea {
159+ OIFRotateArea {
160 id: rotate
161
162 anchors.fill: parent
163
164=== modified file 'formatting/cpplint.py'
165--- formatting/cpplint.py 2011-07-27 18:55:12 +0000
166+++ formatting/cpplint.py 2012-07-24 22:53:21 +0000
167@@ -1075,7 +1075,7 @@
168 cppvar)
169 return
170
171- # UTOUCH_QML: ignored
172+ # OIF_QML: ignored
173 # The guard should be PATH_FILE_H_, but we also allow PATH_FILE_H__
174 # for backward compatibility.
175 #if ifndef != cppvar:
176@@ -2282,7 +2282,7 @@
177
178 line = clean_lines.lines[linenum]
179
180- # UTOUCH_QML: ignored
181+ # OIF_QML: ignored
182 # "include" should use the new style "foo/bar.h" instead of just "bar.h"
183 #if _RE_PATTERN_INCLUDE_NEW_STYLE.search(line):
184 # error(filename, linenum, 'build/include', 4,
185
186=== modified file 'src/CMakeLists.txt'
187--- src/CMakeLists.txt 2011-08-10 23:50:27 +0000
188+++ src/CMakeLists.txt 2012-07-24 22:53:21 +0000
189@@ -1,4 +1,4 @@
190-set(uTouch_SRCS
191+set(oif_SRCS
192 continuousgesturearea.cpp
193 device.cpp
194 geissingleton.cpp
195@@ -7,14 +7,14 @@
196 gestureevent.cpp
197 instantaneousgesturearea.cpp
198 touch.cpp
199- utouch_plugin.cpp
200- utouchdragarea.cpp
201- utouchpincharea.cpp
202- utouchrotatearea.cpp
203- utouchtaparea.cpp
204+ oif_plugin.cpp
205+ oifdragarea.cpp
206+ oifpincharea.cpp
207+ oifrotatearea.cpp
208+ oiftaparea.cpp
209 )
210
211-set(uTouch_HDRS
212+set(oif_HDRS
213 continuousgesturearea.h
214 device.h
215 geissingleton.h
216@@ -23,22 +23,22 @@
217 gestureevent.h
218 instantaneousgesturearea.h
219 touch.h
220- utouch_plugin.h
221- utouchdragarea.h
222- utouchpincharea.h
223- utouchrotatearea.h
224- utouchtaparea.h
225+ oif_plugin.h
226+ oifdragarea.h
227+ oifpincharea.h
228+ oifrotatearea.h
229+ oiftaparea.h
230 )
231
232-qt4_wrap_cpp(uTouch_MOC_SRCS ${uTouch_HDRS})
233-
234-add_library(uTouch MODULE ${uTouch_SRCS} ${uTouch_MOC_SRCS})
235-
236-target_link_libraries(uTouch ${UTOUCH_GEIS_LDFLAGS})
237-
238-set(PLUGIN_INSTALL_DIR lib/qt4/imports/uTouch)
239-
240-install(TARGETS uTouch DESTINATION ${PLUGIN_INSTALL_DIR})
241+qt4_wrap_cpp(oif_MOC_SRCS ${oif_HDRS})
242+
243+add_library(oif MODULE ${oif_SRCS} ${oif_MOC_SRCS})
244+
245+target_link_libraries(oif ${GEIS_LDFLAGS})
246+
247+set(PLUGIN_INSTALL_DIR lib/qt4/imports/oif)
248+
249+install(TARGETS oif DESTINATION ${PLUGIN_INSTALL_DIR})
250
251 install(FILES qmldir DESTINATION ${PLUGIN_INSTALL_DIR})
252
253@@ -49,12 +49,12 @@
254
255 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/html
256 COMMAND ${DOXYGEN_EXECUTABLE}
257- DEPENDS ${uTouch_SRCS} ${uTouch_HDRS} ${CMAKE_BINARY_DIR}/Doxyfile
258+ DEPENDS ${oif_SRCS} ${oif_HDRS} ${CMAKE_BINARY_DIR}/Doxyfile
259 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
260 COMMENT "Generating API documentation with Doxygen" VERBATIM)
261
262 add_custom_target(doc ALL DEPENDS ${CMAKE_BINARY_DIR}/html)
263
264- install(DIRECTORY ${CMAKE_BINARY_DIR}/html DESTINATION "share/doc/utouch-qml")
265- install(FILES ${CMAKE_BINARY_DIR}/qch/utouch-qml.qch DESTINATION "share/qt4/doc/qch")
266+ install(DIRECTORY ${CMAKE_BINARY_DIR}/html DESTINATION "share/doc/oif-qml")
267+ install(FILES ${CMAKE_BINARY_DIR}/qch/oif-qml.qch DESTINATION "share/qt4/doc/qch")
268 endif (DOXYGEN_FOUND)
269
270=== modified file 'src/attributes.h'
271--- src/attributes.h 2011-07-28 01:52:10 +0000
272+++ src/attributes.h 2012-07-24 22:53:21 +0000
273@@ -2,8 +2,8 @@
274 * Lesser General Public License version 3 or later (see the file COPYING).
275 */
276
277-#ifndef UTOUCH_QML_ATTRIBUTES_H_
278-#define UTOUCH_QML_ATTRIBUTES_H_
279+#ifndef OIF_QML_ATTRIBUTES_H_
280+#define OIF_QML_ATTRIBUTES_H_
281
282 #include <QString>
283 #include <QVariant>
284@@ -197,4 +197,4 @@
285
286 } // namespace geis_attributes
287
288-#endif // UTOUCH_QML_ATTRIBUTES_H_
289+#endif // OIF_QML_ATTRIBUTES_H_
290
291=== modified file 'src/continuousgesturearea.h'
292--- src/continuousgesturearea.h 2011-08-10 23:50:27 +0000
293+++ src/continuousgesturearea.h 2012-07-24 22:53:21 +0000
294@@ -2,8 +2,8 @@
295 * Lesser General Public License version 3 or later (see the file COPYING).
296 */
297
298-#ifndef UTOUCH_QML_CONTINUOUSGESTUREAREA_H_
299-#define UTOUCH_QML_CONTINUOUSGESTUREAREA_H_
300+#ifndef OIF_QML_CONTINUOUSGESTUREAREA_H_
301+#define OIF_QML_CONTINUOUSGESTUREAREA_H_
302
303 #include <QDeclarativeItem>
304
305@@ -71,4 +71,4 @@
306
307 QML_DECLARE_TYPE(ContinuousGestureArea)
308
309-#endif // UTOUCH_QML_CONTINUOUSGESTUREAREA_H_
310+#endif // OIF_QML_CONTINUOUSGESTUREAREA_H_
311
312=== modified file 'src/device.h'
313--- src/device.h 2011-07-26 01:34:14 +0000
314+++ src/device.h 2012-07-24 22:53:21 +0000
315@@ -2,8 +2,8 @@
316 * Lesser General Public License version 3 or later (see the file COPYING).
317 */
318
319-#ifndef UTOUCH_QML_DEVICE_H_
320-#define UTOUCH_QML_DEVICE_H_
321+#ifndef OIF_QML_DEVICE_H_
322+#define OIF_QML_DEVICE_H_
323
324 #include <QDeclarativeItem>
325
326@@ -85,8 +85,8 @@
327 /**
328 * This property holds a variant map of attributes of the touch.
329 *
330- * All uTouch touch attributes are available in this property. The keys may
331- * be referenced in the geis.h header file.
332+ * All touch attributes are available in this property. The keys may be
333+ * referenced in the geis.h header file.
334 */
335 Q_PROPERTY(const QVariantMap attributes READ attributes CONSTANT)
336
337@@ -152,4 +152,4 @@
338
339 QML_DECLARE_TYPE(Device)
340
341-#endif // UTOUCH_QML_DEVICE_H_
342+#endif // OIF_QML_DEVICE_H_
343
344=== modified file 'src/geissingleton.h'
345--- src/geissingleton.h 2011-07-27 18:48:40 +0000
346+++ src/geissingleton.h 2012-07-24 22:53:21 +0000
347@@ -2,8 +2,8 @@
348 * Lesser General Public License version 3 or later (see the file COPYING).
349 */
350
351-#ifndef UTOUCH_QML_GEISSINGLETON_H_
352-#define UTOUCH_QML_GEISSINGLETON_H_
353+#ifndef OIF_QML_GEISSINGLETON_H_
354+#define OIF_QML_GEISSINGLETON_H_
355
356 #include <QHash>
357 #include <QMultiMap>
358@@ -57,4 +57,4 @@
359 void GeisEventSlot();
360 };
361
362-#endif // UTOUCH_QML_GEISSINGLETON_H_
363+#endif // OIF_QML_GEISSINGLETON_H_
364
365=== modified file 'src/gesture.h'
366--- src/gesture.h 2011-07-28 18:34:45 +0000
367+++ src/gesture.h 2012-07-24 22:53:21 +0000
368@@ -2,8 +2,8 @@
369 * Lesser General Public License version 3 or later (see the file COPYING).
370 */
371
372-#ifndef UTOUCH_QML_GESTURE_H_
373-#define UTOUCH_QML_GESTURE_H_
374+#ifndef OIF_QML_GESTURE_H_
375+#define OIF_QML_GESTURE_H_
376
377 #include <QDeclarativeItem>
378
379@@ -126,4 +126,4 @@
380 QML_DECLARE_TYPE(Gesture)
381 QML_DECLARE_TYPE(TouchLimits)
382
383-#endif // UTOUCH_QML_GESTURE_H_
384+#endif // OIF_QML_GESTURE_H_
385
386=== modified file 'src/gesturearea.h'
387--- src/gesturearea.h 2011-08-10 23:50:27 +0000
388+++ src/gesturearea.h 2012-07-24 22:53:21 +0000
389@@ -2,8 +2,8 @@
390 * Lesser General Public License version 3 or later (see the file COPYING).
391 */
392
393-#ifndef UTOUCH_QML_GESTUREAREA_H_
394-#define UTOUCH_QML_GESTUREAREA_H_
395+#ifndef OIF_QML_GESTUREAREA_H_
396+#define OIF_QML_GESTUREAREA_H_
397
398 #include <QDeclarativeItem>
399
400@@ -56,8 +56,8 @@
401 QVariant current_;
402
403 friend class GestureArea;
404- friend class UTouchPinchArea;
405- friend class UTouchRotateArea;
406+ friend class OIFPinchArea;
407+ friend class OIFRotateArea;
408
409 Q_DISABLE_COPY(GestureProperty)
410 };
411@@ -148,4 +148,4 @@
412 QML_DECLARE_TYPE(GestureArea)
413 QML_DECLARE_TYPE(GestureProperty)
414
415-#endif // UTOUCH_QML_GESTUREAREA_H_
416+#endif // OIF_QML_GESTUREAREA_H_
417
418=== modified file 'src/gestureevent.h'
419--- src/gestureevent.h 2011-07-28 18:34:45 +0000
420+++ src/gestureevent.h 2012-07-24 22:53:21 +0000
421@@ -2,8 +2,8 @@
422 * Lesser General Public License version 3 or later (see the file COPYING).
423 */
424
425-#ifndef UTOUCH_QML_GESTUREEVENT_H_
426-#define UTOUCH_QML_GESTUREEVENT_H_
427+#ifndef OIF_QML_GESTUREEVENT_H_
428+#define OIF_QML_GESTUREEVENT_H_
429
430 #include <QDeclarativeItem>
431
432@@ -52,8 +52,8 @@
433 /**
434 * This property holds a variant map of attributes of the gesture.
435 *
436- * All uTouch gesture attributes are available in this property. The keys
437- * may be referenced in the geis.h header file.
438+ * All gesture attributes are available in this property. The keys may be
439+ * referenced in the geis.h header file.
440 */
441 Q_PROPERTY(const QVariantMap attributes READ attributes CONSTANT)
442
443@@ -90,4 +90,4 @@
444
445 QML_DECLARE_TYPE(GestureEvent)
446
447-#endif // UTOUCH_QML_GESTUREEVENT_H_
448+#endif // OIF_QML_GESTUREEVENT_H_
449
450=== modified file 'src/instantaneousgesturearea.h'
451--- src/instantaneousgesturearea.h 2011-08-10 23:50:27 +0000
452+++ src/instantaneousgesturearea.h 2012-07-24 22:53:21 +0000
453@@ -2,8 +2,8 @@
454 * Lesser General Public License version 3 or later (see the file COPYING).
455 */
456
457-#ifndef UTOUCH_QML_INSTANTANEOUSGESTUREAREA_H_
458-#define UTOUCH_QML_INSTANTANEOUSGESTUREAREA_H_
459+#ifndef OIF_QML_INSTANTANEOUSGESTUREAREA_H_
460+#define OIF_QML_INSTANTANEOUSGESTUREAREA_H_
461
462 #include <QDeclarativeItem>
463
464@@ -37,4 +37,4 @@
465
466 QML_DECLARE_TYPE(InstantaneousGestureArea)
467
468-#endif // UTOUCH_QML_INSTANTANEOUSGESTUREAREA_H_
469+#endif // OIF_QML_INSTANTANEOUSGESTUREAREA_H_
470
471=== renamed file 'src/utouch_plugin.cpp' => 'src/oif_plugin.cpp'
472--- src/utouch_plugin.cpp 2011-07-27 18:48:40 +0000
473+++ src/oif_plugin.cpp 2012-07-24 22:53:21 +0000
474@@ -2,7 +2,7 @@
475 * Lesser General Public License version 3 or later (see the file COPYING).
476 */
477
478-#include "utouch_plugin.h"
479+#include "oif_plugin.h"
480
481 #include <qdeclarative.h>
482
483@@ -10,16 +10,16 @@
484 #include "gesture.h"
485 #include "gestureevent.h"
486 #include "touch.h"
487-#include "utouchdragarea.h"
488-#include "utouchpincharea.h"
489-#include "utouchrotatearea.h"
490-#include "utouchtaparea.h"
491+#include "oifdragarea.h"
492+#include "oifpincharea.h"
493+#include "oifrotatearea.h"
494+#include "oiftaparea.h"
495
496-void uTouchPlugin::registerTypes(const char* uri) {
497- qmlRegisterType< UTouchDragArea >(uri, 1, 0, "UTouchDragArea");
498- qmlRegisterType< UTouchPinchArea >(uri, 1, 0, "UTouchPinchArea");
499- qmlRegisterType< UTouchRotateArea >(uri, 1, 0, "UTouchRotateArea");
500- qmlRegisterType< UTouchTapArea >(uri, 1, 0, "UTouchTapArea");
501+void oifPlugin::registerTypes(const char* uri) {
502+ qmlRegisterType< OIFDragArea >(uri, 1, 0, "OIFDragArea");
503+ qmlRegisterType< OIFPinchArea >(uri, 1, 0, "OIFPinchArea");
504+ qmlRegisterType< OIFRotateArea >(uri, 1, 0, "OIFRotateArea");
505+ qmlRegisterType< OIFTapArea >(uri, 1, 0, "OIFTapArea");
506 qmlRegisterType< Gesture >();
507 qmlRegisterType< TouchLimits >();
508 qmlRegisterType< GestureEvent >();
509@@ -29,4 +29,4 @@
510 qmlRegisterType< AxisInfo >();
511 }
512
513-Q_EXPORT_PLUGIN2(uTouch, uTouchPlugin)
514+Q_EXPORT_PLUGIN2(oif, oifPlugin)
515
516=== renamed file 'src/utouch_plugin.h' => 'src/oif_plugin.h'
517--- src/utouch_plugin.h 2011-07-26 01:34:14 +0000
518+++ src/oif_plugin.h 2012-07-24 22:53:21 +0000
519@@ -2,16 +2,16 @@
520 * Lesser General Public License version 3 or later (see the file COPYING).
521 */
522
523-#ifndef UTOUCH_QML_UTOUCH_PLUGIN_H_
524-#define UTOUCH_QML_UTOUCH_PLUGIN_H_
525+#ifndef OIF_QML_OIF_PLUGIN_H_
526+#define OIF_QML_OIF_PLUGIN_H_
527
528 #include <QDeclarativeExtensionPlugin>
529
530-class uTouchPlugin : public QDeclarativeExtensionPlugin {
531+class oifPlugin : public QDeclarativeExtensionPlugin {
532 Q_OBJECT
533
534 public:
535 void registerTypes(const char* uri);
536 };
537
538-#endif // UTOUCH_QML_UTOUCH_PLUGIN_H_
539+#endif // OIF_QML_OIF_PLUGIN_H_
540
541=== renamed file 'src/utouchdragarea.cpp' => 'src/oifdragarea.cpp'
542--- src/utouchdragarea.cpp 2011-08-10 23:50:27 +0000
543+++ src/oifdragarea.cpp 2012-07-24 22:53:21 +0000
544@@ -2,10 +2,10 @@
545 * Lesser General Public License version 3 or later (see the file COPYING).
546 */
547
548-#include "utouchdragarea.h"
549+#include "oifdragarea.h"
550
551 #include "gestureevent.h"
552
553-UTouchDragArea::UTouchDragArea(QDeclarativeItem* parent)
554+OIFDragArea::OIFDragArea(QDeclarativeItem* parent)
555 : ContinuousGestureArea(parent, kDrag)
556 {}
557
558=== renamed file 'src/utouchdragarea.h' => 'src/oifdragarea.h'
559--- src/utouchdragarea.h 2011-08-10 23:50:27 +0000
560+++ src/oifdragarea.h 2012-07-24 22:53:21 +0000
561@@ -2,8 +2,8 @@
562 * Lesser General Public License version 3 or later (see the file COPYING).
563 */
564
565-#ifndef UTOUCH_QML_UTOUCHDRAGAREA_H_
566-#define UTOUCH_QML_UTOUCHDRAGAREA_H_
567+#ifndef OIF_QML_OIFDRAGAREA_H_
568+#define OIF_QML_OIFDRAGAREA_H_
569
570 #include "continuousgesturearea.h"
571
572@@ -11,16 +11,16 @@
573 * An input-only item for receiving non-instantaneous drag gesture events.
574 */
575
576-class UTouchDragArea : public ContinuousGestureArea {
577+class OIFDragArea : public ContinuousGestureArea {
578 Q_OBJECT
579
580 public:
581- explicit UTouchDragArea(QDeclarativeItem* parent = 0);
582+ explicit OIFDragArea(QDeclarativeItem* parent = 0);
583
584 private:
585- Q_DISABLE_COPY(UTouchDragArea)
586+ Q_DISABLE_COPY(OIFDragArea)
587 };
588
589-QML_DECLARE_TYPE(UTouchDragArea)
590+QML_DECLARE_TYPE(OIFDragArea)
591
592-#endif // UTOUCH_QML_UTOUCHDRAGAREA_H_
593+#endif // OIF_QML_OIFDRAGAREA_H_
594
595=== renamed file 'src/utouchpincharea.cpp' => 'src/oifpincharea.cpp'
596--- src/utouchpincharea.cpp 2011-08-10 23:50:27 +0000
597+++ src/oifpincharea.cpp 2012-07-24 22:53:21 +0000
598@@ -2,15 +2,15 @@
599 * Lesser General Public License version 3 or later (see the file COPYING).
600 */
601
602-#include "utouchpincharea.h"
603+#include "oifpincharea.h"
604
605 #include "gestureevent.h"
606
607-UTouchPinchArea::UTouchPinchArea(QDeclarativeItem* parent)
608+OIFPinchArea::OIFPinchArea(QDeclarativeItem* parent)
609 : ContinuousGestureArea(parent, kPinch)
610 {}
611
612-bool UTouchPinchArea::IsGestureEventHandled(GestureEvent* event) {
613+bool OIFPinchArea::IsGestureEventHandled(GestureEvent* event) {
614 GeisFloat radius =
615 event->attributes().value(GEIS_GESTURE_ATTRIBUTE_RADIUS).toFloat();
616
617@@ -21,7 +21,7 @@
618 radius_.receivers(SIGNAL(currentChanged())) > 0;
619 }
620
621-void UTouchPinchArea::HandleGestureUpdateEvent(bool end, GestureEvent* event) {
622+void OIFPinchArea::HandleGestureUpdateEvent(bool end, GestureEvent* event) {
623 GeisFloat radius =
624 event->attributes().value(GEIS_GESTURE_ATTRIBUTE_RADIUS).toFloat();
625
626
627=== renamed file 'src/utouchpincharea.h' => 'src/oifpincharea.h'
628--- src/utouchpincharea.h 2011-08-10 23:50:27 +0000
629+++ src/oifpincharea.h 2012-07-24 22:53:21 +0000
630@@ -2,8 +2,8 @@
631 * Lesser General Public License version 3 or later (see the file COPYING).
632 */
633
634-#ifndef UTOUCH_QML_UTOUCHPINCHAREA_H_
635-#define UTOUCH_QML_UTOUCHPINCHAREA_H_
636+#ifndef OIF_QML_OIFPINCHAREA_H_
637+#define OIF_QML_OIFPINCHAREA_H_
638
639 #include "continuousgesturearea.h"
640
641@@ -11,7 +11,7 @@
642 * An input-only item for receiving non-instantaneous pinch gesture events.
643 */
644
645-class UTouchPinchArea : public ContinuousGestureArea {
646+class OIFPinchArea : public ContinuousGestureArea {
647 Q_OBJECT
648 /**
649 * This property holds the average radius of the touches.
650@@ -19,7 +19,7 @@
651 Q_PROPERTY(GestureProperty* radius READ radius CONSTANT)
652
653 public:
654- explicit UTouchPinchArea(QDeclarativeItem* parent = 0);
655+ explicit OIFPinchArea(QDeclarativeItem* parent = 0);
656
657 GestureProperty* radius() { return &radius_; }
658
659@@ -29,9 +29,9 @@
660 private:
661 GestureProperty radius_;
662
663- Q_DISABLE_COPY(UTouchPinchArea)
664+ Q_DISABLE_COPY(OIFPinchArea)
665 };
666
667-QML_DECLARE_TYPE(UTouchPinchArea)
668+QML_DECLARE_TYPE(OIFPinchArea)
669
670-#endif // UTOUCH_QML_UTOUCHPINCHAREA_H_
671+#endif // OIF_QML_OIFPINCHAREA_H_
672
673=== renamed file 'src/utouchrotatearea.cpp' => 'src/oifrotatearea.cpp'
674--- src/utouchrotatearea.cpp 2011-08-10 23:50:27 +0000
675+++ src/oifrotatearea.cpp 2012-07-24 22:53:21 +0000
676@@ -2,15 +2,15 @@
677 * Lesser General Public License version 3 or later (see the file COPYING).
678 */
679
680-#include "utouchrotatearea.h"
681+#include "oifrotatearea.h"
682
683 #include "gestureevent.h"
684
685-UTouchRotateArea::UTouchRotateArea(QDeclarativeItem* parent)
686+OIFRotateArea::OIFRotateArea(QDeclarativeItem* parent)
687 : ContinuousGestureArea(parent, kRotate)
688 {}
689
690-bool UTouchRotateArea::IsGestureEventHandled(GestureEvent* event) {
691+bool OIFRotateArea::IsGestureEventHandled(GestureEvent* event) {
692 GeisFloat angle =
693 event->attributes().value(GEIS_GESTURE_ATTRIBUTE_ANGLE).toFloat();
694
695@@ -21,7 +21,7 @@
696 angle_.receivers(SIGNAL(currentChanged())) > 0;
697 }
698
699-void UTouchRotateArea::HandleGestureUpdateEvent(bool end,
700+void OIFRotateArea::HandleGestureUpdateEvent(bool end,
701 GestureEvent* event) {
702 GeisFloat angle =
703 event->attributes().value(GEIS_GESTURE_ATTRIBUTE_ANGLE).toFloat();
704
705=== renamed file 'src/utouchrotatearea.h' => 'src/oifrotatearea.h'
706--- src/utouchrotatearea.h 2011-08-10 23:50:27 +0000
707+++ src/oifrotatearea.h 2012-07-24 22:53:21 +0000
708@@ -2,8 +2,8 @@
709 * Lesser General Public License version 3 or later (see the file COPYING).
710 */
711
712-#ifndef UTOUCH_QML_UTOUCHROTATEAREA_H_
713-#define UTOUCH_QML_UTOUCHROTATEAREA_H_
714+#ifndef OIF_QML_OIFROTATEAREA_H_
715+#define OIF_QML_OIFROTATEAREA_H_
716
717 #include "continuousgesturearea.h"
718
719@@ -11,7 +11,7 @@
720 * An input-only item for receiving non-instantaneous rotate gesture events.
721 */
722
723-class UTouchRotateArea : public ContinuousGestureArea {
724+class OIFRotateArea : public ContinuousGestureArea {
725 Q_OBJECT
726 /**
727 * This property holds the rotation angle of the touches.
728@@ -19,7 +19,7 @@
729 Q_PROPERTY(GestureProperty* angle READ angle CONSTANT)
730
731 public:
732- explicit UTouchRotateArea(QDeclarativeItem* parent = 0);
733+ explicit OIFRotateArea(QDeclarativeItem* parent = 0);
734
735 GestureProperty* angle() { return &angle_; }
736
737@@ -29,9 +29,9 @@
738 private:
739 GestureProperty angle_;
740
741- Q_DISABLE_COPY(UTouchRotateArea)
742+ Q_DISABLE_COPY(OIFRotateArea)
743 };
744
745-QML_DECLARE_TYPE(UTouchRotateArea)
746+QML_DECLARE_TYPE(OIFRotateArea)
747
748-#endif // UTOUCH_QML_UTOUCHROTATEAREA_H_
749+#endif // OIF_QML_OIFROTATEAREA_H_
750
751=== renamed file 'src/utouchtaparea.cpp' => 'src/oiftaparea.cpp'
752--- src/utouchtaparea.cpp 2011-08-10 23:50:27 +0000
753+++ src/oiftaparea.cpp 2012-07-24 22:53:21 +0000
754@@ -2,10 +2,10 @@
755 * Lesser General Public License version 3 or later (see the file COPYING).
756 */
757
758-#include "utouchtaparea.h"
759+#include "oiftaparea.h"
760
761 #include "gestureevent.h"
762
763-UTouchTapArea::UTouchTapArea(QDeclarativeItem* parent)
764+OIFTapArea::OIFTapArea(QDeclarativeItem* parent)
765 : InstantaneousGestureArea(parent, kTap)
766 {}
767
768=== renamed file 'src/utouchtaparea.h' => 'src/oiftaparea.h'
769--- src/utouchtaparea.h 2011-08-10 23:50:27 +0000
770+++ src/oiftaparea.h 2012-07-24 22:53:21 +0000
771@@ -2,8 +2,8 @@
772 * Lesser General Public License version 3 or later (see the file COPYING).
773 */
774
775-#ifndef UTOUCH_QML_UTOUCHTAPAREA_H_
776-#define UTOUCH_QML_UTOUCHTAPAREA_H_
777+#ifndef OIF_QML_OIFTAPAREA_H_
778+#define OIF_QML_OIFTAPAREA_H_
779
780 #include "instantaneousgesturearea.h"
781
782@@ -11,16 +11,16 @@
783 * An input-only item for receiving instantaneous tap gesture events.
784 */
785
786-class UTouchTapArea : public InstantaneousGestureArea {
787+class OIFTapArea : public InstantaneousGestureArea {
788 Q_OBJECT
789
790 public:
791- explicit UTouchTapArea(QDeclarativeItem* parent = 0);
792+ explicit OIFTapArea(QDeclarativeItem* parent = 0);
793
794 private:
795- Q_DISABLE_COPY(UTouchTapArea)
796+ Q_DISABLE_COPY(OIFTapArea)
797 };
798
799-QML_DECLARE_TYPE(UTouchTapArea)
800+QML_DECLARE_TYPE(OIFTapArea)
801
802-#endif // UTOUCH_QML_UTOUCHTAPAREA_H_
803+#endif // OIF_QML_OIFTAPAREA_H_
804
805=== modified file 'src/qmldir'
806--- src/qmldir 2011-07-26 01:34:14 +0000
807+++ src/qmldir 2012-07-24 22:53:21 +0000
808@@ -1,2 +1,2 @@
809-plugin uTouch
810+plugin oif
811
812
813=== modified file 'src/touch.h'
814--- src/touch.h 2011-07-28 18:27:53 +0000
815+++ src/touch.h 2012-07-24 22:53:21 +0000
816@@ -2,8 +2,8 @@
817 * Lesser General Public License version 3 or later (see the file COPYING).
818 */
819
820-#ifndef UTOUCH_QML_TOUCH_H_
821-#define UTOUCH_QML_TOUCH_H_
822+#ifndef OIF_QML_TOUCH_H_
823+#define OIF_QML_TOUCH_H_
824
825 #include <QDeclarativeItem>
826
827@@ -31,8 +31,8 @@
828 /**
829 * This property holds a variant map of attributes of the touch.
830 *
831- * All uTouch touch attributes are available in this property. The keys may
832- * be referenced in the geis.h header file.
833+ * All touch attributes are available in this property. The keys may be
834+ * referenced in the geis.h header file.
835 */
836 Q_PROPERTY(const QVariantMap attributes READ attributes)
837
838@@ -54,4 +54,4 @@
839
840 QML_DECLARE_TYPE(Touch)
841
842-#endif // UTOUCH_QML_TOUCH_H_
843+#endif // OIF_QML_TOUCH_H_

Subscribers

People subscribed via source and target branches