Changeset 141 in pacpusframework for branches/2.0-beta1/include

Timestamp:

Jul 30, 2013, 5:48:06 PM (11 years ago)

Author:

Marek Kurdej

Message:

Major update: using Boost.Log if PACPUS_USE_LOG is true.
Added: overloaded operator<< for QString (explicit instantiation).

Location:

branches/2.0-beta1/include/Pacpus/kernel

Files:

• DbiteException.h (modified) (1 diff)
• Log.h (modified) (1 diff)
• PacpusApplication.h (modified) (1 diff)

branches/2.0-beta1/include/Pacpus/kernel/DbiteException.h

@@ -43 +43 @@
     virtual const char* what() const throw();
 
-
 private:
     std::string mWhat;

branches/2.0-beta1/include/Pacpus/kernel/Log.h

@@ -28 +28 @@
 public:
     LogConfigurator();
-    ~LogConfigurator();
-
     static void configureLoggerWithFile(const char * configFilename);
-} initializer; // using Schwarz/nifty counter idiom for static initialization
+} logInitializer;
 
 } // namespace pacpus
 
-#ifdef PACPUS_USE_LOG
-  #include <log4cxx/logger.h>
+#if defined(PACPUS_USE_LOG)
 
-  class QString;
-  
-  #define DECLARE_STATIC_LOGGER(name) \
-    static log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger(name))
+#include <boost/log/trivial.hpp>
+#include <iosfwd>
+class QString;
 
-  #define LOG_TRACE(message)          LOG4CXX_TRACE(logger, message)
-  #define LOG_DEBUG(message)          LOG4CXX_DEBUG(logger, message)
-  #define LOG_INFO(message)           LOG4CXX_INFO(logger, message)
-  #define LOG_WARN(message)           LOG4CXX_WARN(logger, message)
-  #define LOG_ERROR(message)          LOG4CXX_ERROR(logger, message)
-  #define LOG_FATAL(message)          LOG4CXX_FATAL(logger, message)
+template< typename CharT, typename TraitsT >
+PACPUSLIB_API std::basic_ostream< CharT, TraitsT >& operator<< (std::basic_ostream< CharT, TraitsT >& strm, QString const& s);
 
-  /// Output stream ::log4cxx::helpers::CharMessageBuffer operator for QString
-  PACPUSLIB_API ::log4cxx::helpers::CharMessageBuffer & operator<<(::log4cxx::helpers::CharMessageBuffer & os, const QString & s);
-  /// Output stream ::log4cxx::helpers::MessageBuffer operator for QString
-  PACPUSLIB_API ::log4cxx::helpers::CharMessageBuffer & operator<<(::log4cxx::helpers::MessageBuffer & os, const QString & s);
+#define DECLARE_STATIC_LOGGER(name) 
+
+#define LOG(level, message)         BOOST_LOG_TRIVIAL(level) << message
+#define LOG_TRACE(message)          LOG(trace, message)
+#define LOG_DEBUG(message)          LOG(debug, message)
+#define LOG_INFO(message)           LOG(info, message)
+#define LOG_WARN(message)           LOG(warning, message)
+#define LOG_ERROR(message)          LOG(error, message)
+#define LOG_FATAL(message)          LOG(fatal, message)
 
 #else
-  /// Declares a log4cxx logger
-  ///
-  /// @param name Name of the logger, displayed when logging a message.
-  #define DECLARE_STATIC_LOGGER(name)
-  /// Logs a message at TRACE level using default logger
-  #define LOG_TRACE(message)
-  /// Logs a message at DEBUG level using default logger
-  #define LOG_DEBUG(message)
-  /// Logs a message at INFO level using default logger
-  #define LOG_INFO(message)
-  /// Logs a message at WARN level using default logger
-  #define LOG_WARN(message)
-  /// Logs a message at ERROR level using default logger
-  #define LOG_ERROR(message)
-  /// Logs a message at FATAL level using default logger
-  #define LOG_FATAL(message)
+
+/// @param name Name of the logger, displayed when logging a message.
+#define DECLARE_STATIC_LOGGER(name)
+/// Logs a message at TRACE level using default logger
+#define LOG_TRACE(message)
+/// Logs a message at DEBUG level using default logger
+#define LOG_DEBUG(message)
+/// Logs a message at INFO level using default logger
+#define LOG_INFO(message)
+/// Logs a message at WARN level using default logger
+#define LOG_WARN(message)
+/// Logs a message at ERROR level using default logger
+#define LOG_ERROR(message)
+/// Logs a message at FATAL level using default logger
+#define LOG_FATAL(message)
+
 #endif // PACPUS_USE_LOG
 

branches/2.0-beta1/include/Pacpus/kernel/PacpusApplication.h

@@ -16 +16 @@
 
 #include <QApplication>
+
+#include <Pacpus/kernel/pacpus.h>
 
 namespace pacpus {