Remove CTKCore dependency on Log4Qt. See #67

* Since some existing project are still relying on ctkLogger, the class
is mark as deprecated and qDebug(), qWarning(), qCritical() are used instead
of the log4qt methods.

Libs/Core/CMakeLists.txt

@@ -3,7 +3,6 @@ PROJECT(CTKCore)
 #
 # 3rd party dependencies
 #
-INCLUDE(${Log4Qt_USE_FILE})
 
 # CMake modules
 SET(CMAKE_MODULE_PATH ${CTKCore_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH})

Libs/Core/ctkLogger.cpp

@@ -20,21 +20,20 @@
 
 // Qt includes
 #include <QDebug>
-#include <QSqlDatabase>
 
 // CTK includes
 #include <ctkLogger.h>
 
 // Log4Qt includes
-#include <log4qt/log4qt.h>
-#include <log4qt/logger.h>
-#include <log4qt/basicconfigurator.h>
+//#include <log4qt/log4qt.h>
+//#include <log4qt/logger.h>
+//#include <log4qt/basicconfigurator.h>
 
 //-----------------------------------------------------------------------------
 class ctkLoggerPrivate
 {
 public:
-  Log4Qt::Logger *Logger;
+  //Log4Qt::Logger *Logger;
 };
 
 //-----------------------------------------------------------------------------
@@ -42,8 +41,8 @@ ctkLogger::ctkLogger(QString name, QObject* _parent)
   : Superclass(_parent)
   , d_ptr(new ctkLoggerPrivate)
 {
-  Q_D(ctkLogger);
-  d->Logger = Log4Qt::Logger::logger( name.toStdString().c_str());
+  //Q_D(ctkLogger);
+  //d->Logger = Log4Qt::Logger::logger( name.toStdString().c_str());
 }
 
 //-----------------------------------------------------------------------------
