[Scummvm-cvs-logs] SF.net SVN: scummvm: [21685] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 21685
Author:   fingolfin
Date:     2006-04-08 01:43:28 -0700 (Sat, 08 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21685&view=rev

Log Message:
-----------
Move some more bits into namespace Scumm

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/plugin.cpp
    scummvm/trunk/engines/scumm/plugin.h
Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp	2006-04-08 08:23:33 UTC (rev 21684)
+++ scummvm/trunk/engines/scumm/plugin.cpp	2006-04-08 08:43:28 UTC (rev 21685)
@@ -44,7 +44,7 @@
 #endif
 
 
-using namespace Scumm;
+namespace Scumm {
 
 #pragma mark -
 #pragma mark --- Data types & constants ---
@@ -838,12 +838,16 @@
 	return -1;
 }
 
+} // End of namespace Scumm
 
 #pragma mark -
 #pragma mark --- Plugin code ---
 #pragma mark -
 
 
+using namespace Scumm;
+
+
 GameList Engine_SCUMM_gameIDList() {
 	const PlainGameDescriptor *g = gameDescriptions;
 	GameList games;

Modified: scummvm/trunk/engines/scumm/plugin.h
===================================================================
--- scummvm/trunk/engines/scumm/plugin.h	2006-04-08 08:23:33 UTC (rev 21684)
+++ scummvm/trunk/engines/scumm/plugin.h	2006-04-08 08:43:28 UTC (rev 21685)
@@ -26,6 +26,8 @@
 
 #include "common/util.h"
 
+namespace Scumm {
+
 /**
  * Descriptor of a specific SCUMM game. Used internally to store
  * information about the tons of game variants that exist.
@@ -40,7 +42,6 @@
 
 };
 
-
 enum GenMethods {
 	kGenMac,
 	kGenMacNoParens,
@@ -55,8 +56,10 @@
 };
 
 
-extern bool applySubstResFileName(const SubstResFileNames &subst, const char *filename, char *buf, int bufsize);
-extern int findSubstResFileName(SubstResFileNames &subst, const char *filename, int index);
+bool applySubstResFileName(const SubstResFileNames &subst, const char *filename, char *buf, int bufsize);
+int findSubstResFileName(SubstResFileNames &subst, const char *filename, int index);
 
+} // End of namespace Scumm
 
+
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.