[Orxonox-commit 6171] r10829 - in code/branches/cpp11_v2: src/libraries/core/input src/libraries/util/output test/util/output
landauf at orxonox.net
landauf at orxonox.net
Sun Nov 22 17:30:57 CET 2015
Author: landauf
Date: 2015-11-22 17:30:57 +0100 (Sun, 22 Nov 2015)
New Revision: 10829
Modified:
code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.cc
code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h
code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc
code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h
code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc
code/branches/cpp11_v2/test/util/output/LogWriterTest.cc
code/branches/cpp11_v2/test/util/output/MemoryWriterTest.cc
code/branches/cpp11_v2/test/util/output/OutputListenerTest.cc
code/branches/cpp11_v2/test/util/output/OutputStreamTest.cc
Log:
replace all remaining usages of SharedPtr with std::shared_ptr
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.cc 2015-11-22 16:26:10 UTC (rev 10828)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.cc 2015-11-22 16:30:57 UTC (rev 10829)
@@ -204,6 +204,6 @@
void KeyBinderManager::registerKeybindCallback(LuaFunctor* function)
{
- this->callbackFunction_ = function;
+ this->callbackFunction_.reset(function);
}
}
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h 2015-11-22 16:26:10 UTC (rev 10828)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h 2015-11-22 16:30:57 UTC (rev 10829)
@@ -33,9 +33,9 @@
#include <map>
#include <string>
+#include <memory>
#include "util/Singleton.h"
-#include "util/SharedPtr.h"
#include "core/config/Configurable.h"
namespace orxonox //tolua_export
@@ -107,16 +107,16 @@
void defaultFilenameChanged();
// KeyBinder management
- KeyBinder* currentBinder_; //! Currently selected KeyBinder (never nullptr!)
- std::map<std::string, KeyBinder*> binders_; //! All loaded KeyBinders
- bool bDefaultFileLoaded_; //! Tells whether the default one is loaded
- std::string defaultFilename_; //! Name of the file with the default key bindings
+ KeyBinder* currentBinder_; //! Currently selected KeyBinder (never nullptr!)
+ std::map<std::string, KeyBinder*> binders_; //! All loaded KeyBinders
+ bool bDefaultFileLoaded_; //! Tells whether the default one is loaded
+ std::string defaultFilename_; //! Name of the file with the default key bindings
// keybind command related
- SharedPtr<LuaFunctor> callbackFunction_; //! Function to be called when key was pressed after "keybind" command
- bool bBinding_; //! Tells whether a key binding process is active
- bool bTemporary_; //! Stores tkeybind/keybind value
- std::string command_; //! Stores the command received by (t)keybind
+ std::shared_ptr<LuaFunctor> callbackFunction_; //! Function to be called when key was pressed after "keybind" command
+ bool bBinding_; //! Tells whether a key binding process is active
+ bool bTemporary_; //! Stores tkeybind/keybind value
+ std::string command_; //! Stores the command received by (t)keybind
static KeyBinderManager* singletonPtr_s;
}; //tolua_export
Modified: code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc 2015-11-22 16:26:10 UTC (rev 10828)
+++ code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc 2015-11-22 16:30:57 UTC (rev 10829)
@@ -40,7 +40,6 @@
#include "LogWriter.h"
#include "util/Output.h"
#include "util/StringUtils.h"
-#include "util/SharedPtr.h"
namespace orxonox
{
@@ -80,9 +79,9 @@
delete this->logWriterInstance_;
}
- /*static*/ SharedPtr<OutputManager>& OutputManager::Testing::getInstancePointer()
+ /*static*/ std::shared_ptr<OutputManager>& OutputManager::Testing::getInstancePointer()
{
- static SharedPtr<OutputManager> instance(new OutputManager());
+ static std::shared_ptr<OutputManager> instance(new OutputManager());
return instance;
}
Modified: code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h 2015-11-22 16:26:10 UTC (rev 10828)
+++ code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h 2015-11-22 16:30:57 UTC (rev 10829)
@@ -40,6 +40,7 @@
#include <vector>
#include <map>
+#include <memory>
#include "OutputDefinitions.h"
#include "AdditionalContextListener.h"
@@ -136,7 +137,7 @@
public:
struct _UtilExport Testing
{
- static SharedPtr<OutputManager>& getInstancePointer();
+ static std::shared_ptr<OutputManager>& getInstancePointer();
};
};
}
Modified: code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc 2015-11-22 16:26:10 UTC (rev 10828)
+++ code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc 2015-11-22 16:30:57 UTC (rev 10829)
@@ -2,7 +2,6 @@
#include "util/Output.h"
#include "util/output/ConsoleWriter.h"
#include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
namespace orxonox
{
@@ -15,7 +14,7 @@
virtual void SetUp()
{
// reset output manager
- OutputManager::Testing::getInstancePointer() = new OutputManager();
+ OutputManager::Testing::getInstancePointer().reset(new OutputManager());
}
virtual void TearDown()
Modified: code/branches/cpp11_v2/test/util/output/LogWriterTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/LogWriterTest.cc 2015-11-22 16:26:10 UTC (rev 10828)
+++ code/branches/cpp11_v2/test/util/output/LogWriterTest.cc 2015-11-22 16:30:57 UTC (rev 10829)
@@ -3,7 +3,6 @@
#include "util/output/LogWriter.h"
#include "util/Convert.h"
#include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
namespace orxonox
{
@@ -23,7 +22,7 @@
virtual void SetUp()
{
// reset output manager
- OutputManager::Testing::getInstancePointer() = new OutputManager();
+ OutputManager::Testing::getInstancePointer().reset(new OutputManager());
}
virtual void TearDown()
Modified: code/branches/cpp11_v2/test/util/output/MemoryWriterTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/MemoryWriterTest.cc 2015-11-22 16:26:10 UTC (rev 10828)
+++ code/branches/cpp11_v2/test/util/output/MemoryWriterTest.cc 2015-11-22 16:30:57 UTC (rev 10829)
@@ -3,7 +3,6 @@
#include "util/Output.h"
#include "util/output/MemoryWriter.h"
#include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
namespace orxonox
{
@@ -22,7 +21,7 @@
virtual void SetUp()
{
// reset output manager
- OutputManager::Testing::getInstancePointer() = new OutputManager();
+ OutputManager::Testing::getInstancePointer().reset(new OutputManager());
}
virtual void TearDown()
Modified: code/branches/cpp11_v2/test/util/output/OutputListenerTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/OutputListenerTest.cc 2015-11-22 16:26:10 UTC (rev 10828)
+++ code/branches/cpp11_v2/test/util/output/OutputListenerTest.cc 2015-11-22 16:30:57 UTC (rev 10829)
@@ -2,7 +2,6 @@
#include <gmock/gmock.h>
#include "util/output/OutputListener.h"
#include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
namespace orxonox
{
@@ -341,12 +340,12 @@
virtual void SetUp()
{
this->manager_ = new MockOutputManager();
- OutputManager::Testing::getInstancePointer() = this->manager_;
+ OutputManager::Testing::getInstancePointer().reset(this->manager_);
}
virtual void TearDown()
{
- OutputManager::Testing::getInstancePointer() = new OutputManager();
+ OutputManager::Testing::getInstancePointer().reset(new OutputManager());
}
protected:
Modified: code/branches/cpp11_v2/test/util/output/OutputStreamTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/OutputStreamTest.cc 2015-11-22 16:26:10 UTC (rev 10828)
+++ code/branches/cpp11_v2/test/util/output/OutputStreamTest.cc 2015-11-22 16:30:57 UTC (rev 10829)
@@ -7,7 +7,6 @@
#include "util/output/OutputStream.h"
#include "util/output/OutputManager.h"
#include "util/output/MemoryWriter.h"
-#include "util/SharedPtr.h"
namespace orxonox
{
@@ -87,12 +86,12 @@
virtual void SetUp()
{
this->manager_ = new MockOutputManager();
- OutputManager::Testing::getInstancePointer() = this->manager_;
+ OutputManager::Testing::getInstancePointer().reset(this->manager_);
}
virtual void TearDown()
{
- OutputManager::Testing::getInstancePointer() = new OutputManager();
+ OutputManager::Testing::getInstancePointer().reset(new OutputManager());
}
protected:
More information about the Orxonox-commit
mailing list