Removed jpoint.h and jsize.h.

src/core/cfg.h

@@ -20,11 +20,11 @@
 #define CORE_CFG_H_INCLUDED
 
 #include <allegro/config.h>
-#include "jinete/jbase.h"
+#include "Vaca/Rect.h"
-#include "jinete/jrect.h"
-
 #include "core/color.h"
 
+using Vaca::Rect;
+
 class ConfigModule
 {
 public:

src/jinete/jinete.h

@@ -55,13 +55,11 @@
 #include "jinete/jmenu.h"
 #include "jinete/jmessage.h"
 #include "jinete/jpanel.h"
-#include "jinete/jpoint.h"
 #include "jinete/jpopup_window.h"
 #include "jinete/jquickmenu.h"
 #include "jinete/jrect.h"
 #include "jinete/jregion.h"
 #include "jinete/jsep.h"
-#include "jinete/jsize.h"
 #include "jinete/jslider.h"
 #include "jinete/jstream.h"
 #include "jinete/jstring.h"

src/jinete/jpoint.h

@@ -1,42 +0,0 @@
-/* Jinete - a GUI library
- * Copyright (C) 2003-2010 David Capello.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of the author nor the names of its contributors may
- *     be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef JINETE_JPOINT_H_INCLUDED
-#define JINETE_JPOINT_H_INCLUDED
-
-#include "jinete/jbase.h"
-
-// Jinete+Vaca merge
-#include "Vaca/Point.h"
-
-using Vaca::Point;
-
-#endif

src/jinete/jrect.h

@@ -33,8 +33,6 @@
 #define JINETE_JRECT_H_INCLUDED
 
 #include "jinete/jbase.h"
-#include "jinete/jpoint.h"
-#include "jinete/jsize.h"
 
 #define jrect_w(r) (((JRect)(r))->x2-((JRect)(r))->x1)
 #define jrect_h(r) (((JRect)(r))->y2-((JRect)(r))->y1)
@@ -64,9 +62,4 @@ void jrect_stretch(JRect rect, int border);
 void jrect_moveto(JRect rect, int x, int y);
 void jrect_displace(JRect rect, int dx, int dy);
 
-// Jinete+Vaca merge
-#include "Vaca/Rect.h"
-
-using Vaca::Rect;
-
 #endif

src/jinete/jsize.h

@@ -1,42 +0,0 @@
-/* Jinete - a GUI library
- * Copyright (C) 2003-2010 David Capello.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of the author nor the names of its contributors may
- *     be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef JINETE_JSIZE_H_INCLUDED
-#define JINETE_JSIZE_H_INCLUDED
-
-#include "jinete/jbase.h"
-
-// Jinete+Vaca merge
-#include "Vaca/Size.h"
-
-using Vaca::Size;
-
-#endif

src/jinete/jwidget.h

@@ -32,12 +32,13 @@
 #ifndef JINETE_JWIDGET_H_INCLUDED
 #define JINETE_JWIDGET_H_INCLUDED
 
+#include <string>
+
 #include "jinete/jbase.h"
 #include "jinete/jrect.h"
+#include "Vaca/Rect.h"
 #include "Vaca/Widget.h"
 
-#include <string>
-
 #ifndef NDEBUG
 #include "jinete/jintern.h"
 #define assert_valid_widget(widget) assert((widget) != NULL &&		\
@@ -46,6 +47,8 @@
 #define assert_valid_widget(widget) ((void)0)
 #endif
 
+using Vaca::Rect;
+
 struct FONT;
 struct BITMAP;
 

src/settings/settings.h

@@ -19,11 +19,13 @@
 #ifndef SETTINGS_SETTINGS_H_INCLUDED
 #define SETTINGS_SETTINGS_H_INCLUDED
 
-#include "jinete/jrect.h"
+#include "Vaca/Rect.h"
 #include "core/color.h"
 #include "tiled_mode.h"
 #include "pen_type.h"
 
+using Vaca::Rect;
+
 class IToolSettings;
 class IPenSettings;
 class Tool;

src/tools/tool.h

@@ -23,12 +23,16 @@
 #include <list>
 #include <vector>
 
+#include "Vaca/Point.h"
+#include "Vaca/Rect.h"
 #include "jinete/jmessage.h"
 #include "jinete/jrect.h"
-#include "jinete/jpoint.h"
 
 #include "tiled_mode.h"
 
+using Vaca::Point;
+using Vaca::Rect;
+
 class Context;
 class Sprite;
 class Image;

src/widgets/toolbar.cpp

@@ -25,6 +25,7 @@
 #include "jinete/jinete.h"
 #include "Vaca/Bind.h"
 #include "Vaca/Signal.h"
+#include "Vaca/Size.h"
 
 #include "app.h"
 #include "ui_context.h"
@@ -37,6 +38,8 @@
 #include "widgets/groupbut.h"
 #include "widgets/toolbar.h"
 
+using Vaca::Size;
+
 // Class to show selected tools for each tool (vertically)
 class ToolBar : public Widget
 {