Skip to content

Commit

Permalink
Apply clang format to Overlays (#235)
Browse files Browse the repository at this point in the history
  • Loading branch information
darksylinc committed Dec 31, 2021
1 parent 65d31e6 commit 443db7e
Show file tree
Hide file tree
Showing 27 changed files with 6,265 additions and 6,430 deletions.
625 changes: 318 additions & 307 deletions Components/Overlay/include/OgreBorderPanelOverlayElement.h

Large diffs are not rendered by default.

214 changes: 97 additions & 117 deletions Components/Overlay/include/OgreFont.h

Large diffs are not rendered by default.

46 changes: 22 additions & 24 deletions Components/Overlay/include/OgreFontManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,39 +28,39 @@ THE SOFTWARE
#define _FontManager_H__

#include "OgreOverlayPrerequisites.h"
#include "OgreSingleton.h"
#include "OgreResourceManager.h"

#include "OgreFont.h"
#include "OgreResourceManager.h"
#include "OgreSingleton.h"

namespace Ogre
{
/** \addtogroup Core
* @{
*/
* @{
*/
/** \addtogroup Resources
* @{
*/
* @{
*/
/** Manages Font resources, parsing .fontdef files and generally organising them.*/
class _OgreOverlayExport FontManager : public ResourceManager, public Singleton< FontManager >
class _OgreOverlayExport FontManager : public ResourceManager, public Singleton<FontManager>
{
public:

FontManager();
~FontManager();

/// Create a new font
/// @see ResourceManager::createResource
FontPtr create (const String& name, const String& group,
bool isManual = false, ManualResourceLoader* loader = 0,
const NameValuePairList* createParams = 0);
FontPtr create( const String &name, const String &group, bool isManual = false,
ManualResourceLoader *loader = 0, const NameValuePairList *createParams = 0 );

/// Get a resource by name
/// @see ResourceManager::getResourceByName
FontPtr getByName(const String& name, const String& groupName = ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME);

FontPtr getByName(
const String &name,
const String &groupName = ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME );

/** @copydoc ScriptLoader::parseScript */
void parseScript(DataStreamPtr& stream, const String& groupName);
void parseScript( DataStreamPtr &stream, const String &groupName ) override;
/** Override standard Singleton retrieval.
@remarks
Why do we do this? Well, it's because the Singleton
Expand All @@ -76,7 +76,7 @@ namespace Ogre
but the implementation stays in this single compilation unit,
preventing link errors.
*/
static FontManager& getSingleton();
static FontManager &getSingleton();
/** Override standard Singleton retrieval.
@remarks
Why do we do this? Well, it's because the Singleton
Expand All @@ -92,22 +92,20 @@ namespace Ogre
but the implementation stays in this single compilation unit,
preventing link errors.
*/
static FontManager* getSingletonPtr();
static FontManager *getSingletonPtr();

protected:

/// Internal methods
Resource* createImpl(const String& name, ResourceHandle handle,
const String& group, bool isManual, ManualResourceLoader* loader,
const NameValuePairList* params);
void parseAttribute(const String& line, FontPtr& pFont);

void logBadAttrib(const String& line, FontPtr& pFont);
Resource *createImpl( const String &name, ResourceHandle handle, const String &group,
bool isManual, ManualResourceLoader *loader,
const NameValuePairList *params ) override;

void parseAttribute( const String &line, FontPtr &pFont );

void logBadAttrib( const String &line, FontPtr &pFont );
};
/** @} */
/** @} */
}
} // namespace Ogre

#endif
Loading

0 comments on commit 443db7e

Please sign in to comment.