Move imagerect into separate file.

4 files changed, 78 insertions, 44 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e757f3e6d..1440b8925 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -536,6 +536,7 @@ SET(SRCS
     resources/image.h
     resources/imagehelper.cpp
     resources/imagehelper.h
+    resources/imagerect.h
     resources/imageset.h
     resources/imageset.cpp
     resources/imagewriter.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 18b4df265..638eaeb25 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,6 +75,7 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \
 	      resources/image.h \
 	      resources/imagehelper.cpp \
 	      resources/imagehelper.h \
+	      resources/imagerect.h \
 	      resources/imageset.cpp \
 	      resources/imageset.h \
 	      resources/imagewriter.cpp \
diff --git a/src/render/graphics.h b/src/render/graphics.h
index ce612193c..d7cebec09 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -76,6 +76,8 @@
 
 #include "gui/cliprect.h"
 
+#include "resources/imagerect.h"
+
 #ifdef USE_SDL2
 #include <SDL_render.h>
 #endif
@@ -103,50 +105,6 @@ static const int defaultScreenWidth = 800;
 static const int defaultScreenHeight = 600;
 
 /**
- * 9 images defining a rectangle. 4 corners, 4 sides and a middle area. The
- * topology is as follows:
- *
- * <pre>
- *  !-----!-----------------!-----!
- *  !  0  !        1        !  2  !
- *  !-----!-----------------!-----!
- *  !  3  !        4        !  5  !
- *  !-----!-----------------!-----!
- *  !  6  !        7        !  8  !
- *  !-----!-----------------!-----!
- * </pre>
- *
- * Sections 0, 2, 6 and 8 will remain as is. 1, 3, 4, 5 and 7 will be
- * repeated to fit the size of the widget.
- */
-class ImageRect final
-{
-    public:
-        ImageRect()
-        {
-            for (int f = 0; f < 9; f ++)
-                grid[f] = nullptr;
-        }
-
-        A_DELETE_COPY(ImageRect)
-
-        enum ImagePosition
-        {
-            UPPER_LEFT = 0,
-            UPPER_CENTER = 1,
-            UPPER_RIGHT = 2,
-            LEFT = 3,
-            CENTER = 4,
-            RIGHT = 5,
-            LOWER_LEFT = 6,
-            LOWER_CENTER = 7,
-            LOWER_RIGHT = 8
-        };
-
-        Image *grid[9];
-};
-
-/**
  * A central point of control for graphics.
  */
 class Graphics
diff --git a/src/resources/imagerect.h b/src/resources/imagerect.h
new file mode 100644
index 000000000..0b2ae679e
--- /dev/null
+++ b/src/resources/imagerect.h
@@ -0,0 +1,74 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_IMAGERECT_H
+#define RESOURCES_IMAGERECT_H
+
+#include "localconsts.h"
+
+class Image;
+
+/**
+ * 9 images defining a rectangle. 4 corners, 4 sides and a middle area. The
+ * topology is as follows:
+ *
+ * <pre>
+ *  !-----!-----------------!-----!
+ *  !  0  !        1        !  2  !
+ *  !-----!-----------------!-----!
+ *  !  3  !        4        !  5  !
+ *  !-----!-----------------!-----!
+ *  !  6  !        7        !  8  !
+ *  !-----!-----------------!-----!
+ * </pre>
+ *
+ * Sections 0, 2, 6 and 8 will remain as is. 1, 3, 4, 5 and 7 will be
+ * repeated to fit the size of the widget.
+ */
+class ImageRect final
+{
+    public:
+        ImageRect()
+        {
+            for (int f = 0; f < 9; f ++)
+                grid[f] = nullptr;
+        }
+
+        A_DELETE_COPY(ImageRect)
+
+        enum ImagePosition
+        {
+            UPPER_LEFT = 0,
+            UPPER_CENTER = 1,
+            UPPER_RIGHT = 2,
+            LEFT = 3,
+            CENTER = 4,
+            RIGHT = 5,
+            LOWER_LEFT = 6,
+            LOWER_CENTER = 7,
+            LOWER_RIGHT = 8
+        };
+
+        Image *grid[9];
+};
+
+#endif  // RESOURCES_IMAGERECT_H