many changes and refactoring

This commit is contained in:
Eduardo Bart
2011-07-13 18:12:36 -03:00
parent 6c05ee0e82
commit 8ef1b28546
120 changed files with 1545 additions and 1273 deletions

View File

@@ -1,33 +1,9 @@
/* The MIT License
*
* Copyright (c) 2010 OTClient, https://github.com/edubart/otclient
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include <util/logger.h>
#include <util/util.h>
#include "logger.h"
#include <iostream>
#include <cstdlib>
void Logger::log(int level, const std::string& text, const char *trace)
void log(LogLevel level, const std::string& message, const char *trace)
{
std::string strace;
if(trace) {
@@ -47,7 +23,7 @@ void Logger::log(int level, const std::string& text, const char *trace)
if(!strace.empty())
std::cout << "[" << strace << "] ";
std::cout << text;
std::cout << message;
#ifdef linux
if(colored)
@@ -56,7 +32,6 @@ void Logger::log(int level, const std::string& text, const char *trace)
std::cout << std::endl;
if(level == LFATAL)
if(level == LogFatal)
exit(-1);
}