From 3a0d18fa8b8f6a78479fad7785491feff4f4f468 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 27 Jan 2017 17:26:55 +0300 Subject: Move browserlink into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/gui/browserlink.h | 53 ++++++++++++++++++++++++++++++++++++++++++++ src/gui/widgets/browserbox.h | 24 ++------------------ 4 files changed, 57 insertions(+), 22 deletions(-) create mode 100644 src/gui/browserlink.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c7e8c78c7..61ce1a50b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1342,6 +1342,7 @@ SET(SRCS events/actionevent.h listeners/actionlistener.h gui/widgets/basiccontainer.h + gui/browserlink.h gui/buttoninfo.h gui/buttontext.h const/gui/chat.h diff --git a/src/Makefile.am b/src/Makefile.am index 72938d33d..911bf05d8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -114,6 +114,7 @@ SRC += events/actionevent.h \ listeners/attributelistener.cpp \ listeners/attributelistener.h \ gui/widgets/basiccontainer.h \ + gui/browserlink.h \ gui/buttoninfo.h \ gui/buttontext.h \ const/gui/chat.h \ diff --git a/src/gui/browserlink.h b/src/gui/browserlink.h new file mode 100644 index 000000000..a8dc0cb6f --- /dev/null +++ b/src/gui/browserlink.h @@ -0,0 +1,53 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2017 The ManaPlus Developers + * Copyright (C) 2009 Aethyra Development Team + * + * 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 . + */ + +#ifndef GUI_BROWSERLINK_H +#define GUI_BROWSERLINK_H + +#include + +#include "localconsts.h" + +struct BrowserLink final +{ + BrowserLink() : + x1(0), + x2(0), + y1(0), + y2(0), + link(), + caption() + { + } + + A_DEFAULT_COPY(BrowserLink) + + int x1; + int x2; + int y1; + int y2; + std::string link; + std::string caption; +}; + +#endif // GUI_BROWSERLINK_H diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index 80ec9cf75..7eff1f1ea 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -28,6 +28,8 @@ #include "enums/simpletypes/opaque.h" +#include "gui/browserlink.h" + #include "gui/widgets/linepart.h" #include "gui/widgets/widget.h" @@ -35,28 +37,6 @@ class LinkHandler; -struct BrowserLink final -{ - BrowserLink() : - x1(0), - x2(0), - y1(0), - y2(0), - link(), - caption() - { - } - - A_DEFAULT_COPY(BrowserLink) - - int x1; - int x2; - int y1; - int y2; - std::string link; - std::string caption; -}; - /** * A simple browser box able to handle links and forward events to the * parent conteiner. -- cgit v1.2.3-70-g09d2