Moved shared memory identifier from initializer to constructor

* Identifier is determined in specialized AbstractGraphicsEngine instances
* Identifier is now passed up the chain during object instantiation
* Fixes formerly hardcoded identifier in Starsphere::initialize()
* Also: removed trailing whitespaces

src/framework/AbstractGraphicsEngine.cpp

@@ -20,7 +20,8 @@
 
 #include "AbstractGraphicsEngine.h"
 
-AbstractGraphicsEngine::AbstractGraphicsEngine() : m_BoincAdapter()
+AbstractGraphicsEngine::AbstractGraphicsEngine(string sharedMemoryIdentifier) :
+	m_BoincAdapter(sharedMemoryIdentifier)
 {
 }
 

src/framework/AbstractGraphicsEngine.h

@@ -21,9 +21,13 @@
 #ifndef ABSTRACTGRAPHICSENGINE_H_
 #define ABSTRACTGRAPHICSENGINE_H_
 
+#include <string>
+
 #include "BOINCClientAdapter.h"
 #include "Resource.h"
 
+using namespace std;
+
 /**
  * \addtogroup framework Framework
  * @{
@@ -169,11 +173,17 @@ public:
 
 protected:
 	/**
-	 * \brief Default constructor
+	 * \brief Constructor
+	 *
+	 * The constructor is protected since this is an abstract class. It takes
+	 * as an argument the name of the shared memory area which is propagated
+	 * to the BOINC client adapter instance (during construction).
+	 *
+	 * \param sharedMemoryIdentifier The identifier of the shared memory area
 	 *
-	 * The constructor is protected since this is an abstract class.
+	 * \see BOINCClientAdapter::BOINCClientAdapter()
 	 */
-	AbstractGraphicsEngine();
+	AbstractGraphicsEngine(string sharedMemoryIdentifier);
 
 	/**
 	 * \brief This method has to be called in order to update the BOINC client information

src/framework/BOINCClientAdapter.cpp

@@ -20,9 +20,10 @@
 
 #include "BOINCClientAdapter.h"
 
-BOINCClientAdapter::BOINCClientAdapter()
+BOINCClientAdapter::BOINCClientAdapter(string sharedMemoryIdentifier)
 {
 	m_Initialized = false;
+	m_SharedMemoryAreaIdentifier = sharedMemoryIdentifier;
 	m_SharedMemoryAreaAvailable = false;
 }
 
@@ -30,10 +31,8 @@ BOINCClientAdapter::~BOINCClientAdapter()
 {
 }
 
-void BOINCClientAdapter::initialize(string sharedMemoryIdentifier)
+void BOINCClientAdapter::initialize()
 {
-	m_SharedMemoryAreaIdentifier = sharedMemoryIdentifier;
-	
 	readUserInfo();
 	readSharedMemoryArea();
 

src/framework/BOINCClientAdapter.h

@@ -48,8 +48,15 @@ using namespace std;
 class BOINCClientAdapter
 {
 public:
-	/// Default constructor
-	BOINCClientAdapter();
+	/**
+	 * \brief Constructor
+	 *
+	 * It takes as an argument the name of the shared memory area to be used
+	 * for inter-process communication.
+	 *
+	 * \param sharedMemoryIdentifier The identifier of the shared memory area
+	 */
+	BOINCClientAdapter(string sharedMemoryAreaIdentifier);
 
 	/// Destructor
 	virtual ~BOINCClientAdapter();
@@ -71,7 +78,7 @@ public:
 	 *
 	 * This method has to be called first, otherwise no data will be returned when requested!
 	 */
-	void initialize(string sharedMemoryIdentifier);
+	void initialize();
 
 	/**
 	 * \brief Refreshes dynamic data (e.g. search information)

src/framework/WindowManager.cpp

@@ -23,7 +23,7 @@
 WindowManager::WindowManager()
 {
 	m_ScreensaverMode = false;
-	m_BoincAdapter = new BOINCClientAdapter();
+	m_BoincAdapter = new BOINCClientAdapter("");
 }
 
 WindowManager::~WindowManager()
@@ -56,7 +56,7 @@ bool WindowManager::initialize(const int width, const int height, const int fram
 	}
 
 	// get initial non-fullscreen resolution and frame rate from project preferences
-	m_BoincAdapter->initialize("");
+	m_BoincAdapter->initialize();
 	int preferredWidth = m_BoincAdapter->graphicsWindowWidth();
 	int preferredHeight = m_BoincAdapter->graphicsWindowHeight();
 	int preferredFrameRate = m_BoincAdapter->graphicsFrameRate();

src/starsphere/Starsphere.cpp

@@ -23,7 +23,8 @@
 
 #include "Starsphere.h"
 
-Starsphere::Starsphere() : AbstractGraphicsEngine()
+Starsphere::Starsphere(string sharedMemoryAreaIdentifier) :
+	AbstractGraphicsEngine(sharedMemoryAreaIdentifier)
 {
 	m_FontResource = 0;
 	m_FontLogo1 = 0;
@@ -621,7 +622,7 @@ void Starsphere::initialize(const int width, const int height, const Resource *f
 		if(font) m_FontResource = font;
 
 		// initialize the BOINC client adapter
-		m_BoincAdapter.initialize(EinsteinS5R3Adapter::SharedMemoryIdentifier);
+		m_BoincAdapter.initialize();
 
 		// inital HUD offset setup
 		m_XStartPosLeft = 5;

src/starsphere/Starsphere.h

@@ -119,11 +119,18 @@ public:
 
 protected:
 	/**
-	 * \brief Default contructor
+	 * \brief Constructor
 	 *
-	 * The constructor is protected since this an abstract class.
+	 * The constructor is protected since this is an abstract class. It takes
+	 * as an argument the name of the shared memory area which is propagated
+	 * to the BOINC client adapter instance (during construction).
+	 *
+	 * \param sharedMemoryIdentifier The identifier of the shared memory area
+	 *
+	 * \see AbstractGraphicsEngine::AbstractGraphicsEngine()
+	 * \see BOINCClientAdapter::BOINCClientAdapter()
 	 */
-	Starsphere();
+	Starsphere(string sharedMemoryIdentifier);
 
 	/**
 	 * \brief Render science run specific search information

src/starsphere/StarsphereS5R3.cpp

@@ -20,7 +20,9 @@
 
 #include "StarsphereS5R3.h"
 
-StarsphereS5R3::StarsphereS5R3() : Starsphere(), m_EinsteinAdapter(&m_BoincAdapter)
+StarsphereS5R3::StarsphereS5R3() :
+	Starsphere(EinsteinS5R3Adapter::SharedMemoryIdentifier),
+	m_EinsteinAdapter(&m_BoincAdapter)
 {
 }