Browse Source

LOGRAW -> URHO3D_LOGRAW

Ivan K 10 years ago
parent
commit
ecafb47f73

+ 1 - 1
Source/Samples/26_ConsoleInput/ConsoleInput.cpp

@@ -269,5 +269,5 @@ void ConsoleInput::HandleInput(const String& input)
 void ConsoleInput::Print(const String& output)
 void ConsoleInput::Print(const String& output)
 {
 {
     // Logging appears both in the engine console and stdout
     // Logging appears both in the engine console and stdout
-    LOGRAW(output + "\n");
+    URHO3D_LOGRAW(output + "\n");
 }
 }

+ 1 - 1
Source/Samples/41_DatabaseDemo/DatabaseDemo.cpp

@@ -217,5 +217,5 @@ void DatabaseDemo::HandleInput(const String& input)
 void DatabaseDemo::Print(const String& output)
 void DatabaseDemo::Print(const String& output)
 {
 {
     // Logging appears both in the engine console and stdout
     // Logging appears both in the engine console and stdout
-    LOGRAW(output + "\n");
+    URHO3D_LOGRAW(output + "\n");
 }
 }

+ 1 - 1
Source/Urho3D/AngelScript/ScriptAPIDump.cpp

@@ -192,7 +192,7 @@ void Script::OutputAPIRow(DumpMode mode, const String& row, bool removeReference
 
 
 void Script::DumpAPI(DumpMode mode, const String& sourceTree)
 void Script::DumpAPI(DumpMode mode, const String& sourceTree)
 {
 {
-    // Does not use LOGRAW macro here to ensure the messages are always dumped regardless of URHO3D_LOGGING compiler directive
+    // Does not use URHO3D_LOGRAW macro here to ensure the messages are always dumped regardless of URHO3D_LOGGING compiler directive
     // and of Log subsystem availability
     // and of Log subsystem availability
 
 
     // Dump event descriptions and attribute definitions in Doxygen mode. For events, this means going through the header files,
     // Dump event descriptions and attribute definitions in Doxygen mode. For events, this means going through the header files,

+ 10 - 10
Source/Urho3D/Engine/Engine.cpp

@@ -544,7 +544,7 @@ void Engine::DumpProfiler()
 {
 {
     Profiler* profiler = GetSubsystem<Profiler>();
     Profiler* profiler = GetSubsystem<Profiler>();
     if (profiler)
     if (profiler)
-        LOGRAW(profiler->GetData(true, true) + "\n");
+        URHO3D_LOGRAW(profiler->GetData(true, true) + "\n");
 }
 }
 
 
 void Engine::DumpResources(bool dumpFileName)
 void Engine::DumpResources(bool dumpFileName)
@@ -552,11 +552,11 @@ void Engine::DumpResources(bool dumpFileName)
 #ifdef URHO3D_LOGGING
 #ifdef URHO3D_LOGGING
     ResourceCache* cache = GetSubsystem<ResourceCache>();
     ResourceCache* cache = GetSubsystem<ResourceCache>();
     const HashMap<StringHash, ResourceGroup>& resourceGroups = cache->GetAllResources();
     const HashMap<StringHash, ResourceGroup>& resourceGroups = cache->GetAllResources();
-    LOGRAW("\n");
+    URHO3D_LOGRAW("\n");
 
 
     if (dumpFileName)
     if (dumpFileName)
     {
     {
-        LOGRAW("Used resources:\n");
+        URHO3D_LOGRAW("Used resources:\n");
     }
     }
 
 
     for (HashMap<StringHash, ResourceGroup>::ConstIterator i = resourceGroups.Begin();
     for (HashMap<StringHash, ResourceGroup>::ConstIterator i = resourceGroups.Begin();
@@ -568,7 +568,7 @@ void Engine::DumpResources(bool dumpFileName)
             for (HashMap<StringHash, SharedPtr<Resource> >::ConstIterator j = resources.Begin();
             for (HashMap<StringHash, SharedPtr<Resource> >::ConstIterator j = resources.Begin();
                  j != resources.End(); ++j)
                  j != resources.End(); ++j)
             {
             {
-                LOGRAW(j->second_->GetName() + "\n");
+                URHO3D_LOGRAW(j->second_->GetName() + "\n");
             }
             }
 
 
         }
         }
@@ -579,7 +579,7 @@ void Engine::DumpResources(bool dumpFileName)
 
 
             if (num)
             if (num)
             {
             {
-                LOGRAW("Resource type " + resources.Begin()->second_->GetTypeName() +
+                URHO3D_LOGRAW("Resource type " + resources.Begin()->second_->GetTypeName() +
                        ": count " + String(num) + " memory use " + String(memoryUse) + "\n");
                        ": count " + String(num) + " memory use " + String(memoryUse) + "\n");
             }
             }
         }
         }
@@ -587,7 +587,7 @@ void Engine::DumpResources(bool dumpFileName)
 
 
     if (!dumpFileName)
     if (!dumpFileName)
     {
     {
-        LOGRAW("Total memory use of all resources " + String(cache->GetTotalMemoryUse()) + "\n\n");
+        URHO3D_LOGRAW("Total memory use of all resources " + String(cache->GetTotalMemoryUse()) + "\n\n");
     }
     }
 #endif
 #endif
 }
 }
