[Scummvm-cvs-logs] SF.net SVN: scummvm:[52935] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Sep 28 22:30:50 CEST 2010
Revision: 52935
http://scummvm.svn.sourceforge.net/scummvm/?rev=52935&view=rev
Author: fingolfin
Date: 2010-09-28 20:30:50 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
ALL: Fixup some #define names
Modified Paths:
--------------
scummvm/trunk/backends/platform/symbian/src/ScummApp.h
scummvm/trunk/backends/platform/symbian/src/ScummVMApp.h
scummvm/trunk/backends/platform/symbian/src/SymbianOS.h
scummvm/trunk/backends/platform/wince/CEActionsPocket.h
scummvm/trunk/backends/platform/wince/CEActionsSmartphone.h
scummvm/trunk/backends/platform/wince/CEDevice.h
scummvm/trunk/backends/platform/wince/CELauncherDialog.h
scummvm/trunk/backends/platform/wince/CEScaler.h
scummvm/trunk/backends/platform/wince/CEgui/GUIElement.h
scummvm/trunk/backends/platform/wince/CEgui/ItemAction.h
scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.h
scummvm/trunk/backends/platform/wince/CEgui/Panel.h
scummvm/trunk/backends/platform/wince/CEgui/PanelItem.h
scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.h
scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.h
scummvm/trunk/backends/platform/wince/CEgui/Toolbar.h
scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.h
scummvm/trunk/backends/platform/wince/CEkeys/EventsBuffer.h
scummvm/trunk/engines/sci/resource.cpp
scummvm/trunk/gui/ThemeEval.h
scummvm/trunk/tools/create_lure/create_lure_dat.h
scummvm/trunk/tools/skycpt/KmpSearch.h
scummvm/trunk/tools/skycpt/TextFile.h
scummvm/trunk/tools/skycpt/stdafx.h
Modified: scummvm/trunk/backends/platform/symbian/src/ScummApp.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/ScummApp.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/symbian/src/ScummApp.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -22,8 +22,8 @@
* $Id$
*/
-#ifndef ScummAPPH
-#define ScummAPPH
+#ifndef SCUMMAPP_H
+#define SCUMMAPP_H
#include <eikapp.h>
#include <e32base.h>
Modified: scummvm/trunk/backends/platform/symbian/src/ScummVMApp.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/ScummVMApp.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/symbian/src/ScummVMApp.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef ScummVMapph
-#define ScummVMapph
+#ifndef SCUMMVMAPP_H
+#define SCUMMVMAPP_H
#include <eikapp.h>
#include <e32base.h>
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -22,8 +22,8 @@
* $Id$
*/
-#ifndef SDLSYMBIANH
-#define SDLSYMBIANH
+#ifndef SDLSYMBIAN_H
+#define SDLSYMBIAN_H
#include "backends/platform/sdl/sdl.h"
Modified: scummvm/trunk/backends/platform/wince/CEActionsPocket.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsPocket.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEActionsPocket.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEACTIONSPOCKET
-#define CEACTIONSPOCKET
+#ifndef CEACTIONSPOCKET_H
+#define CEACTIONSPOCKET_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEActionsSmartphone.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEActionsSmartphone.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEActionsSmartphone.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEACTIONSSMARTPHONE
-#define CEACTIONSSMARTPHONE
+#ifndef CEACTIONSSMARTPHONE_H
+#define CEACTIONSSMARTPHONE_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEDevice.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEDevice.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEDevice.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEDEVICE
-#define CEDEVICE
+#ifndef CEDEVICE_H
+#define CEDEVICE_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CELauncherDialog.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CELauncherDialog.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CELauncherDialog.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CELAUNCHERDIALOG
-#define CELAUNCHERDIALOG
+#ifndef CELAUNCHERDIALOG_H
+#define CELAUNCHERDIALOG_H
#include "base/plugins.h"
#include "common/fs.h"
Modified: scummvm/trunk/backends/platform/wince/CEScaler.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEScaler.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEScaler.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CESCALER
-#define CESCALER
+#ifndef CESCALER_H
+#define CESCALER_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/GUIElement.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/GUIElement.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEgui/GUIElement.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEGUI_GUIELEMENT
-#define CEGUI_GUIELEMENT
+#ifndef CEGUI_GUIELEMENT_H
+#define CEGUI_GUIELEMENT_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/ItemAction.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ItemAction.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEgui/ItemAction.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEGUI_ITEMACTION
-#define CEGUI_ITEMACTION
+#ifndef CEGUI_ITEMACTION_H
+#define CEGUI_ITEMACTION_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEGUI_ITEMSWITCH
-#define CEGUI_ITEMSWITCH
+#ifndef CEGUI_ITEMSWITCH_H
+#define CEGUI_ITEMSWITCH_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/Panel.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/Panel.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEgui/Panel.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEGUI_PANEL
-#define CEGUI_PANEL
+#ifndef CEGUI_PANEL_H
+#define CEGUI_PANEL_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/PanelItem.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/PanelItem.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEgui/PanelItem.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEGUI_PANELITEM
-#define CEGUI_PANELITEM
+#ifndef CEGUI_PANELITEM_H
+#define CEGUI_PANELITEM_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEgui/PanelKeyboard.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEGUI_PANELKEYBOARD
-#define CEGUI_PANELKEYBOARD
+#ifndef CEGUI_PANELKEYBOARD_H
+#define CEGUI_PANELKEYBOARD_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEgui/SDL_ImageResource.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEGUI_SDL_IMAGERESOURCE
-#define CEGUI_SDL_IMAGERESOURCE
+#ifndef CEGUI_SDL_IMAGERESOURCE_H
+#define CEGUI_SDL_IMAGERESOURCE_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/Toolbar.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/Toolbar.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEgui/Toolbar.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEGUI_TOOLBAR
-#define CEGUI_TOOLBAR
+#ifndef CEGUI_TOOLBAR_H
+#define CEGUI_TOOLBAR_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEgui/ToolbarHandler.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEGUI_TOOLBARHANDLER
-#define CEGUI_TOOLBARHANDLER
+#ifndef CEGUI_TOOLBARHANDLER_H
+#define CEGUI_TOOLBARHANDLER_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/backends/platform/wince/CEkeys/EventsBuffer.h
===================================================================
--- scummvm/trunk/backends/platform/wince/CEkeys/EventsBuffer.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/backends/platform/wince/CEkeys/EventsBuffer.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef CEKEYS_EVENTSBUFFER
-#define CEKEYS_EVENTSBUFFER
+#ifndef CEKEYS_EVENTSBUFFER_H
+#define CEKEYS_EVENTSBUFFER_H
#include "common/scummsys.h"
#include "common/system.h"
Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/engines/sci/resource.cpp 2010-09-28 20:30:50 UTC (rev 52935)
@@ -92,7 +92,7 @@
#undef SCI_REQUIRE_RESOURCE_FILES
-//#define SCI_VERBOSE_resMan 1
+//#define SCI_VERBOSE_RESMAN 1
static const char *sci_error_types[] = {
"No error",
@@ -908,7 +908,7 @@
}
_LRU.push_front(res);
_memoryLRU += res->size;
-#if SCI_VERBOSE_resMan
+#if SCI_VERBOSE_RESMAN
debug("Adding %s.%03d (%d bytes) to lru control: %d bytes total",
getResourceTypeName(res->type), res->number, res->size,
mgr->_memoryLRU);
@@ -939,7 +939,7 @@
Resource *goner = *_LRU.reverse_begin();
removeFromLRU(goner);
goner->unalloc();
-#ifdef SCI_VERBOSE_resMan
+#ifdef SCI_VERBOSE_RESMAN
printf("resMan-debug: LRU: Freeing %s.%03d (%d bytes)\n", getResourceTypeName(goner->type), goner->number, goner->size);
#endif
}
Modified: scummvm/trunk/gui/ThemeEval.h
===================================================================
--- scummvm/trunk/gui/ThemeEval.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/gui/ThemeEval.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef GUI_THEME_EVAL
-#define GUI_THEME_EVAL
+#ifndef GUI_THEME_EVAL_H
+#define GUI_THEME_EVAL_H
#include "common/scummsys.h"
#include "common/hashmap.h"
Modified: scummvm/trunk/tools/create_lure/create_lure_dat.h
===================================================================
--- scummvm/trunk/tools/create_lure/create_lure_dat.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/tools/create_lure/create_lure_dat.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef __CREATELURE_DAT__
-#define __CREATELURE_DAT__
+#ifndef CREATE_LURE_DAT_H
+#define CREATE_LURE_DAT_H
#include "common/endian.h"
#include "common/util.h"
Modified: scummvm/trunk/tools/skycpt/KmpSearch.h
===================================================================
--- scummvm/trunk/tools/skycpt/KmpSearch.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/tools/skycpt/KmpSearch.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef __KmpSearch__
-#define __KmpSearch__
+#ifndef SKYCPT_KMPSEARCH_H
+#define SKYCPT_KMPSEARCH_H
class KmpSearch {
public:
Modified: scummvm/trunk/tools/skycpt/TextFile.h
===================================================================
--- scummvm/trunk/tools/skycpt/TextFile.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/tools/skycpt/TextFile.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -23,8 +23,8 @@
*
*/
-#ifndef __TextFile__
-#define __TextFile__
+#ifndef SKYCPT_TEXTFILE_H
+#define SKYCPT_TEXTFILE_H
#include "stdafx.h"
#include <stdio.h>
Modified: scummvm/trunk/tools/skycpt/stdafx.h
===================================================================
--- scummvm/trunk/tools/skycpt/stdafx.h 2010-09-28 20:29:25 UTC (rev 52934)
+++ scummvm/trunk/tools/skycpt/stdafx.h 2010-09-28 20:30:50 UTC (rev 52935)
@@ -27,8 +27,8 @@
// oder projektspezifische Includedateien, die h\xE4ufig benutzt, aber
// in unregelm\xE4\xDFigen Abst\xE4nden ge\xE4ndert werden.
//
-#ifndef __STDAFX_H__
-#define __STDAFX_H__
+#ifndef SKYCPT_STDAFX_H
+#define SKYCPT_STDAFX_H
#ifdef _MSC_VER
#pragma once
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