From 32e82e99b43191aad34caee2ed5da9eac9279635 Mon Sep 17 00:00:00 2001 From: danij Date: Sun, 27 Jul 2014 00:25:57 +0100 Subject: [PATCH] Refactor|IdTech1Converter: Renamed namespace wadimp as idtech1 --- doomsday/plugins/idtech1converter/include/id1map.h | 4 ++-- doomsday/plugins/idtech1converter/include/version.h | 2 +- doomsday/plugins/idtech1converter/src/id1map.cpp | 12 ++++++------ .../idtech1converter/src/idtech1converter.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doomsday/plugins/idtech1converter/include/id1map.h b/doomsday/plugins/idtech1converter/include/id1map.h index a5855f8aeb..ae42812c6c 100644 --- a/doomsday/plugins/idtech1converter/include/id1map.h +++ b/doomsday/plugins/idtech1converter/include/id1map.h @@ -30,7 +30,7 @@ #include #include -namespace wadimp { +namespace idtech1 { class MaterialDict; @@ -79,6 +79,6 @@ class Id1Map DENG2_PRIVATE(d) }; -} // namespace wadimp +} // namespace idtech1 #endif // IDTECH1CONVERTER_ID1MAP_H diff --git a/doomsday/plugins/idtech1converter/include/version.h b/doomsday/plugins/idtech1converter/include/version.h index 66e6b1694c..215318b39d 100644 --- a/doomsday/plugins/idtech1converter/include/version.h +++ b/doomsday/plugins/idtech1converter/include/version.h @@ -3,7 +3,7 @@ * @ingroup idtech1converter * * @authors Copyright © 2003-2013 Jaakko Keränen - * @authors Copyright © 2006-2013 Daniel Swanson + * @authors Copyright © 2006-2014 Daniel Swanson * @authors Copyright © 2006 Jamie Jones * * @par License diff --git a/doomsday/plugins/idtech1converter/src/id1map.cpp b/doomsday/plugins/idtech1converter/src/id1map.cpp index c1ad00603d..1a97f10ab6 100644 --- a/doomsday/plugins/idtech1converter/src/id1map.cpp +++ b/doomsday/plugins/idtech1converter/src/id1map.cpp @@ -33,7 +33,7 @@ using namespace de; -namespace wadimp { +namespace idtech1 { namespace internal { /// @todo kludge - remove me. @@ -98,7 +98,7 @@ struct SideDef : public Id1MapElement break; default: - DENG2_ASSERT(!"wadimp::SideDef::read: unknown map format!"); + DENG2_ASSERT(!"idtech1::SideDef::read: unknown map format!"); break; }; @@ -206,7 +206,7 @@ struct LineDef : public Id1MapElement break; default: - DENG2_ASSERT(!"wadimp::LineDef::read: unknown map format!"); + DENG2_ASSERT(!"idtech1::LineDef::read: unknown map format!"); break; }; @@ -334,7 +334,7 @@ struct SectorDef : public Id1MapElement break; } default: - DENG2_ASSERT(!"wadimp::SectorDef::read: unknown map format!"); + DENG2_ASSERT(!"idtech1::SectorDef::read: unknown map format!"); break; }; @@ -564,7 +564,7 @@ struct Thing : public Id1MapElement break; } default: - DENG2_ASSERT(!"wadimp::Thing::read: unknown map format!"); + DENG2_ASSERT(!"idtech1::Thing::read: unknown map format!"); break; }; } @@ -1235,4 +1235,4 @@ MaterialId Id1Map::toMaterialId(int uniqueId, MaterialGroup group) return d->materials.toMaterialId(uniqueId, group); } -} // namespace wadimp +} // namespace idtech1 diff --git a/doomsday/plugins/idtech1converter/src/idtech1converter.cpp b/doomsday/plugins/idtech1converter/src/idtech1converter.cpp index cdcc2c4436..deb0d1e5b1 100644 --- a/doomsday/plugins/idtech1converter/src/idtech1converter.cpp +++ b/doomsday/plugins/idtech1converter/src/idtech1converter.cpp @@ -24,7 +24,7 @@ #include using namespace de; -using namespace wadimp; +using namespace idtech1; /** * This function will be called when Doomsday is asked to load a map that is not