Changeset 10459

Timestamp:

May 24, 2015, 1:48:18 PM (9 years ago)

Author:

landauf

Message:

wrap ScopedSingletonWrapper in a StaticallyInitializedScopedSingletonWrapper. doesn't do a lot at the moment.

Location:

code/branches/core7

Files:

• src/libraries/core/Core.cc (modified) (1 diff)
• src/libraries/core/input/KeyBinderManager.cc (modified) (1 diff)
• src/libraries/core/input/KeyDetector.cc (modified) (1 diff)
• src/libraries/core/object/DestroyLaterManager.cc (modified) (1 diff)
• src/libraries/core/singleton/ScopedSingletonIncludes.h (added)
• src/libraries/core/singleton/ScopedSingletonWrapper.h (modified) (2 diffs)
• src/libraries/network/Client.cc (modified) (1 diff)
• src/libraries/network/LANDiscovery.cc (modified) (1 diff)
• src/libraries/network/MasterServer.cc (modified) (1 diff)
• src/modules/designtools/ScreenshotManager.cc (modified) (1 diff)
• src/modules/designtools/SkyboxGenerator.cc (modified) (1 diff)
• src/modules/notifications/NotificationManager.cc (modified) (1 diff)
• src/modules/pickup/PickupManager.cc (modified) (1 diff)
• src/modules/questsystem/QuestManager.cc (modified) (1 diff)
• src/orxonox/CameraManager.cc (modified) (1 diff)
• src/orxonox/LevelManager.cc (modified) (1 diff)
• src/orxonox/MoodManager.cc (modified) (1 diff)
• src/orxonox/PlayerManager.cc (modified) (1 diff)
• src/orxonox/chat/ChatHistory.cc (modified) (1 diff)
• src/orxonox/chat/ChatInputHandler.cc (modified) (1 diff)
• src/orxonox/chat/ChatManager.cc (modified) (1 diff)
• src/orxonox/overlays/InGameConsole.cc (modified) (1 diff)
• src/orxonox/sound/SoundManager.cc (modified) (1 diff)
• test/core/singleton/ScopeTest.cc (modified) (1 diff)

code/branches/core7/src/libraries/core/Core.cc

@@ -57 +57 @@
 #include "util/output/OutputManager.h"
 #include "core/singleton/Scope.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "util/SignalHandler.h"
 #include "PathConfig.h"

code/branches/core7/src/libraries/core/input/KeyBinderManager.cc

@@ -31 +31 @@
 #include "util/Output.h"
 #include "util/Exception.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/config/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"

code/branches/core7/src/libraries/core/input/KeyDetector.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/command/ConsoleCommandIncludes.h"
 #include "Button.h"

code/branches/core7/src/libraries/core/object/DestroyLaterManager.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 
 namespace orxonox

code/branches/core7/src/libraries/core/singleton/ScopedSingletonWrapper.h

@@ -30 +30 @@
     @file
     @ingroup SingletonScope
-    @brief Definition of orxonox::ScopedSingletonWrapper, orxonox::ClassScopedSingletonWrapper, and the ManageScopedSingleton macro.
+    @brief Definition of orxonox::ScopedSingletonWrapper and orxonox::ClassScopedSingletonWrapper.
 
     ScopedSingletonWrapper is used to create and destroy Singletons that belong to
@@ -51 +51 @@
 #include "util/Singleton.h"
 #include "Scope.h"
-
-/**
-    @brief Creates an orxonox::ScopedSingletonWrapper for an orxonox::Singleton and registers it with orxonox::ScopeManager.
-    @param className The name of the singleton class
-    @param scope The scope in which the singleton should exist
-    @param allowedToFail If true, the singleton is allowed to fail and thus a try-catch block is used when creating the singleton.
-
-    If this macro is called for a singleton, it is wrapped in a ScopedSingletonWrapper and registered with ScopeManager
-    and will thus be created if its scope becomes active and destroyed if is deactivated.
-
-
-    Usually a singleton gets created automatically when it is first used, but it will never
-    be destroyed (unless the singleton explicitly deletes itself). To allow controlled
-    construction and destruction, the singleton can be put within a virtual scope. This is
-    done by registering the singleton class with orxonox::ScopeManager. To
-    do so, the ManageScopedSingleton() macro has to be called:
-
-    @code
-    ManageScopedSingleton(TestSingleton, ScopeID::Graphics, false); // muste be called in a source (*.cc) file
-    @endcode
-
-    @b Important: If you call ManageScopedSingleton(), you don't have to initialize singletonPtr_s anymore,
-    because that's already done by the macro.
-
-    Now the singleton TestSingleton gets automatically created if the scope Graphics becomes
-    active and also gets destroyed if the scope is deactivated.
-
-    Note that not all singletons must register with a scope, but it's recommended.
-
-*/
-#define ManageScopedSingleton(className, scope, allowedToFail) \
-    className* className::singletonPtr_s = NULL; \
-    static ClassScopedSingletonWrapper<className, scope, allowedToFail> className##ScopedSingletonWrapper(#className)
 
 namespace orxonox

