From 7f91cf58b9abc9efcdad852ccdd758aefd88e365 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Mon, 7 Jul 2014 13:24:51 +0200 Subject: [PATCH] qmljs: put file specific logs in anonymous namespace putting file specific log categories in anonymous namespace avoid the possibility of nameclashes. Change-Id: I17a07015ffe1c539824fcfcbc2296335d9225dd1 Reviewed-by: Kai Koehne --- src/libs/qmljs/qmljscodeformatter.cpp | 6 ++++-- src/libs/qmljs/qmljsicons.cpp | 6 ++++-- src/libs/qmljs/qmljsimportdependencies.cpp | 6 ++++-- src/libs/qmljs/qmljssimplereader.cpp | 5 ++++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp index caeb40da6f8..89e7544e1ee 100644 --- a/src/libs/qmljs/qmljscodeformatter.cpp +++ b/src/libs/qmljs/qmljscodeformatter.cpp @@ -35,9 +35,11 @@ #include #include -namespace QmlJS { - +namespace { Q_LOGGING_CATEGORY(formatterLog, "qtc.qmljs.formatter") +} + +namespace QmlJS { CodeFormatter::BlockData::BlockData() : m_indentDepth(0) diff --git a/src/libs/qmljs/qmljsicons.cpp b/src/libs/qmljs/qmljsicons.cpp index 611e75d2f2b..3131583aa6f 100644 --- a/src/libs/qmljs/qmljsicons.cpp +++ b/src/libs/qmljs/qmljsicons.cpp @@ -43,9 +43,11 @@ enum { debug = false }; -namespace QmlJS { - +namespace { Q_LOGGING_CATEGORY(iconsLog, "qtc.qmljs.icons") +} + +namespace QmlJS { Icons *Icons::m_instance = 0; diff --git a/src/libs/qmljs/qmljsimportdependencies.cpp b/src/libs/qmljs/qmljsimportdependencies.cpp index 269b087c904..60a79c51b06 100644 --- a/src/libs/qmljs/qmljsimportdependencies.cpp +++ b/src/libs/qmljs/qmljsimportdependencies.cpp @@ -38,9 +38,11 @@ #include -namespace QmlJS { - +namespace { Q_LOGGING_CATEGORY(importsLog, "qtc.qmljs.imports") +} + +namespace QmlJS { ImportKind::Enum toImportKind(ImportType::Enum type) { diff --git a/src/libs/qmljs/qmljssimplereader.cpp b/src/libs/qmljs/qmljssimplereader.cpp index a47da70ce05..46505eb3c1a 100644 --- a/src/libs/qmljs/qmljssimplereader.cpp +++ b/src/libs/qmljs/qmljssimplereader.cpp @@ -39,8 +39,11 @@ #include -namespace QmlJS{ +namespace { Q_LOGGING_CATEGORY(simpleReaderLog, "qtc.qmljs.simpleReader") +} + +namespace QmlJS{ QVariant SimpleReaderNode::property(const QString &name) const {