@@ -105,62 +105,62 @@ TEST(Property, children)
105105
106106TEST (VectorProperty, default_value)
107107{
108- VectorProperty* vp = new VectorProperty () ;
109- Ogre::Vector3 vec = vp-> getVector ();
108+ VectorProperty vp;
109+ Ogre::Vector3 vec = vp. getVector ();
110110 EXPECT_EQ (0 , vec.x );
111111 EXPECT_EQ (0 , vec.y );
112112 EXPECT_EQ (0 , vec.z );
113113}
114114
115115TEST (VectorProperty, set_and_get)
116116{
117- VectorProperty* vp = new VectorProperty () ;
117+ VectorProperty vp;
118118 Ogre::Vector3 vec (1 , 2 , 3 );
119- vp-> setVector (vec);
119+ vp. setVector (vec);
120120
121- Ogre::Vector3 vec2 = vp-> getVector ();
121+ Ogre::Vector3 vec2 = vp. getVector ();
122122 EXPECT_EQ (1 , vec2.x );
123123 EXPECT_EQ (2 , vec2.y );
124124 EXPECT_EQ (3 , vec2.z );
125125}
126126
127127TEST (VectorProperty, set_string)
128128{
129- VectorProperty* vp = new VectorProperty () ;
130- vp-> setValue (QString (" 1;2;3" ));
129+ VectorProperty vp;
130+ vp. setValue (QString (" 1;2;3" ));
131131
132- Ogre::Vector3 vec = vp-> getVector ();
132+ Ogre::Vector3 vec = vp. getVector ();
133133 EXPECT_EQ (1 , vec.x );
134134 EXPECT_EQ (2 , vec.y );
135135 EXPECT_EQ (3 , vec.z );
136136
137- vp-> setValue (QString (" chubby!" ));
137+ vp. setValue (QString (" chubby!" ));
138138
139- vec = vp-> getVector ();
139+ vec = vp. getVector ();
140140 EXPECT_EQ (1 , vec.x );
141141 EXPECT_EQ (2 , vec.y );
142142 EXPECT_EQ (3 , vec.z );
143143}
144144
145145TEST (VectorProperty, set_child)
146146{
147- VectorProperty* vp = new VectorProperty () ;
148- vp-> subProp (" X" )->setValue (0.9 );
149- vp-> subProp (" Y" )->setValue (1.1 );
150- vp-> subProp (" Z" )->setValue (1.3 );
147+ VectorProperty vp;
148+ vp. subProp (" X" )->setValue (0.9 );
149+ vp. subProp (" Y" )->setValue (1.1 );
150+ vp. subProp (" Z" )->setValue (1.3 );
151151
152- Ogre::Vector3 vec = vp-> getVector ();
152+ Ogre::Vector3 vec = vp. getVector ();
153153 EXPECT_EQ (0 .9f , vec.x );
154154 EXPECT_EQ (1 .1f , vec.y );
155155 EXPECT_EQ (1 .3f , vec.z );
156156}
157157
158158TEST (VectorProperty, get_child)
159159{
160- VectorProperty* vp = new VectorProperty (" v" , Ogre::Vector3 (1 , 2 , 3 ));
161- EXPECT_EQ (1 , vp-> subProp (" X" )->getValue ().toFloat ());
162- EXPECT_EQ (2 , vp-> subProp (" Y" )->getValue ().toFloat ());
163- EXPECT_EQ (3 , vp-> subProp (" Z" )->getValue ().toFloat ());
160+ VectorProperty vp (" v" , Ogre::Vector3 (1 , 2 , 3 ));
161+ EXPECT_EQ (1 , vp. subProp (" X" )->getValue ().toFloat ());
162+ EXPECT_EQ (2 , vp. subProp (" Y" )->getValue ().toFloat ());
163+ EXPECT_EQ (3 , vp. subProp (" Z" )->getValue ().toFloat ());
164164}
165165
166166TEST (VectorProperty, set_value_events)
@@ -181,8 +181,8 @@ TEST(VectorProperty, set_value_events)
181181
182182TEST (QuaternionProperty, default_value)
183183{
184- QuaternionProperty* qp = new QuaternionProperty () ;
185- Ogre::Quaternion quat = qp-> getQuaternion ();
184+ QuaternionProperty qp;
185+ Ogre::Quaternion quat = qp. getQuaternion ();
186186 EXPECT_EQ (0 , quat.x );
187187 EXPECT_EQ (0 , quat.y );
188188 EXPECT_EQ (0 , quat.z );
@@ -191,11 +191,11 @@ TEST(QuaternionProperty, default_value)
191191
192192TEST (QuaternionProperty, set_and_get)
193193{
194- QuaternionProperty* qp = new QuaternionProperty () ;
194+ QuaternionProperty qp;
195195 Ogre::Quaternion quat (4 , 1 , 2 , 3 );
196- qp-> setQuaternion (quat);
196+ qp. setQuaternion (quat);
197197
198- Ogre::Quaternion quat2 = qp-> getQuaternion ();
198+ Ogre::Quaternion quat2 = qp. getQuaternion ();
199199 EXPECT_EQ (1 , quat2.x );
200200 EXPECT_EQ (2 , quat2.y );
201201 EXPECT_EQ (3 , quat2.z );
@@ -204,18 +204,18 @@ TEST(QuaternionProperty, set_and_get)
204204
205205TEST (QuaternionProperty, set_string)
206206{
207- QuaternionProperty* qp = new QuaternionProperty () ;
208- qp-> setValue (QString (" 1;2;3;4" ));
207+ QuaternionProperty qp;
208+ qp. setValue (QString (" 1;2;3;4" ));
209209
210- Ogre::Quaternion quat = qp-> getQuaternion ();
210+ Ogre::Quaternion quat = qp. getQuaternion ();
211211 EXPECT_EQ (1 , quat.x );
212212 EXPECT_EQ (2 , quat.y );
213213 EXPECT_EQ (3 , quat.z );
214214 EXPECT_EQ (4 , quat.w );
215215
216- qp-> setValue (QString (" chubby!" ));
216+ qp. setValue (QString (" chubby!" ));
217217
218- quat = qp-> getQuaternion ();
218+ quat = qp. getQuaternion ();
219219 EXPECT_EQ (1 , quat.x );
220220 EXPECT_EQ (2 , quat.y );
221221 EXPECT_EQ (3 , quat.z );
@@ -224,13 +224,13 @@ TEST(QuaternionProperty, set_string)
224224
225225TEST (QuaternionProperty, set_child)
226226{
227- QuaternionProperty* qp = new QuaternionProperty () ;
228- qp-> subProp (" X" )->setValue (0.9 );
229- qp-> subProp (" Y" )->setValue (1.1 );
230- qp-> subProp (" Z" )->setValue (1.3 );
231- qp-> subProp (" W" )->setValue (1.5 );
227+ QuaternionProperty qp;
228+ qp. subProp (" X" )->setValue (0.9 );
229+ qp. subProp (" Y" )->setValue (1.1 );
230+ qp. subProp (" Z" )->setValue (1.3 );
231+ qp. subProp (" W" )->setValue (1.5 );
232232
233- Ogre::Quaternion quat = qp-> getQuaternion ();
233+ Ogre::Quaternion quat = qp. getQuaternion ();
234234 EXPECT_EQ (0 .9f , quat.x );
235235 EXPECT_EQ (1 .1f , quat.y );
236236 EXPECT_EQ (1 .3f , quat.z );
@@ -239,11 +239,11 @@ TEST(QuaternionProperty, set_child)
239239
240240TEST (QuaternionProperty, get_child)
241241{
242- QuaternionProperty* qp = new QuaternionProperty (" v" , Ogre::Quaternion (4 , 1 , 2 , 3 ));
243- EXPECT_EQ (1 , qp-> subProp (" X" )->getValue ().toFloat ());
244- EXPECT_EQ (2 , qp-> subProp (" Y" )->getValue ().toFloat ());
245- EXPECT_EQ (3 , qp-> subProp (" Z" )->getValue ().toFloat ());
246- EXPECT_EQ (4 , qp-> subProp (" W" )->getValue ().toFloat ());
242+ QuaternionProperty qp (" v" , Ogre::Quaternion (4 , 1 , 2 , 3 ));
243+ EXPECT_EQ (1 , qp. subProp (" X" )->getValue ().toFloat ());
244+ EXPECT_EQ (2 , qp. subProp (" Y" )->getValue ().toFloat ());
245+ EXPECT_EQ (3 , qp. subProp (" Z" )->getValue ().toFloat ());
246+ EXPECT_EQ (4 , qp. subProp (" W" )->getValue ().toFloat ());
247247}
248248
249249TEST (QuaternionProperty, set_value_events)
@@ -265,49 +265,49 @@ TEST(QuaternionProperty, set_value_events)
265265
266266TEST (ColorProperty, default_value)
267267{
268- ColorProperty* qp = new ColorProperty () ;
269- QColor color = qp-> getColor ();
268+ ColorProperty qp;
269+ QColor color = qp. getColor ();
270270 EXPECT_EQ (0 , color.red ());
271271 EXPECT_EQ (0 , color.green ());
272272 EXPECT_EQ (0 , color.blue ());
273273}
274274
275275TEST (ColorProperty, set_and_get)
276276{
277- ColorProperty* qp = new ColorProperty () ;
277+ ColorProperty qp;
278278 QColor color (1 , 2 , 3 );
279- qp-> setColor (color);
279+ qp. setColor (color);
280280
281- QColor color2 = qp-> getColor ();
281+ QColor color2 = qp. getColor ();
282282 EXPECT_EQ (1 , color2.red ());
283283 EXPECT_EQ (2 , color2.green ());
284284 EXPECT_EQ (3 , color2.blue ());
285285}
286286
287287TEST (ColorProperty, set_string)
288288{
289- ColorProperty* qp = new ColorProperty () ;
290- qp-> setValue (QString (" 1;2;3" ));
289+ ColorProperty qp;
290+ qp. setValue (QString (" 1;2;3" ));
291291
292- QColor color = qp-> getColor ();
292+ QColor color = qp. getColor ();
293293 EXPECT_EQ (1 , color.red ());
294294 EXPECT_EQ (2 , color.green ());
295295 EXPECT_EQ (3 , color.blue ());
296296
297- qp-> setValue (QString (" chubby!" ));
297+ qp. setValue (QString (" chubby!" ));
298298
299- color = qp-> getColor ();
299+ color = qp. getColor ();
300300 EXPECT_EQ (1 , color.red ());
301301 EXPECT_EQ (2 , color.green ());
302302 EXPECT_EQ (3 , color.blue ());
303303}
304304
305305TEST (ColorProperty, set_string_limits)
306306{
307- ColorProperty* qp = new ColorProperty () ;
308- qp-> setValue (QString (" -1;2000;3" ));
307+ ColorProperty qp;
308+ qp. setValue (QString (" -1;2000;3" ));
309309
310- QColor color = qp-> getColor ();
310+ QColor color = qp. getColor ();
311311 EXPECT_EQ (0 , color.red ());
312312 EXPECT_EQ (255 , color.green ());
313313 EXPECT_EQ (3 , color.blue ());
0 commit comments