@@ -615,9 +615,9 @@ void Engine::DumpMemory()
         if (block->nBlockUse > 0)
         if (block->nBlockUse > 0)
         {
         {
             if (block->szFileName)
             if (block->szFileName)
-                LOGRAW("Block " + String((int)block->lRequest) + ": " + String(block->nDataSize) + " bytes, file " + String(block->szFileName) + " line " + String(block->nLine) + "\n");
+                URHO3D_LOGRAW("Block " + String((int)block->lRequest) + ": " + String(block->nDataSize) + " bytes, file " + String(block->szFileName) + " line " + String(block->nLine) + "\n");
             else
             else
-                LOGRAW("Block " + String((int)block->lRequest) + ": " + String(block->nDataSize) + " bytes\n");
+                URHO3D_LOGRAW("Block " + String((int)block->lRequest) + ": " + String(block->nDataSize) + " bytes\n");
 
 
             total += block->nDataSize;
             total += block->nDataSize;
             ++blocks;
             ++blocks;
@@ -625,9 +625,9 @@ void Engine::DumpMemory()
         block = block->pBlockHeaderPrev;
         block = block->pBlockHeaderPrev;
     }
     }
 
 
-    LOGRAW("Total allocated memory " + String(total) + " bytes in " + String(blocks) + " blocks\n\n");
+    URHO3D_LOGRAW("Total allocated memory " + String(total) + " bytes in " + String(blocks) + " blocks\n\n");
 #else
 #else
-    LOGRAW("DumpMemory() supported on MSVC debug mode only\n\n");
+    URHO3D_LOGRAW("DumpMemory() supported on MSVC debug mode only\n\n");
 #endif
 #endif
 #endif
 #endif
 }
 }

+ 1 - 1
Source/Urho3D/IO/FileSystem.cpp

@@ -111,7 +111,7 @@ int DoSystemCommand(const String& commandLine, bool redirectToLog, Context* cont
     while (!feof(file))
     while (!feof(file))
     {
     {
         if (fgets(buffer, sizeof(buffer), file))
         if (fgets(buffer, sizeof(buffer), file))
-            LOGRAW(String(buffer));
+            URHO3D_LOGRAW(String(buffer));
     }
     }
     int exitCode = pclose(file);
     int exitCode = pclose(file);
 
 

+ 2 - 2
Source/Urho3D/IO/Log.h

@@ -135,7 +135,7 @@ private:
 #define URHO3D_LOGINFO(message) Urho3D::Log::Write(Urho3D::LOG_INFO, message)
 #define URHO3D_LOGINFO(message) Urho3D::Log::Write(Urho3D::LOG_INFO, message)
 #define URHO3D_LOGWARNING(message) Urho3D::Log::Write(Urho3D::LOG_WARNING, message)
 #define URHO3D_LOGWARNING(message) Urho3D::Log::Write(Urho3D::LOG_WARNING, message)
 #define URHO3D_LOGERROR(message) Urho3D::Log::Write(Urho3D::LOG_ERROR, message)
 #define URHO3D_LOGERROR(message) Urho3D::Log::Write(Urho3D::LOG_ERROR, message)
-#define LOGRAW(message) Urho3D::Log::WriteRaw(message)
+#define URHO3D_LOGRAW(message) Urho3D::Log::WriteRaw(message)
 #define LOGDEBUGF(format, ...) Urho3D::Log::Write(Urho3D::LOG_DEBUG, Urho3D::ToString(format, ##__VA_ARGS__))
 #define LOGDEBUGF(format, ...) Urho3D::Log::Write(Urho3D::LOG_DEBUG, Urho3D::ToString(format, ##__VA_ARGS__))
 #define LOGINFOF(format, ...) Urho3D::Log::Write(Urho3D::LOG_INFO, Urho3D::ToString(format, ##__VA_ARGS__))
 #define LOGINFOF(format, ...) Urho3D::Log::Write(Urho3D::LOG_INFO, Urho3D::ToString(format, ##__VA_ARGS__))
 #define LOGWARNINGF(format, ...) Urho3D::Log::Write(Urho3D::LOG_WARNING, Urho3D::ToString(format, ##__VA_ARGS__))
 #define LOGWARNINGF(format, ...) Urho3D::Log::Write(Urho3D::LOG_WARNING, Urho3D::ToString(format, ##__VA_ARGS__))
@@ -146,7 +146,7 @@ private:
 #define URHO3D_LOGINFO(message) ((void)0)
 #define URHO3D_LOGINFO(message) ((void)0)
 #define URHO3D_LOGWARNING(message) ((void)0)
 #define URHO3D_LOGWARNING(message) ((void)0)
 #define URHO3D_LOGERROR(message) ((void)0)
 #define URHO3D_LOGERROR(message) ((void)0)
-#define LOGRAW(message) ((void)0)
+#define URHO3D_LOGRAW(message) ((void)0)
 #define LOGDEBUGF(...) ((void)0)
 #define LOGDEBUGF(...) ((void)0)
 #define LOGINFOF(...) ((void)0)
 #define LOGINFOF(...) ((void)0)
 #define LOGWARNINGF(...) ((void)0)
 #define LOGWARNINGF(...) ((void)0)