[Scummvm-cvs-logs] SF.net SVN: scummvm:[46400] tools/branches/gsoc2009-gui
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Dec 17 01:06:53 CET 2009
Revision: 46400
http://scummvm.svn.sourceforge.net/scummvm/?rev=46400&view=rev
Author: fingolfin
Date: 2009-12-17 00:06:53 +0000 (Thu, 17 Dec 2009)
Log Message:
-----------
Remove util.h
Modified Paths:
--------------
tools/branches/gsoc2009-gui/compress_gob.cpp
tools/branches/gsoc2009-gui/compress_tinsel.cpp
tools/branches/gsoc2009-gui/degob.cpp
tools/branches/gsoc2009-gui/degob_script.cpp
tools/branches/gsoc2009-gui/degob_script.h
tools/branches/gsoc2009-gui/degob_script_bargon.cpp
tools/branches/gsoc2009-gui/degob_script_v1.cpp
tools/branches/gsoc2009-gui/degob_script_v2.cpp
tools/branches/gsoc2009-gui/degob_script_v3.cpp
tools/branches/gsoc2009-gui/degob_script_v4.cpp
tools/branches/gsoc2009-gui/degob_script_v5.cpp
tools/branches/gsoc2009-gui/degob_script_v6.cpp
tools/branches/gsoc2009-gui/desword2.cpp
tools/branches/gsoc2009-gui/encode_dxa.cpp
tools/branches/gsoc2009-gui/extract_gob_stk.cpp
tools/branches/gsoc2009-gui/extract_loom_tg16.cpp
tools/branches/gsoc2009-gui/extract_mm_apple.cpp
tools/branches/gsoc2009-gui/extract_mm_c64.cpp
tools/branches/gsoc2009-gui/extract_mm_nes.cpp
tools/branches/gsoc2009-gui/extract_parallaction.h
tools/branches/gsoc2009-gui/extract_zak_c64.cpp
tools/branches/gsoc2009-gui/gui/configuration.h
tools/branches/gsoc2009-gui/tool.cpp
tools/branches/gsoc2009-gui/utils/adpcm.cpp
Removed Paths:
-------------
tools/branches/gsoc2009-gui/util.h
Modified: tools/branches/gsoc2009-gui/compress_gob.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_gob.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/compress_gob.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -20,7 +20,6 @@
*
*/
-#include "util.h"
#include "compress_gob.h"
struct CompressGob::Chunk {
Modified: tools/branches/gsoc2009-gui/compress_tinsel.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_tinsel.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/compress_tinsel.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -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"
Modified: tools/branches/gsoc2009-gui/degob.cpp
===================================================================
--- tools/branches/gsoc2009-gui/degob.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/degob.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -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);
Modified: tools/branches/gsoc2009-gui/degob_script.cpp
===================================================================
--- tools/branches/gsoc2009-gui/degob_script.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/degob_script.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -21,6 +21,8 @@
*/
#include "degob_script.h"
+#include "common/endian.h"
+#include "common/util.h"
#include <stdarg.h>
#ifdef _MSC_VER
Modified: tools/branches/gsoc2009-gui/degob_script.h
===================================================================
--- tools/branches/gsoc2009-gui/degob_script.h 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/degob_script.h 2009-12-17 00:06:53 UTC (rev 46400)
@@ -23,9 +23,10 @@
#ifndef DEGOB_SCRIPT_H
#define DEGOB_SCRIPT_H
+#include "common/scummsys.h"
+
#include <string>
#include <list>
-#include "util.h"
#define _OPCODET(ver, x) TYPE_TEXTDESC, 0, #x
#define _OPCODEF(ver, x) TYPE_FUNCDESC, &ver::x, #x
Modified: tools/branches/gsoc2009-gui/degob_script_bargon.cpp
===================================================================
--- tools/branches/gsoc2009-gui/degob_script_bargon.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/degob_script_bargon.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -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)
Modified: tools/branches/gsoc2009-gui/degob_script_v1.cpp
===================================================================
--- tools/branches/gsoc2009-gui/degob_script_v1.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/degob_script_v1.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -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)
Modified: tools/branches/gsoc2009-gui/degob_script_v2.cpp
===================================================================
--- tools/branches/gsoc2009-gui/degob_script_v2.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/degob_script_v2.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -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)
Modified: tools/branches/gsoc2009-gui/degob_script_v3.cpp
===================================================================
--- tools/branches/gsoc2009-gui/degob_script_v3.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/degob_script_v3.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -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)
Modified: tools/branches/gsoc2009-gui/degob_script_v4.cpp
===================================================================
--- tools/branches/gsoc2009-gui/degob_script_v4.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/degob_script_v4.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -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)
Modified: tools/branches/gsoc2009-gui/degob_script_v5.cpp
===================================================================
--- tools/branches/gsoc2009-gui/degob_script_v5.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/degob_script_v5.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -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)
Modified: tools/branches/gsoc2009-gui/degob_script_v6.cpp
===================================================================
--- tools/branches/gsoc2009-gui/degob_script_v6.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/degob_script_v6.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -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)
Modified: tools/branches/gsoc2009-gui/desword2.cpp
===================================================================
--- tools/branches/gsoc2009-gui/desword2.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/desword2.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -20,7 +20,6 @@
*
*/
-#include "util.h"
#include "common/file.h"
enum {
Modified: tools/branches/gsoc2009-gui/encode_dxa.cpp
===================================================================
--- tools/branches/gsoc2009-gui/encode_dxa.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/encode_dxa.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -22,7 +22,7 @@
*/
#include "encode_dxa.h"
-#include "util.h"
+#include "common/endian.h"
#include <sys/stat.h>
#include <png.h>
Modified: tools/branches/gsoc2009-gui/extract_gob_stk.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_gob_stk.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/extract_gob_stk.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -20,8 +20,8 @@
*
*/
-#include "util.h"
#include "extract_gob_stk.h"
+#include "common/endian.h"
#define confSTK10 "STK10"
#define confSTK21 "STK21"
Modified: tools/branches/gsoc2009-gui/extract_loom_tg16.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_loom_tg16.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/extract_loom_tg16.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -20,7 +20,6 @@
*
*/
-#include "util.h"
#include <stdarg.h>
#include "extract_loom_tg16.h"
Modified: tools/branches/gsoc2009-gui/extract_mm_apple.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_mm_apple.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/extract_mm_apple.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -20,7 +20,6 @@
*
*/
-#include "util.h"
#include <stdarg.h>
#include "extract_mm_apple.h"
Modified: tools/branches/gsoc2009-gui/extract_mm_c64.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_mm_c64.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/extract_mm_c64.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -20,7 +20,6 @@
*
*/
-#include "util.h"
#include <stdarg.h>
#include "extract_mm_c64.h"
Modified: tools/branches/gsoc2009-gui/extract_mm_nes.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_mm_nes.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/extract_mm_nes.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -20,7 +20,6 @@
*
*/
-#include "util.h"
#include <stdarg.h>
#include "extract_mm_nes.h"
Modified: tools/branches/gsoc2009-gui/extract_parallaction.h
===================================================================
--- tools/branches/gsoc2009-gui/extract_parallaction.h 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/extract_parallaction.h 2009-12-17 00:06:53 UTC (rev 46400)
@@ -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);
Modified: tools/branches/gsoc2009-gui/extract_zak_c64.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_zak_c64.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/extract_zak_c64.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -20,7 +20,6 @@
*
*/
-#include "util.h"
#include <stdarg.h>
#include "extract_zak_c64.h"
Modified: tools/branches/gsoc2009-gui/gui/configuration.h
===================================================================
--- tools/branches/gsoc2009-gui/gui/configuration.h 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/gui/configuration.h 2009-12-17 00:06:53 UTC (rev 46400)
@@ -26,8 +26,7 @@
#include <wx/config.h>
#include <wx/filename.h>
-#include "../util.h"
-#include "../compress.h" // for AudioFormat
+#include "compress.h" // for AudioFormat
class ToolGUI;
Modified: tools/branches/gsoc2009-gui/tool.cpp
===================================================================
--- tools/branches/gsoc2009-gui/tool.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/tool.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -24,7 +24,6 @@
#include <iostream>
#include <sstream>
-#include "util.h"
#include "common/file.h"
#include "tool.h"
Deleted: tools/branches/gsoc2009-gui/util.h
===================================================================
--- tools/branches/gsoc2009-gui/util.h 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/util.h 2009-12-17 00:06:53 UTC (rev 46400)
@@ -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 <assert.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-#endif
Modified: tools/branches/gsoc2009-gui/utils/adpcm.cpp
===================================================================
--- tools/branches/gsoc2009-gui/utils/adpcm.cpp 2009-12-16 23:58:44 UTC (rev 46399)
+++ tools/branches/gsoc2009-gui/utils/adpcm.cpp 2009-12-17 00:06:53 UTC (rev 46400)
@@ -21,7 +21,7 @@
*/
#include "adpcm.h"
-#include "util.h"
+#include "common/endian.h"
namespace Audio {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list