diff options
author | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2017-12-06 22:44:25 +0000 |
---|---|---|
committer | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2017-12-06 22:44:25 +0000 |
commit | ff954ec3b2de3f0bce8aee70680469468896df7d (patch) | |
tree | 26bb6bf2cde86a42f28be1153cd1512f5a266787 /Gem/develop | |
parent | c6c6ed3a8a4e17072e2a9e740746c35e70606526 (diff) |
Gem 0b181e632de887a6624259e6f2c10c917f68f480 osx/x86_64
built 'master:0b181e632de887a6624259e6f2c10c917f68f480' for osx/x86_64
Diffstat (limited to 'Gem/develop')
-rw-r--r-- | Gem/develop/include/Gem/Base/GemBase.h | 2 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Base/GemShape.h | 2 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Base/GemWindow.h | 14 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Gem/Cache.h | 4 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Gem/ContextData.h | 2 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Gem/Exception.h | 4 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Gem/GLStack.h | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/Gem/develop/include/Gem/Base/GemBase.h b/Gem/develop/include/Gem/Base/GemBase.h index 9b0d362..faf490b 100644 --- a/Gem/develop/include/Gem/Base/GemBase.h +++ b/Gem/develop/include/Gem/Base/GemBase.h @@ -112,7 +112,7 @@ class GEM_EXTERN GemBase : public CPPExtern void realStopRendering(); void gem_startstopMess(int state); - void gem_renderMess(GemCache* state, GemState* state2); + void gem_renderMess(GemCache* cache, GemState* state); static inline GemBase *GetMyClass(void *data) {return((GemBase *)((Obj_header *)data)->data);} diff --git a/Gem/develop/include/Gem/Base/GemShape.h b/Gem/develop/include/Gem/Base/GemShape.h index 2878156..6f25cea 100644 --- a/Gem/develop/include/Gem/Base/GemShape.h +++ b/Gem/develop/include/Gem/Base/GemShape.h @@ -41,7 +41,7 @@ class GEM_EXTERN GemShape : public GemBase ////////// // Constructor // [in] size - A size of 0. means to just use the default (ie, 1.) - GemShape(t_floatarg size); + explicit GemShape(t_floatarg size); GemShape(); protected: diff --git a/Gem/develop/include/Gem/Base/GemWindow.h b/Gem/develop/include/Gem/Base/GemWindow.h index c69f249..b1bdc7f 100644 --- a/Gem/develop/include/Gem/Base/GemWindow.h +++ b/Gem/develop/include/Gem/Base/GemWindow.h @@ -57,10 +57,10 @@ class GEM_EXTERN GemWindow : public CPPExtern /* LATER think about detaching the output from the stack, so we can e.g. destroy a window from a mouse-callback */ void info(std::vector<t_atom>); void info(t_symbol*s, int, t_atom*); - void info(std::string); - void info(std::string, t_float); - void info(std::string, int i); - void info(std::string, std::string); + void info(const std::string&); + void info(const std::string&, t_float); + void info(const std::string&, int i); + void info(const std::string&, const std::string&); /* tell downstream objects to render */ void bang(void); @@ -72,7 +72,7 @@ class GEM_EXTERN GemWindow : public CPPExtern /* mouse entering window */ void entry(int devId, int state); /* keyboard buttons */ - void key(int devId, std::string, int, int state); + void key(int devId, const std::string&, int, int state); /* window resize/move */ void dimension(unsigned int, unsigned int); @@ -177,14 +177,14 @@ class GEM_EXTERN GemWindow : public CPPExtern virtual void transparentMess(bool on); /* window decoration (pre creation) */ - virtual void titleMess(std::string); + virtual void titleMess(const std::string&); virtual void borderMess(bool on); virtual void fullscreenMess(int on); virtual void offsetMess(int x, int y); /* creation/destruction */ - virtual void createMess(std::string); + virtual void createMess(const std::string&); virtual void destroyMess(void); /* post creation */ diff --git a/Gem/develop/include/Gem/Gem/Cache.h b/Gem/develop/include/Gem/Gem/Cache.h index bfb153a..d75803f 100644 --- a/Gem/develop/include/Gem/Gem/Cache.h +++ b/Gem/develop/include/Gem/Gem/Cache.h @@ -36,9 +36,9 @@ class GEM_EXTERN GemCache ////////// // Constructor - GemCache(gemhead *parent); + explicit GemCache(gemhead *parent); - GemCache(const GemCache&); + explicit GemCache(const GemCache&); ////////// // Destructor diff --git a/Gem/develop/include/Gem/Gem/ContextData.h b/Gem/develop/include/Gem/Gem/ContextData.h index 94f51b3..0b764b6 100644 --- a/Gem/develop/include/Gem/Gem/ContextData.h +++ b/Gem/develop/include/Gem/Gem/ContextData.h @@ -56,7 +56,7 @@ template<class ContextDataType = int> /* coverity[uninit_member] we track the un-initialization ourselves */ ContextData(void) : m_haveDefaultValue(false) {;} - ContextData(ContextDataType v) : m_haveDefaultValue(true), m_defaultValue(v) {;} + explicit ContextData(ContextDataType v) : m_haveDefaultValue(true), m_defaultValue(v) {;} virtual ~ContextData() { m_ContextDataVector.clear(); diff --git a/Gem/develop/include/Gem/Gem/Exception.h b/Gem/develop/include/Gem/Gem/Exception.h index 85a91f6..76d0bbe 100644 --- a/Gem/develop/include/Gem/Gem/Exception.h +++ b/Gem/develop/include/Gem/Gem/Exception.h @@ -40,8 +40,8 @@ class GEM_EXTERN GemException { public: GemException(void); - GemException(const char*error); - GemException(const std::string&error); + explicit GemException(const char*error); + explicit GemException(const std::string&error); virtual ~GemException(void); virtual const char *what(void) const; diff --git a/Gem/develop/include/Gem/Gem/GLStack.h b/Gem/develop/include/Gem/Gem/GLStack.h index 4c9037c..49663f0 100644 --- a/Gem/develop/include/Gem/Gem/GLStack.h +++ b/Gem/develop/include/Gem/Gem/GLStack.h @@ -21,7 +21,7 @@ namespace gem { class GEM_EXTERN GLStack { public: - GLStack(bool haveValidContext=false); + explicit GLStack(bool haveValidContext=false); virtual ~GLStack(void); enum GemStackId { MODELVIEW, COLOR, TEXTURE, PROJECTION }; |