From bbb7c128488d0bc1dbedd4fe9f8a7a4de778705b Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Sat, 18 Apr 2015 10:24:36 +0200 Subject: Renamed the Error log macro to ErrorMsg because of nameclashes With Storage::Error. Perhaps turn to akLog, akError, ...? --- common/log.h | 3 ++- synchronizer/listener.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/log.h b/common/log.h index 8d3dc75..e06ac5a 100644 --- a/common/log.h +++ b/common/log.h @@ -14,4 +14,5 @@ QDebug debugStream(DebugLevel debugLevel, int line, const char* file, const char #define Trace() debugStream(DebugLevel::Trace, __LINE__, __FILE__, Q_FUNC_INFO) #define Log() debugStream(DebugLevel::Log, __LINE__, __FILE__, Q_FUNC_INFO) #define Warning() debugStream(DebugLevel::Warning, __LINE__, __FILE__, Q_FUNC_INFO) -#define Error() debugStream(DebugLevel::Error, __LINE__, __FILE__, Q_FUNC_INFO) +//FIXME Error clashes with Storage::Error and MessageQueue::Error +#define ErrorMsg() debugStream(DebugLevel::Error, __LINE__, __FILE__, Q_FUNC_INFO) diff --git a/synchronizer/listener.cpp b/synchronizer/listener.cpp index 7481537..64e9c21 100644 --- a/synchronizer/listener.cpp +++ b/synchronizer/listener.cpp @@ -368,7 +368,7 @@ void Listener::loadResource() Log() << "\tFacades: " << Akonadi2::FacadeFactory::instance().getFacade(m_resourceName)->type(); m_resource->configurePipeline(m_pipeline); } else { - Error() << "Failed to load resource " << m_resourceName; + ErrorMsg() << "Failed to load resource " << m_resourceName; } //TODO: on failure ... what? //Enter broken state? -- cgit v1.2.3