From a1ca5e04b60902f84eb5da7d5e212ecf66d7f3e6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 1 Nov 2013 12:37:41 +0300
Subject: in logger put debug logging in ifdef.

---
 src/logger.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/logger.cpp')

diff --git a/src/logger.cpp b/src/logger.cpp
index 12a51070d..a177b895e 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -25,7 +25,9 @@
 #include <iostream>
 #include <sstream>
 
+#ifdef ENABLEDEBUGLOG
 #include "gui/widgets/tabs/chattab.h"
+#endif
 
 #ifdef WIN32
 #include <windows.h>
@@ -95,6 +97,7 @@ void Logger::log(const std::string &str)
     log("%s", str.c_str());
 }
 
+#ifdef ENABLEDEBUGLOG
 void Logger::dlog(const std::string &str)
 {
     if (!mDebugLog)
@@ -118,6 +121,7 @@ void Logger::dlog(const std::string &str)
     if (mChatWindow && debugChatTab)
         debugChatTab->chatLog(str, BY_LOGGER);
 }
+#endif
 
 void Logger::log1(const char *const buf)
 {
-- 
cgit v1.2.3-70-g09d2


From 1c04a68a1604bf59dd2c33195f9f3fb2207a91e2 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 1 Nov 2013 12:50:15 +0300
Subject: remove log to chat from logger.

---
 src/defaults.cpp |  1 -
 src/game.cpp     |  4 ----
 src/logger.cpp   | 14 --------------
 src/logger.h     |  7 -------
 4 files changed, 26 deletions(-)

(limited to 'src/logger.cpp')

diff --git a/src/defaults.cpp b/src/defaults.cpp
index 0b71b1db7..e0409bffb 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -182,7 +182,6 @@ DefaultsData* getConfigDefaults()
     AddDEF("npcFont", "fonts/dejavusans.ttf");
     AddDEF("showBackground", true);
     AddDEF("enableTradeTab", true);
-    AddDEF("logToChat", false);
     AddDEF("cyclePlayers", true);
     AddDEF("cycleMonsters", true);
     AddDEF("cycleNPC", true);
diff --git a/src/game.cpp b/src/game.cpp
index 9b6b5a339..342aaf249 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -314,9 +314,6 @@ static void createGuiWindows()
         gmChatTab = new GmTab(chatWindow);
     }
 
-    if (config.getBoolValue("logToChat"))
-        logger->setChatWindow(chatWindow);
-
     if (!isSafeMode && chatWindow)
         chatWindow->loadState();
 
@@ -338,7 +335,6 @@ static void destroyGuiWindows()
 {
     Net::getGeneralHandler()->gameEnded();
 
-    logger->setChatWindow(nullptr);
     if (whoIsOnline)
         whoIsOnline->setAllowUpdate(false);
 
diff --git a/src/logger.cpp b/src/logger.cpp
index a177b895e..953c9488b 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -25,10 +25,6 @@
 #include <iostream>
 #include <sstream>
 
-#ifdef ENABLEDEBUGLOG
-#include "gui/widgets/tabs/chattab.h"
-#endif
-
 #ifdef WIN32
 #include <windows.h>
 #elif defined __APPLE__
@@ -67,7 +63,6 @@
 Logger::Logger() :
     mLogFile(),
     mLogToStandardOut(true),
-    mChatWindow(nullptr),
     mDebugLog(false)
 {
 }
@@ -117,9 +112,6 @@ void Logger::dlog(const std::string &str)
 
     if (mLogToStandardOut)
         std::cout << timeStr.str() << str << std::endl;
-
-    if (mChatWindow && debugChatTab)
-        debugChatTab->chatLog(str, BY_LOGGER);
 }
 #endif
 
@@ -139,9 +131,6 @@ void Logger::log1(const char *const buf)
 
     if (mLogToStandardOut)
         std::cout << timeStr.str() << buf << std::endl;
-
-    if (mChatWindow && debugChatTab)
-        debugChatTab->chatLog(buf, BY_LOGGER);
 }
 
 void Logger::log(const char *const log_text, ...)
@@ -174,9 +163,6 @@ void Logger::log(const char *const log_text, ...)
     if (mLogToStandardOut)
         std::cout << timeStr.str() << buf << std::endl;
 
-    if (mChatWindow && debugChatTab)
-        debugChatTab->chatLog(buf, BY_LOGGER);
-
     // Delete temporary buffer
     delete [] buf;
 }
diff --git a/src/logger.h b/src/logger.h
index 90c3a689f..71a194467 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -65,12 +65,6 @@ class Logger final
         void setLogToStandardOut(const bool value)
         { mLogToStandardOut = value; }
 
-        /**
-         * Enables logging to chat window
-         */
-        void setChatWindow(ChatWindow *const window)
-        { mChatWindow = window; }
-
         /**
          * Enters a message in the log. The message will be timestamped.
          */
@@ -120,7 +114,6 @@ class Logger final
     private:
         std::ofstream mLogFile;
         bool mLogToStandardOut;
-        ChatWindow *mChatWindow;
         bool mDebugLog;
 };
 
-- 
cgit v1.2.3-70-g09d2


From e8ce245e0bbb87bc45d15b9f0eb8bf423373d203 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 1 Nov 2013 13:15:49 +0300
Subject: move global logger definition from client to logger file.

---
 src/client.cpp | 1 -
 src/logger.cpp | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/logger.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index fa8b860d5..dd5b06776 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -167,7 +167,6 @@ Configuration features;            // XML file features
 Configuration branding;            // XML branding information reader
 Configuration paths;               // XML default paths information reader
 Client *client = nullptr;
-Logger *logger = nullptr;          // Log object
 ChatLogger *chatLogger = nullptr;  // Chat log object
 KeyboardConfig keyboard;
 UserPalette *userPalette = nullptr;
diff --git a/src/logger.cpp b/src/logger.cpp
index 953c9488b..972d333e4 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -60,6 +60,8 @@
         << static_cast<int>((tv.tv_usec / 10000) % 100) \
         << "] ";
 
+Logger *logger = nullptr;          // Log object
+
 Logger::Logger() :
     mLogFile(),
     mLogToStandardOut(true),
-- 
cgit v1.2.3-70-g09d2