feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs: switch to the new category logging

Browse Source 
Change-Id: Id4e43779590939e9d6dd2d0dab536f70e721f097
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-05-27 10:39:50 +02:00
committed by Kai Koehne
parent b204c4dba2
commit 4dc438db5e
17 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libs/qmljs/qmljssimplereader.cpp
View File

@@ -33,16 +33,14 @@
#include "parser/qmljslexer_p.h"
#include "parser/qmljsengine_p.h"
#include <utils/logging.h>
#include "qmljsutils.h"
#include <QFile>
enum {
debug = false
};
using namespace QmlJS;
namespace QmlJS{
Q_LOGGING_CATEGORY(simpleReaderLog, "qtc.qmljs.simpleReader")
QVariant SimpleReaderNode::property(const QString &name) const
{
@@ -304,8 +302,7 @@ SimpleReaderNode::Ptr SimpleReader::readFromSource(const QString &source)
void SimpleReader::elementStart(const QString &name)
{
if (debug)
qDebug() << "SimpleReader::elementStart()" << name;
qCDebug(simpleReaderLog) << "elementStart()" << name;
SimpleReaderNode::Ptr newNode = SimpleReaderNode::create(name, m_currentNode);
@@ -321,8 +318,7 @@ void SimpleReader::elementEnd()
{
Q_ASSERT(m_currentNode);
if (debug)
qDebug() << "SimpleReader::elementEnd()" << m_currentNode.data()->name();
qCDebug(simpleReaderLog) << "elementEnd()" << m_currentNode.data()->name();
m_currentNode = m_currentNode.data()->parent();
}
@@ -331,11 +327,12 @@ void SimpleReader::propertyDefinition(const QString &name, const QVariant &value
{
Q_ASSERT(m_currentNode);
if (debug)
qDebug() << "SimpleReader::propertyDefinition()" << m_currentNode.data()->name() << name << value;
qCDebug(simpleReaderLog) << "propertyDefinition()" << m_currentNode.data()->name() << name << value;
if (m_currentNode.data()->propertyNames().contains(name))
addError(tr("Property is defined twice."), currentSourceLocation());
m_currentNode.data()->setProperty(name, value);
}
} // namespace QmlJS