[Orxonox-commit 1472] r6190 - in code/branches/presentation2/src: libraries/core libraries/core/input orxonox/sound

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-12-02 09:02:49 +0100 (Wed, 02 Dec 2009)
New Revision: 6190

Modified:
   code/branches/presentation2/src/libraries/core/GUIManager.cc
   code/branches/presentation2/src/libraries/core/LuaState.cc
   code/branches/presentation2/src/libraries/core/Shell.cc
   code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h
   code/branches/presentation2/src/orxonox/sound/BaseSound.cc
   code/branches/presentation2/src/orxonox/sound/SoundManager.cc
Log:
Small style changes (no code changes).

Modified: code/branches/presentation2/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/GUIManager.cc	2009-12-01 19:09:52 UTC (rev 6189)
+++ code/branches/presentation2/src/libraries/core/GUIManager.cc	2009-12-02 08:02:49 UTC (rev 6190)
@@ -55,7 +55,6 @@
 #include "util/OrxAssert.h"
 #include "ConsoleCommand.h"
 #include "Core.h"
-#include "input/InputManager.h"
 #include "LuaState.h"
 #include "PathConfig.h"
 #include "Resource.h"

Modified: code/branches/presentation2/src/libraries/core/LuaState.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/LuaState.cc	2009-12-01 19:09:52 UTC (rev 6189)
+++ code/branches/presentation2/src/libraries/core/LuaState.cc	2009-12-02 08:02:49 UTC (rev 6190)
@@ -91,7 +91,7 @@
         if (resourceGroup != "NoResourceGroupProvided")
             sourceInfo = Resource::getInfo(filename, resourceGroup);
 
-        // Continue search if not explicitely forbidden
+        // Continue search if not explicitly forbidden
         if (bSearchOtherPaths && sourceInfo == NULL)
         {
             // Call might be relative to the file currently being processed
@@ -139,7 +139,7 @@
 
     void LuaState::doString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo)
     {
-        // Save the oold source file info
+        // Save the old source file info
         shared_ptr<ResourceInfo> oldSourceFileInfo = sourceFileInfo_;
         // Only override if sourceFileInfo provides useful information
         if (sourceFileInfo != NULL)

Modified: code/branches/presentation2/src/libraries/core/Shell.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/Shell.cc	2009-12-01 19:09:52 UTC (rev 6189)
+++ code/branches/presentation2/src/libraries/core/Shell.cc	2009-12-02 08:02:49 UTC (rev 6190)
@@ -65,7 +65,7 @@
         this->commandHistoryConfigFileType_ = ConfigFileManager::getInstance().getNewConfigFileType();
         ConfigFileManager::getInstance().setFilename(this->commandHistoryConfigFileType_, "commandHistory.ini");
 
-        // Use a stringstream object to buffer the output and get it line by line in update()
+        // Use a stringstream object to buffer the output
         this->outputStream_ = &this->outputBuffer_;
 
         this->setConfigValues();

Modified: code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h
===================================================================
--- code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h	2009-12-01 19:09:52 UTC (rev 6189)
+++ code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h	2009-12-02 08:02:49 UTC (rev 6190)
@@ -59,7 +59,7 @@
         void setConfigValues();
 
         //! Returns the currently selected KeyBinder
-        KeyBinder*    getCurrent()
+        KeyBinder* getCurrent()
             { return this->currentBinder_; }
         //! Like getCurrent(), but returns it as InputHandler* (so you don't have to include KeyBinder.h)
         InputHandler* getCurrentAsHandler();
@@ -67,7 +67,7 @@
         void setCurrent(const std::string& filename);
 
         //! Returns the default KeyBinder
-        KeyBinder*    getDefault()
+        KeyBinder* getDefault()
             { return binders_[this->defaultFilename_]; }
         //! Returns the default KeyBinder as InputHandler* (so you don't have to include KeyBinder.h)
         InputHandler* getDefaultAsHandler();
@@ -79,12 +79,12 @@
             { this->setCurrent(this->defaultFilename_); }
 
         //! Returns a pointer to a KeyBinder (creates it if not yet loaded)
-        KeyBinder*    get(const std::string& name);
+        KeyBinder* get(const std::string& name);
         //! Like get() but return value is of type InputHandler* (so you don't have to include KeyBinder.h)
         InputHandler* getAsHandler(const std::string& name);
 
         //! Loads a KeyBinder by creating it (no different from get() except for the return value)
-        void load  (const std::string& filename);
+        void load(const std::string& filename);
         //! Destroys a KeyBinder completely (does nothing if not yet loaded)
         void unload(const std::string& filename);
 

Modified: code/branches/presentation2/src/orxonox/sound/BaseSound.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/BaseSound.cc	2009-12-01 19:09:52 UTC (rev 6189)
+++ code/branches/presentation2/src/orxonox/sound/BaseSound.cc	2009-12-02 08:02:49 UTC (rev 6190)
@@ -54,7 +54,6 @@
             alGenSources(1, &this->audioSource_);
             assert(this->audioSource_ != 0);
         }
-        
     }
 
     BaseSound::~BaseSound()

Modified: code/branches/presentation2/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/SoundManager.cc	2009-12-01 19:09:52 UTC (rev 6189)
+++ code/branches/presentation2/src/orxonox/sound/SoundManager.cc	2009-12-02 08:02:49 UTC (rev 6190)
@@ -503,5 +503,4 @@
             }
         }
     }
-    
 }