Changeset 11099 for code/trunk/src/libraries/core
- Timestamp:
- Jan 27, 2016, 6:50:51 PM (9 years ago)
- Location:
- code/trunk/src/libraries/core
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/libraries/core/CoreIncludes.h
r11071 r11099 125 125 @brief Registers the class in the framework with a given Factory. 126 126 @param ClassName The name of the class 127 @param FactoryInstance An instance of a factory that can create the class 128 @param bLoadable Whether the class is allowed to be loaded through XML 127 129 */ 128 130 #define RegisterClassWithFactory(ClassName, FactoryInstance, bLoadable) \ … … 201 203 @note This of course only works with Identifiables. 202 204 The only use is in conjunction with macros that don't know the class type. 203 @param objectPointer to an Identifiable205 @param p Pointer to an Identifiable 204 206 */ 205 207 template <class T> 206 inline Identifier* ClassByObjectType(const T* )208 inline Identifier* ClassByObjectType(const T* p) 207 209 { 208 210 return ClassIdentifier<T>::getIdentifier(); -
code/trunk/src/libraries/core/GUIManager.cc
r11083 r11099 793 793 } 794 794 795 /** Executes a CEGUI function normally, but catches CEGUI::ScriptException. 795 /** 796 @copydoc protectedCeguiSystemCall 797 @param function 798 Any callable object/function that takes one parameter. 799 @param object 800 Object to be used as an argument for the @p function 801 @return 802 True if input was handled, false otherwise. A caught exception yields true. 803 */ 804 template <typename FunctionType, typename ObjectType> 805 bool GUIManager::protectedCall(FunctionType function, ObjectType object) 806 { 807 try 808 { 809 return function(object); 810 } 811 catch (CEGUI::ScriptException& ex) 812 { 813 // Display the error and proceed. See @remarks why this can be dangerous. 814 orxout(internal_error) << ex.getMessage() << endl; 815 return true; 816 } 817 } 818 819 /** 820 Executes a CEGUI function normally, but catches CEGUI::ScriptException. 796 821 When a ScriptException occurs, the error message will be displayed and 797 822 the program carries on. … … 808 833 True if input was handled, false otherwise. A caught exception yields true. 809 834 */ 810 template <typename FunctionType, typename ObjectType>811 bool GUIManager::protectedCall(FunctionType function, ObjectType object)812 {813 try814 {815 return function(object);816 }817 catch (CEGUI::ScriptException& ex)818 {819 // Display the error and proceed. See @remarks why this can be dangerous.820 orxout(internal_error) << ex.getMessage() << endl;821 return true;822 }823 }824 825 835 template <typename FunctionType> 826 836 bool GUIManager::protectedCeguiSystemCall(FunctionType function) -
code/trunk/src/libraries/core/class/IdentifierManager.cc
r11071 r11099 255 255 /** 256 256 @brief Returns the Identifier with a given typeid-name. 257 @param name The typeid-nameof the wanted Identifier257 @param typeInfo The type_info of the wanted Identifier 258 258 @return The Identifier 259 259 */ -
code/trunk/src/libraries/core/command/CommandExecutor.cc
r11071 r11099 67 67 @param command A string containing the command 68 68 @param useTcl If true, the command is passed to tcl (see TclBind) 69 @param printErrors If true, print an error when command failed 69 70 @return Returns the error-code (see @ref CommandExecutorErrorCodes "error codes") 70 71 */ -
code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc
r10624 r11099 100 100 @brief Prints text to the console. 101 101 @param level_name The name of the output level 102 @param text The text to print 102 103 */ 103 104 void orxout_level(const std::string& level_name, const std::string& text) … … 119 120 @param level_name The name of the output level 120 121 @param context_name The name of the output context 122 @param text The text to print 121 123 */ 122 124 void orxout_level_context(const std::string& level_name, const std::string& context_name, const std::string& text) -
code/trunk/src/libraries/core/commandline/CommandLineIncludes.h
r11071 r11099 30 30 @defgroup CmdArgs Commandline arguments 31 31 @ingroup Config 32 @brief For a reference of all commandline arguments see @ref cmdargspage33 32 */ 34 33 -
code/trunk/src/libraries/core/commandline/CommandLineParser.cc
r11071 r11099 218 218 @param value 219 219 String containing the value 220 @param bParsingFile221 Parsing a file or the command line itself222 220 */ 223 221 void CommandLineParser::checkFullArgument(const std::string& name, const std::string& value) … … 237 235 @param value 238 236 String containing the value 239 @param bParsingFile240 Parsing a file or the command line itself241 237 */ 242 238 void CommandLineParser::checkShortcut(const std::string& shortcut, const std::string& value) -
code/trunk/src/libraries/core/commandline/CommandLineParser.h
r11071 r11099 26 26 * 27 27 */ 28 29 /**30 @defgroup CmdArgs Commandline arguments31 @ingroup Config32 @brief For a reference of all commandline arguments see @ref cmdargspage33 */34 28 35 29 /** -
code/trunk/src/libraries/core/config/ConfigValueContainer.h
r11071 r11099 109 109 */ 110 110 template <class D, class V> 111 ConfigValueContainer(ConfigFileType::Value type, Identifier* identifier, const std::string& sectionname, const std::string& varname, const D& defvalue, const V& )111 ConfigValueContainer(ConfigFileType::Value type, Identifier* identifier, const std::string& sectionname, const std::string& varname, const D& defvalue, const V& value) 112 112 { 113 113 this->init(type, identifier, sectionname, varname); … … 125 125 */ 126 126 template <class D, class V> 127 ConfigValueContainer(ConfigFileType::Value type, Identifier* identifier, const std::string& sectionname, const std::string& varname, const std::vector<D>& defvalue, const std::vector<V>& )127 ConfigValueContainer(ConfigFileType::Value type, Identifier* identifier, const std::string& sectionname, const std::string& varname, const std::vector<D>& defvalue, const std::vector<V>& value) 128 128 { 129 129 this->init(type, identifier, sectionname, varname); -
code/trunk/src/libraries/core/object/IteratorBase.h
r11071 r11099 173 173 /** 174 174 @brief Increments the Iterator if it points at the given element. 175 @param object The object to compare with175 @param element The element to compare with 176 176 */ 177 177 virtual void removedElement(ObjectListBaseElement* element) override -
code/trunk/src/libraries/core/object/ObjectListBase.h
r11071 r11099 55 55 /** 56 56 @brief Constructor: Creates the list-element with an object. 57 @param object BaseThe object to store57 @param object The object to store 58 58 */ 59 59 ObjectListBaseElement(Listable* object) : next_(nullptr), prev_(nullptr), objectBase_(object), list_(nullptr) {}
Note: See TracChangeset
for help on using the changeset viewer.