[Orxonox-commit 6333] r10990 - in code/branches/cpp11_v2/src: libraries/core libraries/core/class libraries/core/command libraries/core/commandline libraries/core/config libraries/core/input libraries/core/module libraries/core/object libraries/core/singleton libraries/tools libraries/tools/interfaces libraries/util libraries/util/output orxonox orxonox/chat
landauf at orxonox.net
landauf at orxonox.net
Tue Dec 29 16:47:42 CET 2015
Author: landauf
Date: 2015-12-29 16:47:42 +0100 (Tue, 29 Dec 2015)
New Revision: 10990
Modified:
code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.h
code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h
code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.h
code/branches/cpp11_v2/src/libraries/core/Core.h
code/branches/cpp11_v2/src/libraries/core/CoreConfig.h
code/branches/cpp11_v2/src/libraries/core/GUIManager.h
code/branches/cpp11_v2/src/libraries/core/Game.h
code/branches/cpp11_v2/src/libraries/core/GameMode.h
code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h
code/branches/cpp11_v2/src/libraries/core/Language.h
code/branches/cpp11_v2/src/libraries/core/Resource.h
code/branches/cpp11_v2/src/libraries/core/ViewportEventListener.h
code/branches/cpp11_v2/src/libraries/core/WindowEventListener.h
code/branches/cpp11_v2/src/libraries/core/XMLNameListener.h
code/branches/cpp11_v2/src/libraries/core/XMLPort.h
code/branches/cpp11_v2/src/libraries/core/class/Identifier.h
code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h
code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h
code/branches/cpp11_v2/src/libraries/core/command/Executor.cc
code/branches/cpp11_v2/src/libraries/core/command/Executor.h
code/branches/cpp11_v2/src/libraries/core/command/Functor.h
code/branches/cpp11_v2/src/libraries/core/command/IRC.h
code/branches/cpp11_v2/src/libraries/core/command/Shell.h
code/branches/cpp11_v2/src/libraries/core/command/TclBind.h
code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.h
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntry.h
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h
code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h
code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h
code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h
code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h
code/branches/cpp11_v2/src/libraries/core/input/InputHandler.h
code/branches/cpp11_v2/src/libraries/core/input/InputManager.h
code/branches/cpp11_v2/src/libraries/core/input/InputState.h
code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h
code/branches/cpp11_v2/src/libraries/core/input/JoyStickQuantityListener.h
code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h
code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h
code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h
code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationHandler.h
code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.h
code/branches/cpp11_v2/src/libraries/core/object/ClassFactory.h
code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h
code/branches/cpp11_v2/src/libraries/core/singleton/Scope.h
code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h
code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.cc
code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h
code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.cc
code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h
code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h
code/branches/cpp11_v2/src/libraries/tools/interfaces/TimeFactorListener.h
code/branches/cpp11_v2/src/libraries/util/Clock.h
code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h
code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h
code/branches/cpp11_v2/src/libraries/util/Singleton.h
code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h
code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h
code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h
code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h
code/branches/cpp11_v2/src/orxonox/CameraManager.h
code/branches/cpp11_v2/src/orxonox/LevelManager.h
code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h
Log:
use '= delete' to explicitly delete unimplemented copy-constructors (for non-copyable classes).
use '= default' to explicitly implement default constructors/destructors.
Modified: code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -103,7 +103,7 @@
std::vector<std::string> getPluginPaths();
private:
- ApplicationPaths(const ApplicationPaths&); //!< Don't use (undefined symbol)
+ ApplicationPaths(const ApplicationPaths&) = delete;
std::vector<std::string> getModuleOrPluginPaths(boost::filesystem::path& directory, const std::string& extension);
Modified: code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -275,7 +275,7 @@
{
public:
/// Default-constructor: Does nothing.
- inline ClassTreeMaskObjectIterator() {}
+ inline ClassTreeMaskObjectIterator() = default;
/// Copy-Constructor: Initializes the iterator from another ClassTreeMask.
inline ClassTreeMaskObjectIterator(const ClassTreeMask& mask) { (*this) = mask; }
Modified: code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -92,7 +92,7 @@
void setConfigurablePaths(const ApplicationPaths& applicationPaths);
private:
- ConfigurablePaths(const ConfigurablePaths&); //!< Don't use (undefined symbol)
+ ConfigurablePaths(const ConfigurablePaths&) = delete;
boost::filesystem::path& dataPath_; //!< Path to the data files folder
boost::filesystem::path& externalDataPath_; //!< Path to the external data files folder
Modified: code/branches/cpp11_v2/src/libraries/core/Core.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Core.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/Core.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -72,7 +72,7 @@
Core(const std::string& cmdLine);
/// Leave empty and use destroy() instead
- ~Core() {}
+ ~Core() = default;
/// Destructor that also executes when the object fails to construct
void destroy();
@@ -91,7 +91,7 @@
{ return this->config_; }
private:
- Core(const Core&); //!< Don't use (undefined symbol)
+ Core(const Core&) = delete;
void setThreadAffinity(int limitToCPU);
Modified: code/branches/cpp11_v2/src/libraries/core/CoreConfig.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/CoreConfig.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/CoreConfig.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -75,7 +75,7 @@
{
public:
DevModeListener();
- virtual ~DevModeListener() {}
+ virtual ~DevModeListener() = default;
virtual void devModeChanged(bool value) = 0;
};
}
Modified: code/branches/cpp11_v2/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GUIManager.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/GUIManager.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -96,7 +96,7 @@
GUIManager(const std::pair<int, int>& mousePosition);
//! Leave empty and use cleanup() instead
- ~GUIManager() {}
+ ~GUIManager() = default;
/// Destructor that also executes when object fails to construct
void destroy();
@@ -150,7 +150,7 @@
inline bool usingOldCEGUI(void) { return this->oldCEGUI_; } // tolua_export
private:
- GUIManager(const GUIManager& instance); //!< private and undefined copy c'tor (this is a singleton class)
+ GUIManager(const GUIManager&) = delete;
void executeCode(const std::string& str);
Modified: code/branches/cpp11_v2/src/libraries/core/Game.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Game.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/Game.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -91,7 +91,7 @@
Game(const std::string& cmdLine);
//! Leave empty and use cleanup() instead
- ~Game() {}
+ ~Game() = default;
/// Destructor that also executes when object fails to construct
void destroy();
@@ -121,7 +121,7 @@
class _CoreExport GameStateFactory
{
public:
- virtual ~GameStateFactory() { }
+ virtual ~GameStateFactory() = default;
static std::shared_ptr<GameState> fabricate(const GameStateInfo& info);
template <class T>
static void createFactory(const std::string& className)
@@ -144,7 +144,7 @@
uint32_t tickLength;
};
- Game(Game&); // don't mess with singletons
+ Game(const Game&) = delete;
void loadGraphics();
void unloadGraphics(bool loadGraphicsManagerWithoutRenderer = true);
Modified: code/branches/cpp11_v2/src/libraries/core/GameMode.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GameMode.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/GameMode.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -62,9 +62,10 @@
static void setIsStandalone (bool val) { bIsStandalone_s = val; updateIsMaster(); } ///< Defines if the program is in standalone mode (offline)
private:
- GameMode();
- GameMode(const GameMode& inst);
- ~GameMode();
+ // static class, no instances allowed:
+ GameMode() = delete;
+ GameMode(const GameMode&) = delete;
+ ~GameMode() = delete;
/// Checks if we're in control of the game (either standalone or server).
static void updateIsMaster()
Modified: code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -70,7 +70,7 @@
GraphicsManager(bool bLoadRenderer = true);
//! Leave empty and use cleanup() instead
- ~GraphicsManager() {}
+ ~GraphicsManager() = default;
/// Destructor that also executes when object fails to construct
void destroy();
@@ -101,7 +101,7 @@
void setCamera(Ogre::Camera* camera);
private:
- GraphicsManager(GraphicsManager&); // don't mess with singletons
+ GraphicsManager(const GraphicsManager&) = delete;
// OGRE initialisation
void loadOgreRoot();
Modified: code/branches/cpp11_v2/src/libraries/core/Language.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Language.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/Language.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -170,7 +170,7 @@
const std::string& getLocalisation(const LanguageEntryLabel& label, bool bError = true) const;
private:
- Language(const Language&);
+ Language(const Language&) = delete;
void readDefaultLanguageFile();
bool readTranslatedLanguageFile(const std::string& language);
Modified: code/branches/cpp11_v2/src/libraries/core/Resource.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Resource.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/Resource.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -140,9 +140,10 @@
static const std::string& getDefaultResourceGroup();
private:
- Resource();
- ~Resource();
- Resource(const Resource& instance);
+ // static class, no instances allowed:
+ Resource() = delete;
+ Resource(const Resource&) = delete;
+ ~Resource() = delete;
};
}
Modified: code/branches/cpp11_v2/src/libraries/core/ViewportEventListener.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ViewportEventListener.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/ViewportEventListener.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -43,7 +43,7 @@
protected:
ViewportEventListener();
- virtual ~ViewportEventListener() {}
+ virtual ~ViewportEventListener() = default;
};
}
Modified: code/branches/cpp11_v2/src/libraries/core/WindowEventListener.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/WindowEventListener.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/WindowEventListener.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -46,7 +46,7 @@
protected:
WindowEventListener();
- virtual ~WindowEventListener() { }
+ virtual ~WindowEventListener() = default;
//! Returns the current render window width
unsigned int getWindowWidth() const { return windowWidth_s; }
Modified: code/branches/cpp11_v2/src/libraries/core/XMLNameListener.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/XMLNameListener.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/XMLNameListener.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -43,7 +43,7 @@
{
public:
XMLNameListener();
- virtual ~XMLNameListener() {}
+ virtual ~XMLNameListener() = default;
virtual void loadedNewXMLName(BaseObject* object) = 0;
};
Modified: code/branches/cpp11_v2/src/libraries/core/XMLPort.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/XMLPort.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/XMLPort.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -333,7 +333,7 @@
public:
XMLPortParamContainer()
{ this->parseResult_ = PR_not_started; }
- virtual ~XMLPortParamContainer() {}
+ virtual ~XMLPortParamContainer() = default;
inline const std::string& getName() const
{ return this->paramname_; }
@@ -377,10 +377,6 @@
this->saveexecutor_ = saveexecutor;
}
- ~XMLPortClassParamContainer()
- {
- }
-
XMLPortParamContainer& port(BaseObject* owner, T* object, Element& xmlelement, XMLPort::Mode mode)
{
OrxAssert(owner, "XMLPortParamContainer must have a BaseObject as owner.");
@@ -510,7 +506,7 @@
public:
XMLPortObjectContainer()
{ this->bApplyLoaderMask_ = false; }
- virtual ~XMLPortObjectContainer() {}
+ virtual ~XMLPortObjectContainer() = default;
XMLPortObjectContainer& port(BaseObject* object, Element& xmlelement, XMLPort::Mode mode);
@@ -551,10 +547,6 @@
this->bLoadBefore_ = bLoadBefore;
}
- ~XMLPortClassObjectContainer()
- {
- }
-
virtual void callLoadExecutor(BaseObject* object, BaseObject* newObject) override
{
T* castObject = orxonox_cast<T*>(object);
Modified: code/branches/cpp11_v2/src/libraries/core/class/Identifier.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/Identifier.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/class/Identifier.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -117,7 +117,7 @@
public:
Identifier(const std::string& name, Factory* factory, bool bLoadable);
- Identifier(const Identifier& identifier); // don't copy
+ Identifier(const Identifier&) = delete;
virtual ~Identifier();
/// Returns the name of the class the Identifier belongs to.
@@ -301,7 +301,7 @@
static ClassIdentifier<T>* getIdentifier();
private:
- ClassIdentifier(const ClassIdentifier<T>& identifier) {} // don't copy
+ ClassIdentifier(const ClassIdentifier<T>&) = delete;
void setConfigValues(T* object, Configurable*) const;
void setConfigValues(T* object, Identifiable*) const;
Modified: code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -53,7 +53,7 @@
public:
IdentifierManager();
- ~IdentifierManager() {}
+ ~IdentifierManager() = default;
void addIdentifier(Identifier* identifier);
void removeIdentifier(Identifier* identifier);
@@ -94,7 +94,7 @@
{ return this->identifierByNetworkId_; }
private:
- IdentifierManager(const IdentifierManager&); // not implemented
+ IdentifierManager(const IdentifierManager&) = delete;
/// Increases the hierarchyCreatingCounter_s variable, causing all new objects to store their parents.
inline void startCreatingHierarchy()
Modified: code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -131,9 +131,9 @@
static void _autocomplete(const std::string& group, const std::string& name) {} ///< Pseudo console command used whenever no real command is available. In these cases this command provides auto-completion for console commands and groups.
private:
- CommandExecutor() {} ///< Empty constructor
- CommandExecutor(const CommandExecutor& other); ///< Not implemented copy-constructor
- ~CommandExecutor() {} ///< Empty destructor
+ CommandExecutor() = default; ///< Empty constructor
+ CommandExecutor(const CommandExecutor&) = delete; ///< Not implemented copy-constructor
+ ~CommandExecutor() = default; ///< Empty destructor
static CommandExecutor& getInstance();
Modified: code/branches/cpp11_v2/src/libraries/core/command/Executor.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/Executor.cc 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/command/Executor.cc 2015-12-29 15:47:42 UTC (rev 10990)
@@ -66,13 +66,6 @@
}
/**
- @brief Destructor
- */
- Executor::~Executor()
- {
- }
-
- /**
@brief Calls the wrapped function with arguments that are passed in a string.
@param arguments The arguments that should be passed to the function, separated by @a delimiter
@param error A pointer to a variable (or nullptr) that is used to store the error code (see @ref CommandExecutorErrorCodes "CommandExecutor error codes")
Modified: code/branches/cpp11_v2/src/libraries/core/command/Executor.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/Executor.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/command/Executor.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -99,7 +99,7 @@
public:
Executor(const FunctorPtr& functor, const std::string& name = "");
Executor(const Executor& other);
- virtual ~Executor();
+ virtual ~Executor() = default;
/// Calls the wrapped function with 0 arguments. If the function needs more arguments, the executor's default values are used.
inline MultiType operator()() const
Modified: code/branches/cpp11_v2/src/libraries/core/command/Functor.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/Functor.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/command/Functor.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -186,7 +186,7 @@
};
public:
- virtual ~Functor() {}
+ virtual ~Functor() = default;
/// Calls the function-pointer with up to five arguments. In case of a member-function, the assigned object-pointer is used to call the function. @return Returns the return-value of the function (if any; MultiType::Null otherwise)
virtual MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) = 0;
Modified: code/branches/cpp11_v2/src/libraries/core/command/IRC.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/IRC.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/command/IRC.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -64,8 +64,8 @@
void initialize();
IRC();
- IRC(const IRC& other); ///< Copy-constructor: Not implemented
- ~IRC() {} ///< Destructor
+ IRC(const IRC&) = delete;
+ ~IRC() = default;
Tcl::interpreter* interpreter_; ///< The Tcl interpreter that is used for the IRC connection
std::string nickname_; ///< The user's nickname on the IRC server
Modified: code/branches/cpp11_v2/src/libraries/core/command/Shell.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/Shell.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/command/Shell.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -60,7 +60,8 @@
friend class Shell;
public:
- virtual ~ShellListener() {}
+ ShellListener() = default;
+ virtual ~ShellListener() = default;
private:
virtual void linesChanged() {} ///< Called if all output-lines have changed
@@ -147,7 +148,7 @@
{ return Shell::cacheSize_s; }
private:
- Shell(const Shell& other);
+ Shell(const Shell&) = delete;
// DevModeListener
virtual void devModeChanged(bool value) override;
Modified: code/branches/cpp11_v2/src/libraries/core/command/TclBind.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/TclBind.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/command/TclBind.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -123,7 +123,7 @@
static std::string eval(const std::string& tclcode, int* error = nullptr);
private:
- TclBind(const TclBind& other); ///< Copy-constructor, not implemented
+ TclBind(const TclBind&) = delete;
static std::string tcl_helper(Tcl::object const &args, bool bQuery);
Modified: code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -106,8 +106,7 @@
const MultiType& getDefaultValue() const { return defaultValue_; }
private:
- //! Undefined copy constructor
- CommandLineArgument(const CommandLineArgument& instance);
+ CommandLineArgument(const CommandLineArgument&) = delete;
//! Parses the value string of a command line argument.
void parse(const std::string& value);
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntry.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntry.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntry.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -50,7 +50,7 @@
{
public:
/// Destructor
- virtual ~ConfigFileEntry() {};
+ virtual ~ConfigFileEntry() = default;
/// Changes the value of the entry.
virtual void setValue(const std::string& value) = 0;
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -53,7 +53,7 @@
inline ConfigFileEntryComment(const std::string& comment) : comment_(comment) {}
/// Destructor
- virtual inline ~ConfigFileEntryComment() {}
+ virtual inline ~ConfigFileEntryComment() = default;
virtual inline const std::string& getName() const override
{ return this->comment_; }
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -66,7 +66,7 @@
{ this->update(); }
/// Destructor
- virtual inline ~ConfigFileEntryValue() {}
+ virtual inline ~ConfigFileEntryValue() = default;
virtual inline const std::string& getName() const override
{ return this->name_; }
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -64,7 +64,7 @@
{ this->update(); /*No virtual calls in base class ctor*/ }
/// Destructor
- inline ~ConfigFileEntryVectorValue() {}
+ inline ~ConfigFileEntryVectorValue() = default;
virtual inline unsigned int getIndex() const override
{ return this->index_; }
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -66,7 +66,7 @@
}
private:
- ConfigFileManager(const ConfigFileManager&); ///< Copy-constructor: not implemented
+ ConfigFileManager(const ConfigFileManager&) = delete;
std::array<ConfigFile*, 3> configFiles_; ///< Stores the config files for each type in an array (must have the same size like ConfigFileType::Value)
static ConfigFileManager* singletonPtr_s; ///< Stores the singleton-pointer
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -66,7 +66,7 @@
{
public:
inline ConfigValueCallback(void (T::*function) (void)) : function_(function) {}
- virtual inline ~ConfigValueCallback() {}
+ virtual inline ~ConfigValueCallback() = default;
virtual inline void call(void* object) override
{
if (!IdentifierManager::getInstance().isCreatingHierarchy())
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -46,7 +46,7 @@
: bListenToAllChanges_(bListenToAllChanges), bOnlySingleInput_(bOnlySingleInput),
trueKeyFalseChar_(trueKeyFalseChar), char_(_char), key_(key)
{ }
- virtual ~BaseInputBufferListenerTuple() { }
+ virtual ~BaseInputBufferListenerTuple() = default;
virtual void callFunction() = 0;
bool bListenToAllChanges_;
bool bOnlySingleInput_;
@@ -64,7 +64,7 @@
: BaseInputBufferListenerTuple(bListenToAllChanges, bOnlySingleInput, trueKeyFalseChar, _char, key),
listener_(listener), function_(function)
{ }
- virtual ~InputBufferListenerTuple() { }
+ virtual ~InputBufferListenerTuple() = default;
virtual void callFunction() override
{
(listener_->*function_)();
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -56,7 +56,7 @@
{
public:
BaseCommand() : bFixedKeybindMode_(false) {}
- virtual ~BaseCommand() { }
+ virtual ~BaseCommand() = default;
virtual bool execute(float abs = 1.0f, float rel = 1.0f) = 0;
virtual CommandEvaluation* getEvaluation() = 0;
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -59,7 +59,7 @@
public:
//! Only resets the members
InputDevice(unsigned int id) : bCalibrating_(false), deviceID_(id) { }
- virtual ~InputDevice() { }
+ virtual ~InputDevice() = default;
//! Returns the device class (derived) name as string
virtual std::string getClassName() const = 0;
//! Updates the device which should in turn distribute events
@@ -98,7 +98,7 @@
std::vector<InputState*> inputStates_;
private:
- InputDevice(const InputDevice& rhs); //!< Don't use!
+ InputDevice(const InputDevice&) = delete;
bool bCalibrating_; //!< Whether the device is in calibration mode
const unsigned int deviceID_; //!< ID of the device (the same as in InputDeviceEnumerator for mouse and keyboard)
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputHandler.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputHandler.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputHandler.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -118,7 +118,7 @@
class _CoreExport InputHandler
{
public:
- virtual ~InputHandler() { }
+ virtual ~InputHandler() = default;
template<class T> void buttonEvent(unsigned int device, T button, ButtonEvent::TPress)
{ this->buttonPressed(button); }
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputManager.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputManager.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -191,8 +191,7 @@
static InputManager& getInstance() { return Singleton<InputManager>::getInstance(); } // tolua_export
private: // functions
- // don't mess with a Singleton
- InputManager(const InputManager&);
+ InputManager(const InputManager&) = delete;
// Internal methods
void loadDevices();
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputState.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputState.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputState.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -154,7 +154,7 @@
private:
InputState(const std::string& name, bool bAlwaysGetsInput, bool bTransparent, InputStatePriority priority);
- ~InputState() { }
+ ~InputState() = default;
virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
Modified: code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -69,7 +69,7 @@
public:
//! Assigns a generated ID string and loads the calibration (if present)
JoyStick(unsigned int id, OIS::InputManager* oisInputManager);
- ~JoyStick() { }
+ ~JoyStick() = default;
void setConfigValues();
//! Returns the name generated from the number of knobs and the device name
Modified: code/branches/cpp11_v2/src/libraries/core/input/JoyStickQuantityListener.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/JoyStickQuantityListener.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/input/JoyStickQuantityListener.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -47,7 +47,7 @@
friend class InputManager;
protected:
JoyStickQuantityListener();
- virtual ~JoyStickQuantityListener() { }
+ virtual ~JoyStickQuantityListener() = default;
//! Returns a list with all JoySticks currently loaded
const std::vector<JoyStick*>& getJoyStickList() const { return joyStickList_s; }
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -101,7 +101,7 @@
void registerKeybindCallback(LuaFunctor* function); //tolua_export
private:
- KeyBinderManager(const KeyBinderManager&);
+ KeyBinderManager(const KeyBinderManager&) = delete;
void keybindInternal(const std::string& command, bool bTemporary);
void keybindKeyPressed(const std::string& keyName);
void defaultFilenameChanged();
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -47,7 +47,7 @@
void setCallback(const FunctorPtr& function) { this->callbackFunction_ = function; }
private:
- KeyDetector(const KeyDetector&);
+ KeyDetector(const KeyDetector&) = delete;
void callback(const std::string& name);
virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
Modified: code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -62,7 +62,7 @@
public:
//! Only resets the keyboard modifiers. Initialising is done in the base class.
Keyboard(unsigned int id, OIS::InputManager* oisInputManager) : super(id, oisInputManager), modifiers_(0) { }
- ~Keyboard() { }
+ ~Keyboard() = default;
private:
//! Resets the keyboard modifiers
Modified: code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationHandler.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationHandler.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationHandler.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -36,8 +36,8 @@
class _CoreExport StaticInitializationHandler
{
public:
- StaticInitializationHandler() {}
- virtual ~StaticInitializationHandler() {}
+ StaticInitializationHandler() = default;
+ virtual ~StaticInitializationHandler() = default;
virtual void setupHandler() = 0;
virtual void shutdownHandler() = 0;
Modified: code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -42,8 +42,8 @@
friend class Singleton<StaticInitializationManager>;
public:
- StaticInitializationManager() {}
- virtual ~StaticInitializationManager() {}
+ StaticInitializationManager() = default;
+ virtual ~StaticInitializationManager() = default;
void addHandler(StaticInitializationHandler* handler);
void removeHandler(StaticInitializationHandler* handler);
Modified: code/branches/cpp11_v2/src/libraries/core/object/ClassFactory.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/ClassFactory.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/object/ClassFactory.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -52,7 +52,8 @@
class _CoreExport Factory
{
public:
- virtual ~Factory() {}
+ Factory() = default;
+ virtual ~Factory() = default;
virtual Identifiable* fabricate(Context* context) = 0;
};
Modified: code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -103,7 +103,8 @@
class _CoreExport ObjectListElementRemovalListener
{
public:
- virtual ~ObjectListElementRemovalListener() {}
+ ObjectListElementRemovalListener = default;
+ virtual ~ObjectListElementRemovalListener() = default;
virtual void removedElement(ObjectListBaseElement* element) = 0;
};
Modified: code/branches/cpp11_v2/src/libraries/core/singleton/Scope.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/singleton/Scope.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/singleton/Scope.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -71,7 +71,7 @@
protected:
ScopeListener() : bActivated_(false) { }
- virtual ~ScopeListener() { }
+ virtual ~ScopeListener() = default;
//! Gets called if the scope is activated
virtual void activated() = 0;
Modified: code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -63,7 +63,7 @@
ScopedSingletonWrapper(const std::string& className)
: className_(className)
{ }
- virtual ~ScopedSingletonWrapper() { }
+ virtual ~ScopedSingletonWrapper() = default;
protected:
const std::string className_; ///< The name of the scoped singleton class that is managed by this object
Modified: code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.cc 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.cc 2015-12-29 15:47:42 UTC (rev 10990)
@@ -47,10 +47,6 @@
this->setResourceGroup(Resource::getDefaultResourceGroup());
}
- ResourceCollection::~ResourceCollection()
- {
- }
-
void ResourceCollection::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
XMLPortParam(ResourceCollection, "resourceGroup", setResourceGroup, getResourceGroup, xmlelement, mode);
Modified: code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -41,7 +41,7 @@
{
public:
ResourceCollection(Context* context);
- virtual ~ResourceCollection();
+ virtual ~ResourceCollection() = default;
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
@@ -53,7 +53,7 @@
ResourceLocation* getResourceLocation(unsigned int index) const;
private:
- ResourceCollection(const ResourceCollection&);
+ ResourceCollection(const ResourceCollection&) = delete;
std::string resourceGroup_;
std::vector<ResourceLocation*> resourceLocations_;
Modified: code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.cc 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.cc 2015-12-29 15:47:42 UTC (rev 10990)
@@ -53,10 +53,6 @@
bRecursive_ = false;
}
- ResourceLocation::~ResourceLocation()
- {
- }
-
void ResourceLocation::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
XMLPortParam(ResourceLocation, "path", setPath, getPath, xmlelement, mode);
Modified: code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -43,7 +43,7 @@
public:
ResourceLocation(Context* context);
- virtual ~ResourceLocation();
+ virtual ~ResourceLocation() = default;
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
@@ -59,7 +59,7 @@
const std::string& getResourceGroup() const { return resourceGroup_; }
private:
- ResourceLocation(const ResourceLocation&);
+ ResourceLocation(const ResourceLocation&) = delete;
void load(const std::string& resourceGroup);
void unload();
Modified: code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -48,9 +48,10 @@
static const std::string& getMaterialName(const std::string& textureName, const ColourValue& colour);
private:
- TextureGenerator();
- TextureGenerator(const TextureGenerator&);
- ~TextureGenerator();
+ // static class, no instances allowed:
+ TextureGenerator() = delete;
+ TextureGenerator(const TextureGenerator&) = delete;
+ ~TextureGenerator() = delete;
static std::map<std::string, std::map<ColourValue, std::string>> materials_s;
static unsigned int materialCount_s;
Modified: code/branches/cpp11_v2/src/libraries/tools/interfaces/TimeFactorListener.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/interfaces/TimeFactorListener.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/tools/interfaces/TimeFactorListener.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -38,7 +38,7 @@
{
public:
TimeFactorListener();
- virtual ~TimeFactorListener() {}
+ virtual ~TimeFactorListener() = default;
static void setTimeFactor(float factor);
static inline float getTimeFactor()
Modified: code/branches/cpp11_v2/src/libraries/util/Clock.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/Clock.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/util/Clock.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -101,8 +101,7 @@
unsigned long long getRealMicroseconds() const;
private:
- /// Undefined
- Clock(const Clock& instance);
+ Clock(const Clock&) = delete;
Ogre::Timer* timer_; ///< Ogre timer object
unsigned long long tickTime_; ///< Currently captured time
Modified: code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -86,7 +86,7 @@
}
private:
- DestructionHelper(const DestructionHelper&); //!< Don't use (undefined)
+ DestructionHelper(const DestructionHelper&) = delete;
T* object_;
};
Modified: code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -67,7 +67,10 @@
class ImplicitConversion
{
private:
- ImplicitConversion(); ImplicitConversion(const ImplicitConversion&); ~ImplicitConversion();
+ // static class, no instances allowed:
+ ImplicitConversion() = delete;
+ ImplicitConversion(const ImplicitConversion&) = delete;
+ ~ImplicitConversion() = delete;
// Gets chosen only if there is an implicit conversion from FromType to ToType.
static char test(ToType);
// Accepts any argument. Why do we not use a template? The reason is that with templates,
Modified: code/branches/cpp11_v2/src/libraries/util/Singleton.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/Singleton.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/util/Singleton.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -143,7 +143,7 @@
}
private:
- Singleton(const Singleton& rhs); //!< Don't use (undefined)
+ Singleton(const Singleton&) = delete;
};
}
Modified: code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -52,7 +52,7 @@
{
public:
ConsoleWriter(std::ostream& outputStream);
- ConsoleWriter(const ConsoleWriter&);
+ ConsoleWriter(const ConsoleWriter&) = delete;
virtual ~ConsoleWriter();
void enable();
Modified: code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -56,7 +56,7 @@
{
public:
LogWriter();
- LogWriter(const LogWriter&);
+ LogWriter(const LogWriter&) = delete;
virtual ~LogWriter();
void setLogDirectory(const std::string& directory);
Modified: code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -67,7 +67,7 @@
public:
MemoryWriter();
- MemoryWriter(const MemoryWriter&);
+ MemoryWriter(const MemoryWriter&) = delete;
virtual ~MemoryWriter();
void resendOutput(OutputListener* listener) const;
Modified: code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -66,7 +66,7 @@
{
public:
OutputManager();
- OutputManager(const OutputManager&);
+ OutputManager(const OutputManager&) = delete;
virtual ~OutputManager();
static OutputManager& getInstance();
Modified: code/branches/cpp11_v2/src/orxonox/CameraManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/CameraManager.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/orxonox/CameraManager.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -58,7 +58,7 @@
void useCamera(Ogre::Camera* camera);
private:
- CameraManager(const CameraManager&); // don't use
+ CameraManager(const CameraManager&) = delete;
std::list<Camera*> cameraList_;
Modified: code/branches/cpp11_v2/src/orxonox/LevelManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/LevelManager.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/orxonox/LevelManager.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -108,7 +108,7 @@
// tolua_end
private:
- LevelManager(const LevelManager&);
+ LevelManager(const LevelManager&) = delete;
void activateNextLevel(); //!< Activate the next level.
Modified: code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h 2015-12-29 10:35:49 UTC (rev 10989)
+++ code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h 2015-12-29 15:47:42 UTC (rev 10990)
@@ -46,13 +46,13 @@
public:
ChatManager();
- virtual ~ChatManager() {}
+ virtual ~ChatManager() = default;
static void message(const std::string& message, unsigned int targetID = NETWORK_PEER_ID_BROADCAST);
static void chat(const std::string& message, unsigned int targetID = NETWORK_PEER_ID_BROADCAST);
protected:
- ChatManager(const ChatManager&);
+ ChatManager(const ChatManager&) = delete;
virtual void incomingChat(const std::string& message, unsigned int sourceID) override;
More information about the Orxonox-commit
mailing list