Skip to content

Commit

Permalink
Refactor|IdTech1Converter: Renamed namespace wadimp as idtech1
Browse files Browse the repository at this point in the history
  • Loading branch information
danij-deng committed Jul 26, 2014
1 parent 76d44ce commit 32e82e9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions doomsday/plugins/idtech1converter/include/id1map.h
Expand Up @@ -30,7 +30,7 @@
#include <de/StringPool>
#include <QMap>

namespace wadimp {
namespace idtech1 {

class MaterialDict;

Expand Down Expand Up @@ -79,6 +79,6 @@ class Id1Map
DENG2_PRIVATE(d)
};

} // namespace wadimp
} // namespace idtech1

#endif // IDTECH1CONVERTER_ID1MAP_H
2 changes: 1 addition & 1 deletion doomsday/plugins/idtech1converter/include/version.h
Expand Up @@ -3,7 +3,7 @@
* @ingroup idtech1converter
*
* @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
* @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
* @authors Copyright © 2006-2014 Daniel Swanson <danij@dengine.net>
* @authors Copyright © 2006 Jamie Jones <jamie_jones_au@yahoo.com.au>
*
* @par License
Expand Down
12 changes: 6 additions & 6 deletions doomsday/plugins/idtech1converter/src/id1map.cpp
Expand Up @@ -33,7 +33,7 @@

using namespace de;

namespace wadimp {
namespace idtech1 {
namespace internal {

/// @todo kludge - remove me.
Expand Down Expand Up @@ -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;
};

Expand Down Expand Up @@ -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;
};

Expand Down Expand Up @@ -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;
};

Expand Down Expand Up @@ -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;
};
}
Expand Down Expand Up @@ -1235,4 +1235,4 @@ MaterialId Id1Map::toMaterialId(int uniqueId, MaterialGroup group)
return d->materials.toMaterialId(uniqueId, group);
}

} // namespace wadimp
} // namespace idtech1
2 changes: 1 addition & 1 deletion doomsday/plugins/idtech1converter/src/idtech1converter.cpp
Expand Up @@ -24,7 +24,7 @@
#include <de/Log>

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
Expand Down

0 comments on commit 32e82e9

Please sign in to comment.