From 6cad6849b57bd69007fafcc434ff5177aa2b442b Mon Sep 17 00:00:00 2001 From: David Capello Date: Thu, 11 Mar 2010 00:45:19 -0200 Subject: [PATCH] Removed jpoint.h and jsize.h. --- src/core/cfg.h | 6 +++--- src/jinete/jinete.h | 2 -- src/jinete/jpoint.h | 42 ----------------------------------------- src/jinete/jrect.h | 7 ------- src/jinete/jsize.h | 42 ----------------------------------------- src/jinete/jwidget.h | 7 +++++-- src/settings/settings.h | 4 +++- src/tools/tool.h | 6 +++++- src/widgets/toolbar.cpp | 3 +++ 9 files changed, 19 insertions(+), 100 deletions(-) delete mode 100644 src/jinete/jpoint.h delete mode 100644 src/jinete/jsize.h diff --git a/src/core/cfg.h b/src/core/cfg.h index 242cbb493..cdc28a6b6 100644 --- a/src/core/cfg.h +++ b/src/core/cfg.h @@ -20,11 +20,11 @@ #define CORE_CFG_H_INCLUDED #include -#include "jinete/jbase.h" -#include "jinete/jrect.h" - +#include "Vaca/Rect.h" #include "core/color.h" +using Vaca::Rect; + class ConfigModule { public: diff --git a/src/jinete/jinete.h b/src/jinete/jinete.h index 8ec7a4ab2..12451ed6e 100644 --- a/src/jinete/jinete.h +++ b/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" diff --git a/src/jinete/jpoint.h b/src/jinete/jpoint.h deleted file mode 100644 index 7541b508e..000000000 --- a/src/jinete/jpoint.h +++ /dev/null @@ -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 diff --git a/src/jinete/jrect.h b/src/jinete/jrect.h index d6e794692..1a1f9870f 100644 --- a/src/jinete/jrect.h +++ b/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 diff --git a/src/jinete/jsize.h b/src/jinete/jsize.h deleted file mode 100644 index 5921acd1f..000000000 --- a/src/jinete/jsize.h +++ /dev/null @@ -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 diff --git a/src/jinete/jwidget.h b/src/jinete/jwidget.h index 5ec5d92a7..974d9d7d1 100644 --- a/src/jinete/jwidget.h +++ b/src/jinete/jwidget.h @@ -32,12 +32,13 @@ #ifndef JINETE_JWIDGET_H_INCLUDED #define JINETE_JWIDGET_H_INCLUDED +#include + #include "jinete/jbase.h" #include "jinete/jrect.h" +#include "Vaca/Rect.h" #include "Vaca/Widget.h" -#include - #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; diff --git a/src/settings/settings.h b/src/settings/settings.h index 7e4825468..5c0441237 100644 --- a/src/settings/settings.h +++ b/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; diff --git a/src/tools/tool.h b/src/tools/tool.h index ae74c521f..381f7a96d 100644 --- a/src/tools/tool.h +++ b/src/tools/tool.h @@ -23,12 +23,16 @@ #include #include +#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; diff --git a/src/widgets/toolbar.cpp b/src/widgets/toolbar.cpp index e12a2a7ec..6589a2dc4 100644 --- a/src/widgets/toolbar.cpp +++ b/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 {