Merge branch '67-remove-log4qt'. Closes #67

* 67-remove-log4qt:
  Remove unused method from ctkLogger and update logging method. See #67

Libs/Core/Testing/Cpp/CMakeLists.txt

@@ -138,6 +138,7 @@ SIMPLE_TEST( ctkErrorLogQtMessageHandlerWithThreadsTest1 )
 SIMPLE_TEST( ctkErrorLogStreamMessageHandlerWithThreadsTest1 )
 SIMPLE_TEST( ctkHistogramTest1 )
 SIMPLE_TEST( ctkLoggerTest1 )
+SET_PROPERTY(TEST ctkLoggerTest1 PROPERTY PASS_REGULAR_EXPRESSION "logger.debug\nlogger.info\nlogger.trace\nlogger.warn\nlogger.error\nlogger.fatal")
 SIMPLE_TEST( ctkModelTesterTest1 )
 SIMPLE_TEST( ctkModelTesterTest2 )
 SIMPLE_TEST( ctkPimplTest1 )

Libs/Core/Testing/Cpp/ctkLoggerTest1.cpp

@@ -35,83 +35,13 @@ int ctkLoggerTest1(int argc, char * argv [] )
 
   //--------------------------------------------------------------------
   ctkLogger logger("LoggerTest");
-  std::cout<< "Logger default : " << logger.isOffEnabled() << std::endl;
-  logger.setOff();
-  if (!logger.isOffEnabled())
-    {
-    std::cerr << "Line " << __LINE__
-              << " - Problem vith Logger::setOff()" << std::endl;
-    return EXIT_FAILURE;
-    }
-  std::cout<< "Logger after setOff() : " << logger.isOffEnabled() << std::endl;
 
-  //------------------------------------------------------------------
-  std::cout<< "Logger Debug default : " << logger.isDebugEnabled() << std::endl;
-  logger.setDebug();
-  if (!logger.isDebugEnabled())
-    {
-    std::cerr << "Line " << __LINE__
-              << " - Problem vith Logger::setDebug()" << std::endl;
-    return EXIT_FAILURE;
-    }
-  std::cout << "Logger Debug after setDebug() : "
-            << logger.isDebugEnabled() << std::endl;
-
-  //------------------------------------------------------------------
-  logger.setInfo();
-  if (!logger.isInfoEnabled())
-    {
-    std::cerr << "Line " << __LINE__
-              << " - Problem vith Logger::setDebug()" << std::endl;
-    return EXIT_FAILURE;
-    }
-
-  //------------------------------------------------------------------
-  logger.setTrace();
-  if (!logger.isTraceEnabled())
-    {
-    std::cerr << "Line " << __LINE__
-              << " - Problem vith Logger::setTrace()" << std::endl;
-    return EXIT_FAILURE;
-    }
-
-  //------------------------------------------------------------------
-  logger.setError();
-  if (!logger.isErrorEnabled())
-    {
-    std::cerr << "Line " << __LINE__
-              << " - Problem vith Logger::setError()" << std::endl;
-    return EXIT_FAILURE;
-    }
-
-  //------------------------------------------------------------------
-  logger.setWarn();
-  if (!logger.isWarnEnabled())
-    {
-    std::cerr << "Line " << __LINE__
-              << " - Problem vith Logger::setWarn()" << std::endl;
-    return EXIT_FAILURE;
-    }
-
-  //------------------------------------------------------------------
-  logger.setFatal();
-  if (!logger.isFatalEnabled())
-    {
-    std::cerr << "Line " << __LINE__
-              << " - Problem vith Logger::setFatal()" << std::endl;
-    return EXIT_FAILURE;
-    }
-
-  //------------------------------------------------------------------
-  logger.configure();
-  QString defaultString;  
-  logger.debug(defaultString);
-  logger.info(defaultString);
-  logger.trace(defaultString);
-  logger.warn(defaultString);
-  logger.warn(defaultString);
-  logger.error(defaultString);
-  logger.fatal(defaultString);
+  logger.debug("logger.debug");
+  logger.info("logger.info");
+  logger.trace("logger.trace");
+  logger.warn("logger.warn");
+  logger.error("logger.error");
+  logger.fatal("logger.fatal");
 
   return EXIT_SUCCESS;
 }

Libs/Core/ctkLogger.cpp

@@ -41,6 +41,7 @@ ctkLogger::ctkLogger(QString name, QObject* _parent)
   : Superclass(_parent)
   , d_ptr(new ctkLoggerPrivate)
 {
+  Q_UNUSED(name);
   //Q_D(ctkLogger);
   //d->Logger = Log4Qt::Logger::logger( name.toStdString().c_str());
 }
@@ -50,18 +51,18 @@ ctkLogger::~ctkLogger()
 {
 }
 
-//-----------------------------------------------------------------------------
-void ctkLogger::configure()
-{
-  //Log4Qt::BasicConfigurator::configure();
-}
+////-----------------------------------------------------------------------------
+//void ctkLogger::configure()
+//{
+//  //Log4Qt::BasicConfigurator::configure();
+//}
 
 //-----------------------------------------------------------------------------
 void ctkLogger::debug(const QString& s)
 {
   //Q_D(ctkLogger);
   //d->Logger->debug(s);
-  qDebug() << s;
+  qDebug().nospace() << qPrintable(s);
 }
 
 //-----------------------------------------------------------------------------