code/branches/core7/src/libraries/network/Client.cc

@@ -52 +52 @@
 #include "core/Game.h"
 #include "core/commandline/CommandLineParser.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 
 namespace orxonox

code/branches/core7/src/libraries/network/LANDiscovery.cc

@@ -33 +33 @@
 
 #include "core/CoreIncludes.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 
 

code/branches/core7/src/libraries/network/MasterServer.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/CorePrereqs.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "util/Output.h"
 

code/branches/core7/src/modules/designtools/ScreenshotManager.cc

@@ -48 +48 @@
 #include "core/Resource.h"
 #include "core/command/ConsoleCommandIncludes.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "util/StringUtils.h"
 

code/branches/core7/src/modules/designtools/SkyboxGenerator.cc

@@ -45 +45 @@
 #include "core/command/ConsoleCommandIncludes.h"
 #include "core/command/CommandExecutor.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 
 #include "controllers/HumanController.h"

code/branches/core7/src/modules/notifications/NotificationManager.cc

@@ -37 +37 @@
 #include "core/CoreIncludes.h"
 #include "core/LuaState.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 
 #include "interfaces/NotificationListener.h"

code/branches/core7/src/modules/pickup/PickupManager.cc

@@ -38 +38 @@
 #include "core/GUIManager.h"
 #include "core/class/Identifier.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "network/Host.h"
 #include "network/NetworkFunction.h"

code/branches/core7/src/modules/questsystem/QuestManager.cc

@@ -36 +36 @@
 #include "util/Exception.h"
 #include "util/OrxAssert.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/command/ConsoleCommand.h"
 #include "core/GUIManager.h"

code/branches/core7/src/orxonox/CameraManager.cc

@@ -38 +38 @@
 #include "core/GraphicsManager.h"
 #include "core/object/ObjectList.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "tools/Shader.h"
 #include "graphics/Camera.h"

code/branches/core7/src/orxonox/LevelManager.cc

@@ -36 +36 @@
 #include <map>
 
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/commandline/CommandLineIncludes.h"
 #include "core/config/ConfigValueIncludes.h"

code/branches/core7/src/orxonox/MoodManager.cc

@@ -29 +29 @@
 #include "MoodManager.h"
 
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/config/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"

code/branches/core7/src/orxonox/PlayerManager.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 
 #include "Level.h"

code/branches/core7/src/orxonox/chat/ChatHistory.cc

@@ -28 +28 @@
 
 #include "ChatHistory.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 
 #ifndef CHATTEST

code/branches/core7/src/orxonox/chat/ChatInputHandler.cc

@@ -47 +47 @@
 #endif
 
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/CoreIncludes.h"
 #include "core/GUIManager.h"

code/branches/core7/src/orxonox/chat/ChatManager.cc

@@ -31 +31 @@
 
 #include "core/CoreIncludes.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/command/ConsoleCommandIncludes.h"
 #include "network/Host.h"

code/branches/core7/src/orxonox/overlays/InGameConsole.cc

@@ -50 +50 @@
 #include "core/config/ConfigValueIncludes.h"
 #include "core/command/ConsoleCommandIncludes.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/GUIManager.h"
 #include "core/input/InputManager.h"

code/branches/core7/src/orxonox/sound/SoundManager.cc

@@ -38 +38 @@
 #include "util/Math.h"
 #include "util/Clock.h"
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/config/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"

code/branches/core7/test/core/singleton/ScopeTest.cc

@@ -1 +1 @@
 #include <gtest/gtest.h>
-#include "core/singleton/ScopedSingletonWrapper.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 
 namespace orxonox