Changeset 677

Timestamp:

Dec 23, 2007, 7:19:07 PM (17 years ago)

Author:

landauf

Message:

changed \n to std::endl

Location:

code/branches/FICN/src

Files:

• audio/AudioIncludes.h (modified) (1 diff)
• audio/AudioStream.cc (modified) (1 diff)
• audio/AudioStream.h (modified) (1 diff)
• loader/LevelLoader.cc (modified) (4 diffs)
• orxonox/core/ClassFactory.h (modified) (1 diff)
• orxonox/core/ConfigValueContainer.cc (modified) (2 diffs)
• orxonox/core/CoreIncludes.h (modified) (2 diffs)
• orxonox/core/Factory.cc (modified) (2 diffs)
• orxonox/core/Identifier.cc (modified) (2 diffs)
• orxonox/core/Identifier.h (modified) (8 diffs)
• orxonox/core/Iterator.h (modified) (1 diff)
• orxonox/core/MetaObjectList.h (modified) (1 diff)
• orxonox/objects/test1.cc (modified) (4 diffs)
• orxonox/objects/test2.cc (modified) (4 diffs)
• orxonox/objects/test3.cc (modified) (2 diffs)

code/branches/FICN/src/audio/AudioIncludes.h

@@ -12 +12 @@
 
 #include "../orxonox/core/Error.h"
-

code/branches/FICN/src/audio/AudioStream.cc

@@ -105 +105 @@
                 {
             COUT(3)
-                << "version         " << vorbisInfo->version         << "\n"
-                << "channels        " << vorbisInfo->channels        << "\n"
-                << "rate (hz)       " << vorbisInfo->rate            << "\n"
-                << "bitrate upper   " << vorbisInfo->bitrate_upper   << "\n"
-                << "bitrate nominal " << vorbisInfo->bitrate_nominal << "\n"
-                << "bitrate lower   " << vorbisInfo->bitrate_lower   << "\n"
-                << "bitrate window  " << vorbisInfo->bitrate_window  << "\n"
-                << "\n"
-                << "vendor " << vorbisComment->vendor << "\n";
+                << "version         " << vorbisInfo->version         << std::endl
+                << "channels        " << vorbisInfo->channels        << std::endl
+                << "rate (hz)       " << vorbisInfo->rate            << std::endl
+                << "bitrate upper   " << vorbisInfo->bitrate_upper   << std::endl
+                << "bitrate nominal " << vorbisInfo->bitrate_nominal << std::endl
+                << "bitrate lower   " << vorbisInfo->bitrate_lower   << std::endl
+                << "bitrate window  " << vorbisInfo->bitrate_window  << std::endl
+                << std::endl
+                << "vendor " << vorbisComment->vendor << std::endl;
 
             for(int i = 0; i < vorbisComment->comments; i++)
-                COUT(3) << "   " << vorbisComment->user_comments[i] << "\n";
+                COUT(3) << "   " << vorbisComment->user_comments[i] << std::endl;
 
             COUT(3) << std::endl;

code/branches/FICN/src/audio/AudioStream.h

@@ -6 +6 @@
 namespace audio
 {
-        #define BUFFER_SIZE (4096 * 4)
-        
-        class AudioStream
-        {
-            public:
-                                        AudioStream(std::string path);
-                void open();
-                void release();
-                void display();
-                bool playback();
-                bool playing();
-                bool update();
-                                        inline bool isLoaded() { return loaded; }       
+  #define BUFFER_SIZE (4096 * 4)
 
-            protected:
-        
-                bool stream(ALuint buffer);
-                void empty();
-                void check();
-                std::string errorString(int code);
-        
-            private:
-        
-                                        std::string path;
+  class AudioStream
+  {
+    public:
+      AudioStream(std::string path);
+      void open();
+      void release();
+      void display();
+      bool playback();
+      bool playing();
+      bool update();
+      inline bool isLoaded() { return loaded; }
 
-                FILE*           oggFile;
-                OggVorbis_File  oggStream;
-                vorbis_info*    vorbisInfo;
-                vorbis_comment* vorbisComment;
-                                        bool loaded;    
+    protected:
+      bool stream(ALuint buffer);
+      void empty();
+      void check();
+      std::string errorString(int code);
 
-                ALuint buffers[2];
-                ALuint source;
-                ALenum format;
-        };
+    private:
+      std::string path;
+
+      FILE*           oggFile;
+      OggVorbis_File  oggStream;
+      vorbis_info*    vorbisInfo;
+      vorbis_comment* vorbisComment;
+      bool loaded;
+
+      ALuint buffers[2];
+      ALuint source;
+      ALenum format;
+  };
 }
 

code/branches/FICN/src/loader/LevelLoader.cc

@@ -136 +136 @@
         mLoadOverlay->show();
 
-        COUT(0) << "\n\n\nThis is Orxonox\nthe hottest 3D action shooter ever to exist\n\n\n";
-        COUT(0) << "Level: " << name() << "\nDescription:" << description() << "\nImage:"<<image()<<"\n\n\n";
-        COUT(4) << "Backgroundcolor: " << loadingBackgroundColor_ << "\nBackgroundimage:" << loadingBackgroundImage_ << "\n\n\n";
+        COUT(0) << "This is Orxonox" << std::endl;
+        COUT(0) << "the hottest 3D action shooter ever to exist" << std::endl;
+        COUT(0) << "Level: " << name() << std::endl << "Description:" << description() << std::endl << "Image:" << image() << std::endl;
+        COUT(4) << "Backgroundcolor: " << loadingBackgroundColor_ << std::endl << "Backgroundimage:" << loadingBackgroundImage_ << std::endl;
 
       }