@@ -69,7 +70,7 @@ void ctkLogger::info(const QString& s)
 {
   //Q_D(ctkLogger);
   //d->Logger->info(s);
-  qDebug() << s;
+  qDebug().nospace() << qPrintable(s);
 }
 
 //-----------------------------------------------------------------------------
@@ -77,7 +78,7 @@ void ctkLogger::trace(const QString& s)
 {
   //Q_D(ctkLogger);
   //d->Logger->trace(s);
-  qDebug() << s;
+  qDebug().nospace() << qPrintable(s);
 }
 
 //-----------------------------------------------------------------------------
@@ -85,7 +86,7 @@ void ctkLogger::warn(const QString& s)
 {
   //Q_D(ctkLogger);
   //d->Logger->warn(s);
-  qWarning() << s;
+  qWarning().nospace() << qPrintable(s);
 }
 
 //-----------------------------------------------------------------------------
@@ -93,7 +94,7 @@ void ctkLogger::error(const QString& s)
 {
   //Q_D(ctkLogger);
   //d->Logger->error(s);
-  qCritical() << s;
+  qCritical().nospace() << qPrintable(s);
 }
 
 //-----------------------------------------------------------------------------
@@ -101,103 +102,103 @@ void ctkLogger::fatal(const QString& 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));
-}
-
-//-----------------------------------------------------------------------------
-void ctkLogger::setDebug()
-{
-  //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));
-}
-
-//-----------------------------------------------------------------------------
-void ctkLogger::setTrace()
-{
-  //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));
-}
-
-//-----------------------------------------------------------------------------
-void ctkLogger::setError()
-{
-  //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));
-}
-
-//-----------------------------------------------------------------------------
-bool ctkLogger::isOffEnabled()
-{
-  //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();
-}
-
-//-----------------------------------------------------------------------------
-bool ctkLogger::isInfoEnabled()
-{
-  //Q_D(ctkLogger);
-  //return d->Logger->isInfoEnabled();
-}
-
-//-----------------------------------------------------------------------------
-bool ctkLogger::isTraceEnabled()
-{
-  //Q_D(ctkLogger);
-  //return d->Logger->isTraceEnabled();
-}
-
-//-----------------------------------------------------------------------------
-bool ctkLogger::isWarnEnabled()
-{
-  //Q_D(ctkLogger);
-  //return d->Logger->isWarnEnabled();
-}
-
-//-----------------------------------------------------------------------------
-bool ctkLogger::isErrorEnabled()
-{
-  //Q_D(ctkLogger);
-  //return d->Logger->isErrorEnabled();
-}
-
-//-----------------------------------------------------------------------------
-bool ctkLogger::isFatalEnabled()
-{
-  //Q_D(ctkLogger);
-  //return d->Logger->isFatalEnabled();
-}
+  qCritical().nospace() << qPrintable(s);
+}
+
+////-----------------------------------------------------------------------------
+//void ctkLogger::setOff()
+//{
+//  //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));
+//}
+
+////-----------------------------------------------------------------------------
+//void ctkLogger::setInfo()
+//{
+//  //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));
+//}
+
+////-----------------------------------------------------------------------------
+//void ctkLogger::setWarn()
+//{
+//  //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));
+//}
+
+////-----------------------------------------------------------------------------
+//void ctkLogger::setFatal()
+//{
+//  //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));
+//}
+
+////-----------------------------------------------------------------------------
+//bool ctkLogger::isDebugEnabled()
+//{
+//  //Q_D(ctkLogger);
+//  //return d->Logger->isDebugEnabled();
+//}
+
+////-----------------------------------------------------------------------------
+//bool ctkLogger::isInfoEnabled()
+//{
+//  //Q_D(ctkLogger);
+//  //return d->Logger->isInfoEnabled();
+//}
+
+////-----------------------------------------------------------------------------
+//bool ctkLogger::isTraceEnabled()
+//{
+//  //Q_D(ctkLogger);
+//  //return d->Logger->isTraceEnabled();
+//}
+
+////-----------------------------------------------------------------------------
+//bool ctkLogger::isWarnEnabled()
+//{
+//  //Q_D(ctkLogger);
+//  //return d->Logger->isWarnEnabled();
+//}
+
+////-----------------------------------------------------------------------------
+//bool ctkLogger::isErrorEnabled()
+//{
+//  //Q_D(ctkLogger);
+//  //return d->Logger->isErrorEnabled();
+//}
+
+////-----------------------------------------------------------------------------
+//bool ctkLogger::isFatalEnabled()
+//{
+//  //Q_D(ctkLogger);
+//  //return d->Logger->isFatalEnabled();
+//}

Libs/Core/ctkLogger.h

@@ -42,8 +42,6 @@ public:
   explicit ctkLogger(QString name, QObject* parent = 0);
   virtual ~ctkLogger ();
 
-  static void configure();
-
   void debug(const QString& s);
   void info(const QString& s);
   void trace(const QString& s);
@@ -51,22 +49,6 @@ public:
   void error(const QString& s);
   void fatal(const QString& s);
 
-  void setOff();
-  void setDebug();
-  void setInfo();
-  void setTrace();
-  void setError();
-  void setWarn();
-  void setFatal();
-
-  bool isOffEnabled();
-  bool isDebugEnabled();
-  bool isInfoEnabled();
-  bool isTraceEnabled();
-  bool isWarnEnabled();
-  bool isErrorEnabled();
-  bool isFatalEnabled();
-
 protected:
   QScopedPointer<ctkLoggerPrivate> d_ptr;