aboutsummaryrefslogtreecommitdiff
path: root/Gem/develop
diff options
context:
space:
mode:
Diffstat (limited to 'Gem/develop')
-rw-r--r--Gem/develop/include/Gem/Base/CPPExtern.h4
-rw-r--r--Gem/develop/include/Gem/Base/TextBase.h2
-rw-r--r--Gem/develop/include/Gem/Gem/Dylib.h22
-rw-r--r--Gem/develop/include/Gem/Gem/Exception.h14
-rw-r--r--Gem/develop/include/Gem/Gem/ImageIO.h6
-rw-r--r--Gem/develop/include/Gem/Gem/Properties.h4
-rw-r--r--Gem/develop/include/Gem/Gem/Settings.h12
-rw-r--r--Gem/develop/include/Gem/RTE/MessageCallbacks.h4
-rw-r--r--Gem/develop/include/Gem/RTE/RTE.h8
-rw-r--r--Gem/develop/include/Gem/Utils/GLUtil.h2
-rw-r--r--Gem/develop/include/Gem/Utils/GemString.h3
-rw-r--r--Gem/develop/include/Gem/Utils/WorkerThread.h2
-rw-r--r--Gem/develop/include/Gem/Utils/any.h13
-rw-r--r--Gem/develop/include/Gem/plugins/film.h2
-rw-r--r--Gem/develop/include/Gem/plugins/imagesaver.h2
-rw-r--r--Gem/develop/include/Gem/plugins/record.h6
-rw-r--r--Gem/develop/include/Gem/plugins/video.h8
17 files changed, 64 insertions, 50 deletions
diff --git a/Gem/develop/include/Gem/Base/CPPExtern.h b/Gem/develop/include/Gem/Base/CPPExtern.h
index ddacc54..1f296d9 100644
--- a/Gem/develop/include/Gem/Base/CPPExtern.h
+++ b/Gem/develop/include/Gem/Base/CPPExtern.h
@@ -146,8 +146,8 @@ class GEM_EXTERN CPPExtern
// wraps open_via_path() and canvas_makefilename()
// the full filename is returned
// if the file does not exist, it is constructed
- std::string findFile(const std::string filename, const std::string ext) const;
- std::string findFile(const std::string filename) const;
+ std::string findFile(const std::string&filename, const std::string&ext) const;
+ std::string findFile(const std::string&filename) const;
private:
mutable bool m_endpost; /* internal state for startpost/post/endpost */
diff --git a/Gem/develop/include/Gem/Base/TextBase.h b/Gem/develop/include/Gem/Base/TextBase.h
index f65204a..de1ebbe 100644
--- a/Gem/develop/include/Gem/Base/TextBase.h
+++ b/Gem/develop/include/Gem/Base/TextBase.h
@@ -97,7 +97,7 @@ class GEM_EXTERN TextBase : public GemBase
//////////
// The font to use
- virtual void fontNameMess(const std::string filename);
+ virtual void fontNameMess(const std::string&filename);
//////////
// set line distance
diff --git a/Gem/develop/include/Gem/Gem/Dylib.h b/Gem/develop/include/Gem/Gem/Dylib.h
index 1af65c1..30fea7e 100644
--- a/Gem/develop/include/Gem/Gem/Dylib.h
+++ b/Gem/develop/include/Gem/Gem/Dylib.h
@@ -26,12 +26,12 @@ class GEM_EXTERN GemDylib {
public:
GemDylib(const CPPExtern*obj,
- const std::string libname,
- const std::string extension=std::string("")
- ) throw(GemException);
- GemDylib(const std::string libname,
- const std::string extension=std::string("")
- ) throw(GemException);
+ const std::string&libname,
+ const std::string&extension=std::string("")
+ ); // throws GemException
+ GemDylib(const std::string&libname,
+ const std::string&extension=std::string("")
+ ); // throws GemException
GemDylib(const GemDylib&);
@@ -43,10 +43,10 @@ class GEM_EXTERN GemDylib {
// if void<procname>(void) exists in dylib, run it and return "true"
// else return false;
- bool run(const std::string procname);
+ bool run(const std::string&procname);
// if <procname> exists in dylib, return it, else return NULL
- function_t proc(const std::string procname);
+ function_t proc(const std::string&procname);
public:
/**
@@ -54,9 +54,9 @@ class GEM_EXTERN GemDylib {
* if "extension" is NULL, a platform-specific default is used
* on success "true" is returned, else "false
*/
- static bool LoadLib(const std::string procname,
- const std::string baselibname,
- const std::string fileext=std::string(""));
+ static bool LoadLib(const std::string&procname,
+ const std::string&baselibname,
+ const std::string&fileext=std::string(""));
static const std::string getDefaultExtension(void);
diff --git a/Gem/develop/include/Gem/Gem/Exception.h b/Gem/develop/include/Gem/Gem/Exception.h
index 6df277f..8aaedf8 100644
--- a/Gem/develop/include/Gem/Gem/Exception.h
+++ b/Gem/develop/include/Gem/Gem/Exception.h
@@ -39,15 +39,15 @@ typedef struct _text t_object;
class GEM_EXTERN GemException
{
public:
- GemException(void) throw();
- GemException(const char*error) throw();
- GemException(const std::string error) throw();
- virtual ~GemException(void) throw();
+ GemException(void);
+ GemException(const char*error);
+ GemException(const std::string&error);
+ virtual ~GemException(void);
- virtual const char *what(void) const throw();
- virtual void report(const char*origin=0) const throw();
+ virtual const char *what(void) const;
+ virtual void report(const char*origin=0) const;
private:
- const std::string ErrorString;
+ const std::string&ErrorString;
};
namespace gem {
diff --git a/Gem/develop/include/Gem/Gem/ImageIO.h b/Gem/develop/include/Gem/Gem/ImageIO.h
index 7e71226..8b66e15 100644
--- a/Gem/develop/include/Gem/Gem/ImageIO.h
+++ b/Gem/develop/include/Gem/Gem/ImageIO.h
@@ -48,7 +48,7 @@ namespace gem {
* the loaded image is stored in 'img'
* 'props' holds a list of additional image properties discovered during loading
*/
- static bool sync(const std::string filename,
+ static bool sync(const std::string&filename,
imageStruct&img,
Properties&props);
@@ -97,7 +97,7 @@ namespace gem {
*/
static bool async(callback cb,
void*userdata,
- const std::string filename,
+ const std::string&filename,
id_t&ID
);
@@ -113,7 +113,7 @@ namespace gem {
*/
static bool sync(callback cb,
void*userdata,
- const std::string filename,
+ const std::string&filename,
id_t&ID);
/*
diff --git a/Gem/develop/include/Gem/Gem/Properties.h b/Gem/develop/include/Gem/Gem/Properties.h
index 7ce011d..588fbf3 100644
--- a/Gem/develop/include/Gem/Gem/Properties.h
+++ b/Gem/develop/include/Gem/Gem/Properties.h
@@ -63,7 +63,7 @@ namespace gem
* if the key was in the property-map, return the type of the property
* if no key of the given value exists, return <code>PropertyType::UNSET</code>
*/
- virtual enum PropertyType type(const std::string) const;
+ virtual enum PropertyType type(const std::string&) const;
/* set a property
* e.g.: double w=640; prop.set("width", w);
@@ -92,7 +92,7 @@ namespace gem
/*
* delete a given key from the Properties
*/
- virtual void erase(const std::string);
+ virtual void erase(const std::string&);
/*
* delete all keys from the Properties
*/
diff --git a/Gem/develop/include/Gem/Gem/Settings.h b/Gem/develop/include/Gem/Gem/Settings.h
index e54b9d5..9052982 100644
--- a/Gem/develop/include/Gem/Gem/Settings.h
+++ b/Gem/develop/include/Gem/Gem/Settings.h
@@ -22,13 +22,13 @@ namespace gem { namespace Settings {
void print(void);
void save(void);
- t_atom*get(const std::string key);
- void set(const std::string key, t_atom*value=NULL);
+ t_atom*get(const std::string&key);
+ void set(const std::string&key, t_atom*value=NULL);
- void get(const std::string key, int&value);
- void get(const std::string key, float&value);
- void get(const std::string key, double&value);
- void get(const std::string key, std::string&value);
+ void get(const std::string&key, int&value);
+ void get(const std::string&key, float&value);
+ void get(const std::string&key, double&value);
+ void get(const std::string&key, std::string&value);
std::vector<std::string> keys();
}; };
diff --git a/Gem/develop/include/Gem/RTE/MessageCallbacks.h b/Gem/develop/include/Gem/RTE/MessageCallbacks.h
index b4df71b..79e174e 100644
--- a/Gem/develop/include/Gem/RTE/MessageCallbacks.h
+++ b/Gem/develop/include/Gem/RTE/MessageCallbacks.h
@@ -20,13 +20,13 @@
* CPPEXTERN_MSG (classPtr, "foo", gimmeMess); // A_GIMME
* CPPEXTERN_MSG0(classPtr, "doit", bangMess); // no args
* CPPEXTERN_MSG1(classPtr, "name", nameMess, t_symbol*); // 1 arg (A_SYMBOL)
- * CPPEXTERN_MSG1(classPtr, "title", titleMess, std::string); // 1 arg (A_SYMBOL)
+ * CPPEXTERN_MSG1(classPtr, "title", titleMess, const std::string&); // 1 arg (A_SYMBOL)
* CPPEXTERN_MSG3(classPtr, "values", tripletMess, t_float, t_float, t_float); // 3 args (A_FLOAT)
* }
* void myclass::gimmeMess (t_symbol*s, int argc, t_atom*argv) {;}
* void myclass::bangMess (void) {;}
* void myclass::nameMess (t_symbol*s) {;}
- * void myclass::titleMess (std::string s) {;}
+ * void myclass::titleMess (const std::string&s) {;}
* void myclass::tripletMess(t_float a, t_float b, t_float c) {;}
*/
#ifndef _INCLUDE__GEM_RTE_MESSAGECALLBACKS_H_
diff --git a/Gem/develop/include/Gem/RTE/RTE.h b/Gem/develop/include/Gem/RTE/RTE.h
index bbcad94..18e2a93 100644
--- a/Gem/develop/include/Gem/RTE/RTE.h
+++ b/Gem/develop/include/Gem/RTE/RTE.h
@@ -43,13 +43,19 @@ namespace gem {
* resolve a function-name in the current RTE
* @return pointer to the function named 'name', or NULL if it doesn't exist
*/
- virtual void*getFunction(const std::string&name);
+ virtual void*getFunction(const std::string&name) const;
/**
* find a file in the given context(canvas), searching RTEs search paths
* @return expanded filename
*/
virtual std::string findFile(const std::string&name, const std::string&ext, const void*context) const;
+
+ /**
+ * add 'path' to the search-paths (if context==NULL, to the global search path)
+ * @return expanded filename
+ */
+ virtual bool addSearchPath(const std::string&path, void*context);
};
};
};
diff --git a/Gem/develop/include/Gem/Utils/GLUtil.h b/Gem/develop/include/Gem/Utils/GLUtil.h
index c550c07..16fa492 100644
--- a/Gem/develop/include/Gem/Utils/GLUtil.h
+++ b/Gem/develop/include/Gem/Utils/GLUtil.h
@@ -45,7 +45,7 @@ GEM_EXTERN extern int getGLbitfield(int argc, struct _atom *argv);
public:
GLuintMap(const std::string&name);
virtual ~GLuintMap();
- GLuint get(float) throw(GemException&);
+ GLuint get(float); // throws GemException
/* map a GLuint to float; if float is 0, the new mapping is created,
* else we just update an existing one
* updating is especially useful with multiple contexts */
diff --git a/Gem/develop/include/Gem/Utils/GemString.h b/Gem/develop/include/Gem/Utils/GemString.h
index d134f50..d767bf0 100644
--- a/Gem/develop/include/Gem/Utils/GemString.h
+++ b/Gem/develop/include/Gem/Utils/GemString.h
@@ -28,7 +28,8 @@ namespace gem {
GEM_EXTERN std::wstring getVisualLine(const std::wstring&);
/* convert a UTF-8 string to wchar */
- GEM_EXTERN std::wstring toWstring(const char*str) throw(int);
+ // throws 'int', holding the position of the char that couldn't be converted
+ GEM_EXTERN std::wstring toWstring(const char*str);
};
};
diff --git a/Gem/develop/include/Gem/Utils/WorkerThread.h b/Gem/develop/include/Gem/Utils/WorkerThread.h
index 9ab2285..36d4a4d 100644
--- a/Gem/develop/include/Gem/Utils/WorkerThread.h
+++ b/Gem/develop/include/Gem/Utils/WorkerThread.h
@@ -71,7 +71,7 @@ namespace gem { namespace thread {
// you can use it to set a semaphore in the main thread, to fetch
// the data
// it get's called once after process() has been successful
- // and will nott be called before dequeue has been called at least once
+ // and will not be called before dequeue has been called at least once
//
virtual void signal(void);
diff --git a/Gem/develop/include/Gem/Utils/any.h b/Gem/develop/include/Gem/Utils/any.h
index dff11bb..331a797 100644
--- a/Gem/develop/include/Gem/Utils/any.h
+++ b/Gem/develop/include/Gem/Utils/any.h
@@ -34,9 +34,18 @@ namespace gem
bad_any_cast(const std::type_info& src, const std::type_info& dest)
: result(std::string("bad cast (")+src.name() + "->" + dest.name()+")")
{ }
- virtual ~bad_any_cast(void) throw()
+ virtual ~bad_any_cast(void)
+#if __cplusplus <= 199711L
+ throw()
+#endif
{ }
- virtual const char* what(void) const throw() {
+ virtual const char* what(void) const
+#if __cplusplus > 199711L
+ noexcept
+#else
+ throw()
+#endif
+ {
return result.c_str();
}
const std::string result;
diff --git a/Gem/develop/include/Gem/plugins/film.h b/Gem/develop/include/Gem/plugins/film.h
index 679c753..14f39ec 100644
--- a/Gem/develop/include/Gem/plugins/film.h
+++ b/Gem/develop/include/Gem/plugins/film.h
@@ -80,7 +80,7 @@ class GEM_EXTERN film
* anything about the internal cs of the decoder
*/
/* returns TRUE if loading was successful, FALSE otherwise */
- virtual bool open(const std::string,
+ virtual bool open(const std::string&,
const gem::Properties&requestprops) = 0;
/* some error codes */
diff --git a/Gem/develop/include/Gem/plugins/imagesaver.h b/Gem/develop/include/Gem/plugins/imagesaver.h
index 4ba2515..e883669 100644
--- a/Gem/develop/include/Gem/plugins/imagesaver.h
+++ b/Gem/develop/include/Gem/plugins/imagesaver.h
@@ -106,7 +106,7 @@ namespace gem { namespace plugins {
*/
virtual void getWriteCapabilities(std::vector<std::string>&mimetypes, gem::Properties&props) = 0;
- /* returns TRUE, if it is save to use this backend from multple threads
+ /* returns TRUE, if it is save to use this backend from multiple threads
*/
virtual bool isThreadable(void) = 0;
};
diff --git a/Gem/develop/include/Gem/plugins/record.h b/Gem/develop/include/Gem/plugins/record.h
index b2aa254..ed0113c 100644
--- a/Gem/develop/include/Gem/plugins/record.h
+++ b/Gem/develop/include/Gem/plugins/record.h
@@ -54,11 +54,11 @@ public:
/**
* get a human readable description of the given codec (e.g. "Motion Jpeg A")
*/
- virtual const std::string getCodecDescription(const std::string codecname) = 0;
+ virtual const std::string getCodecDescription(const std::string&codecname) = 0;
/**
* set the current codec
*/
- virtual bool setCodec(const std::string name) = 0;
+ virtual bool setCodec(const std::string&name) = 0;
/**
* list all properties the currently selected codec supports
@@ -76,7 +76,7 @@ public:
/*
* returns TRUE if opening was successful, FALSE otherwise
*/
- virtual bool start(const std::string filename, gem::Properties&props) = 0;
+ virtual bool start(const std::string&filename, gem::Properties&props) = 0;
//////////
// record a frame
diff --git a/Gem/develop/include/Gem/plugins/video.h b/Gem/develop/include/Gem/plugins/video.h
index 7be968d..a949c86 100644
--- a/Gem/develop/include/Gem/plugins/video.h
+++ b/Gem/develop/include/Gem/plugins/video.h
@@ -71,7 +71,7 @@ namespace gem { namespace plugins {
* the default implementation (which you normally shouldn't need to override)
* will simply set m_devicename and clear m_devicenum
*/
- virtual bool setDevice(const std::string) = 0;
+ virtual bool setDevice(const std::string&) = 0;
//! open the device (calls openDevice())
@@ -164,8 +164,6 @@ namespace gem { namespace plugins {
-
-
/**
* returns TRUE if the object can be used in a thread or FALSE otherwise
* if a backend implements threading itself, it should return FALSE
@@ -177,7 +175,7 @@ namespace gem { namespace plugins {
/** turn on/off "asynchronous"-grabbing
* default is "true"
* "asynchronous" means, that the device is constantly grabbing, and grabFrame() returns the current frame
- * non-"continuous" means, that the device will only issue a new grab when a frame has read
+ * non-"asynchronous" means, that the device will only issue a new grab when a frame has read
* (thus potentially reducing the CPU-load to what is needed, at the cost of slightly outdated images
* returns: the old state
*/
@@ -194,7 +192,7 @@ namespace gem { namespace plugins {
// for pix_video: query whether this backend provides access to this class of devices
// (e.g. "dv")
- virtual bool provides(const std::string) = 0;
+ virtual bool provides(const std::string&) = 0;
// get a list of all provided devices
virtual std::vector<std::string>provides(void) = 0;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 01:20:51 +0000