@@ -162 +163 @@
               if (elemVal == "ogg")
               {
-        COUT(0) << "Adding sound "<< tElem->Attribute("src") << "\n\n\n";
+                COUT(3) << "Adding sound "<< tElem->Attribute("src") << std::endl;
 
                 auMan->ambientAdd(tElem->Attribute("src"));
@@ -186 +187 @@
             if (id)
             {
-                          orxonox::BaseObject* obj = id->fabricate();
-                          obj->loadParams(tElem);
+              orxonox::BaseObject* obj = id->fabricate();
+              obj->loadParams(tElem);
             }
             else
             {
-                COUT(2) << "Warning: '"<< tElem->Value() <<"' is not a valid classname.\n";
+                COUT(2) << "Warning: '"<< tElem->Value() <<"' is not a valid classname." << std::endl;
             }
           }
@@ -203 +204 @@
 
 
-      COUT(0) << "Loading finished!\n\n\n\n\n";
+      COUT(0) << "Loading finished!" << std::endl << std::endl;
     }
   }

code/branches/FICN/src/orxonox/core/ClassFactory.h

@@ -67 +67 @@
     bool ClassFactory<T>::create(const std::string& name)
     {
-        COUT(4) << "*** Create entry for " << name << " in Factory.\n";
+        COUT(4) << "*** Create entry for " << name << " in Factory." << std::endl;
         ClassIdentifier<T>::getIdentifier()->addFactory(new ClassFactory<T>);
         Factory::add(name, ClassIdentifier<T>::getIdentifier());

code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc

@@ -57 +57 @@
         if (!string2Number(this->value_.value_int_, valueString, defvalue))     // Try to convert the string to a value
             this->setConfigFileEntyToDefault();                                 // The conversion failed
-
-        std::cout << "CVC: int: " << this->value_.value_int_ << std::endl;
     }
 
@@ -80 +78 @@
         if (!string2Number(this->value_.value_uint_, valueString, defvalue))    // Try to convert the string to a value
             this->setConfigFileEntyToDefault();                                 // The conversion failed
-
-        std::cout << "CVC: uint: " << this->value_.value_uint_ << std::endl;
     }
 

code/branches/FICN/src/orxonox/core/CoreIncludes.h

@@ -95 +95 @@
 */
 #define RegisterObject(ClassName) \
-    COUT(4) << "*** Register Object: " << #ClassName << "\n"; \
+    COUT(4) << "*** Register Object: " << #ClassName << std::endl; \
     InternRegisterObject(ClassName, false)
 
@@ -103 +103 @@
 */
 #define RegisterRootObject(ClassName) \
