From f918f6b473a290eb5ddbb318c77cb1b0bd55843d Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 17 Dec 2009 00:06:53 +0000 Subject: [PATCH] Remove util.h svn-id: r46400 --- compress_gob.cpp | 1 - compress_tinsel.cpp | 2 +- degob.cpp | 1 + degob_script.cpp | 2 ++ degob_script.h | 3 ++- degob_script_bargon.cpp | 1 + degob_script_v1.cpp | 2 ++ degob_script_v2.cpp | 2 ++ degob_script_v3.cpp | 1 + degob_script_v4.cpp | 1 + degob_script_v5.cpp | 1 + degob_script_v6.cpp | 1 + desword2.cpp | 1 - encode_dxa.cpp | 2 +- extract_gob_stk.cpp | 2 +- extract_loom_tg16.cpp | 1 - extract_mm_apple.cpp | 1 - extract_mm_c64.cpp | 1 - extract_mm_nes.cpp | 1 - extract_parallaction.h | 1 - extract_zak_c64.cpp | 1 - gui/configuration.h | 3 +-- tool.cpp | 1 - util.h | 40 ---------------------------------------- utils/adpcm.cpp | 2 +- 25 files changed, 19 insertions(+), 56 deletions(-) delete mode 100644 util.h diff --git a/compress_gob.cpp b/compress_gob.cpp index dc086271..26a954e0 100644 --- a/compress_gob.cpp +++ b/compress_gob.cpp @@ -20,7 +20,6 @@ * */ -#include "util.h" #include "compress_gob.h" struct CompressGob::Chunk { diff --git a/compress_tinsel.cpp b/compress_tinsel.cpp index ce8f79ff..2cfd069b 100644 --- a/compress_tinsel.cpp +++ b/compress_tinsel.cpp @@ -23,7 +23,7 @@ // By Jimi (m [underline] kiewitz [AT] users.sourceforge.net) #include "compress.h" -#include "util.h" +#include "common/endian.h" #include "compress_tinsel.h" diff --git a/degob.cpp b/degob.cpp index fa26e8b9..f2bce698 100644 --- a/degob.cpp +++ b/degob.cpp @@ -22,6 +22,7 @@ #include "degob_script.h" #include "common/file.h" +#include "common/util.h" static void printHelp(const char *bin); static int getVersion(const char *verStr); diff --git a/degob_script.cpp b/degob_script.cpp index d9e6ec24..8987b3cc 100644 --- a/degob_script.cpp +++ b/degob_script.cpp @@ -21,6 +21,8 @@ */ #include "degob_script.h" +#include "common/endian.h" +#include "common/util.h" #include #ifdef _MSC_VER diff --git a/degob_script.h b/degob_script.h index cd2cfa72..1e86a034 100644 --- a/degob_script.h +++ b/degob_script.h @@ -23,9 +23,10 @@ #ifndef DEGOB_SCRIPT_H #define DEGOB_SCRIPT_H +#include "common/scummsys.h" + #include #include -#include "util.h" #define _OPCODET(ver, x) TYPE_TEXTDESC, 0, #x #define _OPCODEF(ver, x) TYPE_FUNCDESC, &ver::x, #x diff --git a/degob_script_bargon.cpp b/degob_script_bargon.cpp index 5a3e2ad9..fdeb05c6 100644 --- a/degob_script_bargon.cpp +++ b/degob_script_bargon.cpp @@ -21,6 +21,7 @@ */ #include "degob_script.h" +#include "common/util.h" #define OPCODET(x) _OPCODET(Script_Bargon, x) #define OPCODEF(x) _OPCODEF(Script_Bargon, x) diff --git a/degob_script_v1.cpp b/degob_script_v1.cpp index afb484d2..9e83a33a 100644 --- a/degob_script_v1.cpp +++ b/degob_script_v1.cpp @@ -21,6 +21,8 @@ */ #include "degob_script.h" +#include "common/endian.h" +#include "common/util.h" #define OPCODET(x) _OPCODET(Script_v1, x) #define OPCODEF(x) _OPCODEF(Script_v1, x) diff --git a/degob_script_v2.cpp b/degob_script_v2.cpp index 5e5f3e61..fff86b76 100644 --- a/degob_script_v2.cpp +++ b/degob_script_v2.cpp @@ -21,6 +21,8 @@ */ #include "degob_script.h" +#include "common/endian.h" +#include "common/util.h" #define OPCODET(x) _OPCODET(Script_v2, x) #define OPCODEF(x) _OPCODEF(Script_v2, x) diff --git a/degob_script_v3.cpp b/degob_script_v3.cpp index c7e7b44b..a55e70ec 100644 --- a/degob_script_v3.cpp +++ b/degob_script_v3.cpp @@ -21,6 +21,7 @@ */ #include "degob_script.h" +#include "common/util.h" #define OPCODET(x) _OPCODET(Script_v3, x) #define OPCODEF(x) _OPCODEF(Script_v3, x) diff --git a/degob_script_v4.cpp b/degob_script_v4.cpp index 86ddf53b..f0e1bba4 100644 --- a/degob_script_v4.cpp +++ b/degob_script_v4.cpp @@ -21,6 +21,7 @@ */ #include "degob_script.h" +#include "common/util.h" #define OPCODET(x) _OPCODET(Script_v4, x) #define OPCODEF(x) _OPCODEF(Script_v4, x) diff --git a/degob_script_v5.cpp b/degob_script_v5.cpp index b525c428..1e668f76 100644 --- a/degob_script_v5.cpp +++ b/degob_script_v5.cpp @@ -21,6 +21,7 @@ */ #include "degob_script.h" +#include "common/util.h" #define OPCODET(x) _OPCODET(Script_v5, x) #define OPCODEF(x) _OPCODEF(Script_v5, x) diff --git a/degob_script_v6.cpp b/degob_script_v6.cpp index f55e5209..74589545 100644 --- a/degob_script_v6.cpp +++ b/degob_script_v6.cpp @@ -21,6 +21,7 @@ */ #include "degob_script.h" +#include "common/util.h" #define OPCODET(x) _OPCODET(Script_v6, x) #define OPCODEF(x) _OPCODEF(Script_v6, x) diff --git a/desword2.cpp b/desword2.cpp index 92fd93b5..5f55316f 100644 --- a/desword2.cpp +++ b/desword2.cpp @@ -20,7 +20,6 @@ * */ -#include "util.h" #include "common/file.h" enum { diff --git a/encode_dxa.cpp b/encode_dxa.cpp index 776819bb..2d923f59 100644 --- a/encode_dxa.cpp +++ b/encode_dxa.cpp @@ -22,7 +22,7 @@ */ #include "encode_dxa.h" -#include "util.h" +#include "common/endian.h" #include #include diff --git a/extract_gob_stk.cpp b/extract_gob_stk.cpp index dbc92e1b..bd049dab 100644 --- a/extract_gob_stk.cpp +++ b/extract_gob_stk.cpp @@ -20,8 +20,8 @@ * */ -#include "util.h" #include "extract_gob_stk.h" +#include "common/endian.h" #define confSTK10 "STK10" #define confSTK21 "STK21" diff --git a/extract_loom_tg16.cpp b/extract_loom_tg16.cpp index eb04433d..c9887303 100644 --- a/extract_loom_tg16.cpp +++ b/extract_loom_tg16.cpp @@ -20,7 +20,6 @@ * */ -#include "util.h" #include #include "extract_loom_tg16.h" diff --git a/extract_mm_apple.cpp b/extract_mm_apple.cpp index 25a1476f..814e44a9 100644 --- a/extract_mm_apple.cpp +++ b/extract_mm_apple.cpp @@ -20,7 +20,6 @@ * */ -#include "util.h" #include #include "extract_mm_apple.h" diff --git a/extract_mm_c64.cpp b/extract_mm_c64.cpp index 28d89344..a95f0148 100644 --- a/extract_mm_c64.cpp +++ b/extract_mm_c64.cpp @@ -20,7 +20,6 @@ * */ -#include "util.h" #include #include "extract_mm_c64.h" diff --git a/extract_mm_nes.cpp b/extract_mm_nes.cpp index cc364138..3b29cc6e 100644 --- a/extract_mm_nes.cpp +++ b/extract_mm_nes.cpp @@ -20,7 +20,6 @@ * */ -#include "util.h" #include #include "extract_mm_nes.h" diff --git a/extract_parallaction.h b/extract_parallaction.h index 52128cbb..fae57ff1 100644 --- a/extract_parallaction.h +++ b/extract_parallaction.h @@ -24,7 +24,6 @@ #define EXTRACT_PARALLACTION_H #include "tool.h" -#include "util.h" uint32 depackedlen(byte *packed, uint32 plen); void ppdepack(byte *packed, byte *depacked, uint32 plen, uint32 unplen); diff --git a/extract_zak_c64.cpp b/extract_zak_c64.cpp index 936f8374..24539efc 100644 --- a/extract_zak_c64.cpp +++ b/extract_zak_c64.cpp @@ -20,7 +20,6 @@ * */ -#include "util.h" #include #include "extract_zak_c64.h" diff --git a/gui/configuration.h b/gui/configuration.h index 3c3443f1..2a16ae49 100644 --- a/gui/configuration.h +++ b/gui/configuration.h @@ -26,8 +26,7 @@ #include #include -#include "../util.h" -#include "../compress.h" // for AudioFormat +#include "compress.h" // for AudioFormat class ToolGUI; diff --git a/tool.cpp b/tool.cpp index 9e228905..daea4b2d 100644 --- a/tool.cpp +++ b/tool.cpp @@ -24,7 +24,6 @@ #include #include -#include "util.h" #include "common/file.h" #include "tool.h" diff --git a/util.h b/util.h deleted file mode 100644 index 40cadad1..00000000 --- a/util.h +++ /dev/null @@ -1,40 +0,0 @@ -/* ScummVM Tools - * Copyright (C) 2002-2009 The ScummVM project - * - * 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 (at your option) 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#ifndef UTIL_H -#define UTIL_H - -// This header is DEPRECATED. Everything should be gradually migrated away -// from using this to directly including the required headers. - -#include "common/scummsys.h" -#include "common/endian.h" -#include "common/util.h" - -#include -#include -#include -#include -#include - - -#endif diff --git a/utils/adpcm.cpp b/utils/adpcm.cpp index 1132948a..a92e72fa 100644 --- a/utils/adpcm.cpp +++ b/utils/adpcm.cpp @@ -21,7 +21,7 @@ */ #include "adpcm.h" -#include "util.h" +#include "common/endian.h" namespace Audio {