[Scummvm-cvs-logs] SF.net SVN: scummvm:[47439] tools/trunk/engines/mohawk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Jan 22 15:26:03 CET 2010


Revision: 47439
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47439&view=rev
Author:   fingolfin
Date:     2010-01-22 14:26:03 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
Get rid of engines/mohawk/util.h

Modified Paths:
--------------
    tools/trunk/engines/mohawk/archive.h
    tools/trunk/engines/mohawk/utils/file.cpp
    tools/trunk/engines/mohawk/utils/stream.h

Removed Paths:
-------------
    tools/trunk/engines/mohawk/util.h

Modified: tools/trunk/engines/mohawk/archive.h
===================================================================
--- tools/trunk/engines/mohawk/archive.h	2010-01-22 14:14:28 UTC (rev 47438)
+++ tools/trunk/engines/mohawk/archive.h	2010-01-22 14:26:03 UTC (rev 47439)
@@ -24,7 +24,9 @@
 #define MOHAWK_ARCHIVE_H
 
 #include "common/str.h"
-#include "utils/stream.h"
+#include "common/endian.h"
+#include "common/util.h"
+#include "engines/mohawk/utils/stream.h"
 
 // Main FourCC's
 #define ID_MHWK MKID_BE('MHWK') // Main FourCC