@@ -54,147 +53,151 @@ ctkLogger::~ctkLogger()
 //-----------------------------------------------------------------------------
 void ctkLogger::configure()
 {
-  Log4Qt::BasicConfigurator::configure();
+  //Log4Qt::BasicConfigurator::configure();
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::debug(const QString& s)
-{ 
-  Q_D(ctkLogger);
-  d->Logger->debug(s);
+{
+  //Q_D(ctkLogger);
+  //d->Logger->debug(s);
+  qDebug() << s;
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::info(const QString& s)
-{ 
-  Q_D(ctkLogger);
-  d->Logger->info(s);
+{
+  //Q_D(ctkLogger);
+  //d->Logger->info(s);
+  qDebug() << s;
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::trace(const QString& s)
-{ 
-  Q_D(ctkLogger);
-  d->Logger->trace(s);
+{
+  //Q_D(ctkLogger);
+  //d->Logger->trace(s);
+  qDebug() << s;
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::warn(const QString& s)
-{ 
-  Q_D(ctkLogger);
-  d->Logger->warn(s);
+{
+  //Q_D(ctkLogger);
+  //d->Logger->warn(s);
+  qWarning() << s;
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::error(const QString& s)
-{ 
-  Q_D(ctkLogger);
-  d->Logger->error(s);
+{
+  //Q_D(ctkLogger);
+  //d->Logger->error(s);
+  qCritical() << s;
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::fatal(const QString& s)
-{ 
-  Q_D(ctkLogger);
-  d->Logger->fatal(s);
+{
+  //Q_D(ctkLogger);
+  //d->Logger->fatal(s);
+  qCritical() << s;
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::setOff()
 {
-  Q_D(ctkLogger);
-  d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::OFF_INT));
+  //Q_D(ctkLogger);
+  //d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::OFF_INT));
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::setDebug()
 {
-  Q_D(ctkLogger);
-  d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::DEBUG_INT));
+  //Q_D(ctkLogger);
+  //d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::DEBUG_INT));
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::setInfo()
-{ 
-  Q_D(ctkLogger);
-  d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::INFO_INT));
+{
+  //Q_D(ctkLogger);
+  //d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::INFO_INT));
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::setTrace()
-{ 
-  Q_D(ctkLogger);
-  d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::TRACE_INT));
+{
+  //Q_D(ctkLogger);
+  //d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::TRACE_INT));
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::setWarn()
-{ 
-  Q_D(ctkLogger);
-  d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::WARN_INT));
+{
+  //Q_D(ctkLogger);
+  //d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::WARN_INT));
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::setError()
-{ 
-  Q_D(ctkLogger);
-  d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::ERROR_INT));
+{
+  //Q_D(ctkLogger);
+  //d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::ERROR_INT));
 }
 
 //-----------------------------------------------------------------------------
 void ctkLogger::setFatal()
-{ 
-  Q_D(ctkLogger);
-  d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::FATAL_INT));
+{
+  //Q_D(ctkLogger);
+  //d->Logger->setLevel(Log4Qt::Level(Log4Qt::Level::FATAL_INT));
 }
 
 //-----------------------------------------------------------------------------
 bool ctkLogger::isOffEnabled()
 {
-  Q_D(ctkLogger); //Not sure
-  return d->Logger->isEnabledFor(Log4Qt::Level(Log4Qt::Level::OFF_INT));
+  //Q_D(ctkLogger); //Not sure
+  //return d->Logger->isEnabledFor(Log4Qt::Level(Log4Qt::Level::OFF_INT));
 }
 
 //-----------------------------------------------------------------------------
 bool ctkLogger::isDebugEnabled()
-{ 
-  Q_D(ctkLogger);
-  return d->Logger->isDebugEnabled(); 
+{
+  //Q_D(ctkLogger);
+  //return d->Logger->isDebugEnabled();
 }
 
 //-----------------------------------------------------------------------------
 bool ctkLogger::isInfoEnabled()
-{ 
-  Q_D(ctkLogger);
-  return d->Logger->isInfoEnabled(); 
+{
+  //Q_D(ctkLogger);
+  //return d->Logger->isInfoEnabled();
 }
 
 //-----------------------------------------------------------------------------
 bool ctkLogger::isTraceEnabled()
-{ 
-  Q_D(ctkLogger);
-  return d->Logger->isTraceEnabled(); 
+{
+  //Q_D(ctkLogger);
+  //return d->Logger->isTraceEnabled();
 }
 
 //-----------------------------------------------------------------------------
 bool ctkLogger::isWarnEnabled()
-{ 
-  Q_D(ctkLogger);
-  return d->Logger->isWarnEnabled(); 
+{
+  //Q_D(ctkLogger);
+  //return d->Logger->isWarnEnabled();
 }
 
 //-----------------------------------------------------------------------------
 bool ctkLogger::isErrorEnabled()
-{ 
-  Q_D(ctkLogger);
-  return d->Logger->isErrorEnabled(); 
+{
+  //Q_D(ctkLogger);
+  //return d->Logger->isErrorEnabled();
 }
 
 //-----------------------------------------------------------------------------
 bool ctkLogger::isFatalEnabled()
-{ 
-  Q_D(ctkLogger);
-  return d->Logger->isFatalEnabled(); 
+{
+  //Q_D(ctkLogger);
+  //return d->Logger->isFatalEnabled();
 }
-
-

Libs/Core/ctkLogger.h

@@ -21,7 +21,7 @@
 #ifndef __ctkLogger_h
 #define __ctkLogger_h
 
-// Qt includes 
+// Qt includes
 #include <QObject>
 
 // CTK includes
@@ -30,6 +30,8 @@
 
 class ctkLoggerPrivate;
 
+/// \deprecated This class was a wrapper around Log4Qt. Since Log4Qt dependency has been
+/// removed, it is advised to use qDebug(), qWarning() and qCritical() instead.
 /// \ingroup Core
 class CTK_CORE_EXPORT ctkLogger : public QObject
 {
@@ -41,7 +43,7 @@ public:
   virtual ~ctkLogger ();
 
   static void configure();
-  
+
   void debug(const QString& s);
   void info(const QString& s);
   void trace(const QString& s);

Libs/Core/target_libraries.cmake

@@ -1,11 +1,10 @@
 #
 # See CMake/ctkFunctionGetTargetLibraries.cmake
-# 
+#
 # This file should list the libraries required to build the current CTK libraries
 #
 
 SET(target_libraries
-  Log4Qt_LIBRARIES
   QT_LIBRARIES
   BFD_LIBRARIES
   )