Move everything from global namespace to "sp" namespace
When writing the X11 (linux) implementation there was a problem with X11 defining a "Display" type and we also have a Display class in the engine. So to fix that problem and minimize the risk for running into other name conflicts. We move everything from global namespace.
This commit is contained in:
parent
9da8addeb2
commit
e10daeaaa6
120 changed files with 551 additions and 105 deletions
|
|
@ -1,6 +1,8 @@
|
|||
|
||||
#include "FontDriver.h"
|
||||
|
||||
namespace sp {
|
||||
|
||||
FontDriver::FontDriver() :
|
||||
m_hinting (true)
|
||||
{
|
||||
|
|
@ -9,4 +11,6 @@ m_hinting (true)
|
|||
void FontDriver::setHinting(bool value)
|
||||
{
|
||||
m_hinting = value;
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace sp
|
||||
|
|
@ -6,6 +6,8 @@
|
|||
#include <Spectre/Graphics/Image.h>
|
||||
#include <Spectre/Graphics/Font.h>
|
||||
|
||||
namespace sp {
|
||||
|
||||
class FontDriver
|
||||
{
|
||||
public :
|
||||
|
|
@ -28,4 +30,6 @@ protected :
|
|||
bool m_hinting;
|
||||
};
|
||||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_GRAPHICS_FONT_FONTDRIVER_H */
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
#include "FreeTypeError.h"
|
||||
#include "FreeTypeDriver.h"
|
||||
|
||||
namespace sp {
|
||||
|
||||
class LibWrapper
|
||||
{
|
||||
public :
|
||||
|
|
@ -165,4 +167,6 @@ Font::Glyph FreeTypeDriver::loadGlyph(unsigned int codepoint, Image& img, unsign
|
|||
std::string FreeTypeDriver::getName()
|
||||
{
|
||||
return m_face->family_name;
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
|
@ -5,8 +5,11 @@
|
|||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
|
||||
#include <string>
|
||||
#include "FontDriver.h"
|
||||
|
||||
namespace sp {
|
||||
|
||||
class FreeTypeDriver : public FontDriver
|
||||
{
|
||||
public:
|
||||
|
|
@ -26,4 +29,6 @@ private :
|
|||
FT_Face m_face;
|
||||
};
|
||||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_GRAPHICS_FONT_FREETYPEDRIVER_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue