From 630cf85d4b57aba04c1112a7ebda852eed6e61c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sat, 5 Mar 2016 04:51:21 -0300 Subject: [PATCH] Minor refactoring. --- include/eepp/gaming/tilemap.hpp | 6 +-- include/eepp/graphics/particle.hpp | 12 ++--- .../eepp/graphics/renderer/renderergl3.hpp | 4 +- .../eepp/graphics/renderer/renderergl3cp.hpp | 4 +- .../eepp/graphics/renderer/renderergles2.hpp | 4 +- include/eepp/graphics/sprite.hpp | 4 +- include/eepp/math/polygon2.hpp | 38 +++++++-------- include/eepp/network/http.hpp | 8 ++-- include/eepp/physics/physicsmanager.hpp | 8 ++-- include/eepp/system/lock.hpp | 4 +- src/eepp/gaming/tilemap.cpp | 2 +- src/eepp/graphics/renderer/renderergl3.cpp | 2 +- src/eepp/graphics/renderer/renderergl3cp.cpp | 2 +- src/eepp/graphics/renderer/renderergles2.cpp | 2 +- src/eepp/graphics/renderer/rendererhelper.hpp | 2 +- src/eepp/graphics/sprite.cpp | 2 +- src/eepp/network/http.cpp | 14 +++--- src/eepp/physics/physicsmanager.cpp | 2 +- src/eepp/physics/space.cpp | 2 +- src/eepp/window/backend/SDL/windowsdl.cpp | 6 +-- src/eepp/window/backend/SDL2/windowsdl2.cpp | 6 +-- src/eepp/window/backend/SFML/windowsfml.cpp | 6 +-- src/eepp/window/platform/null/nullimpl.cpp | 40 ++++++++-------- src/eepp/window/platform/null/nullimpl.hpp | 10 ++-- src/eepp/window/platform/osx/osximpl.cpp | 40 ++++++++-------- src/eepp/window/platform/osx/osximpl.hpp | 6 +-- src/eepp/window/platform/win/cursorwin.cpp | 4 +- src/eepp/window/platform/win/cursorwin.hpp | 6 +-- src/eepp/window/platform/win/winimpl.cpp | 42 ++++++++--------- src/eepp/window/platform/win/winimpl.hpp | 6 +-- src/eepp/window/platform/x11/cursorx11.cpp | 4 +- src/eepp/window/platform/x11/cursorx11.hpp | 6 +-- src/eepp/window/platform/x11/x11impl.cpp | 46 +++++++++---------- src/eepp/window/platform/x11/x11impl.hpp | 6 +-- src/eepp/window/window.cpp | 2 +- src/examples/physics/physics.cpp | 4 +- src/test/eetest.cpp | 2 +- 37 files changed, 182 insertions(+), 182 deletions(-) diff --git a/include/eepp/gaming/tilemap.hpp b/include/eepp/gaming/tilemap.hpp index 4d62e2ba8..824b1a6b1 100644 --- a/include/eepp/gaming/tilemap.hpp +++ b/include/eepp/gaming/tilemap.hpp @@ -227,10 +227,10 @@ class EE_API TileMap { protected: friend class EE::Gaming::Private::UIMapNew; - class cForcedHeaders + class ForcedHeaders { public: - cForcedHeaders( Sizei mapSize, Sizei tileSize, Uint32 numLayers, Uint32 flags ) : + ForcedHeaders( Sizei mapSize, Sizei tileSize, Uint32 numLayers, Uint32 flags ) : MapSize( mapSize ), TileSize( tileSize ), NumLayers( numLayers ), @@ -282,7 +282,7 @@ class EE_API TileMap { Vector2f mOffscale; Uint32 mLastObjId; PolyObjMap mPolyObjs; - cForcedHeaders* mForcedHeaders; + ForcedHeaders* mForcedHeaders; virtual GameObject * CreateGameObject( const Uint32& Type, const Uint32& Flags, MapLayer * Layer, const Uint32& DataId = 0 ); diff --git a/include/eepp/graphics/particle.hpp b/include/eepp/graphics/particle.hpp index 0b85835d1..1f2589064 100755 --- a/include/eepp/graphics/particle.hpp +++ b/include/eepp/graphics/particle.hpp @@ -47,18 +47,18 @@ class EE_API Particle{ void Size(const Float size) { if (size>0) mSize = size; } Float Size() const { return mSize; } - void Used(const bool used) { cUsed = used; } - bool Used() const { return cUsed; } + void Used(const bool used) { mUsed = used; } + bool Used() const { return mUsed; } - void Id(const Uint32 Id) { cId = Id; } - Uint32 Id() const { return cId; } + void Id(const Uint32 Id) { mId = Id; } + Uint32 Id() const { return mId; } private: Float mX, mY; ColorAf mColor; Float mXSpeed, mYSpeed, mXAcc, mYAcc, mAlphaDecay, mSize; - bool cUsed; - Uint32 cId; + bool mUsed; + Uint32 mId; }; }} diff --git a/include/eepp/graphics/renderer/renderergl3.hpp b/include/eepp/graphics/renderer/renderergl3.hpp index c98a2bfc6..836125717 100644 --- a/include/eepp/graphics/renderer/renderergl3.hpp +++ b/include/eepp/graphics/renderer/renderergl3.hpp @@ -13,7 +13,7 @@ enum EEGL3_SHADERS { }; namespace Private { -class cMatrixStack; +class MatrixStack; } class EE_API RendererGL3 : public cGL { @@ -102,7 +102,7 @@ class EE_API RendererGL3 : public cGL { void ReloadCurrentShader(); protected: - Private::cMatrixStack * mStack; + Private::MatrixStack * mStack; int mProjectionMatrix_id; // cpu-side hook to shader uniform int mModelViewMatrix_id; // cpu-side hook to shader uniform unsigned int mCurrentMode; diff --git a/include/eepp/graphics/renderer/renderergl3cp.hpp b/include/eepp/graphics/renderer/renderergl3cp.hpp index 8a1947f91..2c50c338a 100644 --- a/include/eepp/graphics/renderer/renderergl3cp.hpp +++ b/include/eepp/graphics/renderer/renderergl3cp.hpp @@ -13,7 +13,7 @@ enum EEGL3CP_SHADERS { }; namespace Private { -class cMatrixStack; +class MatrixStack; } class EE_API RendererGL3CP : public cGL { @@ -104,7 +104,7 @@ class EE_API RendererGL3CP : public cGL { void ReloadCurrentShader(); protected: - Private::cMatrixStack * mStack; + Private::MatrixStack * mStack; int mProjectionMatrix_id; // cpu-side hook to shader uniform int mModelViewMatrix_id; // cpu-side hook to shader uniform unsigned int mCurrentMode; diff --git a/include/eepp/graphics/renderer/renderergles2.hpp b/include/eepp/graphics/renderer/renderergles2.hpp index aaa4b25bc..44ce6b1d2 100644 --- a/include/eepp/graphics/renderer/renderergles2.hpp +++ b/include/eepp/graphics/renderer/renderergles2.hpp @@ -16,7 +16,7 @@ enum EEGLES2_SHADERS { }; namespace Private { -class cMatrixStack; +class MatrixStack; } class EE_API RendererGLES2 : public cGL { @@ -105,7 +105,7 @@ class EE_API RendererGLES2 : public cGL { void ReloadCurrentShader(); protected: - Private::cMatrixStack * mStack; + Private::MatrixStack * mStack; int mProjectionMatrix_id; // cpu-side hook to shader uniform int mModelViewMatrix_id; // cpu-side hook to shader uniform unsigned int mCurrentMode; diff --git a/include/eepp/graphics/sprite.hpp b/include/eepp/graphics/sprite.hpp index 83b39ce70..2e5e87f8d 100755 --- a/include/eepp/graphics/sprite.hpp +++ b/include/eepp/graphics/sprite.hpp @@ -382,11 +382,11 @@ class EE_API Sprite { SpriteCallback mCb; void * mUserData; - class cFrame { + class Frame { public: std::vector Spr; }; - std::vector mFrames; + std::vector mFrames; unsigned int FramePos(); diff --git a/include/eepp/math/polygon2.hpp b/include/eepp/math/polygon2.hpp index 262dbbf7a..c00235076 100755 --- a/include/eepp/math/polygon2.hpp +++ b/include/eepp/math/polygon2.hpp @@ -63,25 +63,25 @@ class Polygon2 { std::size_t Size() const; /** @return The position of the polygon ( also known as the offset of the polygon ) */ - Vector2 Position() { return Vector2(cOffsetX, cOffsetY); } + Vector2 Position() { return Vector2(OffsetX, OffsetY); } /** Move the polygon Vector2s, add to every point the distance specified */ void Move( Vector2 dist ); /** @return The X position of the polygon ( the X-axis Offset ) */ - T X() const { return cOffsetX; } + T X() const { return OffsetX; } /** @return The Y position of the polygon ( the Y-axis Offset ) */ - T Y() const { return cOffsetY; } + T Y() const { return OffsetY; } /** @return The position of the polygon ( the offset )*/ - void Position( const Vector2& V ) { cOffsetX = V.x; cOffsetY = V.y; } + void Position( const Vector2& V ) { OffsetX = V.x; OffsetY = V.y; } /** Set the new position of the x-axis ( the x-axis offset ) */ - T X( const T& x ) { cOffsetX = x; } + T X( const T& x ) { OffsetX = x; } /** Set the new position of the y-axis ( the y-axis offset ) */ - T Y( const T& y ) { cOffsetY = y; } + T Y( const T& y ) { OffsetY = y; } /** @return True if the polygons intersect */ bool Intersect( const Polygon2& p1 ); @@ -118,13 +118,13 @@ class Polygon2 { Uint32 ClosestPoint( const Vector2 &to, T * distance = NULL ); private: std::vector< Vector2 > Vector; - T cOffsetX, cOffsetY; + T OffsetX, OffsetY; }; template Polygon2::Polygon2() : - cOffsetX(0), - cOffsetY(0) + OffsetX(0), + OffsetY(0) { Clear(); } @@ -132,31 +132,31 @@ Polygon2::Polygon2() : template Polygon2::Polygon2( const Polygon2& fromPoly ) : Vector( fromPoly.Vector ), - cOffsetX( fromPoly.cOffsetX ), - cOffsetY( fromPoly.cOffsetY ) + OffsetX( fromPoly.OffsetX ), + OffsetY( fromPoly.OffsetY ) { } template -Polygon2::Polygon2( const std::vector< Vector2 >& theVecs ) : cOffsetX(0), cOffsetY(0) { +Polygon2::Polygon2( const std::vector< Vector2 >& theVecs ) : OffsetX(0), OffsetY(0) { for (Uint32 i = 0; i < theVecs.size(); i++) PushBack ( theVecs[i] ); } template -Polygon2::Polygon2( const Triangle2& fromTrig ) : cOffsetX(0), cOffsetY(0) { +Polygon2::Polygon2( const Triangle2& fromTrig ) : OffsetX(0), OffsetY(0) { for (Uint8 i = 0; i < 3; i++) PushBack ( fromTrig.V[i] ); } template -Polygon2::Polygon2( const Quad2& fromQuad ) : cOffsetX(0), cOffsetY(0) { +Polygon2::Polygon2( const Quad2& fromQuad ) : OffsetX(0), OffsetY(0) { for (Uint8 i = 0; i < 4; i++) PushBack ( fromQuad.V[i] ); } template -Polygon2::Polygon2( const tRECT& fromRect ) : cOffsetX(0), cOffsetY(0) { +Polygon2::Polygon2( const tRECT& fromRect ) : OffsetX(0), OffsetY(0) { Vector.push_back( Vector2( fromRect.Left, fromRect.Top ) ); Vector.push_back( Vector2( fromRect.Left, fromRect.Bottom ) ); Vector.push_back( Vector2( fromRect.Right, fromRect.Bottom ) ); @@ -412,10 +412,10 @@ tRECT Polygon2::ToAABB() { if ( MaxY < Vector[i].y ) MaxY = Vector[i].y; } - TmpR.Left = MinX + cOffsetX; - TmpR.Right = MaxX + cOffsetX; - TmpR.Top = MinY + cOffsetY; - TmpR.Bottom = MaxY + cOffsetY; + TmpR.Left = MinX + OffsetX; + TmpR.Right = MaxX + OffsetX; + TmpR.Top = MinY + OffsetY; + TmpR.Bottom = MaxY + OffsetY; return TmpR; } diff --git a/include/eepp/network/http.hpp b/include/eepp/network/http.hpp index a8aa6e272..ef7b7e775 100644 --- a/include/eepp/network/http.hpp +++ b/include/eepp/network/http.hpp @@ -289,9 +289,9 @@ class EE_API Http : NonCopyable { /** @return The host port */ const unsigned short& GetPort() const; private: - class cAsyncRequest : public Thread { + class AsyncRequest : public Thread { public: - cAsyncRequest( Http * http, AsyncResponseCallback cb, Http::Request request, Time timeout ); + AsyncRequest( Http * http, AsyncResponseCallback cb, Http::Request request, Time timeout ); void Run(); protected: @@ -302,12 +302,12 @@ class EE_API Http : NonCopyable { Time mTimeout; bool mRunning; }; - friend class cAsyncRequest; + friend class AsyncRequest; ThreadLocalPtr mConnection; ///< Connection to the host IpAddress mHost; ///< Web host address std::string mHostName; ///< Web host name unsigned short mPort; ///< Port used for connection with host - std::list mThreads; + std::list mThreads; Mutex mThreadsMutex; bool mIsSSL; diff --git a/include/eepp/physics/physicsmanager.hpp b/include/eepp/physics/physicsmanager.hpp index c586f5e73..8c14fdfd3 100644 --- a/include/eepp/physics/physicsmanager.hpp +++ b/include/eepp/physics/physicsmanager.hpp @@ -14,9 +14,9 @@ class CP_API PhysicsManager { SINGLETON_DECLARE_HEADERS(PhysicsManager) public: - class cDrawSpaceOptions { + class DrawSpaceOptions { public: - cDrawSpaceOptions() : + DrawSpaceOptions() : DrawBBs( false ), DrawShapes( true ), #ifdef EE_GLES @@ -47,9 +47,9 @@ class CP_API PhysicsManager { const bool& MemoryManager() const; - PhysicsManager::cDrawSpaceOptions * GetDrawOptions(); + PhysicsManager::DrawSpaceOptions * GetDrawOptions(); protected: - cDrawSpaceOptions mOptions; + DrawSpaceOptions mOptions; friend class Body; friend class Shape; diff --git a/include/eepp/system/lock.hpp b/include/eepp/system/lock.hpp index 8b187eafd..8e6fc133c 100644 --- a/include/eepp/system/lock.hpp +++ b/include/eepp/system/lock.hpp @@ -12,12 +12,12 @@ class Mutex; class EE_API Lock : NonCopyable { public : /** @brief Construct the lock with a target mutex - * The mutex passed to cLock is automatically locked. + * The mutex passed to Lock is automatically locked. * @param mutex Mutex to lock */ explicit Lock( Mutex& mutex ); /** @brief Destructor - * The destructor of cLock automatically unlocks its mutex. */ + * The destructor of Lock automatically unlocks its mutex. */ ~Lock(); private : Mutex& mMutex; ///< Mutex to lock / unlock diff --git a/src/eepp/gaming/tilemap.cpp b/src/eepp/gaming/tilemap.cpp index d6e1c70e9..264f34401 100644 --- a/src/eepp/gaming/tilemap.cpp +++ b/src/eepp/gaming/tilemap.cpp @@ -66,7 +66,7 @@ void TileMap::Reset() { void TileMap::ForceHeadersOnLoad( Sizei mapSize, Sizei tileSize, Uint32 numLayers, Uint32 flags ) { DisableForcedHeaders(); - mForcedHeaders = eeNew( cForcedHeaders, ( mapSize, tileSize, numLayers, flags ) ); + mForcedHeaders = eeNew( ForcedHeaders, ( mapSize, tileSize, numLayers, flags ) ); } void TileMap::DisableForcedHeaders() { diff --git a/src/eepp/graphics/renderer/renderergl3.cpp b/src/eepp/graphics/renderer/renderergl3.cpp index 1b8b15c39..71c843d06 100644 --- a/src/eepp/graphics/renderer/renderergl3.cpp +++ b/src/eepp/graphics/renderer/renderergl3.cpp @@ -63,7 +63,7 @@ RendererGL3::RendererGL3() : mQuadVertexs = 6; #endif - mStack = eeNew( cMatrixStack, () ); + mStack = eeNew( MatrixStack, () ); mStack->mProjectionMatrix.push ( glm::mat4( 1.0f ) ); // identity matrix mStack->mModelViewMatrix.push ( glm::mat4( 1.0f ) ); // identity matrix diff --git a/src/eepp/graphics/renderer/renderergl3cp.cpp b/src/eepp/graphics/renderer/renderergl3cp.cpp index 9a75a142c..af8f5255b 100644 --- a/src/eepp/graphics/renderer/renderergl3cp.cpp +++ b/src/eepp/graphics/renderer/renderergl3cp.cpp @@ -75,7 +75,7 @@ RendererGL3CP::RendererGL3CP() : mQuadsSupported = false; mQuadVertexs = 6; - mStack = eeNew( cMatrixStack, () ); + mStack = eeNew( MatrixStack, () ); mStack->mProjectionMatrix.push ( glm::mat4( 1.0f ) ); // identity matrix mStack->mModelViewMatrix.push ( glm::mat4( 1.0f ) ); // identity matrix } diff --git a/src/eepp/graphics/renderer/renderergles2.cpp b/src/eepp/graphics/renderer/renderergles2.cpp index 72afe30ac..6a778ea45 100644 --- a/src/eepp/graphics/renderer/renderergles2.cpp +++ b/src/eepp/graphics/renderer/renderergles2.cpp @@ -63,7 +63,7 @@ const GLchar * EEGLES2_SHADER_PRIMITIVE_FS = #include "shaders/primitive.frag" RendererGLES2::RendererGLES2() : - mStack( eeNew( cMatrixStack, () ) ), + mStack( eeNew( MatrixStack, () ) ), mProjectionMatrix_id(0), mModelViewMatrix_id(0), mCurrentMode(0), diff --git a/src/eepp/graphics/renderer/rendererhelper.hpp b/src/eepp/graphics/renderer/rendererhelper.hpp index 175666faa..7512870f6 100644 --- a/src/eepp/graphics/renderer/rendererhelper.hpp +++ b/src/eepp/graphics/renderer/rendererhelper.hpp @@ -20,7 +20,7 @@ static glm::mat4 toGLMmat4( const float * m ) { return Result; } -class cMatrixStack +class MatrixStack { public: std::stack mProjectionMatrix; // cpu-side diff --git a/src/eepp/graphics/sprite.cpp b/src/eepp/graphics/sprite.cpp index 6dbd7e341..0a06bc4f7 100755 --- a/src/eepp/graphics/sprite.cpp +++ b/src/eepp/graphics/sprite.cpp @@ -331,7 +331,7 @@ void Sprite::DisableVertexColors() { } unsigned int Sprite::FramePos() { - mFrames.push_back( cFrame() ); + mFrames.push_back( Frame() ); return (unsigned int)mFrames.size() - 1; } diff --git a/src/eepp/network/http.cpp b/src/eepp/network/http.cpp index e6b649d35..406e3896f 100644 --- a/src/eepp/network/http.cpp +++ b/src/eepp/network/http.cpp @@ -237,7 +237,7 @@ Http::Http(const std::string& host, unsigned short port, bool useSSL) : } Http::~Http() { - std::list::iterator itt; + std::list::iterator itt; // First we wait to finish any request pending for ( itt = mThreads.begin(); itt != mThreads.end(); itt++ ) { @@ -359,7 +359,7 @@ Http::Response Http::SendRequest(const Http::Request& request, Time timeout) { return received; } -Http::cAsyncRequest::cAsyncRequest(Http *http, AsyncResponseCallback cb, Http::Request request, Time timeout) : +Http::AsyncRequest::AsyncRequest(Http *http, AsyncResponseCallback cb, Http::Request request, Time timeout) : mHttp( http ), mCb( cb ), mRequest( request ), @@ -368,7 +368,7 @@ Http::cAsyncRequest::cAsyncRequest(Http *http, AsyncResponseCallback cb, Http::R { } -void Http::cAsyncRequest::Run() { +void Http::AsyncRequest::Run() { Http::Response response = mHttp->SendRequest( mRequest, mTimeout ); mCb( *mHttp, mRequest, response ); @@ -382,12 +382,12 @@ void Http::cAsyncRequest::Run() { } void Http::RemoveOldThreads() { - std::list remove; + std::list remove; - std::list::iterator it = mThreads.begin(); + std::list::iterator it = mThreads.begin(); for ( ; it != mThreads.end(); it++ ) { - cAsyncRequest * ar = (*it); + AsyncRequest * ar = (*it); if ( !ar->mRunning ) { // We need to be sure, since the state is set in the thread, this will not block the thread anyway @@ -405,7 +405,7 @@ void Http::RemoveOldThreads() { } void Http::SendAsyncRequest( AsyncResponseCallback cb, const Http::Request& request, Time timeout ) { - cAsyncRequest * thread = eeNew( cAsyncRequest, ( this, cb, request, timeout ) ); + AsyncRequest * thread = eeNew( AsyncRequest, ( this, cb, request, timeout ) ); thread->Launch(); diff --git a/src/eepp/physics/physicsmanager.cpp b/src/eepp/physics/physicsmanager.cpp index 46f711db5..d595ec931 100644 --- a/src/eepp/physics/physicsmanager.cpp +++ b/src/eepp/physics/physicsmanager.cpp @@ -36,7 +36,7 @@ PhysicsManager::~PhysicsManager() { } } -PhysicsManager::cDrawSpaceOptions * PhysicsManager::GetDrawOptions() { +PhysicsManager::DrawSpaceOptions * PhysicsManager::GetDrawOptions() { return &mOptions; } diff --git a/src/eepp/physics/space.cpp b/src/eepp/physics/space.cpp index eee43212d..761d4dbdb 100644 --- a/src/eepp/physics/space.cpp +++ b/src/eepp/physics/space.cpp @@ -290,7 +290,7 @@ void Space::Draw() { BatchRenderer * BR = GlobalBatchRenderer::instance(); BR->SetBlendMode( ALPHA_NORMAL ); - PhysicsManager::cDrawSpaceOptions * options = PhysicsManager::instance()->GetDrawOptions(); + PhysicsManager::DrawSpaceOptions * options = PhysicsManager::instance()->GetDrawOptions(); cpFloat lw = BR->GetLineWidth(); cpFloat ps = BR->GetPointSize(); diff --git a/src/eepp/window/backend/SDL/windowsdl.cpp b/src/eepp/window/backend/SDL/windowsdl.cpp index 88c30b917..eb4e6c179 100644 --- a/src/eepp/window/backend/SDL/windowsdl.cpp +++ b/src/eepp/window/backend/SDL/windowsdl.cpp @@ -178,11 +178,11 @@ void WindowSDL::CreatePlatform() { #endif #if defined( EE_X11_PLATFORM ) - mPlatform = eeNew( Platform::cX11Impl, ( this, mWMinfo->info.x11.display, mWMinfo->info.x11.wmwindow, mWMinfo->info.x11.window, mWMinfo->info.x11.lock_func, mWMinfo->info.x11.unlock_func ) ); + mPlatform = eeNew( Platform::X11Impl, ( this, mWMinfo->info.x11.display, mWMinfo->info.x11.wmwindow, mWMinfo->info.x11.window, mWMinfo->info.x11.lock_func, mWMinfo->info.x11.unlock_func ) ); #elif EE_PLATFORM == EE_PLATFORM_WIN - mPlatform = eeNew( Platform::cWinImpl, ( this, GetWindowHandler() ) ); + mPlatform = eeNew( Platform::WinImpl, ( this, GetWindowHandler() ) ); #elif EE_PLATFORM == EE_PLATFORM_MACOSX - mPlatform = eeNew( Platform::cOSXImpl, ( this ) ); + mPlatform = eeNew( Platform::OSXImpl, ( this ) ); #else Window::CreatePlatform(); #endif diff --git a/src/eepp/window/backend/SDL2/windowsdl2.cpp b/src/eepp/window/backend/SDL2/windowsdl2.cpp index 1915ccf40..fea6fbe90 100644 --- a/src/eepp/window/backend/SDL2/windowsdl2.cpp +++ b/src/eepp/window/backend/SDL2/windowsdl2.cpp @@ -306,11 +306,11 @@ void WindowSDL::CreatePlatform() { #endif #if defined( EE_X11_PLATFORM ) - mPlatform = eeNew( Platform::cX11Impl, ( this, mWMinfo->GetWindowHandler(), mWMinfo->GetWindow(), mWMinfo->GetWindow(), NULL, NULL ) ); + mPlatform = eeNew( Platform::X11Impl, ( this, mWMinfo->GetWindowHandler(), mWMinfo->GetWindow(), mWMinfo->GetWindow(), NULL, NULL ) ); #elif EE_PLATFORM == EE_PLATFORM_WIN - mPlatform = eeNew( Platform::cWinImpl, ( this, GetWindowHandler() ) ); + mPlatform = eeNew( Platform::WinImpl, ( this, GetWindowHandler() ) ); #elif EE_PLATFORM == EE_PLATFORM_MACOSX - mPlatform = eeNew( Platform::cOSXImpl, ( this ) ); + mPlatform = eeNew( Platform::OSXImpl, ( this ) ); #else Window::CreatePlatform(); #endif diff --git a/src/eepp/window/backend/SFML/windowsfml.cpp b/src/eepp/window/backend/SFML/windowsfml.cpp index 66caf5338..b8813314e 100644 --- a/src/eepp/window/backend/SFML/windowsfml.cpp +++ b/src/eepp/window/backend/SFML/windowsfml.cpp @@ -99,14 +99,14 @@ std::string WindowSFML::GetVersion() { void WindowSFML::CreatePlatform() { #if defined( EE_X11_PLATFORM ) if ( 0 != GetWindowHandler() ) { - mPlatform = eeNew( Platform::cX11Impl, ( this, GetWindowHandler(), mSFMLWindow.getSystemHandle(), mSFMLWindow.getSystemHandle(), NULL, NULL ) ); + mPlatform = eeNew( Platform::X11Impl, ( this, GetWindowHandler(), mSFMLWindow.getSystemHandle(), mSFMLWindow.getSystemHandle(), NULL, NULL ) ); } else { Window::CreatePlatform(); } #elif EE_PLATFORM == EE_PLATFORM_WIN - mPlatform = eeNew( Platform::cWinImpl, ( this, GetWindowHandler() ) ); + mPlatform = eeNew( Platform::WinImpl, ( this, GetWindowHandler() ) ); #elif EE_PLATFORM == EE_PLATFORM_MACOSX - mPlatform = eeNew( Platform::cOSXImpl, ( this ) ); + mPlatform = eeNew( Platform::OSXImpl, ( this ) ); #else Window::CreatePlatform(); #endif diff --git a/src/eepp/window/platform/null/nullimpl.cpp b/src/eepp/window/platform/null/nullimpl.cpp index 698fe47e2..8f0888e52 100644 --- a/src/eepp/window/platform/null/nullimpl.cpp +++ b/src/eepp/window/platform/null/nullimpl.cpp @@ -2,71 +2,71 @@ namespace EE { namespace Window { namespace Platform { -cNullImpl::cNullImpl( EE::Window::Window * window ) : +NullImpl::NullImpl( EE::Window::Window * window ) : PlatformImpl( window ) { } -cNullImpl::~cNullImpl() { +NullImpl::~NullImpl() { } -void cNullImpl::MinimizeWindow() { +void NullImpl::MinimizeWindow() { } -void cNullImpl::MaximizeWindow() { +void NullImpl::MaximizeWindow() { } -bool cNullImpl::IsWindowMaximized() { +bool NullImpl::IsWindowMaximized() { return false; } -void cNullImpl::HideWindow() { +void NullImpl::HideWindow() { } -void cNullImpl::RaiseWindow() { +void NullImpl::RaiseWindow() { } -void cNullImpl::ShowWindow() { +void NullImpl::ShowWindow() { } -void cNullImpl::MoveWindow( int left, int top ) { +void NullImpl::MoveWindow( int left, int top ) { } -void cNullImpl::SetContext( eeWindowContex Context ) { +void NullImpl::SetContext( eeWindowContex Context ) { } -Vector2i cNullImpl::Position() { +Vector2i NullImpl::Position() { return Vector2i(0,0); } -void cNullImpl::ShowMouseCursor() { +void NullImpl::ShowMouseCursor() { } -void cNullImpl::HideMouseCursor() { +void NullImpl::HideMouseCursor() { } -Cursor * cNullImpl::CreateMouseCursor( Texture * tex, const Vector2i& hotspot, const std::string& name ) { +Cursor * NullImpl::CreateMouseCursor( Texture * tex, const Vector2i& hotspot, const std::string& name ) { return NULL; } -Cursor * cNullImpl::CreateMouseCursor( Image * img, const Vector2i& hotspot, const std::string& name ) { +Cursor * NullImpl::CreateMouseCursor( Image * img, const Vector2i& hotspot, const std::string& name ) { return NULL; } -Cursor * cNullImpl::CreateMouseCursor( const std::string& path, const Vector2i& hotspot, const std::string& name ) { +Cursor * NullImpl::CreateMouseCursor( const std::string& path, const Vector2i& hotspot, const std::string& name ) { return NULL; } -void cNullImpl::SetMouseCursor( Cursor * cursor ) { +void NullImpl::SetMouseCursor( Cursor * cursor ) { } -void cNullImpl::SetSystemMouseCursor( EE_SYSTEM_CURSOR syscursor ) { +void NullImpl::SetSystemMouseCursor( EE_SYSTEM_CURSOR syscursor ) { } -void cNullImpl::RestoreCursor() { +void NullImpl::RestoreCursor() { } -eeWindowContex cNullImpl::GetWindowContext() { +eeWindowContex NullImpl::GetWindowContext() { return 0; } diff --git a/src/eepp/window/platform/null/nullimpl.hpp b/src/eepp/window/platform/null/nullimpl.hpp index f4eb60811..d6f776153 100644 --- a/src/eepp/window/platform/null/nullimpl.hpp +++ b/src/eepp/window/platform/null/nullimpl.hpp @@ -1,5 +1,5 @@ -#ifndef EE_WINDOWcNullImpl_HPP -#define EE_WINDOWcNullImpl_HPP +#ifndef EE_WINDOWNULLIMPL_HPP +#define EE_WINDOWNULLIMPL_HPP #include #include @@ -8,11 +8,11 @@ namespace EE { namespace Window { namespace Platform { using namespace EE::Window; -class cNullImpl : public PlatformImpl { +class NullImpl : public PlatformImpl { public: - cNullImpl( EE::Window::Window * window ); + NullImpl( EE::Window::Window * window ); - ~cNullImpl(); + ~NullImpl(); void MinimizeWindow(); diff --git a/src/eepp/window/platform/osx/osximpl.cpp b/src/eepp/window/platform/osx/osximpl.cpp index d1fc3026e..2a94c65c1 100644 --- a/src/eepp/window/platform/osx/osximpl.cpp +++ b/src/eepp/window/platform/osx/osximpl.cpp @@ -8,72 +8,72 @@ namespace EE { namespace Window { namespace Platform { -cOSXImpl::cOSXImpl( EE::Window::Window * window ) : +OSXImpl::OSXImpl( EE::Window::Window * window ) : PlatformImpl( window ) { } -cOSXImpl::~cOSXImpl() { +OSXImpl::~OSXImpl() { } -void cOSXImpl::MinimizeWindow() { +void OSXImpl::MinimizeWindow() { } -void cOSXImpl::MaximizeWindow() { +void OSXImpl::MaximizeWindow() { } -bool cOSXImpl::IsWindowMaximized() { +bool OSXImpl::IsWindowMaximized() { return false; } -void cOSXImpl::HideWindow() { +void OSXImpl::HideWindow() { } -void cOSXImpl::RaiseWindow() { +void OSXImpl::RaiseWindow() { } -void cOSXImpl::ShowWindow() { +void OSXImpl::ShowWindow() { } -void cOSXImpl::MoveWindow( int left, int top ) { +void OSXImpl::MoveWindow( int left, int top ) { } -void cOSXImpl::SetContext( eeWindowContex Context ) { +void OSXImpl::SetContext( eeWindowContex Context ) { aglSetCurrentContext( Context ); } -Vector2i cOSXImpl::Position() { +Vector2i OSXImpl::Position() { return Vector2i(0,0); } -void cOSXImpl::ShowMouseCursor() { +void OSXImpl::ShowMouseCursor() { } -void cOSXImpl::HideMouseCursor() { +void OSXImpl::HideMouseCursor() { } -Cursor * cOSXImpl::CreateMouseCursor( Texture * tex, const Vector2i& hotspot, const std::string& name ) { +Cursor * OSXImpl::CreateMouseCursor( Texture * tex, const Vector2i& hotspot, const std::string& name ) { return NULL; } -Cursor * cOSXImpl::CreateMouseCursor( Image * img, const Vector2i& hotspot, const std::string& name ) { +Cursor * OSXImpl::CreateMouseCursor( Image * img, const Vector2i& hotspot, const std::string& name ) { return NULL; } -Cursor * cOSXImpl::CreateMouseCursor( const std::string& path, const Vector2i& hotspot, const std::string& name ) { +Cursor * OSXImpl::CreateMouseCursor( const std::string& path, const Vector2i& hotspot, const std::string& name ) { return NULL; } -void cOSXImpl::SetMouseCursor( Cursor * cursor ) { +void OSXImpl::SetMouseCursor( Cursor * cursor ) { } -void cOSXImpl::SetSystemMouseCursor( EE_SYSTEM_CURSOR syscursor ) { +void OSXImpl::SetSystemMouseCursor( EE_SYSTEM_CURSOR syscursor ) { } -void cOSXImpl::RestoreCursor() { +void OSXImpl::RestoreCursor() { } -eeWindowContex cOSXImpl::GetWindowContext() { +eeWindowContex OSXImpl::GetWindowContext() { return aglGetCurrentContext(); } diff --git a/src/eepp/window/platform/osx/osximpl.hpp b/src/eepp/window/platform/osx/osximpl.hpp index 92fa9aa18..876373c85 100644 --- a/src/eepp/window/platform/osx/osximpl.hpp +++ b/src/eepp/window/platform/osx/osximpl.hpp @@ -11,11 +11,11 @@ namespace EE { namespace Window { namespace Platform { using namespace EE::Window; -class cOSXImpl : public PlatformImpl { +class OSXImpl : public PlatformImpl { public: - cOSXImpl( EE::Window::Window * window ); + OSXImpl( EE::Window::Window * window ); - ~cOSXImpl(); + ~OSXImpl(); void MinimizeWindow(); diff --git a/src/eepp/window/platform/win/cursorwin.cpp b/src/eepp/window/platform/win/cursorwin.cpp index 1803ff412..5f4bd067c 100644 --- a/src/eepp/window/platform/win/cursorwin.cpp +++ b/src/eepp/window/platform/win/cursorwin.cpp @@ -208,8 +208,8 @@ void CursorWin::Create() { mCursor = (void*)icon; } -cWinImpl * CursorWin::GetPlatform() { - return reinterpret_cast( mWindow->GetPlatform() ); +WinImpl * CursorWin::GetPlatform() { + return reinterpret_cast( mWindow->GetPlatform() ); } void * CursorWin::GetCursor() const { diff --git a/src/eepp/window/platform/win/cursorwin.hpp b/src/eepp/window/platform/win/cursorwin.hpp index daab08127..4dac51357 100644 --- a/src/eepp/window/platform/win/cursorwin.hpp +++ b/src/eepp/window/platform/win/cursorwin.hpp @@ -9,13 +9,13 @@ using namespace EE::Window; namespace EE { namespace Window { namespace Platform { -class cWinImpl; +class WinImpl; class CursorWin : public Cursor { public: void * GetCursor() const; protected: - friend class cWinImpl; + friend class WinImpl; void * mCursor; @@ -29,7 +29,7 @@ class CursorWin : public Cursor { void Create(); - cWinImpl * GetPlatform(); + WinImpl * GetPlatform(); }; }}} diff --git a/src/eepp/window/platform/win/winimpl.cpp b/src/eepp/window/platform/win/winimpl.cpp index 75d505277..dc757692d 100644 --- a/src/eepp/window/platform/win/winimpl.cpp +++ b/src/eepp/window/platform/win/winimpl.cpp @@ -31,7 +31,7 @@ static HCURSOR GetLoadCursor( const EE_SYSTEM_CURSOR& cursor, LPCSTR syscur ) { return SYS_CURSORS[ cursor ]; } -cWinImpl::cWinImpl( EE::Window::Window * window, eeWindowHandle handler ) : +WinImpl::WinImpl( EE::Window::Window * window, eeWindowHandle handler ) : PlatformImpl( window ), mHandler( handler ), mCursorCurrent( NULL ), @@ -39,26 +39,26 @@ cWinImpl::cWinImpl( EE::Window::Window * window, eeWindowHandle handler ) : { } -cWinImpl::~cWinImpl() { +WinImpl::~WinImpl() { } -void cWinImpl::MinimizeWindow() { +void WinImpl::MinimizeWindow() { WIN_ShowWindow( mHandler, SW_MINIMIZE ); } -void cWinImpl::MaximizeWindow() { +void WinImpl::MaximizeWindow() { WIN_ShowWindow( mHandler, SW_MAXIMIZE ); } -bool cWinImpl::IsWindowMaximized() { +bool WinImpl::IsWindowMaximized() { return 0 != IsZoomed( mHandler ); } -void cWinImpl::HideWindow() { +void WinImpl::HideWindow() { WIN_ShowWindow( mHandler, SW_HIDE ); } -void cWinImpl::RaiseWindow() { +void WinImpl::RaiseWindow() { HWND top; if ( !mWindow->Windowed() ) @@ -69,25 +69,25 @@ void cWinImpl::RaiseWindow() { SetWindowPos( mHandler, top, 0, 0, 0, 0, (SWP_NOMOVE | SWP_NOSIZE) ); } -void cWinImpl::ShowWindow() { +void WinImpl::ShowWindow() { WIN_ShowWindow( mHandler, SW_SHOW ); } -void cWinImpl::MoveWindow( int left, int top ) { +void WinImpl::MoveWindow( int left, int top ) { SetWindowPos( mHandler, NULL, left, top, 0, 0, SWP_NOSIZE | SWP_NOZORDER ); } -void cWinImpl::SetContext( eeWindowContex Context ) { +void WinImpl::SetContext( eeWindowContex Context ) { wglMakeCurrent( (HDC)GetDC( mHandler ), (HGLRC)Context ); } -Vector2i cWinImpl::Position() { +Vector2i WinImpl::Position() { RECT r; GetWindowRect( mHandler, &r ); return Vector2i( r.left, r.top ); } -void cWinImpl::ShowMouseCursor() { +void WinImpl::ShowMouseCursor() { mCursorHidden = false; if ( !mCursorCurrent ) { @@ -102,7 +102,7 @@ void cWinImpl::ShowMouseCursor() { } } -void cWinImpl::HideMouseCursor() { +void WinImpl::HideMouseCursor() { if ( mCursorHidden ) return; @@ -111,19 +111,19 @@ void cWinImpl::HideMouseCursor() { PostMessage( mHandler, WM_SETCURSOR, 0, 0 ); } -Cursor * cWinImpl::CreateMouseCursor( Texture * tex, const Vector2i& hotspot, const std::string& name ) { +Cursor * WinImpl::CreateMouseCursor( Texture * tex, const Vector2i& hotspot, const std::string& name ) { return eeNew( CursorWin, ( tex, hotspot, name, mWindow ) ); } -Cursor * cWinImpl::CreateMouseCursor( Image * img, const Vector2i& hotspot, const std::string& name ) { +Cursor * WinImpl::CreateMouseCursor( Image * img, const Vector2i& hotspot, const std::string& name ) { return eeNew( CursorWin, ( img, hotspot, name, mWindow ) ); } -Cursor * cWinImpl::CreateMouseCursor( const std::string& path, const Vector2i& hotspot, const std::string& name ) { +Cursor * WinImpl::CreateMouseCursor( const std::string& path, const Vector2i& hotspot, const std::string& name ) { return eeNew( CursorWin, ( path, hotspot, name, mWindow ) ); } -void cWinImpl::SetMouseCursor( Cursor * cursor ) { +void WinImpl::SetMouseCursor( Cursor * cursor ) { mCursorCurrent = reinterpret_cast ( cursor )->GetCursor(); if ( !mCursorHidden ) { @@ -136,7 +136,7 @@ void cWinImpl::SetMouseCursor( Cursor * cursor ) { } } -void cWinImpl::SetSystemMouseCursor( EE_SYSTEM_CURSOR syscursor ) { +void WinImpl::SetSystemMouseCursor( EE_SYSTEM_CURSOR syscursor ) { HCURSOR mc; switch ( syscursor ) { @@ -180,7 +180,7 @@ void cWinImpl::SetSystemMouseCursor( EE_SYSTEM_CURSOR syscursor ) { } } -void cWinImpl::RestoreCursor() { +void WinImpl::RestoreCursor() { if ( !mCursorHidden ) { ShowMouseCursor(); } else { @@ -188,11 +188,11 @@ void cWinImpl::RestoreCursor() { } } -eeWindowHandle cWinImpl::GetHandler() const { +eeWindowHandle WinImpl::GetHandler() const { return mHandler; } -eeWindowContex cWinImpl::GetWindowContext() { +eeWindowContex WinImpl::GetWindowContext() { return wglGetCurrentContext(); } diff --git a/src/eepp/window/platform/win/winimpl.hpp b/src/eepp/window/platform/win/winimpl.hpp index 158027818..10952b88f 100644 --- a/src/eepp/window/platform/win/winimpl.hpp +++ b/src/eepp/window/platform/win/winimpl.hpp @@ -11,11 +11,11 @@ namespace EE { namespace Window { namespace Platform { using namespace EE::Window; -class cWinImpl : public PlatformImpl { +class WinImpl : public PlatformImpl { public: - cWinImpl( EE::Window::Window * window, eeWindowHandle handler ); + WinImpl( EE::Window::Window * window, eeWindowHandle handler ); - ~cWinImpl(); + ~WinImpl(); void MinimizeWindow(); diff --git a/src/eepp/window/platform/x11/cursorx11.cpp b/src/eepp/window/platform/x11/cursorx11.cpp index 4fa3fdc2c..853572ff6 100644 --- a/src/eepp/window/platform/x11/cursorx11.cpp +++ b/src/eepp/window/platform/x11/cursorx11.cpp @@ -74,8 +74,8 @@ void CursorX11::Create() { XcursorImageDestroy( image ); } -cX11Impl * CursorX11::GetPlatform() { - return reinterpret_cast( mWindow->GetPlatform() ); +X11Impl * CursorX11::GetPlatform() { + return reinterpret_cast( mWindow->GetPlatform() ); } X11Cursor CursorX11::GetCursor() const { diff --git a/src/eepp/window/platform/x11/cursorx11.hpp b/src/eepp/window/platform/x11/cursorx11.hpp index 48d94ff7a..6a2fb615a 100644 --- a/src/eepp/window/platform/x11/cursorx11.hpp +++ b/src/eepp/window/platform/x11/cursorx11.hpp @@ -9,13 +9,13 @@ using namespace EE::Window; namespace EE { namespace Window { namespace Platform { -class cX11Impl; +class X11Impl; class CursorX11 : public Cursor { public: X11Cursor GetCursor() const; protected: - friend class cX11Impl; + friend class X11Impl; X11Cursor mCursor; @@ -29,7 +29,7 @@ class CursorX11 : public Cursor { void Create(); - cX11Impl * GetPlatform(); + X11Impl * GetPlatform(); }; }}} diff --git a/src/eepp/window/platform/x11/x11impl.cpp b/src/eepp/window/platform/x11/x11impl.cpp index c5fc1463b..c976dc6f1 100644 --- a/src/eepp/window/platform/x11/x11impl.cpp +++ b/src/eepp/window/platform/x11/x11impl.cpp @@ -17,7 +17,7 @@ namespace EE { namespace Window { namespace Platform { -cX11Impl::cX11Impl( EE::Window::Window * window, eeWindowHandle display, X11Window xwindow, X11Window mainwindow, LockFunc lock, UnlockFunc unlock ) : +X11Impl::X11Impl( EE::Window::Window * window, eeWindowHandle display, X11Window xwindow, X11Window mainwindow, LockFunc lock, UnlockFunc unlock ) : PlatformImpl( window ), mDisplay( display ), mX11Window( xwindow ), @@ -31,7 +31,7 @@ cX11Impl::cX11Impl( EE::Window::Window * window, eeWindowHandle display, X11Wind { } -cX11Impl::~cX11Impl() { +X11Impl::~X11Impl() { if ( None != mCursorInvisible ) XFreeCursor( mDisplay, mCursorInvisible ); @@ -39,7 +39,7 @@ cX11Impl::~cX11Impl() { XFreeCursor( mDisplay, mCursorSystemLast ); } -void cX11Impl::MinimizeWindow() { +void X11Impl::MinimizeWindow() { Lock(); XIconifyWindow( mDisplay, mX11Window, 0 ); @@ -49,7 +49,7 @@ void cX11Impl::MinimizeWindow() { Unlock(); } -void cX11Impl::MaximizeWindow() { +void X11Impl::MaximizeWindow() { // coded by Rafał Maj, idea from Måns Rullgård http://tinyurl.com/68mvk3 Lock(); @@ -74,7 +74,7 @@ void cX11Impl::MaximizeWindow() { Unlock(); } -bool cX11Impl::IsWindowMaximized() { +bool X11Impl::IsWindowMaximized() { Lock(); //bool minimized = false; @@ -126,7 +126,7 @@ bool cX11Impl::IsWindowMaximized() { return false; } -void cX11Impl::HideWindow() { +void X11Impl::HideWindow() { Lock(); XUnmapWindow( mDisplay, mX11Window ); @@ -134,7 +134,7 @@ void cX11Impl::HideWindow() { Unlock(); } -void cX11Impl::RaiseWindow() { +void X11Impl::RaiseWindow() { Lock(); XRaiseWindow( mDisplay, mX11Window ); @@ -142,7 +142,7 @@ void cX11Impl::RaiseWindow() { Unlock(); } -void cX11Impl::ShowWindow() { +void X11Impl::ShowWindow() { Lock(); XMapRaised( mDisplay, mX11Window ); @@ -150,7 +150,7 @@ void cX11Impl::ShowWindow() { Unlock(); } -void cX11Impl::MoveWindow( int left, int top ) { +void X11Impl::MoveWindow( int left, int top ) { Lock(); XMoveWindow( mDisplay, mX11Window, left, top ); @@ -160,7 +160,7 @@ void cX11Impl::MoveWindow( int left, int top ) { Unlock(); } -void cX11Impl::SetContext( eeWindowContex Context ) { +void X11Impl::SetContext( eeWindowContex Context ) { Lock(); glXMakeCurrent( mDisplay, mX11Window, Context ); @@ -168,7 +168,7 @@ void cX11Impl::SetContext( eeWindowContex Context ) { Unlock(); } -Vector2i cX11Impl::Position() { +Vector2i X11Impl::Position() { int x, y; X11Window child_return; @@ -177,7 +177,7 @@ Vector2i cX11Impl::Position() { return Vector2i( x, y ); } -void cX11Impl::ShowMouseCursor() { +void X11Impl::ShowMouseCursor() { if ( !mCursorHidden ) return; @@ -190,7 +190,7 @@ void cX11Impl::ShowMouseCursor() { Unlock(); } -void cX11Impl::HideMouseCursor() { +void X11Impl::HideMouseCursor() { if ( mCursorHidden ) return; @@ -228,19 +228,19 @@ void cX11Impl::HideMouseCursor() { Unlock(); } -Cursor * cX11Impl::CreateMouseCursor( Texture * tex, const Vector2i& hotspot, const std::string& name ) { +Cursor * X11Impl::CreateMouseCursor( Texture * tex, const Vector2i& hotspot, const std::string& name ) { return eeNew( CursorX11, ( tex, hotspot, name, mWindow ) ); } -Cursor * cX11Impl::CreateMouseCursor( Image * img, const Vector2i& hotspot, const std::string& name ) { +Cursor * X11Impl::CreateMouseCursor( Image * img, const Vector2i& hotspot, const std::string& name ) { return eeNew( CursorX11, ( img, hotspot, name, mWindow ) ); } -Cursor * cX11Impl::CreateMouseCursor( const std::string& path, const Vector2i& hotspot, const std::string& name ) { +Cursor * X11Impl::CreateMouseCursor( const std::string& path, const Vector2i& hotspot, const std::string& name ) { return eeNew( CursorX11, ( path, hotspot, name, mWindow ) ); } -void cX11Impl::SetMouseCursor( Cursor * cursor ) { +void X11Impl::SetMouseCursor( Cursor * cursor ) { mCursorCurrent = reinterpret_cast( cursor )->GetCursor(); if ( !mCursorHidden ) { @@ -252,7 +252,7 @@ void cX11Impl::SetMouseCursor( Cursor * cursor ) { } } -void cX11Impl::RestoreCursor() { +void X11Impl::RestoreCursor() { if ( !mCursorHidden ) { Lock(); @@ -264,7 +264,7 @@ void cX11Impl::RestoreCursor() { } } -void cX11Impl::SetSystemMouseCursor( EE_SYSTEM_CURSOR syscursor ) { +void X11Impl::SetSystemMouseCursor( EE_SYSTEM_CURSOR syscursor ) { unsigned int cursor_shape; switch ( syscursor ) { @@ -299,21 +299,21 @@ void cX11Impl::SetSystemMouseCursor( EE_SYSTEM_CURSOR syscursor ) { Unlock(); } -eeWindowHandle cX11Impl::GetDisplay() const { +eeWindowHandle X11Impl::GetDisplay() const { return mDisplay; } -void cX11Impl::Lock() { +void X11Impl::Lock() { if ( NULL != mLock ) mLock(); } -void cX11Impl::Unlock() { +void X11Impl::Unlock() { if ( NULL != mUnlock ) mUnlock(); } -eeWindowContex cX11Impl::GetWindowContext() { +eeWindowContex X11Impl::GetWindowContext() { return glXGetCurrentContext(); } diff --git a/src/eepp/window/platform/x11/x11impl.hpp b/src/eepp/window/platform/x11/x11impl.hpp index 413711316..15c887e9e 100644 --- a/src/eepp/window/platform/x11/x11impl.hpp +++ b/src/eepp/window/platform/x11/x11impl.hpp @@ -11,14 +11,14 @@ namespace EE { namespace Window { namespace Platform { using namespace EE::Window; -class cX11Impl : public PlatformImpl { +class X11Impl : public PlatformImpl { public: typedef void (*LockFunc)(void); typedef void (*UnlockFunc)(void); - cX11Impl( EE::Window::Window * window, eeWindowHandle display, X11Window xwindow, X11Window mainwindow, LockFunc lock, UnlockFunc unlock ); + X11Impl( EE::Window::Window * window, eeWindowHandle display, X11Window xwindow, X11Window mainwindow, LockFunc lock, UnlockFunc unlock ); - ~cX11Impl(); + ~X11Impl(); void MinimizeWindow(); diff --git a/src/eepp/window/window.cpp b/src/eepp/window/window.cpp index 135dd78b7..0c3249b57 100644 --- a/src/eepp/window/window.cpp +++ b/src/eepp/window/window.cpp @@ -481,7 +481,7 @@ void Window::SetCurrentContext( eeWindowContex Context ) { void Window::CreatePlatform() { eeSAFE_DELETE( mPlatform ); - mPlatform = eeNew( Platform::cNullImpl, ( this ) ); + mPlatform = eeNew( Platform::NullImpl, ( this ) ); } void Window::SetCurrent() { diff --git a/src/examples/physics/physics.cpp b/src/examples/physics/physics.cpp index 3706b2f74..f3d228ebc 100644 --- a/src/examples/physics/physics.cpp +++ b/src/examples/physics/physics.cpp @@ -34,7 +34,7 @@ EE::Window::Window * mWindow; Input * KM; void DefaultDrawOptions() { - PhysicsManager::cDrawSpaceOptions * DSO = PhysicsManager::instance()->GetDrawOptions(); + PhysicsManager::DrawSpaceOptions * DSO = PhysicsManager::instance()->GetDrawOptions(); DSO->DrawBBs = false; DSO->DrawShapes = true; DSO->DrawShapesBorders = true; @@ -450,7 +450,7 @@ void StickySeparate(Arbiter *arb, Space *space, void *data) } void Demo4Create() { - PhysicsManager::cDrawSpaceOptions * DSO = PhysicsManager::instance()->GetDrawOptions(); + PhysicsManager::DrawSpaceOptions * DSO = PhysicsManager::instance()->GetDrawOptions(); DSO->DrawBBs = false; DSO->DrawShapes = true; DSO->DrawShapesBorders = false; diff --git a/src/test/eetest.cpp b/src/test/eetest.cpp index 2f812c257..3eb3d0073 100644 --- a/src/test/eetest.cpp +++ b/src/test/eetest.cpp @@ -1780,7 +1780,7 @@ void EETest::ChangeDemo( Uint32 num ) { void EETest::PhysicsCreate() { PhysicsManager::CreateSingleton(); PhysicsManager * PM = PhysicsManager::instance(); - PhysicsManager::cDrawSpaceOptions * DSO = PM->GetDrawOptions(); + PhysicsManager::DrawSpaceOptions * DSO = PM->GetDrawOptions(); DSO->DrawBBs = false; DSO->DrawShapes = true;