From c3d61b4e51a1bbf6a6a83dc823f97014c65a684d Mon Sep 17 00:00:00 2001 From: Oliver Bock <oliver.bock@aei.mpg.de> Date: Wed, 27 May 2009 15:07:42 +0200 Subject: [PATCH] Remove trailing whitespaces --- src/framework/BOINCClientAdapter.cpp | 2 +- src/framework/Resource.h | 26 +++++++++++----------- src/framework/ResourceFactory.cpp | 14 ++++++------ src/framework/ResourceFactory.h | 32 ++++++++++++++-------------- src/starsphere/pulsar_list.C | 2 +- src/starsphere/starlist.C | 2 +- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/framework/BOINCClientAdapter.cpp b/src/framework/BOINCClientAdapter.cpp index 05aca72..3fc03a1 100644 --- a/src/framework/BOINCClientAdapter.cpp +++ b/src/framework/BOINCClientAdapter.cpp @@ -155,7 +155,7 @@ string BOINCClientAdapter::applicationInformation() const string BOINCClientAdapter::projectInformation() const { string temp("<project_preferences />\n"); - + // preferences available? (BOINC initializes them with 0) if(m_UserData.project_preferences != 0) { // ugly workaround for incomplete XML fragment returned by BOINC! diff --git a/src/framework/Resource.h b/src/framework/Resource.h index 93df0b1..6392fa4 100644 --- a/src/framework/Resource.h +++ b/src/framework/Resource.h @@ -33,13 +33,13 @@ using namespace std; /** * \brief Class that serves as storage container for arbitrary binary data resources - * + * * Instances of this class are returned by ResourceFactory and hold any kind of binary data * in the guise of a byte value vector identified by a descriptive string. You can access the - * data using \ref data() and query the identifier using \ref identifier(). - * + * data using \ref data() and query the identifier using \ref identifier(). + * * \see ResourceFactory - * + * * \author Oliver Bock\n * Max-Planck-Institute for Gravitational Physics\n * Hannover, Germany @@ -49,37 +49,37 @@ class Resource public: /** * \brief Constructor - * + * * \param identifier The string used to identify this resource * \param data A vector of byte values used to initialize the resource's data container */ Resource(const string identifier, const vector<unsigned char>& data); - + /// Destructor virtual ~Resource(); - + /** * \brief Retrieve the identifier of this resource - * + * * \return The identifier of this resource */ string identifier() const; - + /** * \brief Retrieve the data stored in this resource - * + * * The data can be accessed using the constant pointer returned by this method. * The pointer points to the beginning of a byte value sequence. The length of the * vector equals the the size of the data content. - * + * * \return The base pointer to the data contained in this resource */ const vector<unsigned char> * data() const; - + private: /// The identifer of this resource string m_Identifier; - + /// The data storage container of this resource const vector<unsigned char> m_Data; }; diff --git a/src/framework/ResourceFactory.cpp b/src/framework/ResourceFactory.cpp index 5610948..9d395aa 100644 --- a/src/framework/ResourceFactory.cpp +++ b/src/framework/ResourceFactory.cpp @@ -24,24 +24,24 @@ ResourceFactory::ResourceFactory() { // determine number of resources int resourceCount = c_ResourceIndex[0][0]; - + // import each resource into factory cache for(int i = 0; i < resourceCount; ++i) { - + // prepare temporary buffer size_t resourceSize = c_ResourceIndex[i+1][1]; vector<unsigned char> buffer(resourceSize); // extract resource data from storage container for(size_t x = 0; x < resourceSize; ++x) { - + // use offset and relative position to find the absolute position unsigned char byteValue = c_ResourceStorage[c_ResourceIndex[i+1][0] + x]; - + // add byte to buffer buffer[x] = byteValue; } - + // add buffer to resource map m_ResourceMap[c_ResourceIdentifiers[i]] = buffer; } @@ -54,12 +54,12 @@ ResourceFactory::~ResourceFactory() const Resource* ResourceFactory::createInstance(const string identifier) { Resource *res = NULL; - + // determine whether the requested identifier exists if(m_ResourceMap.find(identifier) != m_ResourceMap.end()) { // we know the requested resource, create instance res = new Resource(identifier, m_ResourceMap[identifier]); } - + return res; } diff --git a/src/framework/ResourceFactory.h b/src/framework/ResourceFactory.h index 2b1eb31..19df1e3 100644 --- a/src/framework/ResourceFactory.h +++ b/src/framework/ResourceFactory.h @@ -36,22 +36,22 @@ using namespace std; /** * \brief This factory instantiates %Resource objects using a given identifier - * + * * During contruction of the factory object itself it loads all available resources into * an internal cache. The user can subsequently request a copy of this resource by specifying * it using the resource's identifier. * * The resource data is expected to be stored in these three externally linked arrays: * - \ref c_ResourceIdentifiers - * - \ref c_ResourceIndex + * - \ref c_ResourceIndex * - \ref c_ResourceStorage * * These arrays are compiled using the Open %Resource Compiler (ORC) which can be found * in the \c orc subdirectory. - * + * * \see Resource * \see ResourceCompiler - * + * * \author Oliver Bock\n * Max-Planck-Institute for Gravitational Physics\n * Hannover, Germany @@ -61,25 +61,25 @@ class ResourceFactory public: /// Default constructor ResourceFactory(); - + /// Destructor virtual ~ResourceFactory(); - + /** * \brief Creates an instance of the requested resource - * + * * The identifier has to be the same as the one specified in the \c *.orc file * used to compile the resources - * + * * \param identifier The identifer of the resource to be instantiated - * + * * \return A constant pointer to the newly instantiated resource * or NULL if the specified resource could not be found - * + * * \see ResourceCompiler */ const Resource* createInstance(const string identifier); - + private: /// Hashtable mapping identifiers to resource data map<string, vector<unsigned char> > m_ResourceMap; @@ -87,7 +87,7 @@ private: /** * \brief Declaration of the external list of resource identifiers - * + * * \todo Does this need to be global? * Maybe we should wrap a class around the generated resources? */ @@ -95,13 +95,13 @@ extern const string c_ResourceIdentifiers[]; /** * \brief Declaration of the external list of resource indices - * + * * This two-dimensional array contains the necessary indices for * every resource in the storage container. Using these indices you * can easily extract a requested resource: * -# Offset to the resource * -# Length of the resource - * + * * \todo Does this need to be global? * Maybe we should wrap a class around the generated resources? */ @@ -109,11 +109,11 @@ extern const unsigned int c_ResourceIndex[][2]; /** * \brief Declaration of the external resource storage container - * + * * The container comprises all resources in a continuous byte sequence * expressed as hex values. Use the resource index to locate/retrieve * a specific resource from the container. - * + * * \todo Does this need to be global? * Maybe we should wrap a class around the generated resources? */ diff --git a/src/starsphere/pulsar_list.C b/src/starsphere/pulsar_list.C index 59abaab..317a473 100644 --- a/src/starsphere/pulsar_list.C +++ b/src/starsphere/pulsar_list.C @@ -1301,7 +1301,7 @@ float pulsar_info[][N_PULSAR_ITEMS] = { { 346.92f , 22.43f } , { 349.29f , 14.66f } , { 350.59f , 20.95f } , - { 356.71f , -6.17f } + { 356.71f , -6.17f } }; int Npulsars = sizeof(pulsar_info)/(N_PULSAR_ITEMS*sizeof(float)); diff --git a/src/starsphere/starlist.C b/src/starsphere/starlist.C index 761e2e7..48d8bb0 100644 --- a/src/starsphere/starlist.C +++ b/src/starsphere/starlist.C @@ -709,7 +709,7 @@ float star_info[][2] = { { 153.68447399f , -42.12206281f } , { 142.67547063f , -40.46688763f } , { 142.67547063f , -40.46688763f } , { 136.99907126f , -43.43262406f } , { 136.99907126f , -43.43262406f } , { 122.38314727f , -47.33661177f } , -}; +}; int Nstars = sizeof(star_info)/(2*sizeof(float)) ; -- GitLab