From 599695bc4f70c28c556e2c78822eda6ef29d2faa Mon Sep 17 00:00:00 2001
From: Julien
Date: Thu, 16 Jun 2011 11:24:38 -0400
Subject: COMMON: Change TaskbarManager to the new module slot interface

---
 common/system.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'common/system.cpp')

diff --git a/common/system.cpp b/common/system.cpp
index fae7a3ef34..2dab687872 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -32,6 +32,7 @@
 #include "common/fs.h"
 #include "common/savefile.h"
 #include "common/str.h"
+#include "common/taskbar.h"
 #include "common/textconsole.h"
 
 #include "backends/audiocd/default/default-audiocd.h"
@@ -45,6 +46,9 @@ OSystem::OSystem() {
 	_eventManager = 0;
 	_timerManager = 0;
 	_savefileManager = 0;
+#if defined(USE_TASKBAR)
+	_taskbarManager = 0;
+#endif
 	_fsFactory = 0;
 }
 
@@ -58,6 +62,11 @@ OSystem::~OSystem() {
 	delete _timerManager;
 	_timerManager = 0;
 
+#if defined(USE_TASKBAR)
+	delete _taskbarManager;
+	_taskbarManager = 0;
+#endif
+
 	delete _savefileManager;
 	_savefileManager = 0;
 
-- 
cgit v1.2.3


From f7c1e7d002c21eeaf0b5c06d3527ede532f5cd51 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 6 Jun 2011 11:05:23 +0200
Subject: COMMON: Remove default implementation of OSystem::logMessage

---
 common/system.cpp | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'common/system.cpp')

diff --git a/common/system.cpp b/common/system.cpp
index fae7a3ef34..1645a6be10 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -21,11 +21,6 @@
  */
 
 #define FORBIDDEN_SYMBOL_EXCEPTION_exit
-#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
-#define FORBIDDEN_SYMBOL_EXCEPTION_fputs
-#define FORBIDDEN_SYMBOL_EXCEPTION_fflush
-#define FORBIDDEN_SYMBOL_EXCEPTION_stdout
-#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
 
 #include "common/system.h"
 #include "common/events.h"
@@ -136,20 +131,6 @@ Common::String OSystem::getDefaultConfigFileName() {
 	return "scummvm.ini";
 }
 
-void OSystem::logMessage(LogMessageType::Type type, const char *message) {
-#if !defined(__PLAYSTATION2__) && !defined(__DS__)
-	FILE *output = 0;
-
-	if (type == LogMessageType::kInfo || type == LogMessageType::kDebug)
-		output = stdout;
-	else
-		output = stderr;
-
-	fputs(message, output);
-	fflush(output);
-#endif
-}
-
 Common::String OSystem::getSystemLanguage() const {
 	return "en_US";
 }
-- 
cgit v1.2.3