From f791f3b8ec8f784c4c04249d4b5e3fba87751829 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 11 Jun 2016 17:25:21 +0300 Subject: Remove unused includes. --- src/CMakeLists.txt | 2 -- src/Makefile.am | 2 -- src/being/being.h | 2 -- src/enums/simpletypes/istempsprite.h | 33 --------------------------------- src/enums/simpletypes/isweapon.h | 33 --------------------------------- src/net/ea/beingrecv.h | 2 -- src/render/mobileopengl2graphics.cpp | 1 - src/resources/image/subimage.h | 13 ------------- 8 files changed, 88 deletions(-) delete mode 100644 src/enums/simpletypes/istempsprite.h delete mode 100644 src/enums/simpletypes/isweapon.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b1070b034..6984556c4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1227,8 +1227,6 @@ SET(SRCS enums/simpletypes/ignorerecord.h enums/simpletypes/intdefines.h enums/simpletypes/issell.h - enums/simpletypes/istempsprite.h - enums/simpletypes/isweapon.h enums/simpletypes/itemcolor.h enums/simpletypes/keep.h enums/simpletypes/mainconfig.h diff --git a/src/Makefile.am b/src/Makefile.am index 3943b3a24..b262d71ba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -684,8 +684,6 @@ SRC += events/actionevent.h \ enums/simpletypes/ignorerecord.h \ enums/simpletypes/intdefines.h \ enums/simpletypes/issell.h \ - enums/simpletypes/istempsprite.h \ - enums/simpletypes/isweapon.h \ enums/simpletypes/itemcolor.h \ enums/simpletypes/keep.h \ enums/simpletypes/mainconfig.h \ diff --git a/src/being/being.h b/src/being/being.h index 2fd5ed672..e5cc44fa0 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -28,8 +28,6 @@ #include "enums/gui/usercolorid.h" -#include "enums/simpletypes/istempsprite.h" -#include "enums/simpletypes/isweapon.h" #include "enums/simpletypes/move.h" #include "resources/beinginfo.h" diff --git a/src/enums/simpletypes/istempsprite.h b/src/enums/simpletypes/istempsprite.h deleted file mode 100644 index 8409690c8..000000000 --- a/src/enums/simpletypes/istempsprite.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2015-2016 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_ISTEMPSPRITE_H -#define ENUMS_SIMPLETYPES_ISTEMPSPRITE_H - -#include "enums/simpletypes/booldefines.h" - -PRAGMA6(GCC diagnostic push) -PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") - -defBoolEnum(IsTempSprite); - -PRAGMA6(GCC diagnostic pop) - -#endif // ENUMS_SIMPLETYPES_ISTEMPSPRITE_H diff --git a/src/enums/simpletypes/isweapon.h b/src/enums/simpletypes/isweapon.h deleted file mode 100644 index 69cf3053e..000000000 --- a/src/enums/simpletypes/isweapon.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2015-2016 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_ISWEAPON_H -#define ENUMS_SIMPLETYPES_ISWEAPON_H - -#include "enums/simpletypes/booldefines.h" - -PRAGMA6(GCC diagnostic push) -PRAGMA6(GCC diagnostic ignored "-Wunused-const-variable") - -defBoolEnum(IsWeapon); - -PRAGMA6(GCC diagnostic pop) - -#endif // ENUMS_SIMPLETYPES_ISWEAPON_H diff --git a/src/net/ea/beingrecv.h b/src/net/ea/beingrecv.h index c167f174a..3ffc95367 100644 --- a/src/net/ea/beingrecv.h +++ b/src/net/ea/beingrecv.h @@ -24,8 +24,6 @@ #define NET_EA_BEINGRECV_H #include "enums/simpletypes/beingid.h" -#include "enums/simpletypes/istempsprite.h" -#include "enums/simpletypes/isweapon.h" #include "enums/simpletypes/itemcolor.h" #include diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp index 017d02e58..20951d4e4 100644 --- a/src/render/mobileopengl2graphics.cpp +++ b/src/render/mobileopengl2graphics.cpp @@ -38,7 +38,6 @@ #include "render/vertexes/imagecollection.h" #include "resources/imagerect.h" -#include "resources/openglimagehelper.h" #include "resources/image/image.h" diff --git a/src/resources/image/subimage.h b/src/resources/image/subimage.h index 29f7fed1e..1687081de 100644 --- a/src/resources/image/subimage.h +++ b/src/resources/image/subimage.h @@ -25,19 +25,6 @@ #include "localconsts.h" -#ifdef USE_OPENGL - -#ifdef ANDROID -#include -#else -#ifndef USE_SDL2 -#define GL_GLEXT_PROTOTYPES 1 -#endif -#include -#endif - -#endif - #include "resources/image/image.h" /** -- cgit v1.2.3-70-g09d2