diff options
| author | Einar Johan Trøan Sømåen | 2012-07-20 00:53:38 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-20 00:53:38 +0200 |
| commit | c648eb2b5ed80f12222556fd6c8a35b9c99dc0fc (patch) | |
| tree | 181296d8aa28833c25d66f5a1fc14d861c91203e | |
| parent | 3ad839b32c5e432e93058218db9139dfbe8b8c84 (diff) | |
| download | scummvm-rg350-c648eb2b5ed80f12222556fd6c8a35b9c99dc0fc.tar.gz scummvm-rg350-c648eb2b5ed80f12222556fd6c8a35b9c99dc0fc.tar.bz2 scummvm-rg350-c648eb2b5ed80f12222556fd6c8a35b9c99dc0fc.zip | |
WINTERMUTE: Move BFileEntry and BPackage into base/file
| -rw-r--r-- | engines/wintermute/base/BFileManager.cpp | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/BFileManager.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/file/BFileEntry.cpp (renamed from engines/wintermute/base/BFileEntry.cpp) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/file/BFileEntry.h (renamed from engines/wintermute/base/BFileEntry.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/base/file/BPackage.cpp (renamed from engines/wintermute/base/BPackage.cpp) | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/file/BPackage.h (renamed from engines/wintermute/base/BPackage.h) | 0 | ||||
| -rw-r--r-- | engines/wintermute/base/file/BPkgFile.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/file/BPkgFile.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/module.mk | 4 |
9 files changed, 9 insertions, 9 deletions
diff --git a/engines/wintermute/base/BFileManager.cpp b/engines/wintermute/base/BFileManager.cpp index 80b3d7a8df..35dde203c7 100644 --- a/engines/wintermute/base/BFileManager.cpp +++ b/engines/wintermute/base/BFileManager.cpp @@ -32,10 +32,10 @@ #include "engines/wintermute/utils/PathUtil.h"
#include "engines/wintermute/base/file/BDiskFile.h"
#include "engines/wintermute/base/file/BSaveThumbFile.h"
-#include "engines/wintermute/base/BFileEntry.h"
+#include "engines/wintermute/base/file/BFileEntry.h"
+#include "engines/wintermute/base/file/BPackage.h"
#include "engines/wintermute/base/file/BPkgFile.h"
#include "engines/wintermute/base/BResources.h"
-#include "engines/wintermute/base/BPackage.h"
#include "engines/wintermute/base/BRegistry.h"
#include "engines/wintermute/base/BGame.h"
#include "engines/wintermute/dcpackage.h"
diff --git a/engines/wintermute/base/BFileManager.h b/engines/wintermute/base/BFileManager.h index 8e7551480d..7ea9ff5611 100644 --- a/engines/wintermute/base/BFileManager.h +++ b/engines/wintermute/base/BFileManager.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BFILEMANAGER_H
#define WINTERMUTE_BFILEMANAGER_H
-#include "engines/wintermute/base/BFileEntry.h"
+#include "engines/wintermute/base/file/BFileEntry.h"
#include "common/archive.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/BFileEntry.cpp b/engines/wintermute/base/file/BFileEntry.cpp index 39223bfb8e..b00ecb6f9d 100644 --- a/engines/wintermute/base/BFileEntry.cpp +++ b/engines/wintermute/base/file/BFileEntry.cpp @@ -26,7 +26,7 @@ * Copyright (c) 2011 Jan Nedoma
*/
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BFileEntry.h"
+#include "engines/wintermute/base/file/BFileEntry.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BFileEntry.h b/engines/wintermute/base/file/BFileEntry.h index 5fdf2b6308..5fdf2b6308 100644 --- a/engines/wintermute/base/BFileEntry.h +++ b/engines/wintermute/base/file/BFileEntry.h diff --git a/engines/wintermute/base/BPackage.cpp b/engines/wintermute/base/file/BPackage.cpp index 020b7b902f..bddf1abc1e 100644 --- a/engines/wintermute/base/BPackage.cpp +++ b/engines/wintermute/base/file/BPackage.cpp @@ -27,7 +27,7 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BPackage.h"
+#include "engines/wintermute/base/file/BPackage.h"
#include "engines/wintermute/base/BGame.h"
#include "engines/wintermute/base/BFileManager.h"
#include "common/file.h"
diff --git a/engines/wintermute/base/BPackage.h b/engines/wintermute/base/file/BPackage.h index 8c803fddd9..8c803fddd9 100644 --- a/engines/wintermute/base/BPackage.h +++ b/engines/wintermute/base/file/BPackage.h diff --git a/engines/wintermute/base/file/BPkgFile.cpp b/engines/wintermute/base/file/BPkgFile.cpp index 7eafe7919e..b787851290 100644 --- a/engines/wintermute/base/file/BPkgFile.cpp +++ b/engines/wintermute/base/file/BPkgFile.cpp @@ -27,7 +27,7 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BPackage.h"
+#include "engines/wintermute/base/file/BPackage.h"
#include "engines/wintermute/base/file/BPkgFile.h"
#include "engines/wintermute/base/BGame.h"
#include "engines/wintermute/base/BFileManager.h"
diff --git a/engines/wintermute/base/file/BPkgFile.h b/engines/wintermute/base/file/BPkgFile.h index f8a5831485..dc8b4b684f 100644 --- a/engines/wintermute/base/file/BPkgFile.h +++ b/engines/wintermute/base/file/BPkgFile.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BPKGFILE_H
#define WINTERMUTE_BPKGFILE_H
-#include "engines/wintermute/base/BFileEntry.h"
+#include "engines/wintermute/base/file/BFileEntry.h"
namespace Common {
class SeekableReadStream;
diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk index ccda7ffffe..0063d072b1 100644 --- a/engines/wintermute/module.mk +++ b/engines/wintermute/module.mk @@ -40,6 +40,8 @@ MODULE_OBJS := \ base/scriptables/SXString.o \ base/file/BDiskFile.o \ base/file/BFile.o \ + base/file/BFileEntry.o \ + base/file/BPackage.o \ base/file/BSaveThumbFile.o \ base/file/BPkgFile.o \ base/font/BFontBitmap.o \ @@ -59,14 +61,12 @@ MODULE_OBJS := \ base/BDebugger.o \ base/BDynBuffer.o \ base/BFader.o \ - base/BFileEntry.o \ base/BFileManager.o \ base/BGame.o \ base/BFrame.o \ base/BKeyboardState.o \ base/BNamedObject.o \ base/BObject.o \ - base/BPackage.o \ base/BParser.o \ base/BPersistMgr.o \ base/BPoint.o \ |