-    COUT(4) << "*** Register Root-Object: " << #ClassName << "\n"; \
+    COUT(4) << "*** Register Root-Object: " << #ClassName << std::endl; \
     InternRegisterRootObject(ClassName)
 

code/branches/FICN/src/orxonox/core/Factory.cc

@@ -84 +84 @@
     void Factory::createClassHierarchy()
     {
-        COUT(3) << "*** Factory -> Create class-hierarchy\n";
+        COUT(3) << "*** Factory -> Create class-hierarchy" << std::endl;
         std::map<std::string, Identifier*>::iterator it;
         it = getFactoryPointer()->identifierStringMap_.begin();
@@ -95 +95 @@
         }
         (*getFactoryPointer()->identifierStringMap_.begin()).second->stopCreatingHierarchy();
-        COUT(3) << "*** Factory -> Finished class-hierarchy creation\n";
+        COUT(3) << "*** Factory -> Finished class-hierarchy creation" << std::endl;
     }
 

code/branches/FICN/src/orxonox/core/Identifier.cc

@@ -68 +68 @@
     void Identifier::initialize(const IdentifierList* parents)
     {
-        COUT(4) << "*** Initialize " << this->name_ << "-Singleton.\n";
+        COUT(4) << "*** Initialize " << this->name_ << "-Singleton." << std::endl;
         this->bCreatedOneObject_ = true;
 
@@ -97 +97 @@
         {
             // Abstract classes don't have a factory and therefore can't create new objects
-            COUT(1) << "Error: Cannot create an object of type '" << this->name_ << "'. Class is abstract.\n";
-            COUT(1) << "Aborting...";
+            COUT(1) << "Error: Cannot create an object of type '" << this->name_ << "'. Class is abstract." << std::endl;
+            COUT(1) << "Aborting..." << std::endl;
             abort();
             return NULL;

code/branches/FICN/src/orxonox/core/Identifier.h

@@ -117 +117 @@
             {
                 hierarchyCreatingCounter_s++;
-                COUT(4) << "*** Increased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << "\n";
+                COUT(4) << "*** Increased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << std::endl;
             }
 
@@ -126 +126 @@
             {
                 hierarchyCreatingCounter_s--;
-                COUT(4) << "*** Decreased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << "\n";
+                COUT(4) << "*** Decreased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << std::endl;
             }
 
@@ -201 +201 @@
     ClassIdentifier<T>* ClassIdentifier<T>::registerClass(const IdentifierList* parents, const std::string& name, bool bRootClass)
     {
-        COUT(4) << "*** Register Class in " << name << "-Singleton.\n";
+        COUT(4) << "*** Register Class in " << name << "-Singleton." << std::endl;
 
         // It's a singleton, so maybe we have to create it first
         if (!pointer_s)
         {
-            COUT(4) << "*** Register Class in " << name << "-Singleton -> Create Singleton.\n";
+            COUT(4) << "*** Register Class in " << name << "-Singleton -> Create Singleton." << std::endl;
             pointer_s = new ClassIdentifier();
         }
@@ -214 +214 @@
         {
             // If no: We have to store the informations and initialize the Identifier
-
-            COUT(4) << "*** Register Class in " << name << "-Singleton -> Initialize Singleton.\n";
+            COUT(4) << "*** Register Class in " << name << "-Singleton -> Initialize Singleton." << std::endl;
             pointer_s->name_ = name;
-//            Factory::add(name, pointer_s); // Add the Identifier to the Factory
-
             if (bRootClass)
                 pointer_s->initialize(NULL); // If a class is derived from two interfaces, the second interface might think it's derived from the first because of the order of constructor-calls. Thats why we set parents to zero in that case.
@@ -236 +233 @@
         if (!pointer_s)
         {
-            COUT(4) << "*** Create Singleton.\n";
+            COUT(4) << "*** Create Singleton." << std::endl;
             pointer_s = new ClassIdentifier();
         }
@@ -250 +247 @@
     void ClassIdentifier<T>::addObject(T* object)
     {
-        COUT(4) << "*** Added object to " << ClassIdentifier<T>::getIdentifier()->getName() << "-list.\n";
+        COUT(4) << "*** Added object to " << ClassIdentifier<T>::getIdentifier()->getName() << "-list." << std::endl;
         object->getMetaList().add(ClassIdentifier<T>::getIdentifier()->objects_, ClassIdentifier<T>::getIdentifier()->objects_->add(object));
     }
@@ -285 +282 @@
                 if (!identifier->isA(ClassIdentifier<T>::getIdentifier()))
                 {
-                    COUT(1) << "Error: Class " << identifier->getName() << " is not a " << ClassIdentifier<T>::getIdentifier()->getName() << "!\n";
-                    COUT(1) << "Error: SubclassIdentifier<" << ClassIdentifier<T>::getIdentifier()->getName() << "> = Class(" << identifier->getName() << ") is forbidden.\n";
-                    COUT(1) << "Aborting...\n";
+                    COUT(1) << "Error: Class " << identifier->getName() << " is not a " << ClassIdentifier<T>::getIdentifier()->getName() << "!" << std::endl;
+                    COUT(1) << "Error: SubclassIdentifier<" << ClassIdentifier<T>::getIdentifier()->getName() << "> = Class(" << identifier->getName() << ") is forbidden." << std::endl;
+                    COUT(1) << "Aborting..." << std::endl;
                     abort();
                 }
@@ -331 +328 @@
                     if (this->identifier_)
                     {
-                        COUT(1) << "Error: Class " << this->identifier_->getName() << " is not a " << ClassIdentifier<T>::getIdentifier()->getName() << "!\n";
-                        COUT(1) << "Error: Couldn't fabricate a new Object.\n";
-                        COUT(1) << "Aborting...\n";
+                        COUT(1) << "Error: Class " << this->identifier_->getName() << " is not a " << ClassIdentifier<T>::getIdentifier()->getName() << "!" << std::endl;
+                        COUT(1) << "Error: Couldn't fabricate a new Object." << std::endl;
+                        COUT(1) << "Aborting..." << std::endl;
                     }
                     else
                     {
-                        COUT(1) << "Error: Couldn't fabricate a new Object - Identifier is undefined.\n";
-                        COUT(1) << "Aborting...\n";
+                        COUT(1) << "Error: Couldn't fabricate a new Object - Identifier is undefined." << std::endl;
+                        COUT(1) << "Aborting..." << std::endl;
                     }
 

code/branches/FICN/src/orxonox/core/Iterator.h

@@ -151 +151 @@
                 // Comparing with anything except zero makes no sense
                 if (compare != 0)
-                    COUT(2) << "Warning: Comparing the " << ClassIdentifier<T>::getIdentifier()->getName() << "-List-Iterator with " << compare << " has no effect. Only comparison with 0 works.\n";
+                    COUT(2) << "Warning: Comparing the " << ClassIdentifier<T>::getIdentifier()->getName() << "-List-Iterator with " << compare << " has no effect. Only comparison with 0 works." << std::endl;
 
                 return (this->element_ != 0);

code/branches/FICN/src/orxonox/core/MetaObjectList.h

@@ -70 +70 @@
 
 
-        COUT(4) << "*** Removing Object from " << ClassIdentifier<T>::getIdentifier()->getName() << "-list.\n";
+        COUT(4) << "*** Removing Object from " << ClassIdentifier<T>::getIdentifier()->getName() << "-list." << std::endl;
         delete this->element_;
     }

code/branches/FICN/src/orxonox/objects/test1.cc

@@ -52 +52 @@
     void Test1::tick(float dt)
     {
-        std::cout << "Test1: " << this << "\n";
+        std::cout << "Test1: " << this << std::endl;
     }
 
@@ -72 +72 @@
     void Test1::setUsefullClass1(Identifier* identifier)
     {
-        std::cout << "\n";
-        std::cout << "Test1: usefullClass1->isA(Class(Test1)): " << identifier->isA(Class(Test1)) << "\n";
-        std::cout << "Test1: usefullClass1->isA(Class(Test2)): " << identifier->isA(Class(Test2)) << "\n";
-        std::cout << "Test1: usefullClass1->isA(Class(Test3)): " << identifier->isA(Class(Test3)) << "\n";
+        std::cout << std::endl;
+        std::cout << "Test1: usefullClass1->isA(Class(Test1)): " << identifier->isA(Class(Test1)) << std::endl;
+        std::cout << "Test1: usefullClass1->isA(Class(Test2)): " << identifier->isA(Class(Test2)) << std::endl;
+        std::cout << "Test1: usefullClass1->isA(Class(Test3)): " << identifier->isA(Class(Test3)) << std::endl;
         this->usefullClass1_ = identifier;
     }
@@ -81 +81 @@
     void Test1::setUsefullClass2(Identifier* identifier)
     {
-        std::cout << "\n";
-        std::cout << "Test1: usefullClass2->isA(Class(Test1)): " << identifier->isA(Class(Test1)) << "\n";
-        std::cout << "Test1: usefullClass2->isA(Class(Test2)): " << identifier->isA(Class(Test2)) << "\n";
-        std::cout << "Test1: usefullClass2->isA(Class(Test3)): " << identifier->isA(Class(Test3)) << "\n";
+        std::cout << std::endl;
+        std::cout << "Test1: usefullClass2->isA(Class(Test1)): " << identifier->isA(Class(Test1)) << std::endl;
+        std::cout << "Test1: usefullClass2->isA(Class(Test2)): " << identifier->isA(Class(Test2)) << std::endl;
+        std::cout << "Test1: usefullClass2->isA(Class(Test3)): " << identifier->isA(Class(Test3)) << std::endl;
         this->usefullClass2_ = identifier;
     }
@@ -90 +90 @@
     void Test1::setUsefullClassOfTypeTest3(Identifier* identifier)
     {
-        std::cout << "\n";
-        std::cout << "Test1: usefullClass3->isA(Class(Test1)): " << identifier->isA(Class(Test1)) << "\n";
-        std::cout << "Test1: usefullClass3->isA(Class(Test2)): " << identifier->isA(Class(Test2)) << "\n";
-        std::cout << "Test1: usefullClass3->isA(Class(Test3)): " << identifier->isA(Class(Test3)) << "\n";
+        std::cout << std::endl;
+        std::cout << "Test1: usefullClass3->isA(Class(Test1)): " << identifier->isA(Class(Test1)) << std::endl;
+        std::cout << "Test1: usefullClass3->isA(Class(Test2)): " << identifier->isA(Class(Test2)) << std::endl;
+        std::cout << "Test1: usefullClass3->isA(Class(Test3)): " << identifier->isA(Class(Test3)) << std::endl;
         this->usefullClass3_ = identifier;
     }

code/branches/FICN/src/orxonox/objects/test2.cc

@@ -53 +53 @@
     void Test2::timerFunction1()
     {
-        std::cout << "Test2: 1 Sekunde\n";
+        std::cout << "Test2: 1 Sekunde" << std::endl;
     }
 
     void Test2::timerFunction2()
     {
-        std::cout << "Test2: 5 Sekunden\n";
+        std::cout << "Test2: 5 Sekunden" << std::endl;
     }
 
     void Test2::timerFunction3()
     {
-        std::cout << "Test2: 10 Sekunden sind um!\n";
+        std::cout << "Test2: 10 Sekunden sind um!" << std::endl;
     }
 
@@ -83 +83 @@
     void Test2::setUsefullClass1(Identifier* identifier)
     {
-        std::cout << "\n";
-        std::cout << "Test2: usefullClass1->isA(Class(Test1)): " << identifier->isA(Class(Test1)) << "\n";
-        std::cout << "Test2: usefullClass1->isA(Class(Test2)): " << identifier->isA(Class(Test2)) << "\n";
-        std::cout << "Test2: usefullClass1->isA(Class(Test3)): " << identifier->isA(Class(Test3)) << "\n";
+        std::cout << std::endl;
+        std::cout << "Test2: usefullClass1->isA(Class(Test1)): " << identifier->isA(Class(Test1)) << std::endl;
+        std::cout << "Test2: usefullClass1->isA(Class(Test2)): " << identifier->isA(Class(Test2)) << std::endl;
+        std::cout << "Test2: usefullClass1->isA(Class(Test3)): " << identifier->isA(Class(Test3)) << std::endl;
         this->usefullClass1_ = identifier;
     }
@@ -92 +92 @@
     void Test2::setUsefullClass2(Identifier* identifier)
     {
-        std::cout << "\n";
-        std::cout << "Test2: usefullClass2->isA(Class(Test1)): " << identifier->isA(Class(Test1)) << "\n";
-        std::cout << "Test2: usefullClass2->isA(Class(Test2)): " << identifier->isA(Class(Test2)) << "\n";
-        std::cout << "Test2: usefullClass2->isA(Class(Test3)): " << identifier->isA(Class(Test3)) << "\n";
+        std::cout << std::endl;
+        std::cout << "Test2: usefullClass2->isA(Class(Test1)): " << identifier->isA(Class(Test1)) << std::endl;
+        std::cout << "Test2: usefullClass2->isA(Class(Test2)): " << identifier->isA(Class(Test2)) << std::endl;
+        std::cout << "Test2: usefullClass2->isA(Class(Test3)): " << identifier->isA(Class(Test3)) << std::endl;
         this->usefullClass2_ = identifier;
     }
@@ -101 +101 @@
     void Test2::setUsefullClassOfTypeTest3(Identifier* identifier)
     {
-        std::cout << "\n";
-        std::cout << "Test2: usefullClass3->isA(Class(Test1)): " << identifier->isA(Class(Test1)) << "\n";
-        std::cout << "Test2: usefullClass3->isA(Class(Test2)): " << identifier->isA(Class(Test2)) << "\n";
-        std::cout << "Test2: usefullClass3->isA(Class(Test3)): " << identifier->isA(Class(Test3)) << "\n";
+        std::cout << std::endl;
+        std::cout << "Test2: usefullClass3->isA(Class(Test1)): " << identifier->isA(Class(Test1)) << std::endl;
+        std::cout << "Test2: usefullClass3->isA(Class(Test2)): " << identifier->isA(Class(Test2)) << std::endl;
+        std::cout << "Test2: usefullClass3->isA(Class(Test3)): " << identifier->isA(Class(Test3)) << std::endl;
         this->usefullClass3_ = identifier;
     }

code/branches/FICN/src/orxonox/objects/test3.cc

@@ -78 +78 @@
 
     #define testandcout(code) \
-      std::cout << #code << " " << code << "\n"
+      std::cout << #code << " " << code << std::endl
 
     void Test3::usefullClassesIsATest(Test1* test1)
     {
-        std::cout << "\n";
-        std::cout << "Test1:\n";
+        std::cout << std::endl;
+        std::cout << "Test1:" << std::endl;
         testandcout(test1->usefullClass1isA(Class(Test1)));
         testandcout(test1->usefullClass1isA(Class(Test2)));
         testandcout(test1->usefullClass1isA(Class(Test3)));
-        std::cout << "\n";
+        std::cout << std::endl;
         testandcout(test1->usefullClass2isA(Class(Test1)));
         testandcout(test1->usefullClass2isA(Class(Test2)));
         testandcout(test1->usefullClass2isA(Class(Test3)));
-        std::cout << "\n";
+        std::cout << std::endl;
         testandcout(test1->usefullClass3isA(Class(Test1)));
         testandcout(test1->usefullClass3isA(Class(Test2)));
@@ -99 +99 @@
     void Test3::usefullClassesIsATest(Test2* test2)
     {
-        std::cout << "\n";
-        std::cout << "Test2:\n";
+        std::cout << std::endl;
+        std::cout << "Test2:" << std::endl;
         testandcout(test2->usefullClass1isA(Class(Test1)));
         testandcout(test2->usefullClass1isA(Class(Test2)));
         testandcout(test2->usefullClass1isA(Class(Test3)));
-        std::cout << "\n";
+        std::cout << std::endl;
         testandcout(test2->usefullClass2isA(Class(Test1)));
         testandcout(test2->usefullClass2isA(Class(Test2)));
         testandcout(test2->usefullClass2isA(Class(Test3)));
-        std::cout << "\n";
+        std::cout << std::endl;
         testandcout(test2->usefullClass3isA(Class(Test1)));
         testandcout(test2->usefullClass3isA(Class(Test2)));