Merge lp:~vanvugt/compiz/fix-1067234 into lp:compiz/0.9.9

[Sam Spilsbury]

Remove duplicate point.h (LP: #1067234)

I had to keep the copy in include/ rather than the one in src/ because it's
used by include/core/{window,screen}.h. Doing it the other way around caused
pain and complication.

Remove duplicate point.h (LP: #1067234)

I had to keep the copy in include/ rather than the one in src/ because it's
used by include/core/{window,screen}.h. Doing it the other way around caused
pain and complication.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3421
http://jenkins.qa.ubuntu.com/job/compiz-ci/190/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/190/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3421
http://jenkins.qa.ubuntu.com/job/compiz-ci/194/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/194/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

Dunno what's up with those test failures - they are completely unrelated. Lets see if it fails again.

=== modified file 'src/point/CMakeLists.txt'
--- src/point/CMakeLists.txt	2012-01-23 17:46:28 +0000
+++ src/point/CMakeLists.txt	2012-10-16 13:21:38 +0000
@@ -5,16 +5,8 @@
 )
 
 INCLUDE_DIRECTORIES (  
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/src
-
-  ${CMAKE_CURRENT_SOURCE_DIR}/point/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/point/src
-
   ${compiz_SOURCE_DIR}/include
-    
   ${Boost_INCLUDE_DIRS}
-  
   ${GLIBMM_INCLUDE_DIRS}
 )
 
@@ -22,7 +14,7 @@
 
 SET ( 
   PUBLIC_HEADERS 
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/core/point.h
+  ${compiz_SOURCE_DIR}/include/core/point.h
 )
 
 SET ( 

=== removed directory 'src/point/include'
=== removed directory 'src/point/include/core'
=== removed file 'src/point/include/core/point.h'
--- src/point/include/core/point.h	2012-01-19 19:16:27 +0000
+++ src/point/include/core/point.h	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*
- * Copyright © 2008 Dennis Kasprzyk
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Dennis Kasprzyk not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Dennis Kasprzyk makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors: Dennis Kasprzyk <[e-mail]>
- */
-
-#ifndef _COMPPOINT_H
-#define _COMPPOINT_H
-
-#include <vector>
-#include <list>
-
-/**
- * A 2D coordinate (likely in screen space) that can only be mutated
- * through set() methods, since it's data members are private.
- */
-class CompPoint {
-
-    public:
-	CompPoint ();
-	CompPoint (int, int);
-	
-	/**
-	 * Get the x coordinate of this point
-	 */
-	int x () const;
-	
-	/**
-	 * Get the y coordinate of this point
-	 */
-	int y () const;
-	
-	/**
-	 * Set the x and y coordinate of this point
-	 */
-	void set (int, int);
-	
-	/**
-	 * Set the x coordinate of this point
-	 */
-	void setX (int);
-	
-	/**
-	 * Set the y coordinate of this point
-	 */
-	void setY (int);
-
-	bool operator== (const CompPoint &) const;
-	bool operator!= (const CompPoint &) const;
-	
-	/**
-	 * Takes from both co-ordinates
-	 */
-	CompPoint & operator-= (const CompPoint &);
-	/**
-	 * Adds to both co-ordinates
-	 */
-	CompPoint & operator+= (const CompPoint &);
-	
-	/**
-	 * Retuns an added point
-	 */
-	CompPoint operator+ (const CompPoint &) const;
-	/**
-	 * Returns a subtracted point
-	 */
-	CompPoint operator- (const CompPoint &) const;
-
-	typedef std::vector<CompPoint> vector;
-	typedef std::vector<CompPoint *> ptrVector;
-	typedef std::list<CompPoint> list;
-	typedef std::list<CompPoint *> ptrList;
-
-    private:
-	int mX, mY;
-};
-
-inline int
-CompPoint::x () const
-{
-    return mX;
-}
-
-inline int
-CompPoint::y () const
-{
-    return mY;
-}
-
-
-#endif