Changes file names of LogicalGraphicsObject.(h/cpp) to GraphicalObject.(h/cpp) to...

diff --git a/LayerManagerCommands/include/DestroyShaderCommand.h b/LayerManagerCommands/include/DestroyShaderCommand.h
index 0713aa5..f0e8f49 100644 (file)
--- a/LayerManagerCommands/include/DestroyShaderCommand.h
+++ b/LayerManagerCommands/include/DestroyShaderCommand.h
@@ -21,7 +21,7 @@
 #define _DESTROYSHADERCOMMAND_H_
 
 #include "BaseCommandSynchronous.h"
-#include "LogicalGraphicsObject.h"
+#include "GraphicalObject.h"
 #include "Scene.h"
 #include "LayerMap.h"
 #include "SurfaceMap.h"

diff --git a/LayerManagerService/include/GraphicalGroup.h b/LayerManagerService/include/GraphicalGroup.h
index 3339d0a..b0f697e 100644 (file)
--- a/LayerManagerService/include/GraphicalGroup.h
+++ b/LayerManagerService/include/GraphicalGroup.h
@@ -21,7 +21,7 @@
 #define _GRAPHICALGROUP_H_
 
 #include <list>
-#include "LogicalGraphicsObject.h"
+#include "GraphicalObject.h"
 #include "ObjectType.h"
 
 /**

diff --git a/LayerManagerService/include/LogicalGraphicsObject.h b/LayerManagerService/include/GraphicalObject.h
similarity index 97%
rename from LayerManagerService/include/LogicalGraphicsObject.h
rename to LayerManagerService/include/GraphicalObject.h
index 10986cc..1569b1a 100644 (file)
--- a/LayerManagerService/include/LogicalGraphicsObject.h
+++ b/LayerManagerService/include/GraphicalObject.h
@@ -17,8 +17,8 @@
  *
  ****************************************************************************/
 
-#ifndef _LOGICALGRAPHICSOBJECT_H_
-#define _LOGICALGRAPHICSOBJECT_H_
+#ifndef _GRAPHICALOBJECT_H_
+#define _GRAPHICALOBJECT_H_
 
 #include "ObjectType.h"
 
@@ -162,4 +162,4 @@ inline Shader* GraphicalObject::getShader()
 }
 
 
-#endif /* _LOGICALGRAPHICSOBJECT_H_ */
+#endif /* _GRAPHICALOBJECT_H_ */

diff --git a/LayerManagerService/include/GraphicalSurface.h b/LayerManagerService/include/GraphicalSurface.h
index dfe71e0..879086f 100644 (file)
--- a/LayerManagerService/include/GraphicalSurface.h
+++ b/LayerManagerService/include/GraphicalSurface.h
@@ -20,7 +20,7 @@
 #ifndef _GRAPHICALSURFACE_H_
 #define _GRAPHICALSURFACE_H_
 
-#include "LogicalGraphicsObject.h"
+#include "GraphicalObject.h"
 #include "OrientationType.h"
 #include "Rectangle.h"
 #include "Vector2.h"

diff --git a/LayerManagerService/src/LogicalGraphicsObject.cpp b/LayerManagerService/src/GraphicalObject.cpp
similarity index 96%
rename from LayerManagerService/src/LogicalGraphicsObject.cpp
rename to LayerManagerService/src/GraphicalObject.cpp
index b7def1d..7f0aac3 100644 (file)
--- a/LayerManagerService/src/LogicalGraphicsObject.cpp
+++ b/LayerManagerService/src/GraphicalObject.cpp
@@ -17,7 +17,7 @@
 *
 ****************************************************************************/
 
-#include "LogicalGraphicsObject.h"
+#include "GraphicalObject.h"
 
 unsigned int GraphicalObject::nextGraphicId[TypeMax]={1,1,1,1};