1 files changed, 12 insertions, 4 deletions

diff --git a/common/log.h b/common/log.h
index ee92f46..9db9e8e 100644
--- a/common/log.h
+++ b/common/log.h
@@ -2,6 +2,9 @@
 
 #include <QDebug>
 
+namespace Akonadi2 {
+namespace Log {
+
 enum DebugLevel {
     Trace,
     Log,
@@ -9,10 +12,15 @@ enum DebugLevel {
     Error
 };
 
+void setDebugOutputLevel(DebugLevel);
+
 QDebug debugStream(DebugLevel debugLevel, int line, const char* file, const char* function, const char* debugArea = 0);
 
-#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 Trace() Akonadi2::Log::debugStream(Akonadi2::Log::DebugLevel::Trace, __LINE__, __FILE__, Q_FUNC_INFO)
+#define Log() Akonadi2::Log::debugStream(Akonadi2::Log::DebugLevel::Log, __LINE__, __FILE__, Q_FUNC_INFO)
+#define Warning() Akonadi2::Log::debugStream(Akonadi2::Log::DebugLevel::Warning, __LINE__, __FILE__, Q_FUNC_INFO)
 //FIXME Error clashes with Storage::Error and MessageQueue::Error
-#define ErrorMsg() debugStream(DebugLevel::Error, __LINE__, __FILE__, Q_FUNC_INFO)
+#define ErrorMsg() Akonadi2::Log::debugStream(Akonadi2::Log::DebugLevel::Error, __LINE__, __FILE__, Q_FUNC_INFO)