From d73c6ed345178e21621f9f86d1b6b2bceddf6625 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 May 2015 20:36:46 +0300 Subject: Move type SkipError into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/enums/simpletypes/simpletypes.h | 1 - src/enums/simpletypes/skiperror.h | 28 ++++++++++++++++++++++++++++ src/utils/xml.h | 1 + 5 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/enums/simpletypes/skiperror.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8bf4150cf..bdef2aa36 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1073,6 +1073,7 @@ SET(SRCS enums/simpletypes/showcenter.h enums/simpletypes/simpledefines.h enums/simpletypes/simpletypes.h + enums/simpletypes/skiperror.h enums/simpletypes/trading.h enums/simpletypes/useresman.h statuseffect.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 1f567329d..b839b52b8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1201,6 +1201,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ enums/simpletypes/showcenter.h \ enums/simpletypes/simpledefines.h \ enums/simpletypes/simpletypes.h \ + enums/simpletypes/skiperror.h \ enums/simpletypes/trading.h \ enums/simpletypes/useresman.h \ statuseffect.cpp \ diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h index 93a3a4690..ea98531ed 100644 --- a/src/enums/simpletypes/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -25,7 +25,6 @@ #include "localconsts.h" -defBoolEnum(SkipError); defBoolEnum(UseArgs); #endif // ENUMS_SIMPLETYPES_SIMPLETYPES_H diff --git a/src/enums/simpletypes/skiperror.h b/src/enums/simpletypes/skiperror.h new file mode 100644 index 000000000..b76cefdee --- /dev/null +++ b/src/enums/simpletypes/skiperror.h @@ -0,0 +1,28 @@ +/* + * The ManaPlus Client + * Copyright (C) 2015 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 . + */ + +#ifndef ENUMS_SIMPLETYPES_SKIPERROR_H +#define ENUMS_SIMPLETYPES_SKIPERROR_H + +#include "enums/simpletypes/simpledefines.h" + +defBoolEnum(SkipError); + +#endif // ENUMS_SIMPLETYPES_SKIPERROR_H diff --git a/src/utils/xml.h b/src/utils/xml.h index 260f7d715..b96289b54 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -24,6 +24,7 @@ #define UTILS_XML_H #include "enums/simpletypes/simpletypes.h" +#include "enums/simpletypes/skiperror.h" #include "enums/simpletypes/useresman.h" #include -- cgit v1.2.3-60-g2f50