Merge lp:~jpakkane/frame/underscore_removal into lp:frame

Proposed by Jussi Pakkanen
Status: Merged
Merged at revision: 34
Proposed branch: lp:~jpakkane/frame/underscore_removal
Merge into: lp:frame
Diff against target: 58 lines (+8/-8)
4 files modified
include/utouch/frame-mtdev.h (+2/-2)
include/utouch/frame-xi2.h (+2/-2)
include/utouch/frame.h (+2/-2)
src/frame-impl.h (+2/-2)
To merge this branch: bzr merge lp:~jpakkane/frame/underscore_removal
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Chase Douglas (community) Approve
Review via email: mp+61258@code.launchpad.net

Description of the change

Removed leading underscores.

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

Looks fine to me :).

review: Approve
Revision history for this message
Stephen M. Webb (bregma) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/utouch/frame-mtdev.h'
2--- include/utouch/frame-mtdev.h 2011-02-15 13:59:40 +0000
3+++ include/utouch/frame-mtdev.h 2011-05-17 14:17:27 +0000
4@@ -19,8 +19,8 @@
5 *
6 ****************************************************************************/
7
8-#ifndef _UTOUCH_FRAME_MTDEV_H
9-#define _UTOUCH_FRAME_MTDEV_H
10+#ifndef UTOUCH_FRAME_MTDEV_H
11+#define UTOUCH_FRAME_MTDEV_H
12
13 #ifdef __cplusplus
14 extern "C" {
15
16=== modified file 'include/utouch/frame-xi2.h'
17--- include/utouch/frame-xi2.h 2011-02-15 14:01:51 +0000
18+++ include/utouch/frame-xi2.h 2011-05-17 14:17:27 +0000
19@@ -19,8 +19,8 @@
20 *
21 ****************************************************************************/
22
23-#ifndef _UTOUCH_FRAME_XI2_H
24-#define _UTOUCH_FRAME_XI2_H
25+#ifndef UTOUCH_FRAME_XI2_H
26+#define UTOUCH_FRAME_XI2_H
27
28 #ifdef __cplusplus
29 extern "C" {
30
31=== modified file 'include/utouch/frame.h'
32--- include/utouch/frame.h 2011-04-13 20:01:01 +0000
33+++ include/utouch/frame.h 2011-05-17 14:17:27 +0000
34@@ -19,8 +19,8 @@
35 *
36 ****************************************************************************/
37
38-#ifndef _UTOUCH_FRAME_H
39-#define _UTOUCH_FRAME_H
40+#ifndef UTOUCH_FRAME_H
41+#define UTOUCH_FRAME_H
42
43 #ifdef __cplusplus
44 extern "C" {
45
46=== modified file 'src/frame-impl.h'
47--- src/frame-impl.h 2011-04-01 16:13:09 +0000
48+++ src/frame-impl.h 2011-05-17 14:17:27 +0000
49@@ -19,8 +19,8 @@
50 *
51 ****************************************************************************/
52
53-#ifndef _FRAME_IMPL_H
54-#define _FRAME_IMPL_H
55+#ifndef FRAME_IMPL_H
56+#define FRAME_IMPL_H
57
58 #include <utouch/frame.h>
59

Subscribers

People subscribed via source and target branches