commit 7fd231cf

sago007 · 2018-03-17 13:46
7fd231cf94427d18532b348092a2bb7274e280c9 patch · browse files
parent 8e10bc79483f667e8f5d8a6c14a4f686b6916537

Made a lot of contructors explicit if they only took one parameter

Changed files

M	src/sago/SagoDataHolder.hpp before
M	src/sago/SagoSpriteHolder.hpp before
M	src/sago/SagoTextField.cpp before

diff --git a/src/sago/SagoDataHolder.hpp b/src/sago/SagoDataHolder.hpp index 4cc0185..3676cc9 100644 --- a/src/sago/SagoDataHolder.hpp +++ b/src/sago/SagoDataHolder.hpp

@@ -81,7 +81,7 @@ public:

* If the constructor without elements is used then invalidateAll(SDL_Renderer*) must be called before getTexturePtr

SagoDataHolder();

- SagoDataHolder(SDL_Renderer* renderer);

+ explicit SagoDataHolder(SDL_Renderer* renderer);

/**

* Return a pointer to the given texture. The pointer is valid for the lifetime of SagoDataHolder object it was taken from or invalidateAll is called.

* @param textureName Name of the texture

diff --git a/src/sago/SagoSpriteHolder.hpp b/src/sago/SagoSpriteHolder.hpp index 2e88528..7e2924c 100644 --- a/src/sago/SagoSpriteHolder.hpp +++ b/src/sago/SagoSpriteHolder.hpp

@@ -32,7 +32,7 @@ namespace sago {

class SagoSpriteHolder {

public:

- SagoSpriteHolder(const SagoDataHolder &texHolder);

+ explicit SagoSpriteHolder(const SagoDataHolder &texHolder);

virtual ~SagoSpriteHolder();

void ReadSprites();

const sago::SagoSprite& GetSprite(const std::string &spritename) const;

diff --git a/src/sago/SagoTextField.cpp b/src/sago/SagoTextField.cpp index 5f6fb78..5181277 100644 --- a/src/sago/SagoTextField.cpp +++ b/src/sago/SagoTextField.cpp

@@ -24,7 +24,7 @@ SOFTWARE.

#include "SagoTextField.hpp"

#include <iostream>

-#include <SDL/SDL_ttf.h>

+#include <SDL_ttf.h>

namespace sago {