1
=== modified file 'src/point/CMakeLists.txt'
2
--- src/point/CMakeLists.txt	2012-01-23 17:46:28 +0000
3
+++ src/point/CMakeLists.txt	2012-10-16 13:21:38 +0000
4
@@ -5,16 +5,8 @@
5
5
)
5
)
6
6
6
7
7
INCLUDE_DIRECTORIES (  
7
INCLUDE_DIRECTORIES (  
8
8
  ${CMAKE_CURRENT_SOURCE_DIR}/include
9
9
  ${CMAKE_CURRENT_SOURCE_DIR}/src
10
10
11
11
  ${CMAKE_CURRENT_SOURCE_DIR}/point/include
12
12
  ${CMAKE_CURRENT_SOURCE_DIR}/point/src
13
13
14
14
  ${compiz_SOURCE_DIR}/include
8
  ${compiz_SOURCE_DIR}/include
15
15
    
16
16
  ${Boost_INCLUDE_DIRS}
9
  ${Boost_INCLUDE_DIRS}
17
17
  
18
18
  ${GLIBMM_INCLUDE_DIRS}
10
  ${GLIBMM_INCLUDE_DIRS}
19
19
)
11
)
20
20
12
21
@@ -22,7 +14,7 @@
22
22
14
23
23
SET ( 
15
SET ( 
24
24
  PUBLIC_HEADERS 
16
  PUBLIC_HEADERS 
26
25
  ${CMAKE_CURRENT_SOURCE_DIR}/include/core/point.h
17
  ${compiz_SOURCE_DIR}/include/core/point.h
27
26
)
18
)
28
27
19
29
28
SET ( 
20
SET ( 
30
29
21
31
=== removed directory 'src/point/include'
32
=== removed directory 'src/point/include/core'
33
=== removed file 'src/point/include/core/point.h'
34
--- src/point/include/core/point.h	2012-01-19 19:16:27 +0000
35
+++ src/point/include/core/point.h	1970-01-01 00:00:00 +0000
36
@@ -1,110 +0,0 @@
37
1
/*
38
2
 * Copyright © 2008 Dennis Kasprzyk
39
3
 *
40
4
 * Permission to use, copy, modify, distribute, and sell this software
41
5
 * and its documentation for any purpose is hereby granted without
42
6
 * fee, provided that the above copyright notice appear in all copies
43
7
 * and that both that copyright notice and this permission notice
44
8
 * appear in supporting documentation, and that the name of
45
9
 * Dennis Kasprzyk not be used in advertising or publicity pertaining to
46
10
 * distribution of the software without specific, written prior permission.
47
11
 * Dennis Kasprzyk makes no representations about the suitability of this
48
12
 * software for any purpose. It is provided "as is" without express or
49
13
 * implied warranty.
50
14
 *
51
15
 * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
52
16
 * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
53
17
 * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
54
18
 * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
55
19
 * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
56
20
 * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
57
21
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
58
22
 *
59
23
 * Authors: Dennis Kasprzyk <onestone@compiz-fusion.org>
60
24
 */
61
25
62
26
#ifndef _COMPPOINT_H
63
27
#define _COMPPOINT_H
64
28
65
29
#include <vector>
66
30
#include <list>
67
31
68
32
/**
69
33
 * A 2D coordinate (likely in screen space) that can only be mutated
70
34
 * through set() methods, since it's data members are private.
71
35
 */
72
36
class CompPoint {
73
37
74
38
    public:
75
39
	CompPoint ();
76
40
	CompPoint (int, int);
77
41
	
78
42
	/**
79
43
	 * Get the x coordinate of this point
80
44
	 */
81
45
	int x () const;
82
46
	
83
47
	/**
84
48
	 * Get the y coordinate of this point
85
49
	 */
86
50
	int y () const;
87
51
	
88
52
	/**
89
53
	 * Set the x and y coordinate of this point
90
54
	 */
91
55
	void set (int, int);
92
56
	
93
57
	/**
94
58
	 * Set the x coordinate of this point
95
59
	 */
96
60
	void setX (int);
97
61
	
98
62
	/**
99
63
	 * Set the y coordinate of this point
100
64
	 */
101
65
	void setY (int);
102
66
103
67
	bool operator== (const CompPoint &) const;
104
68
	bool operator!= (const CompPoint &) const;
105
69
	
106
70
	/**
107
71
	 * Takes from both co-ordinates
108
72
	 */
109
73
	CompPoint & operator-= (const CompPoint &);
110
74
	/**
111
75
	 * Adds to both co-ordinates
112
76
	 */
113
77
	CompPoint & operator+= (const CompPoint &);
114
78
	
115
79
	/**
116
80
	 * Retuns an added point
117
81
	 */
118
82
	CompPoint operator+ (const CompPoint &) const;
119
83
	/**
120
84
	 * Returns a subtracted point
121
85
	 */
122
86
	CompPoint operator- (const CompPoint &) const;
123
87
124
88
	typedef std::vector<CompPoint> vector;
125
89
	typedef std::vector<CompPoint *> ptrVector;
126
90
	typedef std::list<CompPoint> list;
127
91
	typedef std::list<CompPoint *> ptrList;
128
92
129
93
    private:
130
94
	int mX, mY;
131
95
};
132
96
133
97
inline int
134
98
CompPoint::x () const
135
99
{
136
100
    return mX;
137
101
}
138
102
139
103
inline int
140
104
CompPoint::y () const
141
105
{
142
106
    return mY;
143
107
}
144
108
145
109
146
110
#endif
Reviewer	Review Type	Date Requested	Status
Compiz Maintainers		2012-10-16	Pending
PS Jenkins bot	continuous-integration	2012-10-16	Pending
Review via email: mp+129885@code.launchpad.net