Code-style consistency improvement:

Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files.
make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type.
This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
2018-09-23 14:17:31 -07:00
parent b73b05e9fb
commit ab8f16961e
1773 changed files with 1081087 additions and 474249 deletions

View File

@@ -11,49 +11,47 @@
#include "Gwen/BaseRender.h"
#include "Gwen/Controls/Base.h"
namespace Gwen
namespace Gwen
{
namespace ControlsInternal
{
class GWEN_EXPORT Text : public Controls::Base
{
public:
namespace ControlsInternal
{
class GWEN_EXPORT Text : public Controls::Base
{
public:
GWEN_CONTROL(Text, Controls::Base);
GWEN_CONTROL( Text, Controls::Base );
virtual ~Text();
Gwen::Font* GetFont();
virtual ~Text();
Gwen::Font* GetFont();
void SetString(const UnicodeString& str);
void SetString(const String& str);
void SetString( const UnicodeString& str );
void SetString( const String& str );
void Render(Skin::Base* skin);
void Layout(Skin::Base* skin);
void Render( Skin::Base* skin );
void Layout( Skin::Base* skin );
void RefreshSize();
void RefreshSize();
void SetFont(Gwen::Font* pFont) { m_Font = pFont; }
void SetFont( Gwen::Font* pFont ){ m_Font = pFont; }
const UnicodeString& GetText() const { return m_String; }
const UnicodeString& GetText() const { return m_String; }
Gwen::Point GetCharacterPosition(int iChar);
int GetClosestCharacter(Gwen::Point p);
Gwen::Point GetCharacterPosition( int iChar );
int GetClosestCharacter( Gwen::Point p );
int Length() const { return (int)m_String.size(); }
int Length() const { return (int)m_String.size(); }
virtual void SetTextColor(const Gwen::Color& col) { m_Color = col; }
virtual void SetTextColor( const Gwen::Color& col ){ m_Color = col; }
virtual void OnScaleChanged();
virtual void OnScaleChanged();
inline const Gwen::Color& TextColor() const { return m_Color; }
inline const Gwen::Color &TextColor() const { return m_Color; }
private:
Gwen::UnicodeString m_String;
Gwen::Font* m_Font;
Gwen::Color m_Color;
};
} // namespace ControlsInternal
private:
Gwen::UnicodeString m_String;
Gwen::Font* m_Font;
Gwen::Color m_Color;
};
}
}
} // namespace Gwen
#endif