Deleted: tools/trunk/engines/mohawk/util.h
===================================================================
--- tools/trunk/engines/mohawk/util.h	2010-01-22 14:14:28 UTC (rev 47438)
+++ tools/trunk/engines/mohawk/util.h	2010-01-22 14:26:03 UTC (rev 47439)
@@ -1,220 +0,0 @@
-/* Scumm Tools
- * Copyright (C) 2002-2006 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: https://scummvm.svn.sourceforge.net/svnroot/scummvm/tools/branches/gsoc2009-gui/util.h $
- * $Id: util.h 41441 2009-06-10 23:55:21Z Remere $
- *
- */
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#include "common/scummsys.h"
-
-#include <sys/stat.h>
-
-#if !defined(_MSC_VER)
-#include <unistd.h>
-#endif
-
-#ifdef WIN32
-#include <io.h>
-#include <process.h>
-#endif
-
-typedef uint32 uint;
-
-/*
- * Various utility macros
- */
-
-#if defined(_MSC_VER)
-
-	#define scumm_stricmp stricmp
-	#define scumm_strnicmp _strnicmp
-	#define snprintf _snprintf
-
-	#define SCUMM_LITTLE_ENDIAN
-	#pragma once
-	#pragma warning( disable : 4068 ) /* turn off "unknown pragma" warning */
-	#pragma warning( disable : 4996 ) /* turn off warnings about unsafe functions */
-
-#elif defined(__MINGW32__)
-
-	#define scumm_stricmp stricmp
-	#define scumm_strnicmp strnicmp
-
-	#define SCUMM_LITTLE_ENDIAN
-
-#elif defined(UNIX)
-
-	#define scumm_stricmp strcasecmp
-	#define scumm_strnicmp strncasecmp
-
-	#if defined(__DECCXX) /* Assume alpha architecture */
-	#define INVERSE_MKID
-	#define SCUMM_NEED_ALIGNMENT
-	#endif
-
-#else
-
-	#error No system type defined
-
-#endif
-
-
-/*
- * GCC specific stuff
- */
-#if defined(__GNUC__)
-	#define GCC_PACK __attribute__((packed))
-	#define NORETURN __attribute__((__noreturn__))
-#else
-	#define GCC_PACK
-#endif
-
-#if defined(INVERSE_MKID)
-#define MKID_BE(a) ((uint32) \
-		(((a) >> 24) & 0x000000FF) | \
-		(((a) >>  8) & 0x0000FF00) | \
-		(((a) <<  8) & 0x00FF0000) | \
-		(((a) << 24) & 0xFF000000))
-
-#else
-#  define MKID_BE(a) ((uint32)(a))
-#endif
-
-static inline uint32 SWAP_32(uint32 a) {
-	return ((a >> 24) & 0xFF) | ((a >> 8) & 0xFF00) | ((a << 8) & 0xFF0000) |
-		((a << 24) & 0xFF000000);
-}
-
-static inline uint16 SWAP_16(uint16 a) {
-	return ((a >> 8) & 0xFF) | ((a << 8) & 0xFF00);
-}
-
-#define FORCEINLINE static inline
-
-FORCEINLINE uint16 READ_LE_UINT16(const void *ptr) {
-	const byte *b = (const byte *)ptr;
-	return (b[1] << 8) + b[0];
-}
-FORCEINLINE uint32 READ_LE_UINT32(const void *ptr) {
-	const byte *b = (const byte *)ptr;
-	return (b[3] << 24) + (b[2] << 16) + (b[1] << 8) + (b[0]);
-}
-FORCEINLINE void WRITE_LE_UINT16(void *ptr, uint16 value) {
-	byte *b = (byte *)ptr;
-	b[0] = (byte)(value >> 0);
-	b[1] = (byte)(value >> 8);
-}
-FORCEINLINE void WRITE_LE_UINT32(void *ptr, uint32 value) {
-	byte *b = (byte *)ptr;
-	b[0] = (byte)(value >>  0);
-	b[1] = (byte)(value >>  8);
-	b[2] = (byte)(value >> 16);
-	b[3] = (byte)(value >> 24);
-}
-
-FORCEINLINE uint16 READ_BE_UINT16(const void *ptr) {
-	const byte *b = (const byte *)ptr;
-	return (b[0] << 8) + b[1];
-}
-FORCEINLINE uint32 READ_BE_UINT32(const void *ptr) {
-	const byte *b = (const byte *)ptr;
-	return (b[0] << 24) + (b[1] << 16) + (b[2] << 8) + (b[3]);
-}
-FORCEINLINE void WRITE_BE_UINT16(void *ptr, uint16 value) {
-	byte *b = (byte *)ptr;
-	b[0] = (byte)(value >> 8);
-	b[1] = (byte)(value >> 0);
-}
-FORCEINLINE void WRITE_BE_UINT32(void *ptr, uint32 value) {
-	byte *b = (byte *)ptr;
-	b[0] = (byte)(value >> 24);
-	b[1] = (byte)(value >> 16);
-	b[2] = (byte)(value >>  8);
-	b[3] = (byte)(value >>  0);
-}
-
-#if defined(__GNUC__)
-#define NORETURN_PRE
-#define NORETURN_POST	__attribute__((__noreturn__))
-#elif defined(_MSC_VER)
-#define NORETURN_PRE	_declspec(noreturn)
-#define NORETURN_POST
-#else
-#define NORETURN_PRE
-#define NORETURN_POST
-#endif
-
-
-/* File I/O */
-uint8 readByte(FILE *fp);
-uint16 readUint16BE(FILE *fp);
-uint16 readUint16LE(FILE *fp);
-uint32 readUint32BE(FILE *fp);
-uint32 readUint32LE(FILE *fp);
-void writeByte(FILE *fp, uint8 b);
-void writeUint16BE(FILE *fp, uint16 value);
-void writeUint16LE(FILE *fp, uint16 value);
-void writeUint32BE(FILE *fp, uint32 value);
-void writeUint32LE(FILE *fp, uint32 value);
-uint32 fileSize(FILE *fp);
-
-/* Misc stuff */
-void NORETURN_PRE error(const char *s, ...) NORETURN_POST;
-void warning(const char *s, ...);
-void debug(int level, const char *s, ...);
-void notice(const char *s, ...);
-
-struct Filename {
-	char _path[1024];
-
-	Filename(const char *path = "");
-	Filename(const Filename &path);
-	Filename& operator=(const Filename &fn);
-
-	void setFullPath(const char *path);
-	Filename *setFullName(const char *name);
-	void addExtension(const char *ext);
-	void setExtension(const char *ext);
-
-	bool hasExtension(const char *suffix) const;
-	bool empty() const;
-	bool equals(const Filename* other) const;
-	
-	// Doesn't work
-	bool mkdir(int permission = 077);
-
-	const char *getFullPath() const;
-	const char *getFullName() const;
-	const char *getFullName(char *out) const;
-	const char *getPath(char *out) const;
-};
-
-inline bool operator==(const Filename &f1, const Filename &f2){
-	return f1.equals(&f2);
-}
-
-void displayHelp(const char *msg = NULL, const char *exename = NULL);
-void parseHelpArguments(const char * const argv[], int argc, const char *msg = NULL);
-bool parseOutputFileArguments(Filename *outputname, const char * const argv[], int argc, int start_arg);
-bool parseOutputDirectoryArguments(Filename *outputname, const char * const argv[], int argc, int start_arg);
-
-
-#endif

Modified: tools/trunk/engines/mohawk/utils/file.cpp
===================================================================
--- tools/trunk/engines/mohawk/utils/file.cpp	2010-01-22 14:14:28 UTC (rev 47438)
+++ tools/trunk/engines/mohawk/utils/file.cpp	2010-01-22 14:26:03 UTC (rev 47439)
@@ -20,7 +20,8 @@
  *
  */
 
-#include "file.h"
+#include "common/util.h"
+#include "engines/mohawk/utils/file.h"
 
 
 namespace Common {

Modified: tools/trunk/engines/mohawk/utils/stream.h
===================================================================
--- tools/trunk/engines/mohawk/utils/stream.h	2010-01-22 14:14:28 UTC (rev 47438)
+++ tools/trunk/engines/mohawk/utils/stream.h	2010-01-22 14:26:03 UTC (rev 47439)
@@ -23,7 +23,7 @@
 #ifndef COMMON_STREAM_H
 #define COMMON_STREAM_H
 
-#include "../util.h"
+#include "common/scummsys.h"
 
 namespace Common {
 


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