diff --git a/src/character.hpp b/src/character.hpp index ce78c7d..620e7f4 100644 --- a/src/character.hpp +++ b/src/character.hpp @@ -42,7 +42,7 @@ namespace cloonel { virtual void Draw ( void ) const; private: - SizeNotifiable m_screenRatio; + SizeNotifiable m_screenRatio; const std::unique_ptr m_texture; }; } //unnamed namespace diff --git a/src/platform.hpp b/src/platform.hpp index ed1c7ce..0e687b0 100644 --- a/src/platform.hpp +++ b/src/platform.hpp @@ -41,7 +41,7 @@ namespace cloonel { float2 BottomRight ( void ) const { return TopLeft() + m_size; } private: - SizeNotifiable m_screenRatio; + SizeNotifiable m_screenRatio; float2 m_size; Texture* m_surface; }; diff --git a/src/sizenotifiable.cpp b/src/sizenotifiable.cpp index c942fa0..3bba401 100644 --- a/src/sizenotifiable.cpp +++ b/src/sizenotifiable.cpp @@ -8,7 +8,7 @@ namespace cloonel { namespace implem { } //namespace implem - namespace regbehaviuors { + namespace regbehaviours { ///---------------------------------------------------------------------- ///---------------------------------------------------------------------- void AutoRegister::Register (SizeNotifiableBase* parNotifiable) { @@ -47,7 +47,7 @@ namespace cloonel { std::swap(m_registered, parOther.m_registered); #endif } - } //namespace regbehaviuors + } //namespace regbehaviours ///-------------------------------------------------------------------------- ///-------------------------------------------------------------------------- diff --git a/src/sizenotifiable.hpp b/src/sizenotifiable.hpp index c6382fb..8249bdc 100644 --- a/src/sizenotifiable.hpp +++ b/src/sizenotifiable.hpp @@ -29,7 +29,7 @@ namespace cloonel { class SDLMain; class SizeNotifiableBase; - namespace regbehaviuors { + namespace regbehaviours { class DontRegister { public: enum { SDLMAIN_NEEDED = false }; @@ -66,10 +66,7 @@ namespace cloonel { bool m_registered; #endif }; - } //namespace regbehaviuors - - namespace implem { - } //namespace implem + } //namespace regbehaviours class SizeNotifiableBase { protected: diff --git a/src/tiledwallpaper.hpp b/src/tiledwallpaper.hpp index a61b8d0..4ba4b6d 100644 --- a/src/tiledwallpaper.hpp +++ b/src/tiledwallpaper.hpp @@ -38,8 +38,8 @@ namespace cloonel { virtual void Draw ( void ) const; private: - class TileCountNotifiable : public SizeNotifiable { - typedef SizeNotifiable BaseClass; + class TileCountNotifiable : public SizeNotifiable { + typedef SizeNotifiable BaseClass; public: TileCountNotifiable ( SDLMain* parMain, const ushort2& parTileSize ); virtual ~TileCountNotifiable ( void ) noexcept = default;